1.0.9.48: texi2pdf rework (Aymeric Vincent sbcl-devel 2007-09-05)

	It looks likely that texi2dvi is more ubiquitous than texi2pdf,
	so just apply the patch.
	... (plus whitespace and .cvsignore collateral changes).

diff --git a/doc/internals/.cvsignore b/doc/internals/.cvsignore
index 364eadc..edc3490 100644 (file)
--- a/doc/internals/.cvsignore
+++ b/doc/internals/.cvsignore
@@ -1,6 +1,8 @@
 *.aux
 *.cp
+*.cps
 *.fn
+*.fns
 *.info
 *.ky
 *.log
@@ -8,5 +10,6 @@
 *.pg
 *.toc
 *.tp
+*.txt
 *.vr
 *.include

diff --git a/doc/internals/Makefile b/doc/internals/Makefile
index df076da..1677a14 100644 (file)
--- a/doc/internals/Makefile
+++ b/doc/internals/Makefile
@@ -1,3 +1,7 @@
+ifeq ($(TEXI2PDF),)
+  TEXI2PDF:=texi2dvi -p
+endif
+
 .PHONY: top clean html all
 
 all: sbcl-internals.pdf sbcl-internals.info
@@ -22,7 +26,7 @@ info: top
        epstopdf $< > $@
 
 sbcl-internals.pdf: top $(patsubst %.dot,%.pdf,$(wildcard *.dot)) *.texinfo
-       texi2pdf sbcl-internals.texinfo
+       $(TEXI2PDF) sbcl-internals.texinfo
 
 sbcl-internals.info: top $(patsubst %.dot,%.txt,$(wildcard *.dot)) *.texinfo
 

diff --git a/doc/manual/Makefile b/doc/manual/Makefile
index 72f897f..a58cac5 100644 (file)
--- a/doc/manual/Makefile
+++ b/doc/manual/Makefile
@@ -30,7 +30,7 @@ ifeq ($(MAKEINFO),)
 endif
 
 ifeq ($(TEXI2PDF),)
-  TEXI2PDF:=texi2pdf
+  TEXI2PDF:=texi2dvi -p
 endif
 
 ifeq ($(DVIPS),)
@@ -73,7 +73,7 @@ ps: $(PSFILES)
 pdf: $(PDFFILES)
 
 %.pdf: %.texinfo $(DOCFILES) docstrings
-       texi2pdf $(I_FLAGS) $<
+       $(TEXI2PDF) $(I_FLAGS) $<
 
 # info docfiles
 .PHONY: info

diff --git a/src/pcl/wrapper.lisp b/src/pcl/wrapper.lisp
index c204e4f..eb567cd 100644 (file)
--- a/src/pcl/wrapper.lisp
+++ b/src/pcl/wrapper.lisp
@@ -194,8 +194,8 @@
 (defun valid-wrapper-of (instance)
   (let ((wrapper (wrapper-of instance)))
     (if (invalid-wrapper-p wrapper)
-       (check-wrapper-validity instance)
-       wrapper)))
+        (check-wrapper-validity instance)
+        wrapper)))
 \f
 ;;;  NIL: means nothing so far, no actual arg info has NILs in the
 ;;;  metatype.

diff --git a/version.lisp-expr b/version.lisp-expr
index 1c07746..06dc10c 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"1.0.9.47"
+"1.0.9.48"