Commit f6a7d732 authored by Simon Marlow's avatar Simon Marlow
Browse files

Merge pull request #1 from hvr/pr-buildfix

Fix build of Haskell Report
parents c7e7786d 69337bce
......@@ -162,10 +162,10 @@ veryclean: clean
$(RM) *~ $(LIB_TEX)
clean:
$(RM) ${HT_TEXS} ht/*.html ht/html/* ht/*.htm ht/hask*.png ht/*.log ht/*.tmp \
ht/*.xref ht/classes.eps ht/*.css ht/*.idx ht/*.aux ht/*.dvi \
$(RM) ${HT_TEXS} ht/*.html ht/html/* ht/*.htm ht/hask*.png ht/*.lg ht/*.log ht/*.tmp \
ht/*.xref ht/classes.eps ht/*.css ht/*.idx ht/*.aux ht/*.idv ht/*.dvi \
ht/*.4ct ht/*.4tc ht/*.bbl ht/*.blg
$(RM) *.dvi *.log *.aux *.ilg *.blg *.toc *.bbl *.idx *.tmp *.out \
$(RM) *.dvi *.log *.aux *.ilg *.blg *.toc *.bbl *.idx *.ind *.tmp *.out \
haskell.tex preface.tex $(PARTS_NO_PREFACE) \
haskell.tex haskell.ps haskell.pdf *.o lex.yy.c haskell-report-html/* \
libs/haddock.sty libs/Prelude.tex libs/haskell*.tex
......@@ -204,6 +204,7 @@ ht/%.tex: %.verb
$(EXPAND) < $< | $(VERB_TEX4HT) | sh ../tools/subsection >$@
ht/libs/%.tex: libs/%.tex
-mkdir ht/libs
$(CP) $< $@
jfp: h98-book.tex preface-jfp.tex ${PARTS_NO_PREFACE}
......
......@@ -40,7 +40,7 @@ more readable.
\label{prelude-bool}
\indextycon{Bool}
\indextt{False}\indextt{True}
\index{""|""|@@{\tt {\char'174}{\char'174}}}
\index{\vert\vert@@{\tt {\char'174}{\char'174}}}
\index{&&@@{\tt \&\&}}
\indextt{not}
\indextt{otherwise}
......
......@@ -1464,7 +1464,7 @@ edence & operators & operators & operators \\ \hline\hline
\indextt{elem}
\indextt{notElem}
\index{&&@@{\tt \&\&}}
\index{""|""|@@{\tt {\char'174}{\char'174}}}
\index{\vert\vert@@{\tt {\char'174}{\char'174}}}
\indextt{>>}
\indextt{>>=}
\index{$@@{\tt {\char'044}}}
......
% Formatting for double-sided
\documentclass[twoside,10pt]{book}
\usepackage[T1]{fontenc}
\usepackage{times}
\usepackage{makeidx}
\usepackage{graphicx}
\usepackage{url}
\usepackage[dvipsnames,usenames]{color}
\usepackage[pdftex,bookmarks=true]{hyperref}
\usepackage[bookmarks=true]{hyperref}
% allegedly produces nicer spacing, see
% http://stackoverflow.com/questions/414179/what-are-the-relative-merits-of-pdflatex
......
......@@ -114,10 +114,10 @@ sub printIndexEntries { # also re-sets $indexentries, specialentries
#
# there are a few "raw" chars that need fiddling, too...
#
$raw =~ s/\|/""\|/g;
$raw =~ s/!/""!/g;
$raw =~ s/\@/""\@\@/g;
$raw =~ s/\\/\\\\/g;
$raw =~ s/\|/\\vert/g;
print "\\index\{$raw\@\@$processed\}%\n";
} else {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment