aboutsummaryrefslogtreecommitdiffstats
path: root/z08.c
diff options
context:
space:
mode:
authorJeffrey H. Kingston <jeff@it.usyd.edu.au>2010-09-14 20:40:40 +0000
committerJeffrey H. Kingston <jeff@it.usyd.edu.au>2010-09-14 20:40:40 +0000
commit51fe0cfa3e3ba27f55ff7d14a7fe077cc31ed0b7 (patch)
treefc13db71a563c042388b4a6b3a2bffc4151466b2 /z08.c
parente4836c62b245d618866b6523ec2c892aeb7a76be (diff)
downloadlout-51fe0cfa3e3ba27f55ff7d14a7fe077cc31ed0b7.tar.gz
Lout 3.33.
git-svn-id: http://svn.savannah.nongnu.org/svn/lout/trunk@35 9365b830-b601-4143-9ba8-b4a8e2c3339c
Diffstat (limited to 'z08.c')
-rw-r--r--z08.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/z08.c b/z08.c
index e80f135..119db00 100644
--- a/z08.c
+++ b/z08.c
@@ -1,6 +1,6 @@
/*@z08.c:Object Manifest:ReplaceWithSplit()@**********************************/
/* */
-/* THE LOUT DOCUMENT FORMATTING SYSTEM (VERSION 3.32) */
+/* THE LOUT DOCUMENT FORMATTING SYSTEM (VERSION 3.33) */
/* COPYRIGHT (C) 1991, 2006 Jeffrey H. Kingston */
/* */
/* Jeffrey H. Kingston (jeff@it.usyd.edu.au) */
@@ -1027,6 +1027,7 @@ OBJECT *enclose, BOOLEAN fcr)
word_outline(x) = outline(*style);
word_language(x) = language(*style);
word_baselinemark(x) = baselinemark(*style);
+ word_strut(x) = strut(*style);
word_ligatures(x) = ligatures(*style);
word_hyph(x) = hyph_style(*style) == HYPH_ON;
debug3(DOM, DDD, " manfifest/WORD underline() := %s for %s %s",
@@ -1062,6 +1063,7 @@ OBJECT *enclose, BOOLEAN fcr)
word_outline(y) = outline(*style);
word_language(y) = language(*style);
word_baselinemark(y) = baselinemark(*style);
+ word_strut(y) = strut(*style);
word_ligatures(y) = ligatures(*style);
word_hyph(y) = hyph_style(*style) == HYPH_ON;
if( small_caps(*style) && ok ) y = MapSmallCaps(y, style);
@@ -1102,6 +1104,7 @@ OBJECT *enclose, BOOLEAN fcr)
word_outline(y) = outline(*style);
word_language(y) = language(*style);
word_baselinemark(y) = baselinemark(*style);
+ word_strut(y) = strut(*style);
word_ligatures(y) = ligatures(*style);
word_hyph(y) = hyph_style(*style) == HYPH_ON;
if( small_caps(*style) && ok ) y = MapSmallCaps(y, style);
@@ -1236,6 +1239,7 @@ OBJECT *enclose, BOOLEAN fcr)
word_outline(prev) == word_outline(y) &&
word_language(prev) == word_language(y) &&
word_baselinemark(prev) == word_baselinemark(y) &&
+ word_strut(prev) == word_strut(y) &&
word_ligatures(prev) == word_ligatures(y) )
/* no need to compare underline() since both are false */
{ unsigned typ;
@@ -1253,6 +1257,7 @@ OBJECT *enclose, BOOLEAN fcr)
word_outline(y) = word_outline(prev);
word_language(y) = word_language(prev);
word_baselinemark(y) = word_baselinemark(prev);
+ word_strut(y) = word_strut(prev);
word_ligatures(y) = word_ligatures(prev);
word_hyph(y) = word_hyph(prev);
underline(y) = UNDER_OFF;