[Groff-commit] groff ChangeLog doc/groff.texinfo src/roff/trof...

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Changes by:     Werner LEMBERG <wl>     06/11/13 17:53:13

Modified files:
        .              : ChangeLog 
        doc            : groff.texinfo 
        src/roff/troff : div.cpp 

Log message:
        * doc/groff.texinfo (Page Location Traps) [.wh]: Give more details
        on negative trap positions.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1005&r2=1.1006
http://cvs.savannah.gnu.org/viewcvs/groff/doc/groff.texinfo?cvsroot=groff&r1=1.251&r2=1.252
http://cvs.savannah.gnu.org/viewcvs/groff/src/roff/troff/div.cpp?cvsroot=groff&r1=1.10&r2=1.11

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1005
retrieving revision 1.1006
diff -u -b -r1.1005 -r1.1006
--- ChangeLog   10 Nov 2006 09:52:01 -0000      1.1005
+++ ChangeLog   13 Nov 2006 17:53:12 -0000      1.1006
@@ -1,3 +1,8 @@
+2006-11-13  Werner LEMBERG  <address@hidden>
+
+       * doc/groff.texinfo (Page Location Traps) [.wh]: Give more details
+       on negative trap positions.
+
 2006-11-10  Werner LEMBERG  <address@hidden>
 
        * Makefile.comm (.man.n): Handle @address@hidden

Index: doc/groff.texinfo
===================================================================
RCS file: /cvsroot/groff/groff/doc/groff.texinfo,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -b -r1.251 -r1.252
--- doc/groff.texinfo   26 Oct 2006 19:39:07 -0000      1.251
+++ doc/groff.texinfo   13 Nov 2006 17:53:12 -0000      1.252
@@ -12029,6 +12029,19 @@
 active by either moving it up or increasing the page length so that the
 trap is on the page.
 
+Negative trap values always use the @emph{current} page length; they are
+not converted to an absolute vertical position:
+
address@hidden
+.pl 5i
+.wh -1i xx
+.ptr
+    @result{} xx      -240
+.pl 100i
+.ptr
+    @result{} xx      -240
address@hidden
+
 It is possible to have more than one trap at the same location; to do so,
 the traps must be defined at different locations, then moved together with
 the @code{ch} request; otherwise the second trap would replace the first

Index: src/roff/troff/div.cpp
===================================================================
RCS file: /cvsroot/groff/groff/src/roff/troff/div.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- src/roff/troff/div.cpp      26 May 2005 21:02:01 -0000      1.10
+++ src/roff/troff/div.cpp      13 Nov 2006 17:53:13 -0000      1.11
@@ -355,7 +355,9 @@
       else {
        vunits pos = pt->position;
        pos += page_length;
-       if (pos > 0 && pos > vertical_position && (next_trap == 0 || pos < 
*next_trap_pos)) {
+       if (pos > 0
+           && pos > vertical_position
+           && (next_trap == 0 || pos < *next_trap_pos)) {
          next_trap = pt;
          *next_trap_pos = pos;
        }