Changeset 5a953a in git

Timestamp:

Feb 24, 2009, 1:00:12 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

d9ddf2f5e5b7c611efc8fef41c3ccd4416e72d49

Parents:

e8e2b6921594abbde4a1dccae43bc5f6b73440d1

Message:

*hannes: plral letterplace reorganized


git-svn-id: file:///usr/local/Singular/svn/trunk@11460 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

doc

Files:

• Makefile.in (modified) (19 diffs)
• letterplace.doc (modified) (previous)
• plural.doc (modified) (previous)
• singular.doc (modified) (previous)

doc/Makefile.in

@@ -2 +2 @@
 ###
 ### Makefile for Singular documentation
-### $Id: Makefile.in,v 1.105 2008-10-29 15:43:19 Singular Exp $
+### $Id: Makefile.in,v 1.106 2009-02-24 12:00:12 Singular Exp $
 #####################################################################
 SHELL=/bin/sh
@@ -74 +74 @@
 TMP_DIR         = @TMP_DIR@
 HTML_SUBDIR     = html
-PLU_HTML_SUBDIR = pluhtml
 TEXI2HTML_INIT  = t2h_singular.init
 ifeq ($(VERBOSE),0)
@@ -84 +83 @@
                   -short_ext -l2h_tmp ${TMP_DIR} -subdir ${HTML_SUBDIR} \
                   ${T2H_VERBOSE}
-PLU_TEXI2HTML_OPTS  = -init_file ${TEXI2HTML_INIT} @TEXI2HTML_OPTS@ \
-                  -short_ext -l2h_tmp ${TMP_DIR} -subdir ${PLU_HTML_SUBDIR} \
-                  ${T2H_VERBOSE}
 HTML_MANUAL_PREFIX = sing
-PLU_HTML_MANUAL_PREFIX = sing
 HTML_TUTOR_PREFIX  = tut
 HTML_MANUAL_TOP    = index.htm
@@ -104 +99 @@
                           INSTALL_win.texi
 
-PLU_STANDALONE_TEXI_FILES = COPYING.plural.texi INSTALL_unix.plural.texi \
-                            NEWS.plural.texi README_download.plural.texi \
-                            INSTALL_win.plural.texi
-
-PLU_ONLY_FILES          = pluplatform.tex
-
-PLU_DOC2TEX_FILES       = \
-                plural.tex plumath.tex plureference.tex plutypes.tex pluconventions.tex letterplace.tex
-
 DOC2TEX_FILES   = decodegb.tex \
                 examples.tex general.tex ti_ip.tex math.tex reference.tex \
                 start.tex types.tex pdata.tex tricks.tex platform.tex \
-                ${PLU_DOC2TEX_FILES}
-
-PLU_MANUAL_FILES = ${PLU_DOC2TEX_FILES} ${PLU_ONLY_FILES}
-
-MANUAL_FILES    = ${TEX_FILES} ${DOC2TEX_FILES} ${PLU_MANUAL_FILES}
+                plural.tex letterplace.tex plulibs.tex
+
+MANUAL_FILES    = ${TEX_FILES} ${DOC2TEX_FILES}
 
 TUTOR_FILES     = \
@@ -129 +113 @@
 IMAGES_SRC := $(IMAGES:%=images/%)
 IMAGES_HTML := $(IMAGES:%=${HTML_SUBDIR}/%)
-PLU_IMAGES_HTML := $(IMAGES:%=${PLU_HTML_SUBDIR}/%)
 
 # prepend bindir to path so that programs from there are taken first
@@ -146 +129 @@
 info: singular.hlp
 
-singular.hlp: ${MANUAL_FILES} singular.tex s-plural.tex
+singular.hlp: ${MANUAL_FILES} singular.tex s-plural.tex s-plulibs.tex
         - ${MAKEINFO} --no-split singular.tex
-
-plural.hlp:  ${PLU_MANUAL_FILES} p-pluralmain.tex
-        - ${MAKEINFO} --no-split -o plural.hlp p-pluralmain.tex
 
 # dvi stuff
 dvi: manual.dvi usercard.dvi
 
-s-plural.tex: plural.tex ${PLU_MANUAL_FILES}
-        for PFILE in ${PLU_MANUAL_FILES};\
-        do \
-                sed 's/@value{PSUFFIX}/(plural)/g' < $${PFILE}  >s-$${PFILE};\
-        done
-        sed -e 's/@include plu/@include s-plu/' -e 's/@value{PSUFFIX}/(plural)/g' < plural.tex >s-plural.tex
-
-p-pluralmain.tex: plural.tex pluralmain.tex ${PLU_MANUAL_FILES}
-        for PFILE in ${PLU_MANUAL_FILES};\
-        do \
-                sed -e 's/@value{PSUFFIX}//g' -e 's/@include plu/@include p-plu/' < $${PFILE}  >p-$${PFILE};\
-        done
-        sed -e 's/@include plu/@include p-plu/' -e 's/@value{PSUFFIX}//g' < pluralmain.tex >p-pluralmain.tex
-
-singular.dvi: ${MANUAL_FILES} singular.tex s-plural.tex
+singular.dvi: ${MANUAL_FILES} singular.tex s-plural.tex s-plulibs.tex
         ${TEXI2DVI} singular.tex
 
-singular.pdf: ${MANUAL_FILES} singular.tex s-plural.tex
+singular.pdf: ${MANUAL_FILES} singular.tex s-plural.tex s-plulibs.tex
         ${TEXI2PDF} singular.tex
 
-plural.dvi: ${PLU_MANUAL_FILES} p-pluralmain.tex
-        ${TEXI2DVI} p-pluralmain.tex; mv p-pluralmain.dvi plural.dvi
-
-plural.pdf: ${PLU_MANUAL_FILES} p-pluralmain.tex
-        ${TEXI2PDF} p-pluralmain.tex; mv p-pluralmain.pdf plural.pdf
-
-manual.dvi: ${MANUAL_FILES} manual.tex s-plural.tex
+manual.dvi: ${MANUAL_FILES} manual.tex s-plural.tex s-plulibs.tex
         ${TEXI2DVI} manual.tex
 
@@ -193 +153 @@
         ${TEX} $<
 
+s-plural.tex: plural.tex
+        sed -e "s/BR_PLURAL_BR/(plural)/g" <plural.tex >s-plural.tex
+
+s-plulibs.tex: plulibs.tex
+        sed -e "s/BR_PLURAL_BR/(plural)/g" <plulibs.tex >s-plulibs.tex
+
 # postscript stuff
 ps: dvi manual.ps usercard.ps
@@ -208 +174 @@
         ${DOC2TEX} -no_fun -o manual.tex singular.doc
 
-singular.tex: ${MANUAL_FILES} doc2tex.pl ${LIB_TEX_FILES} ${SINGULAR} ${LIBPARSE} singular.doc $(STANDALONE_TEXI_FILES) ${PLU_MANUAL_FILES}
+singular.tex: ${MANUAL_FILES} doc2tex.pl ${LIB_TEX_FILES} ${SINGULAR} ${LIBPARSE} singular.doc $(STANDALONE_TEXI_FILES)
         ${DOC2TEX} -o singular.tex singular.doc
-
-pluralmain.tex: ${PLU_MANUAL_FILES} doc2tex.pl ${PLU_LIB_TEX_FILES} ${SINGULAR} ${LIBPARSE} pluralmain.doc $(PLU_STANDALONE_TEXI_FILES)
-        ${DOC2TEX} -o pluralmain.tex pluralmain.doc
 
 #pattern rule for tex files
@@ -239 +202 @@
         ${PERL} doc2idx.pl singular.hlp ${HTML_SUBDIR}/${HTML_MANUAL_PREFIX}_cp.idx ${CHKSUM_DB} > singular.idx
 
-plural.idx: plural.hlp ${PLU_HTML_SUBDIR}/${PLU_HTML_MANUAL_PREFIX}_cp.idx doc2idx.pl
-        ${PERL} doc2idx.pl plural.hlp ${PLU_HTML_SUBDIR}/${PLU_HTML_MANUAL_PREFIX}_cp.idx ${CHKSUM_DB} > plural.idx
-
 ###########################################################
 # stand-alone targest
@@ -250 +210 @@
 STANDALONE_FILES      := $(STANDALONE_TEXI_FILES:.texi=)
 
-PLU_STANDALONE_TXT_FILES := $(PLU_STANDALONE_TEXI_FILES:.texi=.txt)
-PLU_STANDALONE_HTML_FILES := $(PLU_STANDALONE_TEXI_FILES:.texi=.html)
-PLU_STANDALONE_FILES      := $(PLU_STANDALONE_TEXI_FILES:.texi=)
-
 ifeq ($(SINGUNAME),@SINGUNAME@)
 UNAME_OPT = -D UNAME
@@ -278 +234 @@
 standalone-html: ${STANDALONE_HTML_FILES}
 standalone-txt:  ${STANDALONE_TXT_FILES}
-
-standalone-plural: standalone-txt-plural standalone-html-plural ${PLU_STANDALONE_FILES}
-
-standalone-html-plural: ${PLU_STANDALONE_HTML_FILES}
-standalone-txt-plural:  ${PLU_STANDALONE_TXT_FILES}
-
 
 WWW_DIR = /singular/www/2-0/
@@ -309 +259 @@
         -top_file ${HTML_MANUAL_TOP} singular.tex
 
-plu_html: pluralmain.tex ${PLU_MANUAL_FILES} ${TMP_DIR} ${PLU_HTML_SUBDIR}/${HTML_MANUAL_TOP} ${PLU_IMAGES_HTML} $(PLU_STANDALONE_TEXI_FILES)
-${PLU_HTML_SUBDIR}/${HTML_MANUAL_TOP}: ${TEXI2HTML_INIT} ${TEXI2HTML} plural.tex
-        ${PERL} ${TEXI2HTML} ${PLU_TEXI2HTML_OPTS} -prefix ${PLU_HTML_MANUAL_PREFIX} \
-        -top_file ${HTML_MANUAL_TOP} pluralmain.tex
-
 # html stuff
 html_tutor: ${TMP_DIR} ${HTML_SUBDIR}/${HTML_TUTOR_TOP} ${IMAGES_HTML}
@@ -322 +267 @@
 ${HTML_SUBDIR}/${HTML_MANUAL_PREFIX}_cp.idx: ${HTML_SUBDIR}/${HTML_MANUAL_TOP}
 
-${PLU_HTML_SUBDIR}/${HTML_MANUAL_PREFIX}_cp.idx: ${PLU_HTML_SUBDIR}/${HTML_MANUAL_TOP}
-
 ${TMP_DIR}:
         ${MKINSTALLDIRS} ${TMP_DIR}
@@ -340 +283 @@
         test -d ${HTML_SUBDIR} || mkdir ${HTML_SUBDIR}
         cp ${IMAGES_SRC} ${HTML_SUBDIR}
-
-${PLU_IMAGES_HTML} : ${IMAGES_SRC}
-        test -d ${PLU_HTML_SUBDIR} || mkdir ${PLU_HTML_SUBDIR}
-        cp ${IMAGES_SRC} ${PLU_HTML_SUBDIR}
-
-
 
 ###########################################################
@@ -354 +291 @@
         ${INSTALL_DATA} singular.hlp ${infodir}
         test -r ${htmldir} || ln -s `pwd`/${HTML_SUBDIR} ${htmldir}
-        test -r ${exdir} || ln -s `pwd`/${EX_SUBDIR} ${exdir}
-
-install-plural: plural.hlp pluhtml plural.idx standalone-plural
-        ${MKINSTALLDIRS} ${infodir}
-        ${INSTALL_DATA} plural.hlp ${infodir}
-        test -r ${htmldir} || ln -s `pwd`/${{PLU_HTML_SUBDIR} ${htmldir}
         test -r ${exdir} || ln -s `pwd`/${EX_SUBDIR} ${exdir}
 
@@ -398 +329 @@
         chmod -R +rX ${install_prefix}/
 
-install-sharedist-plural: plural.hlp plu_html plural.idx \
-                   ${PLU_STANDALONE_HTML_FILES} ${PLU_STANDALONE_TXT_FILES}
-        ${MKINSTALLDIRS} ${install_prefix}
-        ${MKINSTALLDIRS} ${install_infodir}
-        ${INSTALL_DATA} plural.hlp ${install_infodir}/singular.hlp
-        cp plural.hlp singular.hlp
-        chmod -R +rX ${install_infodir}
-        ${MKINSTALLDIRS} ${install_htmldir}
-        cp ${PLU_HTML_SUBDIR}/*.htm ${install_htmldir}
-        cp ${PLU_HTML_SUBDIR}/*.gif ${install_htmldir}
-        - cp ${PLU_HTML_SUBDIR}/*.jpg ${install_htmldir}
-        chmod -R +rX ${install_htmldir}
-        ${MKINSTALLDIRS} ${install_docdir}
-        ${INSTALL_DATA} plural.idx ${install_docdir}/singular.idx
-        ${INSTALL_DATA} ../GPL2 ${install_prefix}/GPL2
-        ${INSTALL_DATA} ../GPL3 ${install_prefix}/GPL3
-        ${INSTALL_DATA} COPYING.plural.txt ${install_prefix}/COPYING
-        ${INSTALL_DATA} COPYING.plural.html ${install_prefix}/COPYING.html
-        ${INSTALL_DATA} NEWS.plural.txt ${install_prefix}/NEWS
-        ${INSTALL_DATA} NEWS.plural.html ${install_prefix}/NEWS.html
-        chmod -R +rX ${install_docdir}
-        chmod -R +rX ${install_prefix}
-        if test -f examples; then \
-                ${MKINSTALLDIRS} ${install_exdir}; \
-                cp -R examples ${install_prefix}; \
-                /bin/rm -f ${install_prefix}/examples/[A-Z]*.res; \
-                /bin/rm -f ${install_prefix}/examples/*.res; \
-                /bin/rm -f ${install_prefix}/examples/[A-Z]*.inc; \
-                /bin/rm -f ${install_prefix}/examples/*.inc; \
-        fi
-        chmod -R +rX ${install_prefix}/
-
-
 # use 'make INSTALL_unix.olaf.txt INSTALL_unix.olaf.html SINGUNAME=olaf'
 # to generate these files for uname 'olaf'
@@ -437 +335 @@
         ${INSTALL_DATA} INSTALL_unix.${SINGUNAME}.txt ${install_prefix}/INSTALL
         ${INSTALL_DATA} INSTALL_unix.${SINGUNAME}.html ${install_prefix}/INSTALL.html
-
-install-bindist-plural:
-        ${MAKE} install-bindist SINGUNAME=plural
 
 install-ftp: ${STANDALONE_HTML_FILES} ${STANDALONE_TXT_FILES}
@@ -471 +366 @@
         /bin/rm -f *.fn *.fns *.ky *.kys *.log *.pg *.pgs *.toc *.tp
         /bin/rm -f *.tps *.vr *.vrs *.dvi *.ps
-        /bin/rm -f s-*.tex p-*.tex
+        /bin/rm -f s-plural.tex
         /bin/rm -f singular.hlp manual.hlp  ${DOC2TEX_FILES} singular.idx
-        /bin/rm -f plural.hlp manual.hlp  ${PLU_DOC2TEX_FILES}
+        /bin/rm -f manual.hlp
         /bin/rm -f ${HTML_SUBDIR}/${HTML_MANUAL_TOP} ${HTML_SUBDIR}/${HTML_TUTOR_TOP}
-        /bin/rm -f ${PLU_HTML_SUBDIR}/${HTML_MANUAL_TOP} ${PLU_HTML_SUBDIR}/${HTML_TUTOR_TOP}
         /bin/rm -rf ${STANDALONE_HTML_FILES} ${STANDALONE_FILES} ${STANDALONE_TXT_FILES}
         /bin/rm -f INSTALL_unix.${SINGUNAME}.txt INSTALL_unix.${SINGUNAME}.html
@@ -482 +376 @@
         /bin/rm -f Makefile
         /bin/rm -rf ${HTML_SUBDIR} ../html ../examples
-        /bin/rm -rf ${PLU_HTML_SUBDIR} ../html ../examples
 
 maintainer-clean: distclean