From e9d644ce58b720c0028541bdc5446e2f132df850 Mon Sep 17 00:00:00 2001 From: wl Date: Mon, 13 Dec 2010 15:12:40 +0000 Subject: 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. --- contrib/chem/ChangeLog | 11 ++++++ contrib/chem/Makefile.sub | 16 ++++++-- contrib/chem/examples/122/README | 74 ------------------------------------ contrib/chem/examples/122/README.txt | 74 ++++++++++++++++++++++++++++++++++++ 4 files changed, 98 insertions(+), 77 deletions(-) delete mode 100644 contrib/chem/examples/122/README create mode 100644 contrib/chem/examples/122/README.txt diff --git a/contrib/chem/ChangeLog b/contrib/chem/ChangeLog index 13e9b1c2..3e6c54fa 100644 --- a/contrib/chem/ChangeLog +++ b/contrib/chem/ChangeLog @@ -1,3 +1,14 @@ +2010-12-13 Werner LEMBERG + + 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 * Makefile.sub (install): Fix handling of examples/122. diff --git a/contrib/chem/Makefile.sub b/contrib/chem/Makefile.sub index b6a19b71..c79da488 100644 --- a/contrib/chem/Makefile.sub +++ b/contrib/chem/Makefile.sub @@ -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 @@ MOSTLYCLEANADD=chem chem.n README examples/README # 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 @@ examples/README: $(srcdir)/examples/README.txt -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: chem \ $(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/* diff --git a/contrib/chem/examples/122/README b/contrib/chem/examples/122/README deleted file mode 100644 index bd51196a..00000000 --- a/contrib/chem/examples/122/README +++ /dev/null @@ -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 -. - -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 - -`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 | 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 . - - -####### Emacs settings - -Local Variables: -mode: text -End: diff --git a/contrib/chem/examples/122/README.txt b/contrib/chem/examples/122/README.txt new file mode 100644 index 00000000..bd51196a --- /dev/null +++ b/contrib/chem/examples/122/README.txt @@ -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 +. + +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 + +`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 | 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 . + + +####### Emacs settings + +Local Variables: +mode: text +End: -- cgit v1.2.1