groff-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Werner LEMBERG
Subject: [Groff-commit] groff ChangeLog doc/groff.texinfo src/roff/trof...
Date: Sun, 10 Sep 2006 08:34:37 +0000

CVSROOT:        /cvsroot/groff
Module name:    groff
Changes by:     Werner LEMBERG <wl>     06/09/10 08:34:37

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

Log message:
        * src/roff/troff/input.cpp (read_size): Revert previous change
        w.r.t. `\s-[-...]'.
        
        * doc/groff.texinfo (Fractional Size Types): Clarify syntax of \s.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.992&r2=1.993
http://cvs.savannah.gnu.org/viewcvs/groff/doc/groff.texinfo?cvsroot=groff&r1=1.247&r2=1.248
http://cvs.savannah.gnu.org/viewcvs/groff/src/roff/troff/input.cpp?cvsroot=groff&r1=1.41&r2=1.42

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.992
retrieving revision 1.993
diff -u -b -r1.992 -r1.993
--- ChangeLog   9 Sep 2006 15:11:24 -0000       1.992
+++ ChangeLog   10 Sep 2006 08:34:36 -0000      1.993
@@ -1,3 +1,10 @@
+2006-09-10  Werner LEMBERG  <address@hidden>
+
+       * src/roff/troff/input.cpp (read_size): Revert previous change
+       w.r.t. `\s-[-...]'.
+
+       * doc/groff.texinfo (Fractional Size Types): Clarify syntax of \s.
+
 2006-09-09  Werner LEMBERG  <address@hidden>
 
        * src/roff/troff/input.cpp (read_size): Fix `\s[-\n[.s]]' so that it

Index: doc/groff.texinfo
===================================================================
RCS file: /cvsroot/groff/groff/doc/groff.texinfo,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -b -r1.247 -r1.248
--- doc/groff.texinfo   2 Sep 2006 21:39:33 -0000       1.247
+++ doc/groff.texinfo   10 Sep 2006 08:34:36 -0000      1.248
@@ -10298,8 +10298,8 @@
 @itemx \s+'@var{n}'
 @itemx \s-'@var{n}'
 Increase or or decrease the point size by @address@hidden points;
address@hidden@tie{}is a numeric expression with a default scale indicator of
address@hidden
address@hidden@tie{}is a numeric expression (which may start with a minus sign)
+with a default scale indicator of @samp{z}.
 @end table
 
 @xref{Font Files}.

Index: src/roff/troff/input.cpp
===================================================================
RCS file: /cvsroot/groff/groff/src/roff/troff/input.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- src/roff/troff/input.cpp    9 Sep 2006 15:11:24 -0000       1.41
+++ src/roff/troff/input.cpp    10 Sep 2006 08:34:37 -0000      1.42
@@ -4902,18 +4902,11 @@
   else {
     token start(tok);
     tok.next();
-    // catch `\s-[-...]' and friends
     c = tok.ch();
-    if (c == '-' || c == '+') {
-      if (inc) {
-       error("two relative changes not allowed in \\s escape");
-       return 0;
-      }
-      else {
+    if (!inc && (c == '-' || c == '+')) {
         inc = c == '+' ? 1 : -1;
        tok.next();
       }
-    }
     if (!get_number(&val, 'z'))
       return 0;
     if (!(start.ch() == '[' && tok.ch() == ']') && start != tok) {




reply via email to

[Prev in Thread] Current Thread [Next in Thread]