Skip to content

Commit 32e9920

Browse files
tuedatueda
committed
docs: fix #438, #440 and improve latex2html setup
- Use the standard LaTeX convention in Ratio (#438). * \binom(x,y) -> \binom{x}{y} * \sign(x) -> \sign{x} In addition, the size of the brackets of \binom{x}{y} is adjusted. - Remove small dots in blank pages (#440). - Simplify LaTeX2HTML process by scripts/run-latex2html.sh with the corresponding .latex2html-init file. - Show section numbers. - Short names for index references. - Generator information at the bottom. - Remove the $TITLE hack for old LaTeX2HTML.
1 parent 6a04b62 commit 32e9920

12 files changed

Lines changed: 88 additions & 62 deletions

‎Makefile.am‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
SUBDIRS = doc sources check
22

3-
EXTRA_DIST = README.md
3+
EXTRA_DIST = README.md scripts/.latex2html-init scripts/run-latex2html.sh
44

55
dist-hook:
66
$(DISTHOOK_VERSION)

‎doc/devref/.latex2html-init‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎doc/devref/Makefile.am‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ MAIN = devref
1010

1111
TEXFILES = $(TEXSRC) $(MAIN).tex version.tex
1212

13-
EXTRA_DIST = $(TEXSRC) .latex2html-init
13+
EXTRA_DIST = $(TEXSRC)
1414

1515
.PHONY: dvi latex2html html ps pdf clean-local update_version_tex
1616

@@ -73,11 +73,7 @@ if CONFIG_LATEX2HTML
7373
latex2html: $(MAIN)/$(MAIN).html
7474

7575
$(MAIN)/$(MAIN).html: $(MAIN).dvi
76-
$(LATEX2HTML) -init_file $(srcdir)/.latex2html-init $(MAIN).tex
77-
cat $(MAIN)/index.html | sed 's/$(MAIN).html#/#/g' >$(MAIN)/index.html.tmp
78-
mv $(MAIN)/index.html.tmp $(MAIN)/index.html
79-
cat $(MAIN)/$(MAIN).html | sed 's/$(MAIN).html#/#/g' >$(MAIN)/$(MAIN).html.tmp
80-
mv $(MAIN)/$(MAIN).html.tmp $(MAIN)/$(MAIN).html
76+
LATEX2HTML="$(LATEX2HTML)" $(top_srcdir)/scripts/run-latex2html.sh $(MAIN).tex
8177

8278
endif
8379
########## CONFIG_LATEX2HTML

‎doc/devref/devref.tex.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
\providecommand{\texorpdfstring}[2]{#1}% htmlonly
3131

32-
\newcommand{\emptypage}{\newpage \thispagestyle{empty} \tiny{.} \normalsize}
32+
\newcommand{\emptypage}{\newpage \thispagestyle{empty} \tiny{\ } \normalsize}
3333
\newcommand{\clearemptydoublepage}{\newpage{\pagestyle{empty}\cleardoublepage}}
3434

3535
\newcommand{\C}[1]{{\tt #1}}

‎doc/manual/.latex2html-init‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎doc/manual/Makefile.am‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ MAIN = manual
2626

2727
TEXFILES = $(TEXSRC) $(MAIN).tex version.tex
2828

29-
EXTRA_DIST = $(TEXSRC) .latex2html-init
29+
EXTRA_DIST = $(TEXSRC)
3030

3131
.PHONY: dvi latex2html html ps pdf clean-local update_version_tex
3232

@@ -89,11 +89,7 @@ if CONFIG_LATEX2HTML
8989
latex2html: $(MAIN)/$(MAIN).html
9090

9191
$(MAIN)/$(MAIN).html: $(MAIN).dvi
92-
$(LATEX2HTML) -init_file $(srcdir)/.latex2html-init $(MAIN).tex
93-
cat $(MAIN)/index.html | sed 's/$(MAIN).html#/#/g' >$(MAIN)/index.html.tmp
94-
mv $(MAIN)/index.html.tmp $(MAIN)/index.html
95-
cat $(MAIN)/$(MAIN).html | sed 's/$(MAIN).html#/#/g' >$(MAIN)/$(MAIN).html.tmp
96-
mv $(MAIN)/$(MAIN).html.tmp $(MAIN)/$(MAIN).html
92+
LATEX2HTML="$(LATEX2HTML)" $(top_srcdir)/scripts/run-latex2html.sh $(MAIN).tex
9793

9894
endif
9995
########## CONFIG_LATEX2HTML

‎doc/manual/man.tex‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
%\hypersetup{hyperindex,pagebackref,pdfpagemode={None},draft=false}
2525

2626
\newcommand{\pfill}{\hfill}
27-
\newcommand{\emptypage}{\newpage \thispagestyle{empty} \tiny{.} \normalsize}
27+
\newcommand{\emptypage}{\newpage \thispagestyle{empty} \tiny{\ } \normalsize}
2828
\newcommand{\lefttabitem}[1]{\noindent{\begin{minipage}[t]{4cm}{#1}
2929
\end{minipage}}\vspace{1mm}}
3030
\newcommand{\leftvitem}[2]{\noindent{\begin{minipage}[t]{#1}{#2}
@@ -51,9 +51,9 @@
5151
\def\Remark#1{{\sl #1}}
5252
\def\Tr{{\rm Tr}}
5353
\def\hash{\symbol{"23}}
54-
\def\sign(#1){(\!-\!1)^{#1}}
55-
\def\binom(#1,#2){ (\!\!
56-
\begin{array}{c} #1 \\ #2 \end{array}\!\! ) }
54+
\def\sign#1{(\!-\!1)^{#1}}
55+
\def\binom#1#2{ \left(\!\!
56+
\begin{array}{c} #1 \\ #2 \end{array}\!\! \right) }
5757
\def\plus{\!+\!}
5858
\def\minus{\!-\!}
5959
\def\mydot{\!\!\cdot\!}

‎doc/manual/manual.tex.in‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
\providecommand{\texorpdfstring}[2]{#1}% htmlonly
3232

3333
\newcommand{\pfill}{\hfill}
34-
\newcommand{\emptypage}{\newpage \thispagestyle{empty} \tiny{.} \normalsize}
34+
\newcommand{\emptypage}{\newpage \thispagestyle{empty} \tiny{\ } \normalsize}
3535
\newcommand{\lefttabitem}[1]{\noindent{\begin{minipage}[t]{4cm}{#1}
3636
\end{minipage}}\vspace{1mm}}
3737
\newcommand{\leftvitem}[2]{\noindent{\begin{minipage}[t]{#1}{#2}
@@ -58,9 +58,9 @@
5858
\def\Remark#1{{\sl #1}}
5959
\def\Tr{{\rm Tr}}
6060
\def\hash{\symbol{"23}}
61-
\def\sign(#1){(\!-\!1)^{#1}}
62-
\def\binom(#1,#2){ (\!\!
63-
\begin{array}{c} #1 \\ #2 \end{array}\!\! ) }
61+
\def\sign#1{(\!-\!1)^{#1}}
62+
\def\binom#1#2{ \left(\!\!
63+
\begin{array}{c} #1 \\ #2 \end{array}\!\! \right) }
6464
\def\plus{\!+\!}
6565
\def\minus{\!-\!}
6666
\def\mydot{\!\!\cdot\!}

‎doc/manual/online.tex‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
\def\Remark#1{{\sl #1}}
3434
\def\Tr{{\rm Tr}}
3535
\def\hash{\symbol{"23}}
36-
\def\sign(#1){(\!-\!1)^{#1}}
37-
\def\binom(#1,#2){ (\!\!
38-
\begin{array}{c} #1 \\ #2 \end{array}\!\! ) }
36+
\def\sign#1{(\!-\!1)^{#1}}
37+
\def\binom#1#2{ \left(\!\!
38+
\begin{array}{c} #1 \\ #2 \end{array}\!\! \right) }
3939
\def\plus{\!+\!}
4040
\def\minus{\!-\!}
4141
\def\mydot{\!\!\cdot\!}

‎doc/manual/statements.tex‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4586,15 +4586,15 @@ \section{ratio}
45864586
in which \verb:a:, \verb:b: and \verb:c: should be three symbols {\FORM}
45874587
will assume that $c = b-a$ and then make the substitutions
45884588
\begin{eqnarray}
4589-
\frac{1}{a^m}\frac{1}{b^n} & = & \sum_{i=0}^{m-1}\sign(i)
4590-
\binom(n-1+i,n-1)\frac{1}{a^{m-i}}\frac{1}{c^{n+i}}
4591-
+\sum_{i=0}^{n-1}\sign(m)
4592-
\binom(m-1+i,m-1)\frac{1}{b^{n-i}}\frac{1}{c^{m+i}}
4589+
\frac{1}{a^m}\frac{1}{b^n} & = & \sum_{i=0}^{m-1}\sign{i}
4590+
\binom{n-1+i}{n-1}\frac{1}{a^{m-i}}\frac{1}{c^{n+i}}
4591+
+\sum_{i=0}^{n-1}\sign{m}
4592+
\binom{m-1+i}{m-1}\frac{1}{b^{n-i}}\frac{1}{c^{m+i}}
45934593
\nonumber \\
4594-
\frac{b^n}{a^m} & = & \sum_{i=0}^n\binom(n,i)\frac{c^i}{a^{m-n+i}}
4594+
\frac{b^n}{a^m} & = & \sum_{i=0}^n\binom{n}{i}\frac{c^i}{a^{m-n+i}}
45954595
\ \ \ \ \ \ \ \hfill m\ge n \nonumber \\
4596-
\frac{b^n}{a^m} & = & \sum_{i=0}^{m-1}\binom(n,i)\frac{c^{n-i}}{a^{m-i}}
4597-
+ \sum_{i=0}^{n-m}\binom(m-1+i,m-1)
4596+
\frac{b^n}{a^m} & = & \sum_{i=0}^{m-1}\binom{n}{i}\frac{c^{n-i}}{a^{m-i}}
4597+
+ \sum_{i=0}^{n-m}\binom{m-1+i}{m-1}
45984598
c^ib^{n-m-i}
45994599
\ \ \ \ \ \ \ \hfill m<n \nonumber
46004600
\end{eqnarray}

0 commit comments

Comments
 (0)