[Groff-commit] groff/contrib/gdiffmk ChangeLog README gdiffmk....

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Branch:         
Changes by:     Werner LEMBERG <address@hidden> 04/12/15 06:04:49

Modified files:
        contrib/gdiffmk: ChangeLog README gdiffmk.man gdiffmk.sh 
Added files:
        contrib/gdiffmk/tests: file1 file2 test_baseline test_baseline6 
                               test_baseline7 tests.sh 

Log message:
        * gdiffmk.sh: Make sed pattern work with alternate result of GNU
        diff's -D option, using `!' instead of `not' in #endif comments.
        (Exit): Use prefix for each emitted message line.
        
        * tests/*: New files for testing gdiffmk.
        
        * README, gdiffmk.man, gdiffmk.sh: Updated.
        Minor fixes.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/ChangeLog.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/README.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/gdiffmk.man.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/gdiffmk.sh.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/tests/file1?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/tests/file2?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/tests/test_baseline?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/tests/test_baseline6?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/tests/test_baseline7?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/tests/tests.sh?rev=1.1

Patches:
Index: groff/contrib/gdiffmk/ChangeLog
diff -u groff/contrib/gdiffmk/ChangeLog:1.2 groff/contrib/gdiffmk/ChangeLog:1.3
--- groff/contrib/gdiffmk/ChangeLog:1.2 Mon Dec 13 20:53:26 2004
+++ groff/contrib/gdiffmk/ChangeLog     Wed Dec 15 06:04:48 2004
@@ -1,10 +1,23 @@
+2004-12-14  Werner LEMBERG  <address@hidden>
+
+       * gdiffmk.sh: Make sed pattern work with alternate result of GNU
+       diff's -D option, using `!' instead of `not' in #endif comments.
+       (Exit): Use prefix for each emitted message line.
+
+2004-12-14  Mike Bianchi  <address@hidden>
+
+       * tests/*: New files for testing gdiffmk.
+
+       * README, gdiffmk.man, gdiffmk.sh: Updated.
+       Minor fixes.
+
 2004-12-13  Mike Bianchi  <address@hidden>
 
        Add `-x' command line option to select a diff program.
 
        * gdiffmk.sh: Add code to handle `-x'.
        Move test for working `diff' down.
-       Fix sed pattern.
+       Fix sed pattern -- `.mc *' needs to be followed by `.mc .'.
        (Usage): Updated.
        * gdiffmk.man: Updated.
 
Index: groff/contrib/gdiffmk/README
diff -u groff/contrib/gdiffmk/README:1.1 groff/contrib/gdiffmk/README:1.2
--- groff/contrib/gdiffmk/README:1.1    Sun Dec 12 20:06:55 2004
+++ groff/contrib/gdiffmk/README        Wed Dec 15 06:04:48 2004
@@ -3,35 +3,41 @@
 
 It should not be confused with diffmk commands that operate on XML.
 
-The inspiration for this code was a Perl 2 version written in 1989 by Randal L.
-Schwartz.  Thanks to Werner Lemberg for help in making the package more
-portable and fit into the GNU groff source structure.
+The inspiration for this code was a Perl 2 version written in 1989 by Randal
+L. Schwartz.  See
        
-http://www.landfield.com/software/comp.sources.misc/archive-name/volume06/diffmk.p.gz
+  landfield.com/software/comp.sources.misc/archive-name/volume06/diffmk.p.gz
 
-Gnu diff(1) with the -Dname option does all of the work and sed(1) translates
-the output into something groff/troff/nroff can handle.
+Thanks to Werner Lemberg for help in making the package more portable and
+fit into the GNU groff source structure.
 
-Note the BUGS on the man page.
-
-$Header: /cvsroot/groff/groff/contrib/gdiffmk/README,v 1.1 2004/12/12 20:06:55 
wl Exp $
+Gnu diff(1) with the -Dname option does all of the work and sed(1)
+translates the output into something groff/troff/nroff can handle.
 
-# Copyright (C) 2004 Free Software Foundation, Inc.
-# Written by Mike Bianchi <address@hidden <mailto:address@hidden>>
-
-# This file is part of the gdiffmk utility, which is part of groff.
+Note the BUGS on the man page.
 
-# groff is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# groff is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-# License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with groff; see the files COPYING and LICENSE in the top
-# directory of the groff source.  If not, write to the Free Software
-# Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+The `tests' directory contains simple tests.  `tests.sh run' runs them and
+compares the output against baseline files.  Calling `tests.sh' without
+argument gives the usage.
+
+----------------------------------------------------------------------------
+
+Copyright (C) 2004 Free Software Foundation, Inc.
+Written by Mike Bianchi <address@hidden <mailto:address@hidden>>
+
+This file is part of the gdiffmk utility, which is part of groff.
+
+groff is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+groff is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+License for more details.
+
+You should have received a copy of the GNU General Public License
+along with groff; see the files COPYING and LICENSE in the top
+directory of the groff source.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
Index: groff/contrib/gdiffmk/gdiffmk.man
diff -u groff/contrib/gdiffmk/gdiffmk.man:1.3 
groff/contrib/gdiffmk/gdiffmk.man:1.4
--- groff/contrib/gdiffmk/gdiffmk.man:1.3       Mon Dec 13 20:53:26 2004
+++ groff/contrib/gdiffmk/gdiffmk.man   Wed Dec 15 06:04:48 2004
@@ -134,7 +134,7 @@
 command to perform the comparison of
 .I file1
 and
-.I file2 .
+.IR file2 .
 In particular,
 .I diffcmd
 should accept the
Index: groff/contrib/gdiffmk/gdiffmk.sh
diff -u groff/contrib/gdiffmk/gdiffmk.sh:1.3 
groff/contrib/gdiffmk/gdiffmk.sh:1.4
--- groff/contrib/gdiffmk/gdiffmk.sh:1.3        Mon Dec 13 20:53:26 2004
+++ groff/contrib/gdiffmk/gdiffmk.sh    Wed Dec 15 06:04:48 2004
@@ -57,7 +57,11 @@
 function Exit {
        exitcode=$1
        shift
-       echo >&2 "${cmd}:  $@"
+       for arg
+       do
+               echo >&2 "${cmd}:  $1"
+               shift
+       done
        exit ${exitcode}
 }
 
@@ -74,11 +78,11 @@
 
        if test ! -e "$2"
        then
-               Exit $1  "File \`$2' not found."
+               Exit $1 "File \`$2' not found."
        fi
        if test ! -r "$2"
        then
-               Exit $1  "File \`$2' not readable."
+               Exit $1 "File \`$2' not readable."
        fi
 }
 
@@ -101,7 +105,7 @@
                        Exit $1 "File \`$2' not created; " \
                          "Cannot write directory \`$( dirname "$2" )'."
                fi
-               Exit $1  "File \`$2' not writeable."
+               Exit $1 "File \`$2' not writeable."
        fi
 }
 
@@ -114,7 +118,9 @@
 
        if test "$1" -ef "$3"
        then
-               Exit 3 "\`$3' is the same as \`$2' and would be clobbered."
+               Exit 3 \
+                 "The $2 and OUTPUT arguments both point to the same file," \
+                 "\`$1', and it would be overwritten."
        fi
 }
 
@@ -241,14 +247,14 @@
                  p
                  d
                }
-               /^#ifndef '"${label}"'/,/^#endif \/\* [not ]*'"${label}"'/ {
+               /^#ifndef '"${label}"'/,/^#endif \/\* [!not ]*'"${label}"'/ {
                  /^#else \/\* '"${label}"'/,/^#endif \/\* '"${label}"'/ {
                    /^#else \/\* '"${label}"'/    s/.*/.mc '"${changemark}"'/
                    /^#endif \/\* '"${label}"'/   s/.*/.mc/
                    p
                    d
                  }
-                 /^#endif \/\* not '"${label}"'/ {
+                 /^#endif \/\* \(not\|!\) '"${label}"'/ {
                   s/.*/.mc '"${deletemark}"'/p
                   a\
 .mc