[Groff-commit] groff ChangeLog src/roff/grog/grog.man src/roff...

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Changes by:     Werner LEMBERG <wl>     11/01/22 15:18:57

Modified files:
        .              : ChangeLog 
        src/roff/grog  : grog.man grog.pl grog.sh 

Log message:
        Update `grog'.
        
        * src/roff/grog/{groff.sh,groff.pl}: `groff' now calls `pic'
        automatically if `grap' or `chem' is used.
        `chem' has been folded into `groff'.
        * src/roff/grog/grog.man: Updated.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1281&r2=1.1282
http://cvs.savannah.gnu.org/viewcvs/groff/src/roff/grog/grog.man?cvsroot=groff&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/groff/src/roff/grog/grog.pl?cvsroot=groff&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/groff/src/roff/grog/grog.sh?cvsroot=groff&r1=1.18&r2=1.19

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1281
retrieving revision 1.1282
diff -u -b -r1.1281 -r1.1282
--- ChangeLog   22 Jan 2011 15:00:09 -0000      1.1281
+++ ChangeLog   22 Jan 2011 15:18:53 -0000      1.1282
@@ -1,5 +1,14 @@
 2011-01-22  Werner LEMBERG  <address@hidden>
 
+       Update `grog'.
+
+       * src/roff/grog/{groff.sh,groff.pl}: `groff' now calls `pic'
+       automatically if `grap' or `chem' is used.
+       `chem' has been folded into `groff'.
+       * src/roff/grog/grog.man: Updated.
+
+2011-01-22  Werner LEMBERG  <address@hidden>
+
        Make `groff -G' imply `-p'.
 
        * src/roff/groff/groff.cpp (main): Implement it.

Index: src/roff/grog/grog.man
===================================================================
RCS file: /cvsroot/groff/groff/src/roff/grog/grog.man,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- src/roff/grog/grog.man      2 Jun 2010 14:20:56 -0000       1.18
+++ src/roff/grog/grog.man      22 Jan 2011 15:18:57 -0000      1.19
@@ -10,10 +10,10 @@
 Source file position:  <groff_source_top>/src/roff/grog/grog.man
 Installed position:    $prefix/share/man/man1/grog.1
 
-Last Update: 2 Jun 2010
+Last Update: 22 Jan 2011
 ..
 .de co
-Copyright (C) 1989-2000, 2001, 2002, 2003, 2006, 2007, 2009, 2010
+Copyright (C) 1989-2003, 2006, 2007, 2009-2011
 Free Software Foundation, Inc.
 .
 Written by James Clark.
@@ -466,50 +466,6 @@
 this file does not use a macro package.
 .
 .
-.IP \(bu
-.B grog
-can also handle files using the
-.I chem
-language.
-.
-The example
-.
-.RS
-.IP
-.EX
-grog chAh_brackets.chem
-.EE
-.RE
-.
-.IP
-outputs
-.
-.RS
-.IP
-.EX
-chem chAh_brackets.chem | groff \-pe
-.EE
-.RE
-.
-.IP
-So
-.B chem
-is run first and
-.B groff
-is appended.
-.
-The option
-.B \-p
-for
-.B pic
-is implied automatically by
-.BR chem .
-Additionally, the file uses
-.I eqn
-with
-.BR \-e .
-.
-.
 .\" --------------------------------------------------------------------
 .SH "SEE ALSO"
 .
@@ -517,6 +473,7 @@
 .BR @address@hidden (@MAN1EXT@),
 .BR @address@hidden (@MAN1EXT@),
 .BR @address@hidden (@MAN1EXT@),
+.BR @address@hidden (@MAN1EXT@),
 .BR @address@hidden (@MAN1EXT@),
 .BR @address@hidden (@MAN1EXT@),
 .BR @address@hidden (@MAN1EXT@),

Index: src/roff/grog/grog.pl
===================================================================
RCS file: /cvsroot/groff/groff/src/roff/grog/grog.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- src/roff/grog/grog.pl       5 Jan 2009 20:11:11 -0000       1.20
+++ src/roff/grog/grog.pl       22 Jan 2011 15:18:57 -0000      1.21
@@ -6,7 +6,7 @@
 # Source file position: <groff-source>/src/roff/grog/grog.pl
 # Installed position: <prefix>/bin/grog
 
-# Copyright (C) 1993, 2006, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1993, 2006, 2009, 2011 Free Software Foundation, Inc.
 # Written by James Clark, maintained by Werner Lemberg.
 # Rewritten and put under GPL by Bernd Warken.
 
@@ -26,7 +26,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
-my $Last_Update = '5 Jan 2009';
+my $Last_Update = '22 Jan 2011';
 ########################################################################
 
 require v5.6;
@@ -128,7 +128,7 @@
 
     if (/^(.cstart)|(begin\s+chem)$/) {
       $Groff{'chem'}++;
-      $Groff{'pic'}++;
+      $Groff{'soelim'}++ if $level;
     } elsif (/^\.TS$Sp/) {
       $_ = <FILE>;
       if (!/^\./) {
@@ -151,7 +151,6 @@
       $_ = <FILE>;
       if (!/^\./) {
        $Groff{'grap'}++;
-       $Groff{'pic'}++;
        $Groff{'soelim'}++ if $level;
       }
 #    } elsif (/^\.PS\Sp([ 0-9.<].*)?$/) {
@@ -286,12 +285,13 @@
   $Groff{'refer'} ||= $Groff{'refer_open'} && $Groff{'refer_close'};
 
   if ( $Groff{'pic'} || $Groff{'tbl'} || $Groff{'eqn'} ||
-       $Groff{'grn'} || $Groff{'grap'} || $Groff{'refer'} ) {
+       $Groff{'grn'} || $Groff{'grap'} || $Groff{'refer'} ||
+       $Groff{'chem'} ) {
     my $s = "-";
     $s .= "s" if $Groff{'soelim'};
     $s .= "R" if $Groff{'refer'};
-    # grap must be run before pic
     $s .= "G" if $Groff{'grap'};
+    $s .= "j" if $Groff{'chem'};
     $s .= "p" if $Groff{'pic'};
     $s .= "g" if $Groff{'grn'};
     $s .= "t" if $Groff{'tbl'};
@@ -331,13 +331,8 @@
     push(@Command, $s);
   }
 
-  if ($Groff{'chem'}) {
-    my @chem = ('chem', @ARGV, '|', 'groff');
-    unshift(@Command, @chem);
-  } else {
     unshift @Command, 'groff';
     push(@Command, @ARGV);
-  }
 
   foreach (@Command) {
     next unless /\s/;

Index: src/roff/grog/grog.sh
===================================================================
RCS file: /cvsroot/groff/groff/src/roff/grog/grog.sh,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- src/roff/grog/grog.sh       5 Jan 2009 20:11:11 -0000       1.18
+++ src/roff/grog/grog.sh       22 Jan 2011 15:18:57 -0000      1.19
@@ -5,7 +5,7 @@
 # Source file position: <groff-source>/src/roff/grog/grog.sh
 # Installed position: <prefix>/bin/grog
 
-# Copyright (C) 1993, 2006, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1993, 2006, 2009, 2011 Free Software Foundation, Inc.
 # Written by James Clark, maintained by Werner Lemberg.
 # Rewritten by and put under GPL Bernd Warken.
 
@@ -25,7 +25,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
-Last_Update='5 Jan 2009'
+Last_Update='22 Jan 2011'
 ########################################################################
 
 address@hidden@soelim
@@ -161,16 +161,16 @@
 | awk '
 /^\.SO_START$/ { so = 1 }
 /^\.SO_END$/ { so = 0 }
-/^\.cstart$/ { chem++ }
+/^\.cstart$/ { chem++; if (so > 0) soelim++ }
 /^\.TS/ { tbl++; in_tbl = 1; if (so > 0) soelim++; }
 /^\.TE/ { in_tbl = 0 }
 /^\.PS([ 0-9.<].*)?$/ { pic++; if (so > 0) soelim++ }
 /^\.EQ/ { eqn++; if (so > 0) soelim++ }
 /^\.R1/ { refer++; if (so > 0) soelim++ }
-/^\.\[/ {refer_start++; if (so > 0) soelim++ }
-/^\.\]/ {refer_end++; if (so > 0) soelim++ }
+/^\.\[/ { refer_start++; if (so > 0) soelim++ }
+/^\.\]/ { refer_end++; if (so > 0) soelim++ }
 /^\.GS/ { grn++; if (so > 0) soelim++ }
-/^\.G1/ { grap++; pic++; if (so > 0) soelim++ }
+/^\.G1/ { grap++; if (so > 0) soelim++ }
 /^\.TH/ { if (in_tbl != 1) TH++ }
 /^\.PP/ { PP++ }
 /^\.TL/ { TL++ }
@@ -202,18 +202,15 @@
 /^\.(PRINTSTYLE|START)/ { mom++ }
 
 END {
-  if (chem > 0) {
-    printf "chem %s | ", files
-    pic++    
-    files = ""
-  }
   printf "groff"
   refer = refer || (refer_start && refer_end)
-  if (pic > 0 || tbl > 0 || grn > 0 || grap > 0 || eqn > 0 || refer > 0) {
+  if (pic > 0 || tbl > 0 || grn > 0 || grap > 0 ||
+      eqn > 0 || refer > 0 || chem > 0) {
     printf " -"
     if (soelim > 0) printf "s"
     if (refer > 0) printf "R"
     if (grn > 0) printf "g"
+    if (chem > 0) printf "j"
     if (grap > 0) printf "G"
     if (pic > 0) printf "p"
     if (tbl > 0) printf "t"