Update chem-0.3.0

7 files changed, 75 insertions, 64 deletions

diff --git a/contrib/chem/ChangeLog b/contrib/chem/ChangeLog
index 5f967a60..65bd6abb 100644
--- a/contrib/chem/ChangeLog
+++ b/contrib/chem/ChangeLog
@@ -1,6 +1,20 @@
+2006-11-10  Bernd Warken
+       ________________________________________________________________
+        * release of chem 0.3.0
+
+	* chem.man1: Rename `chem.man' to translate some `@...@'
+	constructs.  Some minor corrections.  Remove some unused macros.
+
+	* examples/README.txt, examples/122/README: Add information on
+	`roff2*' programs.
+
+	* chem.pic: Rename `macros.pic'.
+
+	* Makefile.sub, chem.pl: Replace `macros.pic' by `chem.pic'.
+
 2006-11-09  Werner LEMBERG  <wl@gnu.org>
 
-	* chem.man: Revised.
+        * chem.man: Revised.
 
 2006-11-08  Bernd Warken
        ________________________________________________________________
diff --git a/contrib/chem/Makefile.sub b/contrib/chem/Makefile.sub
index 1d537e8f..8fec7c4a 100644
--- a/contrib/chem/Makefile.sub
+++ b/contrib/chem/Makefile.sub
@@ -5,7 +5,7 @@
 # Copyright (C) 2006 Free Software Foundation, Inc.
 # Written by Bernd Warken.
 
-# Last update: 8 Nov 2006
+# Last update: 9 Nov 2006
 
 # This file is part of `chem' which is part of `groff'.
 
@@ -27,12 +27,18 @@
 ########################################################################
 
 MAN1=chem.n
-CLEANADD=chem chem.n README examples/README
+CLEANADD=chem chem.n chem.man README examples/README
 
 # not all make programs have $(RM) predefined.
 RM=rm -f
 
-all: README examples/README chem $(MAN1)
+all: README examples/README chem chem.man
+
+chem.man: $(srcdir)/chem.man1
+	sed \
+	  -e "s|@tmacdir@|$(DESTDIR)$(tmacdir)|g" \
+	  -e "s|@picdir@|$(DESTDIR)$(datasubdir)/pic|g" \
+	  $< >$@
 
 README: $(srcdir)/README.txt
 	sed -e "s|@g@|$(g)|g" $< >$@
@@ -54,7 +60,7 @@ chem: $(srcdir)/chem.pl $(SH_DEPS_SED_SCRIPT)
 
 install_data: chem \
               README examples/README \
-              $(srcdir)/macros.pic \
+              $(srcdir)/chem.pic \
               $(srcdir)/examples/*.chem $(srcdir)/examples/122/*
 	-test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
 	$(RM) $(DESTDIR)$(bindir)/$(g)chem
@@ -62,7 +68,7 @@ install_data: chem \
 	-test -d $(DESTDIR)$(datasubdir)/pic \
           || $(mkinstalldirs) $(DESTDIR)$(datasubdir)/pic
 	$(RM) $(DESTDIR)$(datasubdir)/pic/chem.pic
-	$(INSTALL_DATA) $(srcdir)/macros.pic \
+	$(INSTALL_DATA) $(srcdir)/chem.pic \
           $(DESTDIR)$(datasubdir)/pic/chem.pic
 	-test -d $(DESTDIR)$(exampledir)/chem \
           || $(mkinstalldirs) $(DESTDIR)$(exampledir)/chem/122
diff --git a/contrib/chem/chem.man b/contrib/chem/chem.man1
index 8884aac6..a2e5b7f5 100644
--- a/contrib/chem/chem.man
+++ b/contrib/chem/chem.man1
@@ -102,39 +102,6 @@ You can also write to the
 ..
 .
 .c --------------------------------------------------------------------
-.c .CB  (<text>...)
-.c
-.c Print in constant-width bold font.
-.c
-.de CB
-.  ft CB
-.  Text \\$*
-.  ft
-..
-.
-.c --------------------------------------------------------------------
-.c .CI  (<text>...)
-.c
-.c Print in constant-width italic font.
-.c
-.de CI
-.  ft CI
-.  Text \\$*
-.  ft
-..
-.
-.c --------------------------------------------------------------------
-.c .CR  (<text>...)
-.c
-.c Print in constant-width roman font.
-.c
-.de CR
-.  ft CR
-.  Text \\$*
-.  ft
-..
-.
-.c --------------------------------------------------------------------
 .c .TP+  ()
 .c
 .c Continuation line for .TP header.
@@ -242,9 +209,9 @@ You can also write to the
 .
 .
 .P
-There are no other options than \f[CB]\-\-help\f[] and
-\%\f[CB]\-\-version\f[]; these options provoke the printing
-of a version or usage information, respectively, and all
+There are no other options than \f[CB]\-h\f[], \f[CB]\-\-help\f[],
+\f[CB]\-v\f[] and \%\f[CB]\-\-version\f[]; these options provoke the
+printing of a version or usage information, respectively, and all
 .I filespec
 arguments are ignored.
 .
@@ -294,8 +261,8 @@ originates from the Perl source file
 .File_name chem.pl .
 It tells
 .B @g@pic
-to include a copy of
-.File_name macros.pic .
+to include a copy of the macro file
+.File_name chem.pic .
 .
 Moreover the
 .I groff
@@ -827,7 +794,7 @@ only letters and numbers is valid:
 The specific construction
 .RS
 .TP
-.BR bond\  \*[Ellipsis] "; moiety"
+.BR bond\  \*[Ellipsis] " ; moiety"
 .RE
 .P
 is equivalent to
@@ -851,8 +818,9 @@ A period character
 .B .\&
 or a single quote
 .B '
-in the first column of a line signals a troff command,
-which is copied through as-is.
+in the first column of a line signals a
+.I troff
+command, which is copied through as-is.
 .
 .
 .P
@@ -985,7 +953,6 @@ construct of eqn).
 .P
 There is no way to control entry point for bonds on groups.
 .
-.
 Normally a bond connects to the carbon atom if entering from
 the top or bottom and otherwise to the nearest corner.
 .
@@ -1013,9 +980,9 @@ A squiggle bond is needed.
 .\" --------------------------------------------------------------------
 .
 .TP
-.File_name @libdir@/groff/chem/macros.pic
+.File_name @picdir@/chem.pic
 A collection of
-.B @g@pic
+.I pic
 macros needed by
 .BR @g@chem .
 .
@@ -1070,7 +1037,7 @@ for information on availability.
 .
 .BR \%groff (@MAN1EXT@),
 .BR \%@g@pic (@MAN1EXT@),
-.B \%groffer (@MAN1EXT@)
+.B \%groffer (@MAN1EXT@).
 .
 .
 .P
diff --git a/contrib/chem/macros.pic b/contrib/chem/chem.pic
index c0c31e15..13fdd55a 100644
--- a/contrib/chem/macros.pic
+++ b/contrib/chem/chem.pic
@@ -1,6 +1,6 @@
 # macros for chem
 	
-# Source file position: <groff-source>/contrib/chem/macros.pic
+# Source file position: <groff-source>/contrib/chem/chem.pic
 # Installed position: <prefix>/lib/groff/chem
 
 # Copyright (C) 2006 Free Software Foundation, Inc.
diff --git a/contrib/chem/chem.pl b/contrib/chem/chem.pl
index 9c6ea782..7dc38657 100755
--- a/contrib/chem/chem.pl
+++ b/contrib/chem/chem.pl
@@ -30,8 +30,8 @@
 # settings
 ########################################################################
 
-my $Program_Version = '0.2.0';
-my $Last_Update = '8 Nov 2006';
+my $Program_Version = '0.3.0';
+my $Last_Update = '10 Nov 2006';
 
 # this setting of the groff version is only used before make is run,
 # otherwise @VERSION@ will set it.
@@ -57,7 +57,7 @@ use FindBin;
 
 my $Chem_Name;
 my $Groff_Version;
-my $File_macros_pic;
+my $File_chem_pic;
 my $File_pic_tmac;
 
 BEGIN {
@@ -74,7 +74,7 @@ BEGIN {
       my $chem_dir = $FindBin::Bin;
       $at_at{'BINDIR'} = $chem_dir;
       $at_at{'G'} = '';
-      $File_macros_pic = File::Spec->catfile($chem_dir, 'macros.pic');
+      $File_chem_pic = File::Spec->catfile($chem_dir, 'chem.pic');
       $File_pic_tmac = File::Spec->catfile($chem_dir, '..', 'pic.tmac');
       $Groff_Version = '';
       $Chem_Name = 'chem';
@@ -84,7 +84,7 @@ BEGIN {
       $at_at{'G'} = '@g@';
       $at_at{'PICDIR'} = '@picdir@';
       $at_at{'TMACDIR'} = '@tmacdir@';
-      $File_macros_pic =
+      $File_chem_pic =
 	File::Spec->catfile($at_at{'PICDIR'}, 'chem.pic');
       $File_pic_tmac = File::Spec->catfile($at_at{'TMACDIR'}, 'pic.tmac');
       $Chem_Name = $at_at{'G'} . 'chem';
@@ -820,7 +820,7 @@ sub fields {
 #
 sub init {
   if ($First_Time) {
-    printf "copy \"%s\"\n", $File_macros_pic;
+    printf "copy \"%s\"\n", $File_chem_pic;
     printf "\ttextht = %g; textwid = .1; cwid = %g\n",
       $Params{'textht'}, $Params{'cwid'};
     printf "\tlineht = %g; linewid = %g\n",
diff --git a/contrib/chem/examples/122/README b/contrib/chem/examples/122/README
index 28f127a5..1b3b3c36 100644
--- a/contrib/chem/examples/122/README
+++ b/contrib/chem/examples/122/README
@@ -26,15 +26,27 @@ You can view the graphical display of the examples by calling
 
     groffer <file>
 
-`groffer' calls `chem' automatically.  Or get a suitable `groff'
-output by running
+`groffer' calls `chem' automatically.
+
+If you want to transform example files to a different format use the
+`roff2*' programs:
+
+`roff2dvi' prints dvi format to standard output,
+`roff2html' generates html output,
+`roff2pdf' outputs pdf mode,
+`roff2ps' produces PostScript output,
+`roff2text' generates text output in the groff device `latin1',
+`roff2x' prints the output  in  the  groff  device  X  that  is
+         suitable  for programs  like `gxditview' or `xditview'.
+
+To get a suitable `groff' output run
 
     @g@chem <file> | groff -p ...
 
 
 ####### License
 
-Last update: 6 Nov 2006
+Last update: 9 Nov 2006
 
 Copyright (C) 2006 Free Software Foundation, Inc.
 Written by Bernd Warken.
diff --git a/contrib/chem/examples/README.txt b/contrib/chem/examples/README.txt
index 160cabda..2e2da232 100644
--- a/contrib/chem/examples/README.txt
+++ b/contrib/chem/examples/README.txt
@@ -4,8 +4,20 @@ You can view the graphical display of the examples by calling
 
     groffer <file>
 
-`groffer' calls `chem' automatically.  Or get a suitable `groff'
-output by running
+`groffer' calls `chem' automatically.
+
+If you want to transform example files to a different format use the
+`roff2*' programs:
+
+`roff2dvi' prints dvi format to standard output,
+`roff2html' generates html output,
+`roff2pdf' outputs pdf mode,
+`roff2ps' produces PostScript output,
+`roff2text' generates text output in the groff device `latin1',
+`roff2x' prints the output  in  the  groff  device  X  that  is
+         suitable  for programs  like `gxditview' or `xditview'.
+
+To get a suitable `groff' output run
 
     @g@chem <file> | groff -p ...
 
@@ -25,7 +37,7 @@ chemically.
 
 ####### License
 
-Last update: 6 Nov 2006
+Last update: 9 Nov 2006
 
 Copyright (C) 2006 Free Software Foundation, Inc.
 Written by Bernd Warken.