I oppose against special treatment of .sty files.
The general rule should be
notangle file.ext.pamphlet > file.ext
noweave file.ext.pamphlet > file.ext.pamphlet.tex
remove ".pamphlet" and add ".tex". That rule seems to be a bit simpler
than having to explain why .sty files must be treated separately.
Ralf
On 11/07/2006 09:32 PM, Waldek Hebisch wrote:
I tried again 'make dvi' in build-improvements. There are still three
problems:
1) typo in 'src/etc/Makefile.pamphlet'
2) confusion because Latex prefers 'axiom.sty.tex' in current directory
to 'axiom.sty' in search path
3) axiom.bib.tex file contains 10 file names with unescaped underscores
inside.
I have a patch solving problems 1 and 2 (included below). BTW the patch
to solve 1 is trival. I think that we shall agree that trivial patches
may be commited without review (but still posted to the mailing list).
Of course we need also agree what trivial means -- the solution to 2
(since it involves file renaming) is probably slightly beyond trival...
BTW. I am a bit annoyed because of discrimination of underscores (I like
them very much), so I am tempted to solve 3 by making underscore into
an active character, which expands to ordinary underscore outside math
mode and to subscript char in math mode.
Beside applying the diff one has to also rename 'src/doc/axiom.sty.pamphlet'
to 'src/doc/axiom-sty.pamphlet'
diff -ru build-improvements.bb/config/setup-dep.mk
build-improvements/config/setup-dep.mk
--- build-improvements.bb/config/setup-dep.mk 2006-11-07 02:34:28.000000000
+0100
+++ build-improvements/config/setup-dep.mk 2006-11-07 17:51:37.000000000
+0100
@@ -101,7 +101,7 @@
$(axiom_build_document) --weave --output=$@ $<
-$(axiom_build_texdir)/axiom.sty: $(axiom_src_docdir)/axiom.sty.pamphlet
+$(axiom_build_texdir)/axiom.sty: $(axiom_src_docdir)/axiom-sty.pamphlet
$(mkinstalldirs) $(axiom_build_texdir)/
$(axiom_build_document) --tangle=axiom.sty --output=$@ $<
diff -ru build-improvements.bb/src/doc/Makefile.pamphlet build-improvements/src/doc/Makefile.pamphlet
--- build-improvements.bb/src/doc/Makefile.pamphlet 2006-11-07
02:34:25.000000000 +0100
+++ build-improvements/src/doc/Makefile.pamphlet 2006-11-07
17:54:25.000000000 +0100
@@ -31,7 +31,7 @@
originally written by Norman Ramsey. To this we've added macros to
support the CATS (Computer Algebra Test Suite).
<<axiom.sty>>=
-${STY}/axiom.sty: $(srcdir)/axiom.sty.pamphlet ${STY}
+${STY}/axiom.sty: $(srcdir)/axiom-sty.pamphlet ${STY}
$(axiom_build_document) --tangle=axiom.sty --output=$@ $<
${STY}:
@@ -144,7 +144,7 @@
subdir = src/doc/
-pamphlets = axiom.sty.pamphlet \
+pamphlets = axiom-sty.pamphlet \
axiom.bib.pamphlet \
DeveloperNotes.pamphlet \
Rosetta.pamphlet \
Only in build-improvements/src/doc: axiom-sty.pamphlet
Only in build-improvements.bb/src/doc: axiom.sty.pamphlet
diff -ru build-improvements.bb/src/etc/Makefile.pamphlet
build-improvements/src/etc/Makefile.pamphlet
--- build-improvements.bb/src/etc/Makefile.pamphlet 2006-11-07
02:34:26.000000000 +0100
+++ build-improvements/src/etc/Makefile.pamphlet 2006-11-07
17:45:45.000000000 +0100
@@ -3,7 +3,7 @@
\usepackage{axiom}
\begin{document}
\title{\$SPAD/src/etc Makefile}
-\author{Timothy Daly \andd Gabriel Dos~Reis}
+\author{Timothy Daly \and Gabriel Dos~Reis}
\maketitle
\begin{abstract}
\end{abstract}
_______________________________________________
Axiom-developer mailing list
Axiom-developer@nongnu.org
http://lists.nongnu.org/mailman/listinfo/axiom-developer
