[Groff-commit] groff/contrib/chem ChangeLog Makefile.sub examp...

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Changes by:     Werner LEMBERG <wl>     10/12/13 15:12:40

Modified files:
        contrib/chem   : ChangeLog Makefile.sub 
Added files:
        contrib/chem/examples/122: README.txt 
Removed files:
        contrib/chem/examples/122: README 

Log message:
        Really fix handling of examples/122.
        
        * examples/122/README: Renamed to...
        * examples/122/README.txt: This.
        
        * Makefile.sub (all): Add `examples/122/README'.
        (examples/122/README): New target.
        (install_data): Fix typo.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/chem/ChangeLog?cvsroot=groff&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/chem/Makefile.sub?cvsroot=groff&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/chem/examples/122/README.txt?cvsroot=groff&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/chem/examples/122/README?cvsroot=groff&r1=1.5&r2=0

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/contrib/chem/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- ChangeLog   2 Jun 2010 14:02:10 -0000       1.14
+++ ChangeLog   13 Dec 2010 15:12:40 -0000      1.15
@@ -1,3 +1,14 @@
+2010-12-13  Werner LEMBERG  <address@hidden>
+
+       Really fix handling of examples/122.
+
+       * examples/122/README: Renamed to...
+       * examples/122/README.txt: This.
+
+       * Makefile.sub (all): Add `examples/122/README'.
+       (examples/122/README): New target.
+       (install_data): Fix typo.
+
 2010-06-02  Larry Jones  <address@hidden>
 
        * Makefile.sub (install): Fix handling of examples/122.

Index: Makefile.sub
===================================================================
RCS file: /cvsroot/groff/groff/contrib/chem/Makefile.sub,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- Makefile.sub        2 Jun 2010 14:02:10 -0000       1.12
+++ Makefile.sub        13 Dec 2010 15:12:40 -0000      1.13
@@ -5,7 +5,7 @@
 # Copyright (C) 2006, 2009, 2010 Free Software Foundation, Inc.
 # Written by Bernd Warken.
 
-# Last update: 2 Jun 2010
+# Last update: 12 Dec 2010
 
 # This file is part of `chem' which is part of `groff'.
 
@@ -30,7 +30,12 @@
 # not all make programs have $(RM) predefined.
 RM=rm -f
 
-all: README examples/README chem $(MAN1)
+all: \
+  README \
+  examples/README \
+  examples/122/README \
+  chem \
+  $(MAN1)
 
 README: $(srcdir)/README.txt
        sed -e "s|@g@|$(g)|g" $? >$@
@@ -39,6 +44,11 @@
        -test -d examples || $(mkinstalldirs) examples
        sed -e "s|@g@|$(g)|g" $? >$@
 
+examples/122/README: $(srcdir)/examples/122/README.txt
+       -test -d examples || $(mkinstalldirs) examples
+       -test -d examples/122 || $(mkinstalldirs) examples/122
+       sed -e "s|@g@|$(g)|g" $? >$@
+
 chem: $(srcdir)/chem.pl $(SH_DEPS_SED_SCRIPT)
        sed -f "$(SH_DEPS_SED_SCRIPT)" \
          -e "s|@g@|$(g)|g" \
@@ -63,7 +73,7 @@
        $(INSTALL_DATA) $(srcdir)/chem.pic \
           $(DESTDIR)$(datasubdir)/pic/chem.pic
        -test -d $(DESTDIR)$(exampledir)/chem \
-          || $(mkinstalldirs) $(DESTDIR)$(exampledir)/chem/122
+          || $(mkinstalldirs) $(DESTDIR)$(exampledir)/chem
        -test -d $(DESTDIR)$(exampledir)/chem/122 \
           || $(mkinstalldirs) $(DESTDIR)$(exampledir)/chem/122
        -$(RM) $(DESTDIR)$(exampledir)/chem/*

Index: examples/122/README.txt
===================================================================
RCS file: examples/122/README.txt
diff -N examples/122/README.txt
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ examples/122/README.txt     13 Dec 2010 15:12:40 -0000      1.1
@@ -0,0 +1,74 @@
+This directory contains the examples for the `chem' language written
+in the book:
+
+    Computing Science Technical Report No. 122
+    CHEM - A Program for Typesetting Chemical Diagrams: User Manual
+    by Jon L. Bentley, Lynn W. Jelinski, Brian W. Kernighan
+
+The book is available in the internet at
+<http://cm.bell-labs.com/cm/cs/cstr/122.ps.gz>.
+
+Many of the examples had to be fixed.  Unfortunately, the `chem' akw
+version does not run on many of these programs.  But the Perl version
+of `chem' works on all examples.
+
+Most examples do not use the modern chemical display.  They have C
+atoms added, whereas the modern method omits all C atoms and their
+directly appended H atoms.
+
+The examples are named and sorted by the chapter where they are found
+in the book.  For example, the file `ch4c_colon.chem' means a `chem'
+example in chapter 4; according to `c', it is the third example in
+this chapter; the name `colon' is used to describe the context of the
+example.
+
+You can view the graphical display of the examples by calling
+
+    groffer <file>
+
+`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
+
+    @address@hidden <file> | groff -p ...
+
+
+####### License
+
+Last update: 5 Jan 2009
+
+Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+Written by Bernd Warken.
+
+This file is part of `chem', which is part of `groff'.
+
+`groff' is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+`groff' is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+
+####### Emacs settings
+
+Local Variables:
+mode: text
+End:

Index: examples/122/README
===================================================================
RCS file: examples/122/README
diff -N examples/122/README
--- examples/122/README 5 Jan 2009 20:10:33 -0000       1.5
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,74 +0,0 @@
-This directory contains the examples for the `chem' language written
-in the book:
-
-    Computing Science Technical Report No. 122
-    CHEM - A Program for Typesetting Chemical Diagrams: User Manual
-    by Jon L. Bentley, Lynn W. Jelinski, Brian W. Kernighan
-
-The book is available in the internet at
-<http://cm.bell-labs.com/cm/cs/cstr/122.ps.gz>.
-
-Many of the examples had to be fixed.  Unfortunately, the `chem' akw
-version does not run on many of these programs.  But the Perl version
-of `chem' works on all examples.
-
-Most examples do not use the modern chemical display.  They have C
-atoms added, whereas the modern method omits all C atoms and their
-directly appended H atoms.
-
-The examples are named and sorted by the chapter where they are found
-in the book.  For example, the file `ch4c_colon.chem' means a `chem'
-example in chapter 4; according to `c', it is the third example in
-this chapter; the name `colon' is used to describe the context of the
-example.
-
-You can view the graphical display of the examples by calling
-
-    groffer <file>
-
-`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
-
-    @address@hidden <file> | groff -p ...
-
-
-####### License
-
-Last update: 5 Jan 2009
-
-Copyright (C) 2006, 2009 Free Software Foundation, Inc.
-Written by Bernd Warken.
-
-This file is part of `chem', which is part of `groff'.
-
-`groff' is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-`groff' is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-
-####### Emacs settings
-
-Local Variables:
-mode: text
-End: