[Emacs-diffs] /srv/bzr/emacs/trunk r108169: Remove the need for lispref vol1.texi and vol2.texi

[Glenn Morris]

------------------------------------------------------------
revno: 108169
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2012-05-08 20:11:41 -0700
message:
  Remove the need for lispref vol1.texi and vol2.texi
  
  * vol1.texi, vol2.texi: Remove files.
  * elisp.texi: Add VOL1,2 conditionals equivalent to vol1,2.texi
  * two-volume.make: Use elisp.texi as input rather than vol1,2.texi.
removed:
  doc/lispref/vol1.texi
  doc/lispref/vol2.texi
modified:
  doc/lispref/ChangeLog
  doc/lispref/elisp.texi
  doc/lispref/two-volume.make

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2012-05-09 03:06:08 +0000
+++ b/doc/lispref/ChangeLog     2012-05-09 03:11:41 +0000
@@ -1,5 +1,9 @@
 2012-05-09  Glenn Morris  <address@hidden>
 
+       * vol1.texi, vol2.texi: Remove files.
+       * elisp.texi: Add VOL1,2 conditionals equivalent to vol1,2.texi
+       * two-volume.make: Use elisp.texi as input rather than vol1,2.texi.
+
        * Makefile.in (clean, mostlyclean): Add some more vol1/2 items.
 
        * two-volume.make (emacsdir): New.

=== modified file 'doc/lispref/elisp.texi'
--- a/doc/lispref/elisp.texi    2012-05-09 03:06:08 +0000
+++ b/doc/lispref/elisp.texi    2012-05-09 03:11:41 +0000
@@ -1,11 +1,58 @@
 \input texinfo  @c -*-texinfo-*-
 @c %**start of header
 @setfilename elisp
+
address@hidden VOL1
address@hidden volflag
address@hidden voltitle Volume 1
address@hidden ifset
+
address@hidden VOL2
address@hidden volflag
address@hidden voltitle Volume 2
address@hidden ifset
+
address@hidden volflag
address@hidden GNU Emacs Lisp Reference Manual: @value{voltitle}
address@hidden ifset
address@hidden volflag
 @settitle GNU Emacs Lisp Reference Manual
address@hidden ifclear
+
 @c %**end of header
 
address@hidden See two-volume-cross-refs.txt.
address@hidden
address@hidden VOL1
+\message{Formatting for two volume edition...Volume 1...}
+%
+% Read special toc file, set up in two-volume.make.
+\gdef\tocreadfilename{elisp1-toc-ready.toc}
+%
+% Don't make outlines, they're not needed and \readdatafile can't pay
+% attention to the special definition above.
+\global\let\pdfmakeoutlines=\relax
+%
+% Start volume 1 chapter numbering at 1; this must be listed as chapno0.
+\global\chapno=0
address@hidden ifset
address@hidden VOL2
+\message{Formatting for two volume edition...Volume 2...}
+%
+% Read special toc file, set up in two-volume.make.
+\gdef\tocreadfilename{elisp2-toc-ready.toc}
+%
+% Don't make outlines, they're not needed and \readdatafile can't pay
+% attention to the special definition above.
+\global\let\pdfmakeoutlines=\relax
+%
+% Start volume 2 chapter numbering at 27; this must be listed as chapno26
+\global\chapno=26
address@hidden ifset
address@hidden tex
+
+
 @c Version of the manual and of Emacs.
address@hidden Please remember to update these in vol1.texi and vol2.texi as 
well.
 @c (See comments for EDITION in emacs.texi)
 @set VERSION  3.1
 @include emacsver.texi
@@ -16,6 +63,10 @@
 @c onto the distribution in the full, 8.5 x 11" size.
 @c @smallbook
 
address@hidden volflag
address@hidden
address@hidden ifset
+
 @ifset smallbook
 @smallbook
 @end ifset
@@ -75,6 +126,9 @@
 
 @titlepage
 @title GNU Emacs Lisp Reference Manual
address@hidden volflag
address@hidden @value{voltitle}
address@hidden ifset
 @subtitle For Emacs Version @value{EMACSVER}
 @subtitle Revision @value{VERSION}, @value{DATE}
 
@@ -1468,6 +1522,7 @@
 @end detailmenu
 @end menu
 
address@hidden VOL2
 @include intro.texi
 @include objects.texi
 @include numbers.texi
@@ -1501,6 +1556,12 @@
 @include files.texi
 
 @include backups.texi
+
address@hidden ifclear
+
address@hidden ================ Beginning of Volume 2 ================
address@hidden VOL1
+
 @include buffers.texi
 @include windows.texi
 @include frames.texi
@@ -1533,6 +1594,8 @@
 
 @include index.texi
 
address@hidden ifclear
+
 @ignore
 @node New Symbols, , Index, Top
 @unnumbered New Symbols Since the Previous Edition

=== modified file 'doc/lispref/two-volume.make'
--- a/doc/lispref/two-volume.make       2012-05-08 01:57:08 +0000
+++ b/doc/lispref/two-volume.make       2012-05-09 03:11:41 +0000
@@ -5,6 +5,8 @@
 # colors, spurious warnings about names being referenced but not
 # existing, etc., dvips | ps2pdf doesn't preserve the page size.
 # Instead of creating a special dvips config file, put up with the warnings.
+# (Note added 2012/05: for me, using texlive-2007-57, pdftex
+# doesn't work for reason, but tex does.)
 texinfodir=../misc
 emacsdir=../emacs
 
@@ -12,22 +14,32 @@
 
 all: vol1.pdf vol2.pdf
 
-# vol1.texi and vol2.texi specially define \tocreadfilename so we can
-# use our premade .toc's.
+# There's probably a better way to do this, without using a temp file.
+# Something like:
+# tex -jobname=vol1 '\def\SETVOL1 \input{elisp.texi}'
+# but I don't know what to use for "\def\SETVOL1".
+tex1 = sed '/address@hidden/a\
address@hidden VOL1' elisp.texi > elisp1tmp.tex && $(tex) -jobname=vol1 
elisp1tmp.tex
+
+tex2 = sed '/address@hidden/a\
address@hidden VOL2' elisp.texi > elisp2tmp.tex && $(tex) -jobname=vol2 
elisp2tmp.tex
+
+# elisp.texi specially defines \tocreadfilename when VOL1 or VOL2 is
+# set, so we can use our premade .toc's.
 # 
 vol1.pdf: elisp1med-fns-ready elisp1med-aux-ready elisp1med-toc-ready
        @echo -e "\f Final TeX run for volume 1..."
        cp elisp1med-toc-ready elisp1-toc-ready.toc
        cp elisp1med-fns-ready vol1.fns
        cp elisp1med-aux-ready vol1.aux
-       $(tex) vol1.texi
+       $(tex1)
 #
 vol2.pdf: elisp2med-fns-ready elisp2med-aux-ready elisp2med-toc-ready
        @echo "Final TeX run for volume 2..."
        cp elisp2med-toc-ready elisp2-toc-ready.toc
        cp elisp2med-fns-ready vol2.fns
        cp elisp2med-aux-ready vol2.aux
-       $(tex) vol2.texi
+       $(tex2)
 
 #  intermediate toc files.
 # 
@@ -105,7 +117,7 @@
        cp elisp1init-toc-ready elisp1-toc-ready.toc
        cp elisp1-fns-ready vol1.fns
        cp elisp1-aux-ready vol1.aux
-       $(tex) vol1.texi
+       $(tex1)
        texindex vol1.??
        mv vol1.aux elisp1med-aux
        mv vol1.toc elisp1med-toc
@@ -115,7 +127,7 @@
        cp elisp2init-toc-ready elisp2-toc-ready.toc
        cp elisp2-fns-ready vol2.fns
        cp elisp2-aux-ready vol2.aux
-       $(tex) vol2.texi
+       $(tex2)
        texindex vol2.??
        mv vol2.aux elisp2med-aux
        mv vol2.toc elisp2med-toc
@@ -189,19 +201,19 @@
 # but we run texindex and TeX a second time just to get them closer.
 # Otherwise it might take even longer for them to converge.
 # 
-elisp1-init: vol1.texi
+elisp1-init: elisp.texi
        @echo -e "\f Initial TeX run for volume 1..."
        rm -f vol1.aux vol1.toc
-       $(tex) $<
+       $(tex1)
        texindex vol1.??
        mv vol1.aux elisp1-aux
        mv vol1.toc elisp1-toc
        touch $@
 #
-elisp2-init: vol2.texi
+elisp2-init: elisp.texi
        @echo "Initial TeX run for volume 2..."
        rm -f vol2.aux vol2.toc
-       $(tex) $<
+       $(tex2)
        texindex vol2.??
        mv vol2.aux elisp2-aux
        mv vol2.toc elisp2-toc

=== removed file 'doc/lispref/vol1.texi'
--- a/doc/lispref/vol1.texi     2012-05-08 06:38:27 +0000
+++ b/doc/lispref/vol1.texi     1970-01-01 00:00:00 +0000
@@ -1,217 +0,0 @@
-\input texinfo  @c -*-texinfo-*-
address@hidden This file is used for printing the GNU Emacs Lisp Reference 
Manual
address@hidden in two volumes.  It is a modified version of elisp.texi.
address@hidden Copyright (C) 1990-1995, 1998-1999, 2001-2012
address@hidden   Free Software Foundation, Inc.
address@hidden %**start of header
address@hidden elisp
address@hidden GNU Emacs Lisp Reference Manual: Volume 1
address@hidden %**end of header
-
address@hidden See two-volume-cross-refs.txt.
address@hidden
-\message{Formatting for two volume edition...Volume 1...}
-%
-% Read special toc file, set up in two-volume.make.
-\gdef\tocreadfilename{elisp1-toc-ready.toc}
-%
-% Don't make outlines, they're not needed and \readdatafile can't pay
-% attention to the special definition above.
-\global\let\pdfmakeoutlines=\relax
-%
-% Start volume 1 chapter numbering at 1; this must be listed as chapno0.
-\global\chapno=0
address@hidden tex
-
address@hidden Version of the manual and of Emacs.
address@hidden VERSION  3.1
address@hidden emacsver.texi
address@hidden DATE May 2012
-
address@hidden Emacs
address@hidden
-* Elisp: (elisp).       The Emacs Lisp Reference Manual.
address@hidden direntry
-
address@hidden in general, keep the following line commented out, unless doing a
address@hidden copy of this manual that will be published.  the manual should go
address@hidden onto the distribution in the full, 8.5 x 11" size.
address@hidden smallbook
-
address@hidden smallbook
address@hidden
address@hidden ifset
-
address@hidden per rms and peterb, use 10pt fonts for the main text, mostly to
address@hidden save on paper cost.
address@hidden Do this inside @tex for now, so current makeinfo does not 
complain.
address@hidden
address@hidden smallbook
address@hidden 10
-\global\let\urlcolor=\Black % don't print links in grayscale
-\global\let\linkcolor=\Black
address@hidden ifset
-\global\hbadness=6666 % don't worry about not-too-underfull boxes
address@hidden tex
-
address@hidden Combine indices.
address@hidden cp fn
address@hidden vr fn
address@hidden ky fn
address@hidden pg fn
address@hidden We use the "type index" to index new functions and variables.
address@hidden @syncodeindex tp fn
-
address@hidden
-This is edition @value{VERSION} of the GNU Emacs Lisp Reference Manual,@*
-corresponding to Emacs version @value{EMACSVER}.
-
-Copyright @copyright{} 1990-1996, 1998-2012 Free Software Foundation, Inc.
-
address@hidden
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.3 or
-any later version published by the Free Software Foundation; with the
-Invariant Sections being ``GNU General Public License,'' with the
-Front-Cover texts being ``A GNU Manual,'' and with the Back-Cover
-Texts as in (a) below.  A copy of the license is included in the
-section entitled ``GNU Free Documentation License.''
-
-(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
-modify this GNU manual.  Buying copies from the FSF supports it in
-developing GNU and promoting software freedom.''
address@hidden quotation
address@hidden copying
-
address@hidden
address@hidden GNU Emacs Lisp Reference Manual
address@hidden Volume 1
address@hidden For Emacs Version @value{EMACSVER}
address@hidden Revision @value{VERSION}, @value{DATE}
-
address@hidden by Bil Lewis, Dan LaLiberte, Richard Stallman,
address@hidden the GNU Manual Group, et al.
address@hidden
address@hidden 0pt plus 1filll
address@hidden
-
address@hidden 2
-
-Published by the Free Software Foundation @*
-51 Franklin St, Fifth Floor @*
-Boston, MA 02110-1301 @*
-USA @*
-ISBN 1-882114-74-4
-
address@hidden 2
-Cover art by Etienne Suvasa.
address@hidden titlepage
-
-
address@hidden Print the tables of contents
address@hidden
address@hidden
-
-
address@hidden
address@hidden Top
address@hidden Emacs Lisp
-
-This Info file contains edition @value{VERSION} of the GNU Emacs Lisp
-Reference Manual, corresponding to GNU Emacs version @value{EMACSVER}.
address@hidden ifnottex
-
address@hidden
-* Not used::                This file is only used with tex, which
-                              generates its own menu.
-
address@hidden
- --- The Detailed Node Listing ---
- ---------------------------------
-
-Here are other nodes that are subnodes of those already listed,
-mentioned here so you can get to them in one step:
-
-Not used
-
-* Not used::                This file is only used with TeX, which
-                              generates its own menu.
address@hidden detailmenu
address@hidden menu
-
address@hidden intro.texi
address@hidden objects.texi
address@hidden numbers.texi
address@hidden strings.texi
-
address@hidden lists.texi
address@hidden sequences.texi
address@hidden hash.texi
address@hidden symbols.texi
address@hidden eval.texi
-
address@hidden control.texi
address@hidden variables.texi
address@hidden functions.texi
address@hidden macros.texi
-
address@hidden customize.texi
address@hidden loading.texi
address@hidden compile.texi
address@hidden advice.texi
-
address@hidden This includes edebug.texi.
address@hidden debugging.texi
address@hidden streams.texi
address@hidden minibuf.texi
address@hidden commands.texi
-
address@hidden keymaps.texi
address@hidden modes.texi
address@hidden help.texi
address@hidden files.texi
-
address@hidden backups.texi
-
address@hidden ================ Beginning of Volume 2 ================
address@hidden include buffers.texi
address@hidden include windows.texi
address@hidden include frames.texi
-
address@hidden include positions.texi
address@hidden include markers.texi
address@hidden include text.texi
address@hidden include nonascii.texi
-
address@hidden include searching.texi
address@hidden include syntax.texi
address@hidden include abbrevs.texi
address@hidden include processes.texi
-
address@hidden include display.texi
address@hidden include os.texi
-
address@hidden appendices
-
address@hidden include anti.texi
address@hidden include doclicense.texi
address@hidden include gpl.texi
address@hidden include tips.texi
address@hidden include internals.texi
address@hidden include errors.texi
address@hidden include maps.texi
address@hidden include hooks.texi
-
address@hidden index.texi
-
address@hidden
address@hidden New Symbols, , Index, Top
address@hidden New Symbols Since the Previous Edition
-
address@hidden tp
address@hidden ignore
-
address@hidden
-
-
-These words prevent "local variables" above from confusing Emacs.

=== removed file 'doc/lispref/vol2.texi'
--- a/doc/lispref/vol2.texi     2012-05-08 06:38:27 +0000
+++ b/doc/lispref/vol2.texi     1970-01-01 00:00:00 +0000
@@ -1,219 +0,0 @@
-\input texinfo  @c -*-texinfo-*-
address@hidden This file is used for printing the GNU Emacs Lisp Reference 
Manual
address@hidden in two volumes.  It is a modified version of elisp.texi.
address@hidden Copyright (C) 1990-1995, 1998-1999, 2001-2012
address@hidden   Free Software Foundation, Inc.
address@hidden %**start of header
address@hidden elisp
address@hidden GNU Emacs Lisp Reference Manual: Volume 2
address@hidden %**end of header
-
address@hidden See two-volume-cross-refs.txt.
address@hidden
-\message{Formatting for two volume edition...Volume 2...}
-%
-% Read special toc file, set up in two-volume.make.
-\gdef\tocreadfilename{elisp2-toc-ready.toc}
-%
-% Don't make outlines, they're not needed and \readdatafile can't pay
-% attention to the special definition above.
-\global\let\pdfmakeoutlines=\relax
-%
-% Start volume 2 chapter numbering at 27; this must be listed as chapno26
-\global\chapno=26
address@hidden tex
-
address@hidden Version of the manual and of Emacs.
address@hidden VERSION  3.1
address@hidden emacsver.texi
address@hidden DATE May 2012
-
address@hidden Emacs
address@hidden
-* Elisp: (elisp).       The Emacs Lisp Reference Manual.
address@hidden direntry
-
address@hidden in general, keep the following line commented out, unless doing a
address@hidden copy of this manual that will be published.  the manual should go
address@hidden onto the distribution in the full, 8.5 x 11" size.
address@hidden smallbook
-
address@hidden smallbook
address@hidden
address@hidden ifset
-
address@hidden per rms and peterb, use 10pt fonts for the main text, mostly to
address@hidden save on paper cost.
address@hidden Do this inside @tex for now, so current makeinfo does not 
complain.
address@hidden
address@hidden smallbook
address@hidden 10
-\global\let\urlcolor=\Black % don't print links in grayscale
-\global\let\linkcolor=\Black
address@hidden ifset
-\global\hbadness=6666 % don't worry about not-too-underfull boxes
address@hidden tex
-
address@hidden Combine indices.
address@hidden cp fn
address@hidden vr fn
address@hidden ky fn
address@hidden pg fn
address@hidden We use the "type index" to index new functions and variables.
address@hidden @syncodeindex tp fn
-
address@hidden
-This is edition @value{VERSION} of the GNU Emacs Lisp Reference Manual,@*
-corresponding to Emacs version @value{EMACSVER}.
-
-Copyright @copyright{} 1990-1996, 1998-2012 Free Software Foundation, Inc.
-
address@hidden
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.3 or
-any later version published by the Free Software Foundation; with the
-Invariant Sections being ``GNU General Public License,'' with the
-Front-Cover texts being ``A GNU Manual,'' and with the Back-Cover
-Texts as in (a) below.  A copy of the license is included in the
-section entitled ``GNU Free Documentation License.''
-
-(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
-modify this GNU manual.  Buying copies from the FSF supports it in
-developing GNU and promoting software freedom.''
address@hidden quotation
address@hidden copying
-
address@hidden
address@hidden GNU Emacs Lisp Reference Manual
address@hidden Volume 2
address@hidden For Emacs Version @value{EMACSVER}
address@hidden Revision @value{VERSION}, @value{DATE}
-
address@hidden by Bil Lewis, Dan LaLiberte, Richard Stallman,
address@hidden the GNU Manual Group, et al.
address@hidden
address@hidden 0pt plus 1filll
address@hidden
-
address@hidden 2
-Published by the Free Software Foundation @*
-51 Franklin St, Fifth Floor @*
-Boston, MA 02110-1301 @*
-USA @*
-ISBN 1-882114-74-4
-
address@hidden 2
-Cover art by Etienne Suvasa.
address@hidden titlepage
-
-
address@hidden Print the tables of contents
address@hidden
address@hidden
-
-
address@hidden
address@hidden Top
address@hidden Emacs Lisp
-
-This Info file contains edition @value{VERSION} of the GNU Emacs Lisp
-Reference Manual, corresponding to GNU Emacs version @value{EMACSVER}.
address@hidden ifnottex
-
address@hidden
-* Not used::                This file is only used with tex, which
-                              generates its own menu.
-
address@hidden
- --- The Detailed Node Listing ---
- ---------------------------------
-
-Here are other nodes that are subnodes of those already listed,
-mentioned here so you can get to them in one step:
-
-Here are other nodes that are subnodes of those already listed,
-mentioned here so you can get to them in one step:
-
-Not used
-
-* Not used::                This file is only used with TeX, which
-                              generates its own menu.
address@hidden detailmenu
address@hidden menu
-
address@hidden include intro.texi
address@hidden include objects.texi
address@hidden include numbers.texi
address@hidden include strings.texi
-
address@hidden include lists.texi
address@hidden include sequences.texi
address@hidden include hash.texi
address@hidden include symbols.texi
address@hidden include eval.texi
-
address@hidden include control.texi
address@hidden include variables.texi
address@hidden include functions.texi
address@hidden include macros.texi
-
address@hidden include customize.texi
address@hidden include loading.texi
address@hidden include compile.texi
address@hidden include advice.texi
-
address@hidden This includes edebug.texi.
address@hidden include debugging.texi
address@hidden include streams.texi
address@hidden include minibuf.texi
address@hidden include commands.texi
-
address@hidden include keymaps.texi
address@hidden include modes.texi
address@hidden include help.texi
address@hidden include files.texi
-
address@hidden include backups.texi
-
address@hidden ================ Beginning of Volume 2 ================
address@hidden buffers.texi
address@hidden windows.texi
address@hidden frames.texi
-
address@hidden positions.texi
address@hidden markers.texi
address@hidden text.texi
address@hidden nonascii.texi
-
address@hidden searching.texi
address@hidden syntax.texi
address@hidden abbrevs.texi
address@hidden processes.texi
-
address@hidden display.texi
address@hidden os.texi
-
address@hidden appendices
-
address@hidden anti.texi
address@hidden doclicense.texi
address@hidden gpl.texi
address@hidden tips.texi
address@hidden internals.texi
address@hidden errors.texi
address@hidden maps.texi
address@hidden hooks.texi
-
address@hidden index.texi
-
address@hidden
address@hidden New Symbols, , Index, Top
address@hidden New Symbols Since the Previous Edition
-
address@hidden tp
address@hidden ignore
-
address@hidden
-
-
-These words prevent "local variables" above from confusing Emacs.