[Groff-commit] groff ChangeLog doc/groff.texinfo tmac/strip.sed

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Changes by:     Werner LEMBERG <wl>     06/06/06 16:49:39

Modified files:
        .              : ChangeLog 
        doc            : groff.texinfo 
        tmac           : strip.sed 

Log message:
        * tmac/strip.sed: Strip `\#' also.
        
        * doc/groff.texinfo: Document usage of \? for string comparison.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.967&r2=1.968
http://cvs.savannah.gnu.org/viewcvs/groff/doc/groff.texinfo?cvsroot=groff&r1=1.240&r2=1.241
http://cvs.savannah.gnu.org/viewcvs/groff/tmac/strip.sed?cvsroot=groff&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.967
retrieving revision 1.968
diff -u -b -r1.967 -r1.968
--- ChangeLog   5 Jun 2006 08:18:25 -0000       1.967
+++ ChangeLog   6 Jun 2006 16:49:39 -0000       1.968
@@ -1,3 +1,9 @@
+2006-06-05  Werner LEMBERG  <address@hidden>
+
+       * tmac/strip.sed: Strip `\#' also.
+
+       * doc/groff.texinfo: Document usage of \? for string comparison.
+
 2006-06-04  Werner LEMBERG  <address@hidden>
 
        * doc/groff.texinfo: Add more index entries for copy-in mode.

Index: doc/groff.texinfo
===================================================================
RCS file: /cvsroot/groff/groff/doc/groff.texinfo,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -b -r1.240 -r1.241
--- doc/groff.texinfo   5 Jun 2006 08:18:25 -0000       1.240
+++ doc/groff.texinfo   6 Jun 2006 16:49:39 -0000       1.241
@@ -10586,8 +10586,9 @@
 @subsection Operators in Conditionals
 
 @cindex @code{if} request, operators to use with
address@hidden @code{ie} request, operators to use with
 @cindex @code{while} request, operators to use with
-In @code{if} and @code{while} requests, there are several more
+In @code{if}, @code{ie}, and @code{while} requests, there are several more
 operators available:
 
 @table @code
@@ -10608,10 +10609,12 @@
 @code{troff} versions only (identifying a @code{-Tversatec} device).
 
 @item '@var{xxx}'@var{yyy}'
-True if the string @var{xxx} is equal to the string @var{yyy}.  Other
-characters can be used in place of the single quotes; the same set of
-delimiters as for the @code{\D} escape is used (@pxref{Escapes}).
address@hidden formats the strings before being compared:
+True if the output produced by @var{xxx} is equal to the output
+produced by @var{yyy}.  Other characters can be used in place of the
+single quotes; the same set of delimiters as for the @code{\D} escape
+is used (@pxref{Escapes}).  @code{gtroff} formats @var{xxx} and @var{yyy}
+in separate environments; after the comparison the resulting data is
+discarded.
 
 @Example
 .ie "|"\fR|\fP" \
@@ -10632,6 +10635,36 @@
 would be ``false'' because (the first) @samp{|} produces an italic
 @samp{|} rather than a roman one.
 
address@hidden string comparison
address@hidden comparison of strings
+To compare strings without processing, surround the data with
address@hidden
+
address@hidden
+.ie "\?|\?"\?\fR|\fP\?" \
+true
+.el \
+false
+    @result{} false
address@hidden
+
address@hidden @code{\?}, and copy-in mode
address@hidden copy-in mode, and @code{\?}
address@hidden mode, copy-in, and @code{\?}
address@hidden
+Since data protected with @code{\?} is read in copy-in mode it is even
+possible to use incomplete input without causing an error.
+
address@hidden
+.ds a \[
+.ds b \[
+.ie '\?\*a\?'\?\*b\?' \
+true
+.el \
+false
+    @result{} true
address@hidden
+
 @item r @var{xxx}
 True if there is a number register named @var{xxx}.
 

Index: tmac/strip.sed
===================================================================
RCS file: /cvsroot/groff/groff/tmac/strip.sed,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- tmac/strip.sed      24 Mar 2001 17:34:47 -0000      1.4
+++ tmac/strip.sed      6 Jun 2006 16:49:39 -0000       1.5
@@ -1,8 +1,10 @@
-# strip comments, spaces, etc. after a line containing `%beginstrip%'
+# strip comments, spaces, etc., after a line containing `%beginstrip%'
 /%beginstrip%/,$ {
   s/^\.[        ]*/./
   s/^\.\\".*/./
+  s/^\\#.*/./
   s/\\".*/\\"/
+  s/\\#.*/\\/
   /\(.[ad]s\)/!s/[      ]*\\"//
   /\(.[ad]s\)/s/\([^    ]*\)\\"/\1/
   s/\([^/]\)doc-/\1/g