diff options
| author | John Mandereau <john.mandereau@gmail.com> | 2008-12-06 14:33:10 +0100 |
|---|---|---|
| committer | John Mandereau <john.mandereau@gmail.com> | 2008-12-06 14:33:10 +0100 |
| commit | 05ea596de0b94fdcc64fa6bafccf4078ccfd53cf (patch) | |
| tree | e36c66b308db27d33a63e1a99ae2e59013a731d2 /tex | |
| parent | a58143ffd322981ea22351c44a0d5929f18892e5 (diff) | |
| parent | fdf56693571c90275388bc93a8dacddb184a9249 (diff) | |
Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond
Diffstat (limited to 'tex')
| -rw-r--r-- | tex/GNUmakefile | 9 | ||||
| -rw-r--r-- | tex/quotes.patch | 61 |
2 files changed, 4 insertions, 66 deletions
diff --git a/tex/GNUmakefile b/tex/GNUmakefile index 51302a6309..bc9dcc9201 100644 --- a/tex/GNUmakefile +++ b/tex/GNUmakefile @@ -1,11 +1,11 @@ depth = .. TEX_FILES = $(filter-out texinfo.tex, $(call src-wildcard,*.tex)) -EXTRA_DIST_FILES = $(TEX_FILES) texinfo.tex quotes.patch -STEPMAKE_TEMPLATES=install install-out +EXTRA_DIST_FILES = $(TEX_FILES) texinfo.tex +STEPMAKE_TEMPLATES = install install-out -INSTALLATION_DIR=$(local_lilypond_datadir)/tex/ -INSTALLATION_FILES=$(TEX_FILES) +INSTALLATION_DIR = $(local_lilypond_datadir)/tex/ +INSTALLATION_FILES = $(TEX_FILES) include $(depth)/make/stepmake.make @@ -13,4 +13,3 @@ local-uninstall: -rmdir $(DESTDIR)$(local_lilypond_datadir)/tex all: $(INSTALLATION_FILES) - diff --git a/tex/quotes.patch b/tex/quotes.patch deleted file mode 100644 index b7bba2e124..0000000000 --- a/tex/quotes.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- 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 |