Use imakeidx for automatic index creation

yssource · May 24, 2019 · f46a741 · f46a741
1 parent fb2e274
commit f46a741
Showing 11 changed files with 20 additions and 75 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -35,7 +35,7 @@ matrix:
   - env: version=dvipdfmx
     script:
     - cd doc/generic/pgf/version-for-dvipdfmx/en
-    - make latex="latex -shell-escape --interaction=nonstopmode"
+    - make latex="latex --interaction=nonstopmode"
 
   - env: version=dvips
     script:

diff --git a/ci/texlive.sh b/ci/texlive.sh
@@ -33,6 +33,7 @@ tlmgr install \
       hyperref \
       ifluatex \
       ifxetex \
+      imakeidx \
       latex \
       latex-bin \
       listings \

diff --git a/doc/generic/pgf/text-en/pgfmanual-en-main-preamble.tex b/doc/generic/pgf/text-en/pgfmanual-en-main-preamble.tex
@@ -151,7 +151,7 @@
 \usepackage{amsmath,amssymb}
 \usepackage{xxcolor}
 \usepackage{pifont}
-\usepackage{makeidx}
+\usepackage{imakeidx}
 
 \ifluatex
 %  \usepackage[no-math]{fontspec}

diff --git a/doc/generic/pgf/version-for-dvipdfm/en/Makefile b/doc/generic/pgf/version-for-dvipdfm/en/Makefile
@@ -5,13 +5,7 @@ TEXINPUTS := ../../text-en:$(TEXINPUTS)
 
 all: $(doc).pdf
 
-pgfmanual.idx: 
-	touch pgfmanual.idx
-
-pgfmanual.ind: pgfmanual.idx 
-	makeindex $(doc).idx
-
-pgfmanual.pdf: $(doc).tex $(doc).ind revisionfile
+pgfmanual.pdf: $(doc).tex revisionfile
 	(TEXINPUTS="$(TEXINPUTS)" $(latex) $(doc).tex) || true
 	(egrep -q $(rerun) $(doc).log && TEXINPUTS="$(TEXINPUTS)" $(latex) $(doc).tex) || true
 	dvipdfm -p a4 $(doc)

diff --git a/doc/generic/pgf/version-for-dvipdfmx/en/Makefile b/doc/generic/pgf/version-for-dvipdfmx/en/Makefile
@@ -5,19 +5,13 @@ TEXINPUTS := ../../text-en:$(TEXINPUTS)
 
 all: $(doc).pdf revisionfile
 
-pgfmanual.idx: 
-	touch pgfmanual.idx
-
-pgfmanual.ind: pgfmanual.idx revisionfile
-	makeindex $(doc).idx
-
-pgfmanual.pdf: $(doc).tex $(doc).ind  revisionfile
+pgfmanual.pdf: $(doc).tex revisionfile
 	mkdir -p plots
 	(TEXINPUTS="$(TEXINPUTS)" $(latex) $(doc).tex) || true
 	(egrep -q $(rerun) $(doc).log && TEXINPUTS="$(TEXINPUTS)" $(latex) $(doc).tex) || true
 	dvipdfmx -p a4 $(doc)
 
-test: $(doc)-test.tex $(doc).ind revisionfile
+test: $(doc)-test.tex revisionfile
 	mkdir -p plots
 	TEXINPUTS="$(TEXINPUTS)" $(latex) $(doc)-test.tex
 	(egrep -q $(rerun) $(doc).log && TEXINPUTS="$(TEXINPUTS)" $(latex) $(doc)-test.tex) || true

diff --git a/doc/generic/pgf/version-for-dvips/en/Makefile b/doc/generic/pgf/version-for-dvips/en/Makefile
@@ -5,19 +5,13 @@ TEXINPUTS := ../../text-en:$(TEXINPUTS)
 
 all: $(doc).ps
 
-pgfmanual.idx: 
-	touch pgfmanual.idx
-
-pgfmanual.ind: pgfmanual.idx 
-	makeindex $(doc).idx
-
-pgfmanual.ps: $(doc).tex $(doc).ind revisionfile
+pgfmanual.ps: $(doc).tex revisionfile
 	TEXINPUTS="$(TEXINPUTS)" $(latex) $(doc).tex
 	(egrep -q $(rerun) $(doc).log && TEXINPUTS="$(TEXINPUTS)" $(latex) $(doc).tex) || true
 	dvips -o $(doc).ps $(doc).dvi
 	gs -dNOPAUSE -sDEVICE=pdfwrite -dBATCH -dCompatibilityLevel=1.4 -sOutputFile=$(doc).pdf $(doc).ps
 
-test: $(doc)-test.tex $(doc).ind revisionfile
+test: $(doc)-test.tex revisionfile
 	TEXINPUTS="$(TEXINPUTS)" $(latex) $(doc)-test.tex
 	(egrep -q $(rerun) $(doc).log && TEXINPUTS="$(TEXINPUTS)" $(latex) $(doc)-test.tex) || true
 	dvips -o $(doc)-test.ps $(doc)-test.dvi

diff --git a/doc/generic/pgf/version-for-dvisvgm/en/Makefile b/doc/generic/pgf/version-for-dvisvgm/en/Makefile
@@ -9,13 +9,7 @@ test: pgfmanual-test.svg
 
 test-no-fonts: pgfmanual-test-no-font.svg
 
-pgfmanual.idx: 
-	touch pgfmanual.idx
-
-pgfmanual.ind: pgfmanual.idx 
-	makeindex $(doc).idx
-
-pgfmanual.dvi: $(doc).tex $(doc).ind revisionfile
+pgfmanual.dvi: $(doc).tex revisionfile
 	TEXINPUTS="$(TEXINPUTS)" $(latex) $(doc).tex
 	(egrep -q $(rerun) $(doc).log && TEXINPUTS="$(TEXINPUTS)" $(latex) $(doc).tex) || true
 	(egrep -q $(rerun) $(doc).log && TEXINPUTS="$(TEXINPUTS)" $(latex) $(doc).tex) || true
@@ -26,7 +20,7 @@ pgfmanual.svg: $(doc).dvi
 pgfmanual-no-font.svg: $(doc).dvi
 	dvisvgm --no-fonts --output=%f-%4p.svg --page=1- --bbox=a4 --linkmark=none $(doc)
 
-pgfmanual-test.dvi: $(doc)-test.tex $(doc).ind revisionfile
+pgfmanual-test.dvi: $(doc)-test.tex revisionfile
 	TEXINPUTS="$(TEXINPUTS)" $(latex) $(doc)-test.tex
 
 pgfmanual-test.svg: $(doc)-test.dvi

diff --git a/doc/generic/pgf/version-for-luatex/en/Makefile b/doc/generic/pgf/version-for-luatex/en/Makefile
@@ -5,29 +5,17 @@ TEXINPUTS := ../../text-en:../../images:$(TEXINPUTS)
 
 all: $(doc).pdf
 
-pgfmanual.idx: 
-	touch pgfmanual.idx
-
-dist: all
-
-pgfmanual.ind: pgfmanual.idx 
-	makeindex $(doc).idx
-
-pgfmanual.pdf: $(doc).tex $(doc).ind revisionfile
-	TEXINPUTS="$(TEXINPUTS)" $(latex) -shell-escape '$(linkcode)' $(doc).tex
+pgfmanual.pdf: $(doc).tex revisionfile
+	TEXINPUTS="$(TEXINPUTS)" $(latex) $(doc).tex
 	(egrep -q $(rerun) $(doc).log && TEXINPUTS="$(TEXINPUTS)" $(latex) $(doc).tex) || true
-	@echo "Use 'make dist' to generate auto-xrefs."
 
-test: $(doc)-test.tex $(doc).ind  revisionfile
+test: $(doc)-test.tex revisionfile
 	TEXINPUTS="$(TEXINPUTS)" $(latex) $(doc)-test.tex
 	(egrep -q $(rerun) $(doc).log && TEXINPUTS="$(TEXINPUTS)" $(latex) $(doc)-test.tex) || true
-	@echo "Use 'make dist' to generate auto-xrefs."
-
 
 revisionfile:
 	cd ../../../../.. && ./scripts/pgf/pgfrevisionfile.sh
 
-
 FORCE:
 
 clean:

diff --git a/doc/generic/pgf/version-for-pdftex/en/Makefile b/doc/generic/pgf/version-for-pdftex/en/Makefile
@@ -5,21 +5,13 @@ TEXINPUTS := ../../text-en:../../images:$(TEXINPUTS)
 
 all: $(doc).pdf
 
-dist: FORCE revisionfile
-	$(latex) --jobname=pgfmanual '\def\pgfautoxrefs{1}\pdfminorversion=5 \pdfobjcompresslevel=2 \input{$(doc)}'
-	makeindex $(doc).idx
-	@echo "$(doc).pdf remade with auto-xref support. Check if auto-xrefs work and rerun make dist if not."
-
-pgfmanual.idx: 
-	touch pgfmanual.idx
-
-pgfmanual.ind: pgfmanual.idx 
-	makeindex $(doc).idx
-
-pgfmanual.pdf: $(doc).tex $(doc).ind revisionfile
+pgfmanual.pdf: $(doc).tex revisionfile
 	TEXINPUTS="$(TEXINPUTS)" $(latex) $(doc).tex
 	(egrep -q $(rerun) $(doc).log && TEXINPUTS="$(TEXINPUTS)" $(latex) $(doc).tex) || true
-	@echo "Use 'make dist' to generate auto-xrefs."
+
+test: $(doc)-test.tex revisionfile
+	TEXINPUTS="$(TEXINPUTS)" $(latex) $(doc)-test.tex
+	(egrep -q $(rerun) $(doc).log && TEXINPUTS="$(TEXINPUTS)" $(latex) $(doc)-test.tex) || true
 
 revisionfile:
 	cd ../../../../.. && ./scripts/pgf/pgfrevisionfile.sh

diff --git a/doc/generic/pgf/version-for-vtex/en/Makefile b/doc/generic/pgf/version-for-vtex/en/Makefile
@@ -5,13 +5,7 @@ TEXINPUTS := ../../text-en:$(TEXINPUTS)
 
 all: $(doc).ps
 
-pgfmanual.idx: 
-	touch pgfmanual.idx
-
-pgfmanual.ind: pgfmanual.idx 
-	makeindex $(doc).idx
-
-pgfmanual.ps: $(doc).tex $(doc).ind revisionfile
+pgfmanual.ps: $(doc).tex revisionfile
 	TEXINPUTS="$(TEXINPUTS)" $(latex) $(doc).tex
 	(egrep -q $(rerun) $(doc).log && TEXINPUTS="$(TEXINPUTS)" $(latex) $(doc).tex) || true
 

diff --git a/doc/generic/pgf/version-for-xetex/en/Makefile b/doc/generic/pgf/version-for-xetex/en/Makefile
@@ -5,13 +5,7 @@ TEXINPUTS := ../../text-en:$(TEXINPUTS)
 
 all: $(doc).pdf
 
-pgfmanual.idx: 
-	touch pgfmanual.idx
-
-pgfmanual.ind: pgfmanual.idx 
-	makeindex $(doc).idx
-
-pgfmanual.pdf: $(doc).tex $(doc).ind revisionfile
+pgfmanual.pdf: $(doc).tex revisionfile
 	(TEXINPUTS="$(TEXINPUTS)" $(latex) $(doc).tex) || true
 	(egrep -q $(rerun) $(doc).log && TEXINPUTS="$(TEXINPUTS)" $(latex) $(doc).tex) || true
 	xdvipdfmx -p a4 $(doc)