[groff] 01/01: chem: new version 1.0.3; make man-page compatible to doclifter

[Bernd Warken]

bwarken pushed a commit to branch master
in repository groff.

commit 705fa2757d907258966b2ade2f6f8fd41d93f8d8
Author: Bernd Warken <address@hidden>
Date:   Sun Jul 6 11:08:39 2014 +0200

    chem: new version 1.0.3; make man-page compatible to doclifter
---
 ChangeLog                |    5 ++
 contrib/chem/ChangeLog   |    6 ++
 contrib/chem/chem.man    |  167 +++++++++++++++++++++++++---------------------
 contrib/chem/chem.pl     |    4 +-
 src/roff/groff/groff.cpp |   60 ++++++++--------
 5 files changed, 135 insertions(+), 107 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0e863a1..9ce9473 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2014-07-05  Bernd Warken  <address@hidden>
 
+       * src/roff/groffgroff.cpp: In `usage()' and `help()' order
+       alphabetically.
+
+2014-07-05  Bernd Warken  <address@hidden>
+
        * grog.pl, subs.pl: Heavily improve argument handling and `groff'
        command line creation.
 
diff --git a/contrib/chem/ChangeLog b/contrib/chem/ChangeLog
index 4d36c14..e72abad 100644
--- a/contrib/chem/ChangeLog
+++ b/contrib/chem/ChangeLog
@@ -1,3 +1,9 @@
+2014-07-05  Bernd Warken  <address@hidden>
+       ________________________________________________________________
+       * chem.pl: New chem version 1.0.3
+
+       * chem.man: Make file doclifter compatible.
+
 2014-07-04  Bernd Warken  <address@hidden>
        ________________________________________________________________
        * release of chem 1.0.2
diff --git a/contrib/chem/chem.man b/contrib/chem/chem.man
index 0cffdac..8a2f3b2 100644
--- a/contrib/chem/chem.man
+++ b/contrib/chem/chem.man
@@ -10,55 +10,27 @@
 Source file position:  <groff_source_top>/contrib/chem/chem.man
 Installed position:    $prefix/share/man/man1/@address@hidden
 
-Last update: 4 Jul 2014
-..
-.
-.
-.de authors
+Last update: 5 Jul 2014
+
 This file was written by Bernd Warken <address@hidden>.
-It is based on the documentation of
-.UR http://\:cm.bell-labs.com/\:cm/\:cs/\:who/\:bwk/\:index.html
-Brian Kernighan
-.UE 's
-original
-.I awk
-version of
-.IR chem .
-..
-.
-.
-.de copying
-Copyright (C) 2006\[en]2009, 2014 Free Software Foundation, Inc.
-.
-.
-.P
-This file is part of
-.IR chem ,
-which is part of
-.IR groff ,
-a free software project.
-.
-You can redistribute it and/or modify it under the terms of the
-.nh
-.B "GNU General Public License"
-.RB ( GPL )
-.B version 2
-.hy
-as published by the
-.nh
-.BR "Free Software Foundation" .
-.hy
-.
-.
-.P
-The license text for
-.B GPL2
-is available in the internet at
-.UR http://www.gnu.org/licenses/gpl-2.0.html
-.UE .
+
+It is based on the documentation of Brian Kernighan's original awk
+version of chem at <http://cm.bell-labs.com/cm/cs/who/bwk/index.html>.
+
+Copyright (C) 2006\[en]2009, 2014
+       Free Software Foundation, Inc.
+
+This file is part of chem, which is part of groff, a free software
+project.
+
+You can redistribute it and/or modify it under the terms of the "GNU
+General Public License version 2" (GPL2) as published by the "Free
+Software Foundation".
+
+The license text for GPL2 is available in the internet at
+<http://www.gnu.org/licenses/gpl-2.0.html>.
 ..
 .
-.
 .\" --------------------------------------------------------------------
 .\" Setup
 .\" --------------------------------------------------------------------
@@ -67,9 +39,15 @@ is available in the internet at
 .\" Characters
 .\" --------------------------------------------------------------------
 .
-.ie t .char \[Ellipsis] \f[S]\N'188'\f[P]
-.el .char \[Ellipsis] \f[I]...\f[P]
-.\" called by \[Ellipsis]
+.\" Ellipsis ...
+.ie t .ds EL \fS\N'188'\fP
+.el .ds EL \&.\|.\|.\&\
+.\" called with \*(EL
+.
+.\" Bullet
+.ie t .ds BU \[bu]
+.el .ds BU *
+.\" used in `.IP \*(BU 2m' (former .Topic)
 .
 .
 .\" --------------------------------------------------------------------
@@ -109,9 +87,9 @@ is available in the internet at
 .\" --------------------------------------------------------------------
 .
 .SY @address@hidden
-.OP \fI\%option \[Ellipsis]\fP
+.OP \fI\%option \*(EL\fP
 .OP \-\-
-.OP \fI\%filespec \[Ellipsis]\fP
+.OP \fI\%filespec \*(EL\fP
 .YS
 .
 .SY @address@hidden
@@ -131,7 +109,6 @@ is available in the internet at
 .SH OPTION USAGE
 .\" --------------------------------------------------------------------
 .
-.P
 There are no other options than
 .BR \-h ,
 .BR \-\-help ,
@@ -283,7 +260,7 @@ followed by
 .BR groffer :
 .
 .IP
-.B @address@hidden [file \[Ellipsis]] | groffer
+.B @address@hidden [file \*(EL] | groffer
 .
 .P
 If you want to create just
@@ -297,7 +274,7 @@ with the option
 for the activation of
 .BR @address@hidden :
 .IP
-.B @address@hidden [file \[Ellipsis]] | groff \-p \[Ellipsis]
+.B @address@hidden [file \*(EL] | groff \-p \*(EL
 .
 .
 .\" --------------------------------------------------------------------
@@ -311,7 +288,7 @@ and a way to glue them together as desired, bonds of 
several styles,
 moieties (e.g.,
 .BR C ,
 .BR NH3 ,
-\[Ellipsis], and strings.
+\*(EL, and strings.
 .
 .
 .\" --------------------------------------------------------------------
@@ -471,14 +448,14 @@ puts a circle into any kind of ring.
 .RB [ \%double\ \c
 .IR i , j\ \c
 .IR k , l\ \c
-\[Ellipsis]
+\*(EL
 .RI [ picstuff ]
 .YS
 .RE
 .
 .
 .P
-The vertices of a ring are numbered 1, 2, \[Ellipsis] from the
+The vertices of a ring are numbered 1, 2, \*(EL from the
 vertex that points in the natural compass direction.
 .
 So for a hexagonal ring with the point at the top, the top vertex
@@ -499,7 +476,7 @@ R2: ring pointing right
 .P
 The ring vertices are named
 .BR .V1 ,
-\[Ellipsis],
+\*(EL,
 .BI .V n\fR,\fP
 with
 .B .V1
@@ -539,7 +516,7 @@ creates two benzene rings connected along a side.
 .
 .P
 Interior double bonds are specified as
-.BI \%double\  n1 , n2\ n3 , n4\ \fR\[Ellipsis];\fP
+.BI \%double\  n1 , n2\ n3 , n4\ \fR\*(EL;\fP
 each number pair adds an interior bond.
 .
 So the alternate form of a benzene ring is
@@ -676,7 +653,7 @@ command.
 .
 It represents a string that should be printed (without the quotes).
 .
-Text within quotes \(dq\[Ellipsis]\(dq is treated more or less
+Text within quotes \(dq\*(EL\(dq is treated more or less
 like a moiety except that no changes are made to the quoted part.
 .
 .
@@ -696,7 +673,7 @@ A name is just
 .
 .IP
 .IB Name :
-\[Ellipsis]
+\*(EL
 .
 .
 .P
@@ -725,7 +702,7 @@ only letters and numbers is valid:
 The specific construction
 .RS
 .TP
-.BR bond\  \[Ellipsis] " ; moiety"
+.BR bond\  \*(EL " ; moiety"
 .RE
 .P
 is equivalent to
@@ -877,7 +854,7 @@ properties of built-in objects.
 .
 .
 .P
-There is no in-line chemistry yet (e.g., analogous to the $\[Ellipsis]$
+There is no in-line chemistry yet (e.g., analogous to the $\*(EL$
 construct of eqn).
 .
 .
@@ -980,6 +957,58 @@ for information on availability.
 .
 .
 .\" --------------------------------------------------------------------
+.SH "AUTHORS"
+.\" --------------------------------------------------------------------
+.
+This file was written by
+.MT address@hidden
+Bernd Warken 
+.ME .
+.
+It is based on the documentation of
+.UR http://\:cm.bell-labs.com/\:cm/\:cs/\:who/\:bwk/\:index.html
+Brian Kernighan
+.UE 's
+original
+.I awk
+version of
+.IR chem .
+.
+.
+.\" --------------------------------------------------------------------
+.SH "COPYING"
+.\" --------------------------------------------------------------------
+.
+Copyright (C) 2006\[en]2009, 2014
+       Free Software Foundation, Inc.
+.
+.P
+This file is part of
+.IR chem ,
+which is part of
+.IR groff ,
+a free software project.
+.
+You can redistribute it and/or modify it under the terms of the
+.nh
+.B "GNU General Public License version 2"
+.RB ( GPL2 )
+.hy
+as published by the
+.nh
+.BR "Free Software Foundation" .
+.hy
+.
+.
+.P
+The license text for
+.B GPL2
+is available in the internet at
+.UR http://www.gnu.org/licenses/gpl-2.0.html
+.UE .
+.
+.
+.\" --------------------------------------------------------------------
 .SH "SEE ALSO"
 .\" --------------------------------------------------------------------
 .
@@ -1009,18 +1038,6 @@ is
 .
 .
 .\" --------------------------------------------------------------------
-.SH "AUTHORS"
-.\" --------------------------------------------------------------------
-.authors
-.
-.
-.\" --------------------------------------------------------------------
-.SH "COPYING"
-.\" --------------------------------------------------------------------
-.copying
-.
-.
-.\" --------------------------------------------------------------------
 .\" Emacs settings
 .\" --------------------------------------------------------------------
 .
diff --git a/contrib/chem/chem.pl b/contrib/chem/chem.pl
index f0b2575..3c94dcc 100755
--- a/contrib/chem/chem.pl
+++ b/contrib/chem/chem.pl
@@ -26,8 +26,8 @@
 # settings
 ########################################################################
 
-my $Program_Version = '1.0.2';
-my $Last_Update = '3 Jul 2014';
+my $Program_Version = '1.0.3';
+my $Last_Update = '5 Jul 2014';
 
 # this setting of the groff version is only used before make is run,
 # otherwise @VERSION@ will set it.
diff --git a/src/roff/groff/groff.cpp b/src/roff/groff/groff.cpp
index 9776473..62330e4 100644
--- a/src/roff/groff/groff.cpp
+++ b/src/roff/groff/groff.cpp
@@ -763,9 +763,9 @@ char **possible_command::get_argv()
 void synopsis(FILE *stream)
 {
   fprintf(stream,
-"usage: %s [-abceghijklpstvzCEGNRSUVXZ] [-Fdir] [-mname] [-Tdev] [-ffam]\n"
-"       [-wname] [-Wname] [-Mdir] [-dcs] [-rcn] [-nnum] [-olist] [-Parg]\n"
-"       [-Darg] [-Karg] [-Larg] [-Idir] [files...]\n",
+"usage: %s [-abceghijklpstvzCEGNRSUVXZ] [-dcs] [-ffam] [-mname] [-nnum]\n"
+"       [-olist] [-rcn] [-wname] [-Darg] [-Fdir] [-Idir] [-Karg] [-Larg]\n"
+"       [-Mdir] [-Parg] [-Tdev] [-Wname] [files...]\n",
          program_name);
 }
 
@@ -774,47 +774,47 @@ void help()
   synopsis(stdout);
   fputs("\n"
 "-h\tprint this message\n"
-"-k\tpreprocess with preconv\n"
-"-t\tpreprocess with tbl\n"
-"-p\tpreprocess with pic\n"
+"-v\tprint version number\n"
 "-e\tpreprocess with eqn\n"
 "-g\tpreprocess with grn\n"
-"-G\tpreprocess with grap\n"
 "-j\tpreprocess with chem\n"
-"-J\tpreprocess with gideal\n"
+"-k\tpreprocess with preconv\n"
+"-p\tpreprocess with pic\n"
 "-s\tpreprocess with soelim\n"
+"-t\tpreprocess with tbl\n"
+"-G\tpreprocess with grap\n"
+"-J\tpreprocess with gideal\n"
 "-R\tpreprocess with refer\n"
-"-Tdev\tuse device dev\n"
-"-X\tuse X11 previewer rather than usual postprocessor\n"
-"-mname\tread macros tmac.name\n"
+"-a\tproduce ASCII description of output\n"
+"-b\tprint backtraces with errors or warnings\n"
+"-c\tdisable color output\n"
 "-dcs\tdefine a string c as s\n"
-"-rcn\tdefine a number register c as n\n"
-"-nnum\tnumber first page n\n"
-"-olist\toutput only pages in list\n"
 "-ffam\tuse fam as the default font family\n"
-"-Fdir\tsearch dir for device directories\n"
-"-Mdir\tsearch dir for macro files\n"
-"-v\tprint version number\n"
-"-z\tsuppress formatted output\n"
-"-Z\tdon't postprocess\n"
-"-a\tproduce ASCII description of output\n"
 "-i\tread standard input after named input files\n"
-"-wname\tenable warning name\n"
-"-Wname\tinhibit warning name\n"
-"-E\tinhibit all errors\n"
-"-b\tprint backtraces with errors or warnings\n"
 "-l\tspool the output\n"
-"-c\tdisable color output\n"
+"-mname\tread macros tmac.name\n"
+"-nnum\tnumber first page n\n"
+"-olist\toutput only pages in list\n"
+"-rcn\tdefine a number register c as n\n"
+"-wname\tenable warning name\n"
+"-z\tsuppress formatted output\n"
 "-C\tenable compatibility mode\n"
-"-V\tprint commands on stdout instead of running them\n"
-"-Parg\tpass arg to the postprocessor\n"
+"-Darg\tuse arg as default input encoding.  Implies -k\n"
+"-E\tinhibit all errors\n"
+"-Fdir\tsearch dir for device directories\n"
+"-Idir\tsearch dir for soelim, troff, and grops.  Implies -s\n"
+"-Karg\tuse arg as input encoding.  Implies -k\n"
 "-Larg\tpass arg to the spooler\n"
+"-Mdir\tsearch dir for macro files\n"
 "-N\tdon't allow newlines within eqn delimiters\n"
+"-Parg\tpass arg to the postprocessor\n"
 "-S\tenable safer mode (the default)\n"
+"-Tdev\tuse device dev\n"
 "-U\tenable unsafe mode\n"
-"-Idir\tsearch dir for soelim, troff, and grops.  Implies -s\n"
-"-Karg\tuse arg as input encoding.  Implies -k\n"
-"-Darg\tuse arg as default input encoding.  Implies -k\n"
+"-V\tprint commands on stdout instead of running them\n"
+"-Wname\tinhibit warning name\n"
+"-X\tuse X11 previewer rather than usual postprocessor\n"
+"-Z\tdon't postprocess\n"
 "\n",
        stdout);
   exit(0);