[cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2013-01-9-g7eea77d
Raymond Toy
rtoy at common-lisp.net
Thu Jan 17 04:48:55 UTC 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMU Common Lisp".
The branch, master has been updated
via 7eea77dfeb313add92ed741aad47e6fbe714220c (commit)
via bf9e40aa2989d9ae6f2055cb91405802cf99c2ff (commit)
via ca46df29c0cb68c07e746be0aca510a5d6873797 (commit)
from ce037e96582861f0f78c071a0900803a3628f893 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7eea77dfeb313add92ed741aad47e6fbe714220c
Author: Raymond Toy <toy.raymond at gmail.com>
Date: Wed Jan 16 20:48:35 2013 -0800
Change default output format to pdf.
o Change default target to generate pdf file
o Update rerun loop with a better pattern that is less likely to cause
an infinite loop.
diff --git a/src/docs/internals/Makefile b/src/docs/internals/Makefile
index bbb389b..0e9d8e6 100644
--- a/src/docs/internals/Makefile
+++ b/src/docs/internals/Makefile
@@ -18,7 +18,7 @@ FILES=architecture.tex back.tex compiler-overview.tex compiler.tex debugger.tex
FIGURES=
-all : $(MASTERFILE).dvi
+all : $(MASTERFILE).pdf
$(MASTERFILE).dvi : $(FILES) $(FIGURES)
$(LATEX) $(MASTERFILE).tex
@@ -52,7 +52,7 @@ firsttime: $(MASTERFILE).dvi
%.pdf : %.tex
$(PDFLATEX) $^
- @while ( grep -v 'Package: rerunfilecheck' $*.log | grep Rerun > /dev/null ); do \
+ @while ( grep 'Rerun to get cross' $*.log > /dev/null ); do \
$(PDFLATEX) $<; \
done
$(PDFLATEX) $<
commit bf9e40aa2989d9ae6f2055cb91405802cf99c2ff
Author: Raymond Toy <toy.raymond at gmail.com>
Date: Wed Jan 16 20:45:42 2013 -0800
Generate pdf file by default.
o Change default from ps to pdf output.
o Fix pattern for rerunning latex to prevent infinite loop due to
extraneous occurrences of "Rerun". (From Carl.)
o Reorder rules for generating pdf so that we generate the indices and
such before starting the loop. Otherwise, we're in an infinite loop
because the indices haven't been generated.
diff --git a/src/docs/cmu-user/Makefile b/src/docs/cmu-user/Makefile
index 4a3e345..25924ef 100644
--- a/src/docs/cmu-user/Makefile
+++ b/src/docs/cmu-user/Makefile
@@ -43,7 +43,7 @@ FILES = *.tex
.SUFFIXES: .tex .dvi .ps .ps1 .pdf .html .info
-all: cmu-user.ps
+all: cmu-user.pdf
# Runs LaTeX once, then reruns LaTeX as many times as necessary to get
@@ -53,7 +53,7 @@ all: cmu-user.ps
# been modified.
%.dvi : %.tex $(FILES)
$(LATEX) $<
- @while ( grep Rerun $*.log > /dev/null ); do \
+ @while ( grep -q "Rerun to get cross" $*.log > /dev/null ); do \
$(LATEX) $<; \
done
if [ "$<" = "cmu-user.tex" ]; then $(MAKE) index; else $(MAKE) index-letter; fi
@@ -62,11 +62,11 @@ all: cmu-user.ps
%.pdf : %.tex $(FILES)
$(PDFLATEX) $<
- @while ( grep -v 'Package: rerunfilecheck' $*.log | grep Rerun > /dev/null ); do \
+ if [ "$<" = "cmu-user.tex" ]; then $(MAKE) index; else $(MAKE) index-letter; fi
+ @while ( grep 'Rerun to get cross' $*.log > /dev/null ); do \
$(PDFLATEX) $<; \
+ if [ "$<" = "cmu-user.tex" ]; then $(MAKE) index; else $(MAKE) index-letter; fi; \
done
- if [ "$<" = "cmu-user.tex" ]; then $(MAKE) index; else $(MAKE) index-letter; fi
- $(PDFLATEX) $<
# the "-fix" option to hevea makes it run as many times as necessary
# to resolve all cross-references and generate an index.
commit ca46df29c0cb68c07e746be0aca510a5d6873797
Author: Raymond Toy <toy.raymond at gmail.com>
Date: Wed Jan 16 20:42:33 2013 -0800
Fix issues with creating pdf and ps documents, from Carl.
cmu-user.tex:
o Include ifpdf package
design.tex:
o Include ifpdf package
o Remove the home-grown ifpdf macro.
macros.tex:
o Remove the home-grown ifpdf macro.
introduction.tex:
unicode.tex:
o Use \url instead of \href for URLs.
diff --git a/src/docs/cmu-user/cmu-user.tex b/src/docs/cmu-user/cmu-user.tex
index 4a94c16..55e8cde 100644
--- a/src/docs/cmu-user/cmu-user.tex
+++ b/src/docs/cmu-user/cmu-user.tex
@@ -32,6 +32,7 @@
\usepackage{xspace}
\usepackage{alltt}
\usepackage{index}
+\usepackage{ifpdf}
\usepackage{ifthen}
\usepackage{calc}
\usepackage{sectsty}
diff --git a/src/docs/cmu-user/introduction.tex b/src/docs/cmu-user/introduction.tex
index dbce9ba..2075509 100644
--- a/src/docs/cmu-user/introduction.tex
+++ b/src/docs/cmu-user/introduction.tex
@@ -47,7 +47,7 @@ about \cmucl. Users will also need a separate manual describing the
\href{http://www.lispworks.com/documentation/HyperSpec/Front/index.htm}
{Hyperspec}.
\else
-\emph{Hyperspec} at \href{http://www.lispworks.com/documentation/HyperSpec/Front/index.htm}
+\emph{Hyperspec} at \url{http://www.lispworks.com/documentation/HyperSpec/Front/index.htm}
\fi
diff --git a/src/docs/cmu-user/macros.tex b/src/docs/cmu-user/macros.tex
index 9c8cba5..bfb1669 100644
--- a/src/docs/cmu-user/macros.tex
+++ b/src/docs/cmu-user/macros.tex
@@ -4,18 +4,6 @@
%
% by Raymond Toy
-
-% define a new conditional statement which allows us to include
-% stuff conditionally when compiling to PDF.
-\newif\ifpdf
-\ifx\pdfoutput\undefined
- \pdffalse
-\else
- \pdfoutput=1
- \pdftrue
-\fi
-
-
% use Palatino
\renewcommand{\rmdefault}{ppl}
\ifpdf
diff --git a/src/docs/cmu-user/unicode.tex b/src/docs/cmu-user/unicode.tex
index c6a1a98..cab4c59 100644
--- a/src/docs/cmu-user/unicode.tex
+++ b/src/docs/cmu-user/unicode.tex
@@ -11,7 +11,7 @@ To understand the support for Unicode, we refer the reader to the
\ifpdf
\href{http://www.unicode.org/}{Unicode standard}.
\else
-\emph{Unicode standard} at \href{http://www.unicode.org}
+\emph{Unicode standard} at \url{http://www.unicode.org}
\fi
\section{Changes}
diff --git a/src/docs/internals/design.tex b/src/docs/internals/design.tex
index 753ed61..776ee1e 100644
--- a/src/docs/internals/design.tex
+++ b/src/docs/internals/design.tex
@@ -2,23 +2,12 @@
%\documentstyle{report} % -*- Dictionary: design -*-
\documentclass{report}
+\usepackage{ifpdf}
\usepackage{ifthen}
\usepackage{calc}
\usepackage{palatino}
\usepackage[hyperindex=false,colorlinks=false,urlcolor=blue]{hyperref}
-% define a new conditional statement which allows us to include
-% stuff conditionally when compiling to PDF.
-\newif\ifpdf
-\ifx\pdfoutput\undefined
- \pdffalse
-\else
- \pdfoutput=1
- \pdftrue
-\fi
-
-
-
\title{Design of CMU Common Lisp}
\date{January 15, 2003}
\author{Robert A. MacLachlan (ed)}
-----------------------------------------------------------------------
Summary of changes:
src/docs/cmu-user/Makefile | 10 +++++-----
src/docs/cmu-user/cmu-user.tex | 1 +
src/docs/cmu-user/introduction.tex | 2 +-
src/docs/cmu-user/macros.tex | 12 ------------
src/docs/cmu-user/unicode.tex | 2 +-
src/docs/internals/Makefile | 4 ++--
src/docs/internals/design.tex | 13 +------------
7 files changed, 11 insertions(+), 33 deletions(-)
hooks/post-receive
--
CMU Common Lisp
More information about the cmucl-cvs
mailing list