WARNING: BREAKING CHANGE

raysan5 · raysan5 · commit 01338b0a14f0 · 2018-12-26T13:26:34.000+01:00
Added a bunch of useful text management functions.
Consequently, some already available functions like `FormatText()` and `SubText()` has been renamed for consistency. Created temporal fallbacks for old names.
raylib version bumped to 2.3.
diff --git a/examples/shapes/shapes_logo_raylib_anim.c b/examples/shapes/shapes_logo_raylib_anim.c
@@ -2,7 +2,7 @@
 *
 *   raylib [shapes] example - raylib logo animation
 *
-*   This example has been created using raylib 1.4 (www.raylib.com)
+*   This example has been created using raylib 2.3 (www.raylib.com)
 *   raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
 *
 *   Copyright (c) 2014 Ramon Santamaria (@raysan5)
@@ -140,7 +140,7 @@ int main()
 
                 DrawRectangle(screenWidth/2 - 112, screenHeight/2 - 112, 224, 224, Fade(RAYWHITE, alpha));
 
-                DrawText(SubText("raylib", 0, lettersCount), screenWidth/2 - 44, screenHeight/2 + 48, 50, Fade(BLACK, alpha));
+                DrawText(TextSubtext("raylib", 0, lettersCount), screenWidth/2 - 44, screenHeight/2 + 48, 50, Fade(BLACK, alpha));
             }
             else if (state == 4)
             {
diff --git a/examples/text/text_writing_anim.c b/examples/text/text_writing_anim.c
@@ -2,7 +2,7 @@
 *
 *   raylib [text] example - Text Writing Animation
 *
-*   This example has been created using raylib 1.4 (www.raylib.com)
+*   This example has been created using raylib 2.3 (www.raylib.com)
 *   raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
 *
 *   Copyright (c) 2016 Ramon Santamaria (@raysan5)
@@ -44,7 +44,7 @@ int main()
 
             ClearBackground(RAYWHITE);
 
-            DrawText(SubText(message, 0, framesCounter/10), 210, 160, 20, MAROON);
+            DrawText(TextSubtext(message, 0, framesCounter/10), 210, 160, 20, MAROON);
             
             DrawText("PRESS [ENTER] to RESTART!", 240, 260, 20, LIGHTGRAY);
             DrawText("PRESS [SPACE] to SPEED UP!", 239, 300, 20, LIGHTGRAY);
diff --git a/games/transmission/screens/screen_gameplay.c b/games/transmission/screens/screen_gameplay.c
@@ -219,18 +219,18 @@ void InitGameplayScreen(void)
         {
             foundWord = false;
 
-            messageWords[currentWord - 1].rec.width = (int)MeasureTextEx(fontMessage, SubText(missions[currentMission].msg, wordInitPosX, (i - wordInitPosX)), 30, 0).x;
+            messageWords[currentWord - 1].rec.width = (int)MeasureTextEx(fontMessage, TextSubtext(missions[currentMission].msg, wordInitPosX, (i - wordInitPosX)), 30, 0).x;
             messageWords[currentWord - 1].rec.height = fontMessage.baseSize;
 
-            strncpy(messageWords[currentWord - 1].text, SubText(missions[currentMission].msg, wordInitPosX, (i - wordInitPosX)), i - wordInitPosX);
+            strncpy(messageWords[currentWord - 1].text, TextSubtext(missions[currentMission].msg, wordInitPosX, (i - wordInitPosX)), i - wordInitPosX);
         }
 
         if (c == '@') // One word to change
         {
             foundWord = true;
             missions[currentMission].msg[i] = ' ';
 
-            offsetX = (int)MeasureTextEx(fontMessage, SubText(missions[currentMission].msg, wordInitPosY, (i + 1) - wordInitPosY), 30, 0).x;
+            offsetX = (int)MeasureTextEx(fontMessage, TextSubtext(missions[currentMission].msg, wordInitPosY, (i + 1) - wordInitPosY), 30, 0).x;
 
             messageWords[currentWord].rec.x = offsetX;
             messageWords[currentWord].rec.y = offsetY;
diff --git a/games/transmission/screens/screen_mission.c b/games/transmission/screens/screen_mission.c
@@ -205,7 +205,7 @@ void DrawMissionScreen(void)
     DrawTexturePro(texBackline, sourceRecBackLine, destRecBackLine, (Vector2){0,0},0, Fade(WHITE, fadeBackLine));
 
     if (writeNumber) DrawTextEx(fontMission, FormatText("Filtración #%02i ", currentMission + 1), numberPosition, missionSize + 10, 0, numberColor);
-    DrawTextEx(fontMission, SubText(missions[currentMission].brief, 0, missionLenght), missionPosition, missionSize, 0, missionColor);
+    DrawTextEx(fontMission, TextSubtext(missions[currentMission].brief, 0, missionLenght), missionPosition, missionSize, 0, missionColor);
     if (writeKeyword && blinkKeyWord) DrawTextEx(fontMission, FormatText("Keyword: %s", missions[currentMission].key), keywordPosition, missionSize + 10, 0, keywordColor);
 
     if (showButton)
diff --git a/games/transmission/screens/screen_title.c b/games/transmission/screens/screen_title.c
@@ -137,8 +137,8 @@ void UpdateTitleScreen(void)
 void DrawTitleScreen(void)
 {
     DrawTexture(texBackground, 0,0, WHITE);
-    DrawTextEx(fontTitle, SubText(textTitle, 0, transmissionLenght), transmissionPosition, titleSize, 0, titleColor);
-    DrawTextEx(fontTitle, SubText(textTitle, 12, missionLenght), missionPositon, titleSize, 0, titleColor);      
+    DrawTextEx(fontTitle, TextSubtext(textTitle, 0, transmissionLenght), transmissionPosition, titleSize, 0, titleColor);
+    DrawTextEx(fontTitle, TextSubtext(textTitle, 12, missionLenght), missionPositon, titleSize, 0, titleColor);      
 
     DrawButton("start");
 }
diff --git a/src/config.h b/src/config.h
@@ -25,7 +25,7 @@
 *
 **********************************************************************************************/
 
-#define RAYLIB_VERSION  "2.2-dev"
+#define RAYLIB_VERSION  "2.3-dev"
 
 // Edit to control what features Makefile'd raylib is compiled with
 #if defined(RAYLIB_CMAKE)
diff --git a/src/core.c b/src/core.c
@@ -3176,17 +3176,17 @@ static void KeyCallback(GLFWwindow *window, int key, int scancode, int action, i
 
                 // NOTE: delay represents the time between frames in the gif, if we capture a gif frame every
                 // 10 game frames and each frame trakes 16.6ms (60fps), delay between gif frames should be ~16.6*10.
-                GifBegin(FormatText("screenrec%03i.gif", screenshotCounter), screenWidth, screenHeight, (int)(GetFrameTime()*10.0f), 8, false);
+                GifBegin(TextFormat("screenrec%03i.gif", screenshotCounter), screenWidth, screenHeight, (int)(GetFrameTime()*10.0f), 8, false);
                 screenshotCounter++;
 
-                TraceLog(LOG_INFO, "Begin animated GIF recording: %s", FormatText("screenrec%03i.gif", screenshotCounter));
+                TraceLog(LOG_INFO, "Begin animated GIF recording: %s", TextFormat("screenrec%03i.gif", screenshotCounter));
             }
         }
         else
     #endif  // SUPPORT_GIF_RECORDING
     #if defined(SUPPORT_SCREEN_CAPTURE)
         {
-            TakeScreenshot(FormatText("screenshot%03i.png", screenshotCounter));
+            TakeScreenshot(TextFormat("screenshot%03i.png", screenshotCounter));
             screenshotCounter++;
         }
     #endif  // SUPPORT_SCREEN_CAPTURE
@@ -4454,7 +4454,7 @@ static void LogoAnimation(void)
 
                 DrawRectangle(screenWidth/2 - 112, screenHeight/2 - 112, 224, 224, Fade(RAYWHITE, alpha));
 
-                DrawText(SubText("raylib", 0, lettersCount), screenWidth/2 - 44, screenHeight/2 + 48, 50, Fade(BLACK, alpha));
+                DrawText(TextSubtext("raylib", 0, lettersCount), screenWidth/2 - 44, screenHeight/2 + 48, 50, Fade(BLACK, alpha));
             }
 
         EndDrawing();
diff --git a/src/raylib.h b/src/raylib.h
@@ -135,6 +135,11 @@
 #define MAGENTA    CLITERAL{ 255, 0, 255, 255 }     // Magenta
 #define RAYWHITE   CLITERAL{ 245, 245, 245, 255 }   // My own White (raylib logo)
 
+// Temporal hack to avoid breaking old codebases using
+// deprecated raylib implementation of these functions
+#define FormatText  TextFormat
+#define SubText     TextSubText
+
 //----------------------------------------------------------------------------------
 // Structures Definition
 //----------------------------------------------------------------------------------
@@ -1111,11 +1116,22 @@ RLAPI int MeasureText(const char *text, int fontSize);
 RLAPI Vector2 MeasureTextEx(Font font, const char *text, float fontSize, float spacing);    // Measure string size for Font
 RLAPI int GetGlyphIndex(Font font, int character);                                          // Get index position for a unicode character on font
 
-// Text string edition functions
-RLAPI const char *FormatText(const char *text, ...);                        // Formatting of text with variables to 'embed'
-RLAPI const char *SubText(const char *text, int position, int length);      // Get a piece of a text string
-RLAPI char **SplitText(char *text, char delimiter, int *strCount);          // Split text string into multiple strings (memory should be freed manually!)
-RLAPI bool IsEqualText(const char *text1, const char *text2);               // Check if two text string are equal
+// Text strings management functions
+// NOTE: Some strings allocate memory internally for returned strings, just be careful!
+RLAPI bool TextIsEqual(const char *text1, const char *text2);                               // Check if two text string are equal
+RLAPI unsigned int TextLength(const char *text);                                            // Get text length, checks for '\0' ending
+RLAPI const char *TextFormat(const char *text, ...);                                        // Text formatting with variables (sprintf)
+RLAPI const char *TextSubtext(const char *text, int position, int length);                  // Get a piece of a text string
+RLAPI const char *TextReplace(char *text, const char *replace, const char *by);             // Replace text string (memory should be freed!)
+RLAPI const char *TextInsert(const char *text, const char *insert, int position);           // Insert text in a position (memory should be freed!)
+RLAPI const char *TextJoin(const char **textList, int count, const char *delimiter);        // Join text strings with delimiter
+RLAPI char **TextSplit(const char *text, char delimiter, int *count);                       // Split text into multiple strings (memory should be freed!)
+RLAPI void TextSplitEx(const char *text, char delimiter, int *count, const char **ptrs, int *lengths); // Get pointers to substrings separated by delimiter
+RLAPI void TextAppend(char *text, const char *append, int *position);                       // Append text at specific position and move cursor!
+RLAPI int TextFindIndex(const char *text, const char *find);                                // Find first text occurrence within a string
+RLAPI const char *TextToUpper(const char *text);                      // Get upper case version of provided string
+RLAPI const char *TextToLower(const char *text);                      // Get lower case version of provided string
+RLAPI const char *TextToPascal(const char *text);                     // Get Pascal case notation version of provided string
 
 //------------------------------------------------------------------------------------
 // Basic 3d Shapes Drawing Functions (Module: models)
diff --git a/src/text.c b/src/text.c

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`*`
`3`	`3`	`* raylib [shapes] example - raylib logo animation`
`4`	`4`	`*`
`5`		`-* This example has been created using raylib 1.4 (www.raylib.com)`
	`5`	`+* This example has been created using raylib 2.3 (www.raylib.com)`
`6`	`6`	`* raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)`
`7`	`7`	`*`
`8`	`8`	`* Copyright (c) 2014 Ramon Santamaria (@raysan5)`
`@@ -140,7 +140,7 @@ int main()`
`140`	`140`
`141`	`141`	`DrawRectangle(screenWidth/2 - 112, screenHeight/2 - 112, 224, 224, Fade(RAYWHITE, alpha));`
`142`	`142`
`143`		`- DrawText(SubText("raylib", 0, lettersCount), screenWidth/2 - 44, screenHeight/2 + 48, 50, Fade(BLACK, alpha));`
	`143`	`+ DrawText(TextSubtext("raylib", 0, lettersCount), screenWidth/2 - 44, screenHeight/2 + 48, 50, Fade(BLACK, alpha));`
`144`	`144`	`}`
`145`	`145`	`else if (state == 4)`
`146`	`146`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`*`
`3`	`3`	`* raylib [text] example - Text Writing Animation`
`4`	`4`	`*`
`5`		`-* This example has been created using raylib 1.4 (www.raylib.com)`
	`5`	`+* This example has been created using raylib 2.3 (www.raylib.com)`
`6`	`6`	`* raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)`
`7`	`7`	`*`
`8`	`8`	`* Copyright (c) 2016 Ramon Santamaria (@raysan5)`
`@@ -44,7 +44,7 @@ int main()`
`44`	`44`
`45`	`45`	`ClearBackground(RAYWHITE);`
`46`	`46`
`47`		`- DrawText(SubText(message, 0, framesCounter/10), 210, 160, 20, MAROON);`
	`47`	`+ DrawText(TextSubtext(message, 0, framesCounter/10), 210, 160, 20, MAROON);`
`48`	`48`
`49`	`49`	`DrawText("PRESS [ENTER] to RESTART!", 240, 260, 20, LIGHTGRAY);`
`50`	`50`	`DrawText("PRESS [SPACE] to SPEED UP!", 239, 300, 20, LIGHTGRAY);`
Original file line number	Diff line number	Diff line change
`@@ -219,18 +219,18 @@ void InitGameplayScreen(void)`
`219`	`219`	`{`
`220`	`220`	`foundWord = false;`
`221`	`221`
`222`		`- messageWords[currentWord - 1].rec.width = (int)MeasureTextEx(fontMessage, SubText(missions[currentMission].msg, wordInitPosX, (i - wordInitPosX)), 30, 0).x;`
	`222`	`+ messageWords[currentWord - 1].rec.width = (int)MeasureTextEx(fontMessage, TextSubtext(missions[currentMission].msg, wordInitPosX, (i - wordInitPosX)), 30, 0).x;`
`223`	`223`	`messageWords[currentWord - 1].rec.height = fontMessage.baseSize;`
`224`	`224`
`225`		`- strncpy(messageWords[currentWord - 1].text, SubText(missions[currentMission].msg, wordInitPosX, (i - wordInitPosX)), i - wordInitPosX);`
	`225`	`+ strncpy(messageWords[currentWord - 1].text, TextSubtext(missions[currentMission].msg, wordInitPosX, (i - wordInitPosX)), i - wordInitPosX);`
`226`	`226`	`}`
`227`	`227`
`228`	`228`	`if (c == '@') // One word to change`
`229`	`229`	`{`
`230`	`230`	`foundWord = true;`
`231`	`231`	`missions[currentMission].msg[i] = ' ';`
`232`	`232`
`233`		`- offsetX = (int)MeasureTextEx(fontMessage, SubText(missions[currentMission].msg, wordInitPosY, (i + 1) - wordInitPosY), 30, 0).x;`
	`233`	`+ offsetX = (int)MeasureTextEx(fontMessage, TextSubtext(missions[currentMission].msg, wordInitPosY, (i + 1) - wordInitPosY), 30, 0).x;`
`234`	`234`
`235`	`235`	`messageWords[currentWord].rec.x = offsetX;`
`236`	`236`	`messageWords[currentWord].rec.y = offsetY;`
Original file line number	Diff line number	Diff line change
`@@ -137,8 +137,8 @@ void UpdateTitleScreen(void)`
`137`	`137`	`void DrawTitleScreen(void)`
`138`	`138`	`{`
`139`	`139`	`DrawTexture(texBackground, 0,0, WHITE);`
`140`		`- DrawTextEx(fontTitle, SubText(textTitle, 0, transmissionLenght), transmissionPosition, titleSize, 0, titleColor);`
`141`		`- DrawTextEx(fontTitle, SubText(textTitle, 12, missionLenght), missionPositon, titleSize, 0, titleColor);`
	`140`	`+ DrawTextEx(fontTitle, TextSubtext(textTitle, 0, transmissionLenght), transmissionPosition, titleSize, 0, titleColor);`
	`141`	`+ DrawTextEx(fontTitle, TextSubtext(textTitle, 12, missionLenght), missionPositon, titleSize, 0, titleColor);`
`142`	`142`
`143`	`143`	`DrawButton("start");`
`144`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`*`
`26`	`26`	`**********************************************************************************************/`
`27`	`27`
`28`		`-#define RAYLIB_VERSION "2.2-dev"`
	`28`	`+#define RAYLIB_VERSION "2.3-dev"`
`29`	`29`
`30`	`30`	`// Edit to control what features Makefile'd raylib is compiled with`
`31`	`31`	`#if defined(RAYLIB_CMAKE)`
Original file line number	Diff line number	Diff line change
`@@ -3176,17 +3176,17 @@ static void KeyCallback(GLFWwindow *window, int key, int scancode, int action, i`
`3176`	`3176`
`3177`	`3177`	`// NOTE: delay represents the time between frames in the gif, if we capture a gif frame every`
`3178`	`3178`	`// 10 game frames and each frame trakes 16.6ms (60fps), delay between gif frames should be ~16.6*10.`
`3179`		`- GifBegin(FormatText("screenrec%03i.gif", screenshotCounter), screenWidth, screenHeight, (int)(GetFrameTime()*10.0f), 8, false);`
	`3179`	`+ GifBegin(TextFormat("screenrec%03i.gif", screenshotCounter), screenWidth, screenHeight, (int)(GetFrameTime()*10.0f), 8, false);`
`3180`	`3180`	`screenshotCounter++;`
`3181`	`3181`
`3182`		`- TraceLog(LOG_INFO, "Begin animated GIF recording: %s", FormatText("screenrec%03i.gif", screenshotCounter));`
	`3182`	`+ TraceLog(LOG_INFO, "Begin animated GIF recording: %s", TextFormat("screenrec%03i.gif", screenshotCounter));`
`3183`	`3183`	`}`
`3184`	`3184`	`}`
`3185`	`3185`	`else`
`3186`	`3186`	`#endif // SUPPORT_GIF_RECORDING`
`3187`	`3187`	`#if defined(SUPPORT_SCREEN_CAPTURE)`
`3188`	`3188`	`{`
`3189`		`- TakeScreenshot(FormatText("screenshot%03i.png", screenshotCounter));`
	`3189`	`+ TakeScreenshot(TextFormat("screenshot%03i.png", screenshotCounter));`
`3190`	`3190`	`screenshotCounter++;`
`3191`	`3191`	`}`
`3192`	`3192`	`#endif // SUPPORT_SCREEN_CAPTURE`
`@@ -4454,7 +4454,7 @@ static void LogoAnimation(void)`
`4454`	`4454`
`4455`	`4455`	`DrawRectangle(screenWidth/2 - 112, screenHeight/2 - 112, 224, 224, Fade(RAYWHITE, alpha));`
`4456`	`4456`
`4457`		`- DrawText(SubText("raylib", 0, lettersCount), screenWidth/2 - 44, screenHeight/2 + 48, 50, Fade(BLACK, alpha));`
	`4457`	`+ DrawText(TextSubtext("raylib", 0, lettersCount), screenWidth/2 - 44, screenHeight/2 + 48, 50, Fade(BLACK, alpha));`
`4458`	`4458`	`}`
`4459`	`4459`
`4460`	`4460`	`EndDrawing();`