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

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Changes by:     Werner LEMBERG <wl>     11/01/22 14:35:49

Modified files:
        .              : ChangeLog NEWS 
        src/roff/groff : groff.cpp groff.man pipeline.h 

Log message:
        Integrate `chem' into `groff' (new option -j).
        
        * src/roff/groff/groff.cpp (CHEM_INDEX): New constant.
        (main) ['j']: Add `chem'.
        (synopsis, help): Updated.
        * src/roff/troff/pipeline.h (MAX_COMMANDS): Increase to 14.
        
        * src/roff/groff/groff.man: Document new command line option.
        * NEWS: Updated.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1279&r2=1.1280
http://cvs.savannah.gnu.org/viewcvs/groff/NEWS?cvsroot=groff&r1=1.265&r2=1.266
http://cvs.savannah.gnu.org/viewcvs/groff/src/roff/groff/groff.cpp?cvsroot=groff&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/groff/src/roff/groff/groff.man?cvsroot=groff&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/groff/src/roff/groff/pipeline.h?cvsroot=groff&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1279
retrieving revision 1.1280
diff -u -b -r1.1279 -r1.1280
--- ChangeLog   22 Jan 2011 12:28:04 -0000      1.1279
+++ ChangeLog   22 Jan 2011 14:35:48 -0000      1.1280
@@ -1,5 +1,17 @@
 2011-01-22  Werner LEMBERG  <address@hidden>
 
+       Integrate `chem' into `groff' (new option -j).
+
+       * src/roff/groff/groff.cpp (CHEM_INDEX): New constant.
+       (main) ['j']: Add `chem'.
+       (synopsis, help): Updated.
+       * src/roff/troff/pipeline.h (MAX_COMMANDS): Increase to 14.
+
+       * src/roff/groff/groff.man: Document new command line option.
+       * NEWS: Updated.
+
+2011-01-22  Werner LEMBERG  <address@hidden>
+
        * doc/groff.texinfo: `chem' is now part of groff.
 
 2011-01-22  Werner LEMBERG  <address@hidden>

Index: NEWS
===================================================================
RCS file: /cvsroot/groff/groff/NEWS,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -b -r1.265 -r1.266
--- NEWS        31 Dec 2010 07:35:06 -0000      1.265
+++ NEWS        22 Jan 2011 14:35:48 -0000      1.266
@@ -1,5 +1,4 @@
-    Copyright (C) 1989-2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-                  2009, 2010
+    Copyright (C) 1989-2011
       Free Software Foundation, Inc.
 
     Copying and distribution of this file, with or without modification,
@@ -9,6 +8,15 @@
 This file describes recent user-visible changes in groff.  Bug fixes are not
 described.  There are more details in the man and info pages.
 
+VERSION 1.21.1
+==============
+
+Groff
+-----
+
+o A new option `-j' has been added to call the `chem' preprocessor.
+
+
 VERSION 1.21
 ============
 

Index: src/roff/groff/groff.cpp
===================================================================
RCS file: /cvsroot/groff/groff/src/roff/groff/groff.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- src/roff/groff/groff.cpp    19 Sep 2010 13:51:25 -0000      1.16
+++ src/roff/groff/groff.cpp    22 Jan 2011 14:35:48 -0000      1.17
@@ -1,6 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989-2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010
+/* Copyright (C) 1989-2011
    Free Software Foundation, Inc.
      Written by James Clark (address@hidden)
 
@@ -55,7 +54,8 @@
 const int SOELIM_INDEX = PRECONV_INDEX + 1;
 const int REFER_INDEX = SOELIM_INDEX + 1;
 const int GRAP_INDEX = REFER_INDEX + 1;
-const int PIC_INDEX = GRAP_INDEX + 1;
+const int CHEM_INDEX = GRAP_INDEX + 1;
+const int PIC_INDEX = CHEM_INDEX + 1;
 const int TBL_INDEX = PIC_INDEX + 1;
 const int GRN_INDEX = TBL_INDEX + 1;
 const int EQN_INDEX = GRN_INDEX + 1;
@@ -135,7 +135,7 @@
   };
   while ((opt = getopt_long(
                  argc, argv,
-                 "abcCd:D:eEf:F:gGhiI:lkK:L:m:M:n:No:pP:r:RsStT:UvVw:W:XzZ",
+                 "abcCd:D:eEf:F:gGhiI:jkK:lL:m:M:n:No:pP:r:RsStT:UvVw:W:XzZ",
                  long_options, NULL))
         != EOF) {
     char buf[3];
@@ -170,6 +170,9 @@
     case 't':
       commands[TBL_INDEX].set_name(command_prefix, "tbl");
       break;
+    case 'j':
+      commands[CHEM_INDEX].set_name(command_prefix, "chem");
+      // fall through
     case 'p':
       commands[PIC_INDEX].set_name(command_prefix, "pic");
       break;
@@ -206,7 +209,7 @@
       vflag = 1;
       printf("GNU groff version %s\n", Version_string);
       printf(
-       "Copyright (C) 2009 Free Software Foundation, Inc.\n"
+       "Copyright (C) 2011 Free Software Foundation, Inc.\n"
        "GNU groff comes with ABSOLUTELY NO WARRANTY.\n"
        "You may redistribute copies of groff and its subprograms\n"
        "under the terms of the GNU General Public License.\n"
@@ -259,7 +262,6 @@
       if (strcmp(optarg, "html") == 0)
        // force soelim to aid the html preprocessor
        commands[SOELIM_INDEX].set_name(command_prefix, "soelim");
-      
       if (strcmp(optarg, "Xps") == 0) {
        warning("-TXps option is obsolete: use -X -Tps instead");
        device = "ps";
@@ -745,7 +747,7 @@
 void synopsis(FILE *stream)
 {
   fprintf(stream,
-"usage: %s [-abceghiklpstvzCENRSUVXZ] [-Fdir] [-mname] [-Tdev] [-ffam]\n"
+"usage: %s [-abceghijklpstvzCENRSUVXZ] [-Fdir] [-mname] [-Tdev] [-ffam]\n"
 "       [-wname] [-Wname] [-Mdir] [-dcs] [-rcn] [-nnum] [-olist] [-Parg]\n"
 "       [-Darg] [-Karg] [-Larg] [-Idir] [files...]\n",
          program_name);
@@ -762,6 +764,7 @@
 "-e\tpreprocess with eqn\n"
 "-g\tpreprocess with grn\n"
 "-G\tpreprocess with grap\n"
+"-j\tpreprocess with chem\n"
 "-s\tpreprocess with soelim\n"
 "-R\tpreprocess with refer\n"
 "-Tdev\tuse device dev\n"

Index: src/roff/groff/groff.man
===================================================================
RCS file: /cvsroot/groff/groff/src/roff/groff/groff.man,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- src/roff/groff/groff.man    9 Sep 2009 14:11:32 -0000       1.57
+++ src/roff/groff/groff.man    22 Jan 2011 14:35:49 -0000      1.58
@@ -1,7 +1,7 @@
 .ig
 groff.man
 
-Copyright (C) 1989, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+Copyright (C) 1989, 2002-2009, 2011
 Free Software Foundation, Inc.
 Rewritten in 2002 by Bernd Warken <address@hidden>
 
@@ -44,7 +44,7 @@
 .\" --------------------------------------------------------------------
 .
 .SY groff
-.OP \-abcegiklpstzCEGNRSUVXZ
+.OP \-abcegikjklpstzCEGNRSUVXZ
 .OP \-d cs
 .OP \-D arg
 .OP \-f fam
@@ -217,6 +217,14 @@
 .
 .
 .TP
+.B \-j
+Preprocess with
+.BR @address@hidden .
+Implies
+.BR \-p .
+.
+.
+.TP
 .B \-k
 Preprocess with
 .BR preconv .
@@ -1713,7 +1721,7 @@
 .SH AUTHORS
 .\" --------------------------------------------------------------------
 .
-Copyright \(co 1989, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+Copyright \(co 2011
 Free Software Foundation, Inc.
 .
 .P

Index: src/roff/groff/pipeline.h
===================================================================
RCS file: /cvsroot/groff/groff/src/roff/groff/pipeline.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- src/roff/groff/pipeline.h   5 Jan 2009 20:11:11 -0000       1.7
+++ src/roff/groff/pipeline.h   22 Jan 2011 14:35:49 -0000      1.8
@@ -1,4 +1,4 @@
-/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2002, 2005, 2009
+/* Copyright (C) 1989-1992, 2000, 2002, 2005, 2009, 2011
    Free Software Foundation, Inc.
      Written by James Clark (address@hidden)
 
@@ -24,7 +24,7 @@
 #endif
 
 /* run_pipeline can handle at most this many commands */
-#define MAX_COMMANDS 13
+#define MAX_COMMANDS 14
 
 /* Children exit with this status if execvp fails. */
 #define EXEC_FAILED_EXIT_STATUS 0xff