(sectionheading, q.v.): call \quoteexpand for

@example too. Backportme.

diff --git a/ChangeLog b/ChangeLog
index 0ed7a36c662ced2636e1315a47404e0c3198262d..e6fd3e4e7f564152132d594b261fc10ccf62e0ae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-02  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * tex/texinfo.tex (sectionheading, q.v.): call \quoteexpand for
+       @example too. Backportme.
+
 2006-06-02  Graham Percival  <gpermus@gmail.com>
 
        * tex/texinfo.cnf: added UTF-8 support for texinfo; patch
@@ -94,9 +99,13 @@
 
        * dynamic-engraver.cc: fix bug (dynamics collide with accidentals)
 
-       * scm/output-ps.scm (repeat-slash): fix a bug that made repeat slash beams
-       too wide.
+       * scm/output-ps.scm (repeat-slash): fix a bug that made repeat
+       slash beams too wide.
 
+2006-05-30  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * VERSION: release 2.9.7
+       
 2006-05-30  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * lily/relocate.cc (read_relocation_dir): Do not blindly

diff --git a/GNUmakefile.in b/GNUmakefile.in
index aae925d8263ceced6ff0d08ca502b928257b299d..21681b64ccdf5a553134aeba4bca0223cd9de3ef 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -177,7 +177,13 @@ $(tree-share-prefix)/mf-link-tree link-mf-tree: $(tree-share-prefix)/lilypond-fo
 TAGS.make: dummy
        etags -o $@ $(find $(srcdir) -name 'GNUmakefile*' -o -name '*.make')
 
-local-clean: build-dir-setup-clean
+local-clean: build-dir-setup-clean local-web-clean
+
+local-web-clean:
+       rm -rf $(outdir)/web-root/
+
+
+
 build-dir-setup-clean:
        cd $(top-build-dir) && rm -rf share
 

diff --git a/tex/GNUmakefile b/tex/GNUmakefile
index b29da5acbfc7f43238fca00d1d0a54e82dea0125..34abb77ed90c1006ef54af2b9eb3fe8d9d5818b1 100644 (file)
--- a/tex/GNUmakefile
+++ b/tex/GNUmakefile
@@ -1,7 +1,7 @@
 depth = ..
 
 TEX_FILES = $(filter-out texinfo.tex, $(call src-wildcard,*.tex))
-EXTRA_DIST_FILES = $(TEX_FILES) texinfo.tex texinfo.cnf
+EXTRA_DIST_FILES = $(TEX_FILES) texinfo.tex texinfo.cnf quotes.patch
 STEPMAKE_TEMPLATES=install install-out
 
 INSTALLATION_DIR=$(local_lilypond_datadir)/tex/

diff --git a/tex/quotes.patch b/tex/quotes.patch
new file mode 100644 (file)
index 0000000..b7bba2e
--- /dev/null
+++ b/tex/quotes.patch
@@ -0,0 +1,61 @@
+--- texinfo/doc/texinfo.tex    2006-06-02 03:19:04.000000000 +0200
++++ texinfo.tex        2006-06-02 03:19:10.000000000 +0200
+@@ -1878,9 +1878,12 @@
+ {
+   \catcode`\-=\active
+   \catcode`\_=\active
++  \catcode`\'=\active
+   %
+   \global\def\code{\begingroup
+     \catcode`\-=\active  \catcode`\_=\active
++    \catcode`\'=\active
++    \let'\singlequotechar
+     \ifallowcodebreaks
+      \let-\codedash
+      \let_\codeunder
+@@ -5059,11 +5062,10 @@
+ %
+ \maketwodispenvs {lisp}{example}{%
+   \nonfillstart
+-  \tt
++  \tt\quoteexpand
+   \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special.
+   \gobble       % eat return
+ }
+-
+ % @display/@smalldisplay: same as @lisp except keep current font.
+ %
+ \makedispenv {display}{%
+@@ -5191,6 +5193,12 @@
+ \newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount
+ %
+ \def\starttabbox{\setbox0=\hbox\bgroup}
++%
++%
++% Don't replace quotes with curly quotes. This makes cut & pasting
++% from a PDF file problematic.
++% 
++\def\singlequotechar{\char'15\relax}
+ \begingroup
+   \catcode`\^^I=\active
+   \gdef\tabexpand{%
+@@ -5203,6 +5211,11 @@
+       \wd0=\dimen0 \box0 \starttabbox
+     }%
+   }
++  \catcode`\'=\active
++  \gdef\quoteexpand{%
++    \catcode`\'=\active
++    \def'{\singlequotechar}
++  }%
+ \endgroup
+ \def\setupverbatim{%
+   \let\nonarrowing = t%
+@@ -5212,6 +5225,7 @@
+   \def\par{\leavevmode\egroup\box0\endgraf}%
+   \catcode`\`=\active
+   \tabexpand
++  \quoteexpand
+   % Respect line breaks,
+   % print special symbols as themselves, and
+   % make each space count

diff --git a/tex/texinfo.tex b/tex/texinfo.tex
index 6bc9fcdadd7aae26e863558c8dd4aeab57d428b3..ab6a1c4d21d61f7485bab85703b61a0d4f45ce35 100644 (file)
--- a/tex/texinfo.tex
+++ b/tex/texinfo.tex
@@ -5062,11 +5062,10 @@ where each line of input produces a line of output.}
 %
 \maketwodispenvs {lisp}{example}{%
   \nonfillstart
-  \tt
+  \tt\quoteexpand
   \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special.
   \gobble       % eat return
 }
-
 % @display/@smalldisplay: same as @lisp except keep current font.
 %
 \makedispenv {display}{%