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 /z20.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 'z20.c')
| -rw-r--r-- | z20.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -1,7 +1,7 @@ /*@z20.c:Galley Flushing:DebugInnersNames()@**********************************/ /* */ -/* 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 */ @@ -532,6 +532,7 @@ void FlushGalley(OBJECT hd) case GRAPHIC: case LINK_SOURCE: case LINK_DEST: + case LINK_URL: case ACAT: case HCAT: case VCAT: @@ -930,7 +931,7 @@ void FlushGalley(OBJECT hd) StringEqual(newtag, string(tag)); /* merge galleys whose seq strings are equal */ - if( found && StringEqual(newseq, string(seq)) ) + if( found && StringEqual(newseq, string(seq)) && !StringEqual(newseq, STR_NOCROSS) ) { SwitchScope(nilobj); val = ReadFromFile(eg_fnum(eg), eg_fpos(eg), eg_lnum(eg)); @@ -951,7 +952,7 @@ void FlushGalley(OBJECT hd) } } - } while( found && StringEqual(newseq, string(seq)) ); + } while( found && StringEqual(newseq, string(seq)) && !StringEqual(newseq, STR_NOCROSS) ); if( found ) { DisposeChild(Up(tag)); DisposeChild(Up(seq)); |