diff options
| author | Jeffrey H. Kingston <jeff@it.usyd.edu.au> | 2010-09-14 20:37:45 +0000 |
|---|---|---|
| committer | Jeffrey H. Kingston <jeff@it.usyd.edu.au> | 2010-09-14 20:37:45 +0000 |
| commit | c89f0bc2209f7f98695e6b94fbac316c84fbf9d4 (patch) | |
| tree | 456d506bd18edd3b768eaffa8f70ae93565682e4 /z21.c | |
| parent | 7db8921aac3a0e1223af269ec7092bdd91a7c7a2 (diff) | |
| download | lout-c89f0bc2209f7f98695e6b94fbac316c84fbf9d4.tar.gz | |
Lout 3.25.
git-svn-id: http://svn.savannah.nongnu.org/svn/lout/trunk@19 9365b830-b601-4143-9ba8-b4a8e2c3339c
Diffstat (limited to 'z21.c')
| -rw-r--r-- | z21.c | 13 |
1 files changed, 11 insertions, 2 deletions
@@ -1,7 +1,7 @@ /*@z21.c:Galley Maker:SizeGalley()@*******************************************/ /* */ -/* THE LOUT DOCUMENT FORMATTING SYSTEM (VERSION 3.24) */ -/* COPYRIGHT (C) 1991, 2000 Jeffrey H. Kingston */ +/* THE LOUT DOCUMENT FORMATTING SYSTEM (VERSION 3.25) */ +/* COPYRIGHT (C) 1991, 2001 Jeffrey H. Kingston */ /* */ /* Jeffrey H. Kingston (jeff@cs.usyd.edu.au) */ /* Basser Department of Computer Science */ @@ -302,12 +302,21 @@ OBJECT *dest_index, OBJECT *recs, OBJECT *inners, OBJECT enclose) back(tmp, COLM) = fwd(tmp, COLM) = 0; back(tmp, ROWM) = fwd(tmp, ROWM) = 0; word_font(tmp) = word_colour(tmp) = word_language(tmp) = 0; + word_baselinemark(tmp) = FALSE; word_outline(tmp) = FALSE; word_hyph(tmp) = FALSE; ReplaceNode(tmp, t); DisposeObject(t); t = tmp; } + else if( bfc(constraint(z)) == -1 ) + { + /* we want to scale down but not up */ + if( size(t, COLM) > bfc(zc) ) + bc(constraint(z)) = fc(constraint(z)) = (bfc(zc) * SF)/size(t, COLM); + else + bc(constraint(z)) = fc(constraint(z)) = 1 * SF; + } else bc(constraint(z)) = fc(constraint(z)) = (bfc(zc) * SF)/size(t, COLM); /* calculate scaled size and adjust */ |