1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-02 14:36:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

(Chinese) Add support for line breaks in ITEMS.XML

Browse Source 
Added detection of the NEWLINE_CHAR character "±" to enable line breaks not only when text exceeds display width, but also upon encountering NEWLINE_CHAR.
Note: This character has been conventionally adopted in the Chinese community as a line break marker within XML item descriptions. The modification affects Chinese text display only.
This commit is contained in:
Juqi
2026-05-02 09:39:03 +03:00
committed by Asdow
parent 99a4ff1527
commit ef325c1cde
1 changed files with 58 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Utils/WordWrap.cpp
+57 -46
View File
@@ -199,7 +199,10 @@ WRAPPED_STRING *LineWrap(INT32 iFont, UINT16 usLineWidthPixels, UINT16 *pusLineW
usCurrentWidthPixels = usCurrentWidthPixels + WFStringPixLength( OneChar, iFont); usCurrentWidthPixels = usCurrentWidthPixels + WFStringPixLength( OneChar, iFont);
//If we are at the end of the string //If we are at the end of the string
if(TempString[ usCurIndex ] == 0)
//Juqi: Add NEWLINE_CHAR detect
// NEWLINE_CHAR "±" is only used to handle Chinese ITMES.XML file.
if (TempString[ usCurIndex ] == 0 && !fNewLine)
{ {
//get to next WrappedString structure //get to next WrappedString structure
pWrappedString = &FirstWrappedString; pWrappedString = &FirstWrappedString;
@@ -224,10 +227,13 @@ WRAPPED_STRING *LineWrap(INT32 iFont, UINT16 usLineWidthPixels, UINT16 *pusLineW
} }
//Juqi: Allow manual line breaks to be added in XML,
if( (g_lang != i18n::Lang::zh && usCurrentWidthPixels > usLineWidthPixels) // rather than relying solely on width for automatic line breaks.
|| if((usCurrentWidthPixels > usLineWidthPixels || fNewLine)
(g_lang == i18n::Lang::zh && usCurrentWidthPixels > usLineWidthPixels &&
((g_lang != i18n::Lang::zh)
||
(g_lang == i18n::Lang::zh
&& TempString[usCurIndex] != L'，' && TempString[usCurIndex] != L'，'
&& TempString[usCurIndex] != L'。' && TempString[usCurIndex] != L'。'
&& TempString[usCurIndex] != L'；' && TempString[usCurIndex] != L'；'
@@ -239,8 +245,9 @@ WRAPPED_STRING *LineWrap(INT32 iFont, UINT16 usLineWidthPixels, UINT16 *pusLineW
&& TempString[usCurIndex] != L'？' && TempString[usCurIndex] != L'？'
&& TempString[usCurIndex] != L')' && TempString[usCurIndex] != L')'
&& TempString[usCurIndex] != L'）' && TempString[usCurIndex] != L'）'
)//||(DestString[ usDestIndex ]==NEWLINE_CHAR )||(fNewLine)) ))
) )
{ {
//if an error has occured, and the string is too long //if an error has occured, and the string is too long
@@ -251,51 +258,55 @@ WRAPPED_STRING *LineWrap(INT32 iFont, UINT16 usLineWidthPixels, UINT16 *pusLineW
// Fix really long unbroken strings, the above code dosent work for it // Fix really long unbroken strings, the above code dosent work for it
usLastMaxWidthIndex = usDestIndex; usLastMaxWidthIndex = usDestIndex;
//Go back to begining of word //Juqi: if NEWLINE_CHAR, don't go back
while( if (!fNewLine)
(g_lang != i18n::Lang::zh && DestString[ usDestIndex ] != L' ' && usCurIndex > 0 && usDestIndex > 0)
||
(g_lang == i18n::Lang::zh && DestString[ usDestIndex ] != L' ' && usCurIndex > 0 && usDestIndex > 0 && DestString[usDestIndex] < 255))
{ {
OneChar[0] = DestString[ usDestIndex ]; //Go back to begining of word
while(
(g_lang != i18n::Lang::zh && DestString[ usDestIndex ] != L' ' && usCurIndex > 0 && usDestIndex > 0)
||
(g_lang == i18n::Lang::zh && DestString[ usDestIndex ] != L' ' && usCurIndex > 0 && usDestIndex > 0 && DestString[usDestIndex] < 255))
{
OneChar[0] = DestString[ usDestIndex ];
usCurrentWidthPixels = usCurrentWidthPixels - WFStringPixLength( OneChar, iFont); usCurrentWidthPixels = usCurrentWidthPixels - WFStringPixLength( OneChar, iFont);
usCurIndex--; usCurIndex--;
usDestIndex--; usDestIndex--;
} }
if (g_lang == i18n::Lang::zh && DestString[usDestIndex] > 255) if (g_lang == i18n::Lang::zh && DestString[usDestIndex] > 255)
{ {
if (DestString[usDestIndex] == L'，' if (DestString[usDestIndex] == L'，'
|| DestString[usDestIndex] == L',' || DestString[usDestIndex] == L','
|| DestString[usDestIndex] == L'。' || DestString[usDestIndex] == L'。'
|| DestString[usDestIndex] == L'；' || DestString[usDestIndex] == L'；'
|| DestString[usDestIndex] == L'”' || DestString[usDestIndex] == L'”'
|| DestString[usDestIndex] == L'’' || DestString[usDestIndex] == L'’'
|| DestString[usDestIndex] == L'：' || DestString[usDestIndex] == L'：'
|| DestString[usDestIndex] == L'、' || DestString[usDestIndex] == L'、'
|| DestString[usDestIndex] == L'?' || DestString[usDestIndex] == L'?'
|| DestString[usDestIndex] == L'？' || DestString[usDestIndex] == L'？'
|| DestString[usDestIndex] == L')' || DestString[usDestIndex] == L')'
|| DestString[usDestIndex] == L'）') || DestString[usDestIndex] == L'）')
{usDestIndex++;} {usDestIndex++;}
else else
{usCurIndex--;} {usCurIndex--;}
} }
usEndIndex = usDestIndex; usEndIndex = usDestIndex;
// OJW - 20090427 // OJW - 20090427
// Fix really long unbroken strings // Fix really long unbroken strings
if( usEndIndex <= 0 ) if( usEndIndex <= 0 )
{ {
usEndIndex = usLastMaxWidthIndex; usEndIndex = usLastMaxWidthIndex;
usDestIndex = usLastMaxWidthIndex; usDestIndex = usLastMaxWidthIndex;
usCurIndex += usLastMaxWidthIndex - 1; usCurIndex += usLastMaxWidthIndex - 1;
} }
// put next line into temp buffer // put next line into temp buffer
DestString[usEndIndex] = 0; DestString[usEndIndex] = 0;
} //Juqi: endif
//get to next WrappedString structure //get to next WrappedString structure
pWrappedString = &FirstWrappedString; pWrappedString = &FirstWrappedString;