[Groff-commit] groff ChangeLog src/roff/groff/groff.cpp src/ro...

[Werner LEMBERG]

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

Modified files:
        .              : ChangeLog 
        src/roff/groff : groff.cpp groff.man 

Log message:
        Make `groff -G' imply `-p'.
        
        * src/roff/groff/groff.cpp (main): Implement it.
        * src/roff/groff/groff.man: Updated.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1280&r2=1.1281
http://cvs.savannah.gnu.org/viewcvs/groff/src/roff/groff/groff.cpp?cvsroot=groff&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/groff/src/roff/groff/groff.man?cvsroot=groff&r1=1.58&r2=1.59

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1280
retrieving revision 1.1281
diff -u -b -r1.1280 -r1.1281
--- ChangeLog   22 Jan 2011 14:35:48 -0000      1.1280
+++ ChangeLog   22 Jan 2011 15:00:09 -0000      1.1281
@@ -1,5 +1,12 @@
 2011-01-22  Werner LEMBERG  <address@hidden>
 
+       Make `groff -G' imply `-p'.
+
+       * src/roff/groff/groff.cpp (main): Implement it.
+       * src/roff/groff/groff.man: Updated.
+
+2011-01-22  Werner LEMBERG  <address@hidden>
+
        Integrate `chem' into `groff' (new option -j).
 
        * src/roff/groff/groff.cpp (CHEM_INDEX): New constant.

Index: src/roff/groff/groff.cpp
===================================================================
RCS file: /cvsroot/groff/groff/src/roff/groff/groff.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- src/roff/groff/groff.cpp    22 Jan 2011 14:35:48 -0000      1.17
+++ src/roff/groff/groff.cpp    22 Jan 2011 15:00:20 -0000      1.18
@@ -50,6 +50,9 @@
 #endif /* NEED_DECLARATION_PUTENV */
 
 // The number of commands must be in sync with MAX_COMMANDS in pipeline.h
+
+// grap and chem must come before pic;
+// tbl must come before eqn
 const int PRECONV_INDEX = 0;
 const int SOELIM_INDEX = PRECONV_INDEX + 1;
 const int REFER_INDEX = SOELIM_INDEX + 1;
@@ -122,6 +125,7 @@
   int safer_flag = 1;
   int is_xhtml = 0;
   int eflag = 0;
+  int need_pic = 0;
   int opt;
   const char *command_prefix = getenv("GROFF_COMMAND_PREFIX");
   const char *encoding = getenv("GROFF_ENCODING");
@@ -172,7 +176,8 @@
       break;
     case 'j':
       commands[CHEM_INDEX].set_name(command_prefix, "chem");
-      // fall through
+      need_pic = 1;
+      break;
     case 'p':
       commands[PIC_INDEX].set_name(command_prefix, "pic");
       break;
@@ -181,6 +186,7 @@
       break;
     case 'G':
       commands[GRAP_INDEX].set_name(command_prefix, "grap");
+      need_pic = 1;
       break;
     case 'e':
       eflag = 1;
@@ -315,6 +321,8 @@
       break;
     }
   }
+  if (need_pic)
+    commands[PIC_INDEX].set_name(command_prefix, "pic");
   if (encoding) {
     commands[PRECONV_INDEX].set_name("preconv");
     if (!Kflag && *encoding)

Index: src/roff/groff/groff.man
===================================================================
RCS file: /cvsroot/groff/groff/src/roff/groff/groff.man,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- src/roff/groff/groff.man    22 Jan 2011 14:35:49 -0000      1.58
+++ src/roff/groff/groff.man    22 Jan 2011 15:00:20 -0000      1.59
@@ -187,6 +187,9 @@
 Preprocess with
 .BR grap .
 .
+Implies
+.BR \-p .
+.
 .
 .TP
 .B \-h
@@ -220,6 +223,7 @@
 .B \-j
 Preprocess with
 .BR @address@hidden .
+.
 Implies
 .BR \-p .
 .