Author: jghali Date: Sat Apr 11 14:14:42 2015 New Revision: 19989 URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19989 Log: #12997: Kerning between non-CJK and CJK letters does not appear until the text frame containing them is modified
Modified:
branches/Version14x/Scribus/scribus/pageitem_textframe.cpp
Modified: branches/Version14x/Scribus/scribus/pageitem_textframe.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=19989&path=/branches/Version14x/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/pageitem_textframe.cpp (original)
+++ branches/Version14x/Scribus/scribus/pageitem_textframe.cpp Sat Apr 11
14:14:42 2015
@@ -1372,7 +1372,7 @@
case
SpecialChars::CJK_KANJI:
case
SpecialChars::CJK_KANA:
case
SpecialChars::CJK_NOTOP:
- kern = wide / 4;
+ kern =
charStyle.fontSize() / 10 / 4;
wide += kern;
hl->glyph.xadvance += kern;
}
@@ -1385,7 +1385,7 @@
case
SpecialChars::CJK_COMMA:
case
SpecialChars::CJK_PERIOD:
case
SpecialChars::CJK_MIDPOINT:
- kern =
-wide / 2;
+ kern =
-charStyle.fontSize() / 10 / 2;
wide +=
kern;
hl->glyph.xadvance += kern;
}
@@ -1395,7 +1395,7 @@
switch(nextStat
& SpecialChars::CJK_CHAR_MASK){
case
SpecialChars::CJK_FENCE_BEGIN:
case
SpecialChars::CJK_FENCE_END:
- kern =
-wide / 2;
+ kern =
-charStyle.fontSize() / 10 / 2;
wide +=
kern;
hl->glyph.xadvance += kern;
}
@@ -1403,7 +1403,7 @@
case
SpecialChars::CJK_MIDPOINT:
switch(nextStat
& SpecialChars::CJK_CHAR_MASK){
case
SpecialChars::CJK_FENCE_BEGIN:
- kern =
-wide / 2;
+ kern =
-charStyle.fontSize() / 10 / 2;
wide +=
kern;
hl->glyph.xadvance += kern;
}
@@ -1416,7 +1416,7 @@
prevStat = SpecialChars::getCJKAttr(hl2->ch) & SpecialChars::CJK_CHAR_MASK;
}
if(prevStat ==
SpecialChars::CJK_FENCE_BEGIN){
- kern =
-wide / 2;
+ kern =
-charStyle.fontSize() / 10 / 2;
wide +=
kern;
hl->glyph.xadvance += kern;
hl->glyph.xoffset += kern;
@@ -1431,7 +1431,7 @@
case
SpecialChars::CJK_KANJI:
case
SpecialChars::CJK_KANA:
case
SpecialChars::CJK_NOTOP:
- kern =
hl2->glyph.wide() / 4;
+ kern =
charStyle.fontSize() / 10 / 4;
wide += kern;
hl->glyph.xadvance += kern;
}
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
