|
JLuc
2013-06-20 12:14
developer
|
|
|
|
JLuc
2013-06-20 12:14
developer
|
|
|
|
JLuc
2013-06-20 12:19
developer
~0030305
Last edited: 2013-06-20 19:03
|
As for font : use for example "Liberation Serif" or "Liberation Sans" so as to reproduce.
AMOF, the outside-of-frame accent comes from a lowercase é letter that has the "K" to-uppercase character effect.
I tried using the "hampe" (french) parameter of the "first line effect" of the PP but with no visible effect afaict.
IMO, scribus layout should be the same with uppercase é or with É.
|
|
|
|
Confirmed, fixed, patched. |
|
|
|
Patch uploaded |
|
|
JLuc
2013-10-01 14:06
developer
~0030650
Last edited: 2013-10-01 14:07
|
it looks like the patch is not uploaded cezaryece...
|
|
|
|
11613.patch (2,067 bytes)
diff --git a/Scribus/scribus/pageitem_textframe.cpp b/Scribus/scribus/pageitem_textframe.cpp
index 0b96a3c..9f51478 100644
--- a/Scribus/scribus/pageitem_textframe.cpp
+++ b/Scribus/scribus/pageitem_textframe.cpp
@@ -1612,9 +1612,9 @@ void PageItem_TextFrame::layout()
opticalMargins = style.opticalMargins();
CharStyle charStyle = ((hl->ch != SpecialChars::PARSEP) ? itemText.charStyle(a) : style.charStyle());
chstr = ExpandToken(a);
- int chstrLen = chstr.length();
if (chstr.isEmpty())
chstr = SpecialChars::ZWNBSPACE;
+ int chstrLen = chstr.length();
curStat = SpecialChars::getCJKAttr(hl->ch);
@@ -1650,6 +1650,32 @@ void PageItem_TextFrame::layout()
style.setLineSpacing (calculateLineSpacing (style, this));
FlopBaseline = (current.startOfCol && firstLineOffset() == FLOPBaselineGrid);
+ //change characters and/or scaling/offset due to typographic effects
+ int chst = charStyle.effects() & 1919;
+ if (chst != ScStyle_Default)
+ {
+ if (chst & ScStyle_Superscript)
+ {
+ offset += charStyle.fontSize() * m_Doc->typographicPrefs().valueSuperScript / 100.0;
+ scaleV *= qMax(m_Doc->typographicPrefs().scalingSuperScript / 100.0, 10.0 / charStyle.fontSize());
+ scaleH *= qMax(m_Doc->typographicPrefs().scalingSuperScript / 100.0, 10.0 / charStyle.fontSize());
+ }
+ else if (chst & ScStyle_Subscript)
+ {
+ offset -= charStyle.fontSize() * m_Doc->typographicPrefs().valueSubScript / 100.0;
+ scaleV *= qMax(m_Doc->typographicPrefs().scalingSubScript / 100.0, 10.0 / charStyle.fontSize());
+ scaleH *= qMax(m_Doc->typographicPrefs().scalingSubScript / 100.0, 10.0 / charStyle.fontSize());
+ }
+ if ((chst & ScStyle_AllCaps) || (chst & ScStyle_SmallCaps))
+ chstr = chstr.toUpper();
+ if (chst & ScStyle_SmallCaps)
+ {
+ double smallcapsScale = m_Doc->typographicPrefs().valueSmallCaps / 100.0;
+ scaleV *=smallcapsScale;
+ scaleH *= smallcapsScale;
+ }
+ }
+
// find out about par gap and dropcap
if (a == firstInFrame())
{
|
|
|
|
Sorry, forgot click Upload button |
|
|
|
Could somebody care for this patch ? |
|
|
JLuc
2015-11-24 13:36
developer
~0037646
Last edited: 2015-11-24 13:48
|
Cezary : i tested the patch and it's not OK.
AMOF with your patch each lines appears on same height, but it introduces a big issue : space on top of line becomes very very high and text doesnt fit anymore in textframe and textframe has to be made much higher so the text fits in it.
This needs to be fixed.
I had to update the file references in the patch so as to apply it so i upload the new version.
|
|
|
JLuc
2015-11-24 13:36
developer
|
issue11613 updated 2015 11 24.patch (2,035 bytes)
diff --git a/scribus/pageitem_textframe.cpp b/scribus/pageitem_textframe.cpp
index 0b96a3c..9f51478 100644
--- a/scribus/pageitem_textframe.cpp
+++ b/scribus/pageitem_textframe.cpp
@@ -1612,9 +1612,9 @@ void PageItem_TextFrame::layout()
opticalMargins = style.opticalMargins();
CharStyle charStyle = ((hl->ch != SpecialChars::PARSEP) ? itemText.charStyle(a) : style.charStyle());
chstr = ExpandToken(a);
- int chstrLen = chstr.length();
if (chstr.isEmpty())
chstr = SpecialChars::ZWNBSPACE;
+ int chstrLen = chstr.length();
curStat = SpecialChars::getCJKAttr(hl->ch);
@@ -1650,6 +1650,32 @@ void PageItem_TextFrame::layout()
style.setLineSpacing (calculateLineSpacing (style, this));
FlopBaseline = (current.startOfCol && firstLineOffset() == FLOPBaselineGrid);
+ //change characters and/or scaling/offset due to typographic effects
+ int chst = charStyle.effects() & 1919;
+ if (chst != ScStyle_Default)
+ {
+ if (chst & ScStyle_Superscript)
+ {
+ offset += charStyle.fontSize() * m_Doc->typographicPrefs().valueSuperScript / 100.0;
+ scaleV *= qMax(m_Doc->typographicPrefs().scalingSuperScript / 100.0, 10.0 / charStyle.fontSize());
+ scaleH *= qMax(m_Doc->typographicPrefs().scalingSuperScript / 100.0, 10.0 / charStyle.fontSize());
+ }
+ else if (chst & ScStyle_Subscript)
+ {
+ offset -= charStyle.fontSize() * m_Doc->typographicPrefs().valueSubScript / 100.0;
+ scaleV *= qMax(m_Doc->typographicPrefs().scalingSubScript / 100.0, 10.0 / charStyle.fontSize());
+ scaleH *= qMax(m_Doc->typographicPrefs().scalingSubScript / 100.0, 10.0 / charStyle.fontSize());
+ }
+ if ((chst & ScStyle_AllCaps) || (chst & ScStyle_SmallCaps))
+ chstr = chstr.toUpper();
+ if (chst & ScStyle_SmallCaps)
+ {
+ double smallcapsScale = m_Doc->typographicPrefs().valueSmallCaps / 100.0;
+ scaleV *=smallcapsScale;
+ scaleH *= smallcapsScale;
+ }
+ }
+
// find out about par gap and dropcap
if (a == firstInFrame())
{
|
|
