X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=GNUmakefile;h=dd8af234683c49057a0045aa3e3919f17835cb01;hb=774c31185180d9cc4ca487a824ffdf9d6dafe92a;hp=3456c4d9c2f396d439345805b109ff52d3f6db75;hpb=a6c1d186ec5bbd8d02dfd2f057cd147afdfe900f;p=mjotex.git

diff --git a/GNUmakefile b/GNUmakefile
index 3456c4d..dd8af23 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -28,7 +28,7 @@ BIBS = local-references.bib
 MJOTEX  = mjo-algebra.tex mjo-algorithm.tex mjo-arrow.tex mjo-calculus.tex
 MJOTEX += mjo-common.tex mjo-complex.tex mjo-cone.tex mjo-convex.tex
 MJOTEX += mjo-eja.tex mjo-font.tex mjo-linear_algebra.tex mjo-listing.tex
-MJOTEX += mjo-misc.tex mjo-proof_by_cases.tex mjo-theorem.tex
+MJOTEX += mjo-proof_by_cases.tex mjo-set.tex mjo-theorem.tex
 MJOTEX += mjo-theorem-star.tex mjo-topology.tex mjo.bst
 
 # Compile a list of raw source code listings (*.listing) and their
@@ -44,6 +44,16 @@ SAGE_LISTING_DSTS = $(patsubst %.listing,%.py,$(SAGE_LISTING_SRCS))
 #
 INDICES = $(PN)
 
+# We have to rebuild the index whenever the contents of the document
+# change, because page numbers get moved around. But when no INDICES
+# are defined, rebuilding them should be a no-op. This next definition
+# ensures that.
+ifdef INDICES
+REMAKE_INDICES = makeindex $(INDEX_SRCS)
+else
+REMAKE_INDICES = true
+endif
+
 # Use kpsewhich (from the kpathsea suite) to find the absolute paths
 # of the bibtex/mjotex files listed in in $(BIBS)/$(MJOTEX). The SRCS
 # variable should contain all (Bib)TeX source files for the document.
@@ -117,6 +127,7 @@ $(PN).pdf: $(SRCS) $(PN).bbl $(INDEX_DSTS)
 		rm $@.previous; \
 	else \
 		mv $@ $@.previous; \
+		$(REMAKE_INDICES); \
 		$(MAKE) $@; \
 	fi;
 
@@ -175,9 +186,10 @@ $(PN).log: $(SRCS)
 	$(MAKE)
 
 # How do we convert a raw listing into something testable by sage? We
-# append/prepend triple quotes to make the whole thing into a doctest.
+# append/prepend triple quotes to make the whole thing into a doctest,
+# and then we replace any blank lines by "<BLANKLINE>".
 sage_listings/%.py: sage_listings/%.listing
-	echo '"""' > $@ && cat $< >> $@ && echo '"""' >> $@
+	echo '"""' > $@ && cat $< >> $@ && echo '"""' >> $@ && sed -i 's/^[[:space:]]*$$/<BLANKLINE>/' $@
 
 # Ensure that there are no overfull or underfull boxes in the output
 # document by parsing the log for said warnings.
@@ -186,7 +198,7 @@ check-boxes: $(PN).log
 	@! grep -i 'overfull\|underfull' $<
 
 # Run chktex to find silly mistakes. There is some exit code weirdness
-# (Savannah bug 45979), so we just look for empty output.
+# (Savannah bug 53129), so we just look for empty output.
 .PHONY: check-chktex
 CHKTEX = chktex --localrc .chktexrc --quiet --inputfiles=0
 check-chktex:
@@ -205,9 +217,7 @@ check-undefined: $(PN).log
 .PHONY: check-sage
 check-sage: $(SAGE_LISTING_DSTS)
 ifdef SAGE_LISTING_DSTS
-	PYTHONPATH="$(HOME)/src/sage.d" \
-          sage -t --timeout=0 --memlimit=0 \
-          $^
+	sage -t --timeout=0 --memlimit=0 $^
 endif
 
 # Run a suite of checks.