Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond

8 files changed, 104 insertions, 184 deletions

diff --git a/Documentation/user/text.itely b/Documentation/user/text.itely
index 04b1720913..70d4bcaf8e 100644
--- a/Documentation/user/text.itely
+++ b/Documentation/user/text.itely
@@ -316,42 +316,8 @@ requires, are described in @ref{Multi-page markup}.
 
 @snippets
 
-@ignore
-@c TODO Replace following example with this snippet when available
-@c Submitted to LSR 30 Nov 08
 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
-{stand--alone-two--column-markup.ly}
-@end ignore
-
-Stand-alone text may be arranged in several columns using @code{\markup}
-commands:
-
-@lilypond[verbatim,quote]
-\markup {
- \fill-line {
-  \hspace #1.0
-  \column {
-   \line {"O sacrum convivium" }
-   \line {"in quo Christus sumitur," }
-   \line {"recolitur memoria passionis ejus," }
-   \line {"mens impletur gratia," }
-   \line {"futurae gloriae nobis pignus datur." }
-   \line {"Amen."}
-  }
-  \hspace #2
-  \column {
-   \line { \italic {"O sacred feast"} }
-   \line { \italic {"in which Christ is received,"} }
-   \line { \italic {"the memory of His Passion is renewed,"} }
-   \line { \italic {"the mind is filled with grace," } }
-   \line { \italic {"and a pledge of future glory is given to us." }}
-   \line { \italic {"Amen."}}
-  }
-  \hspace #1.0
- }
-}
-@end lilypond
-@seealso
+{stand-alone-two-column-markup.ly}
 
 @seealso
 Notation Reference: @ref{Formatting text},
diff --git a/ROADMAP b/ROADMAP
index 59a4fbecbd..4ec2eec4bd 100644
--- a/ROADMAP
+++ b/ROADMAP
@@ -9,42 +9,40 @@ LilyPond development is hosted at:
 Here is a simple explanation of the directory layout for LilyPond's
 source files.
 
-   .			Toplevel READMEs, ChangeLog, build bootstrapping,
-			patches for third party programs
+   .                    Toplevel READMEs, ChangeLog, build bootstrapping,
+                          patches for third party programs
    Documentation/
-       bibliography/	.bib files with references to books and articles
-       misc/		Old announcements, ChangeLogs and NEWS
-       pictures/	The logo
-       topdocs/		Sources for the toplevel READMEs
-		  	(README.txt, INSTALL.txt, NEWS.txt etc.)
-       user/		User manuals
-       po/              translated manual node names
-       fr/ es/ de/      docs translated to French, Spanish, German resp.
-   buildscripts/	Scripts for the build process
-   elisp/		Emacs LilyPond mode and syntax coloring
-   flower/		A simple c++ library
-       include/
-   input/		Music input examples
-       lsr/         Snippets from the LilyPond Snippet Repository
-                    (auto-generated, do not modify!)
-       manual/      Examples from the manual
-       mutopia/		Real music, more at www.mutopiaproject.org
-       new/         Snippets which are too new for LSR
-       regression/	Testing of features, one test per file
-       texidocs/    Translations of texidoc and doctitle fields
-                    (for input/lsr)
-       tutorial/	Examples from the tutorial 
-   lily/		C++ sources for LilyPond (lilypond-bin)
-     include/
-   ly/			System music include files
-   make/		Specific make subroutines and packaging for
-			Red Hat-like distributions (.spec files)
-   mf/			MetaFont sources for the feta font
-   po/			Translations
-   ps/			PostScript library files
-   python/		Python modules, MIDI module
-   scm/			Scheme sources for LilyPond and subroutine files
-   scripts/		End-user scripts
-   stepmake/		Generic make subroutine files
-   tex/			TeX library files
-   vim/			Vi(M) LilyPond mode and syntax coloring
+       bibliography/    .bib files with references to books and articles
+       misc/            Old announcements, ChangeLogs and NEWS
+       pictures/        The logo
+       topdocs/         Sources for the toplevel READMEs
+                          (README.txt, INSTALL.txt, NEWS.txt etc.)
+       user/            User manuals
+       po/              Translated manual node names
+       fr/ es/ de/      Docs translated to French, Spanish, German, resp.
+   buildscripts/        Scripts for the build process
+   elisp/               Emacs LilyPond mode and syntax coloring
+   flower/              A simple C++ library
+   input/               Music input examples
+       lsr/             Snippets from the LilyPond Snippet Repository
+                          (auto-generated, do not modify!)
+       manual/          Examples from the manual
+       mutopia/         Real music, more at www.mutopiaproject.org
+       new/             Snippets which are too new for LSR
+       regression/      Testing of features, one test per file
+       texidocs/        Translations of texidoc and doctitle fields
+                          (for input/lsr)
+       tutorial/        Examples from the tutorial 
+   lily/                C++ sources for the LilyPond binary
+   ly/                  System music include files
+   make/                Specific make subroutines and packaging for
+                          Red Hat-like distributions (.spec files)
+   mf/                  MetaFont sources for the Emmentaler and Aybabtu fonts
+   po/                  Translations for binaries and end-user scripts
+   ps/                  PostScript library files
+   python/              Python modules, MIDI module
+   scm/                 Scheme sources for LilyPond and subroutine files
+   scripts/             End-user scripts
+   stepmake/            Generic make subroutine files
+   tex/                 TeX and texinfo library files
+   vim/                 Vi(M) LilyPond mode and syntax coloring
diff --git a/input/regression/font-postscript.ly b/input/regression/font-postscript.ly
index 4144763962..d061343bfa 100644
--- a/input/regression/font-postscript.ly
+++ b/input/regression/font-postscript.ly
@@ -1,47 +1,29 @@
 \header {
-
-    texidoc = "This file demonstrates how to load different
-    (postscript) fonts. The file @file{font.scm} shows how to define
-    the scheme-function @code{make-century-schoolbook-tree}.
-
-    This file should be run with the TeX and extra options should be
-    passed to LaTeX and dvips to help it find the uncb font."
-
+  texidoc = "This file demonstrates how to load different (postscript)
+fonts.  The file @file{font.scm} shows how to define the scheme-function
+@code{make-century-schoolbook-tree}."
 }
+
 \version "2.11.51"
 
-\paper
-{
-    #(define text-font-defaults
-      '((font-encoding . latin1)
-	(baseline-skip . 2)
-	(word-space . 0.6)))
+\paper {
+  #(define text-font-defaults
+    '((font-encoding . latin1)
+      (baseline-skip . 2)
+      (word-space . 0.6)))
 
-    #(set! fonts (make-century-schoolbook-tree 1.0))
+  #(set! fonts (make-century-schoolbook-tree 1.0))
 }
 
-%ugh.
-% do this here so we don't forget the connection with
-% this file.
-#(system "afm2tfm `kpsewhich uncb8a.afm` uncb8a.tfm") 
-
 \layout {
-    line-width = 160 \mm - 2.0 * 9.0 \mm
+  line-width = 160 \mm - 2.0 * 9.0 \mm
 
-    
-    indent = 0.0\mm
-    ragged-right = ##t
+  indent = 0.0\mm
+  ragged-right = ##t
 }
 
 {
-    \key a \major
-    \time 6/8
-    cis''8.
-
-%% uncomment to test postscript fonts. 
-% ^"test!"
-
-    
-    
-    d''16 cis''8 e''4 e''8
+  \key a \major
+  \time 6/8
+  cis''8.^"test!" d''16 cis''8 e''4 e''8
 }
diff --git a/lily/text-interface.cc b/lily/text-interface.cc
index 0feb99adb6..480d2726a2 100644
--- a/lily/text-interface.cc
+++ b/lily/text-interface.cc
@@ -72,8 +72,8 @@ MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Text_interface, interpret_markup, 3, 0,
 "  Takes three arguments, @var{layout}, @var{props}, and @var{markup}.\n"
 "\n"
 "@var{layout} is a @code{\\layout} block; it may be obtained from a grob with"
-" @code{ly:grob-layout}.  @var{props} is a alist chain, ie. a list of alists."
-"  This is typically obtained with"
+" @code{ly:grob-layout}.  @var{props} is an alist chain, i.e. a list of"
+"  alists.  This is typically obtained with"
 " @code{(ly:grob-alist-chain (ly:layout-lookup layout 'text-font-defaults))}."
 "  @var{markup} is the markup text to be processed.");
 SCM
diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm
index 36f598e22b..b697af3b30 100644
--- a/scm/define-grob-properties.scm
+++ b/scm/define-grob-properties.scm
@@ -169,7 +169,7 @@ be used: @code{#UP}=@code{1}, @code{#DOWN}=@code{-1},
 @code{#LEFT}=@code{-1}, @code{#RIGHT}=@code{1}, @code{#CENTER}=@code{0}.")
      (dot-count ,integer? "The number of dots.")
      (dot-negative-kern ,number? "The space to remove between a dot
-a and slash in percent repeat glyphs.  Larger values bring the two
+and a slash in percent repeat glyphs.  Larger values bring the two
 elements closer together.")
      (dot-placement-list ,list? "List 
 consisting of @code{(@var{description} @var{string-number} 
@@ -525,7 +525,7 @@ dot.")
 number, the quicker the slur attains its @code{height-limit}.")
      (remove-empty ,boolean? "If set, remove group if it contains no
 interesting items.")
-     (remove-first ,boolean? "Remove the first staff of a orchestral
+     (remove-first ,boolean? "Remove the first staff of an orchestral
 score?")
      (restore-first ,boolean? "Print a natural before the
 accidental.")
diff --git a/scm/encoding.scm b/scm/encoding.scm
index 0974c39d03..d500c0c270 100644
--- a/scm/encoding.scm
+++ b/scm/encoding.scm
@@ -1,12 +1,49 @@
 ;;;; encoding.scm -- font encoding
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
-;;;; 
+;;;;
 ;;;; (c) 2004--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 
-
-
-(define-public latin1-coding-vector #(.notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef space exclam quotedbl numbersign dollar percent ampersand quoteright parenleft parenright asterisk plus comma hyphen period slash zero one two three four five six seven eight nine colon semicolon less equal greater question at A B C D E F G H I J K L M N O P Q R S T U V W X Y Z bracketleft backslash bracketright asciicircum underscore quoteleft a b c d e f g h i j k l m n o p q r s t u v w x y z braceleft bar braceright asciitilde .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef dotlessi grave acute circumflex tilde macron breve dotaccent dieresis .notdef ring cedilla .notdef hungarumlaut ogonek caron space exclamdown cent sterling currency yen brokenbar section dieresis copyright ordfeminine guillemotleft logicalnot hyphen registered macron degree plusminus twosuperior threesuperior acute mu paragraph periodcentered cedilla onesuperior ordmasculine guillemotright onequarter onehalf threequarters questiondown Agrave Aacute Acircumflex Atilde Adieresis Aring AE Ccedilla Egrave Eacute Ecircumflex Edieresis Igrave Iacute Icircumflex Idieresis Eth Ntilde Ograve Oacute Ocircumflex Otilde Odieresis multiply Oslash Ugrave Uacute Ucircumflex Udieresis Yacute Thorn germandbls agrave aacute acircumflex atilde adieresis aring ae ccedilla egrave eacute ecircumflex edieresis igrave iacute icircumflex idieresis eth ntilde ograve oacute ocircumflex otilde odieresis divide oslash ugrave uacute ucircumflex udieresis yacute thorn ydieresis))
+(define-public latin1-coding-vector
+  #(.notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef
+    .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef
+    .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef
+    .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef
+    %% 0x20
+    space exclam quotedbl numbersign dollar percent ampersand quoteright
+    parenleft parenright asterisk plus comma hyphen period slash
+    zero one two three four five six seven
+    eight nine colon semicolon less equal greater question
+    %% 0x40
+    at A B C D E F G
+    H I J K L M N O
+    P Q R S T U V W
+    X Y Z bracketleft backslash bracketright asciicircum underscore
+    %% 0x60
+    `quoteleft a b c d e f g
+    h i j k l m n o
+    p q r s t u v w
+    x y z braceleft bar braceright asciitilde .notdef
+    %% 0x80
+    .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef
+    .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef
+    dotlessi grave acute circumflex tilde macron breve dotaccent
+    dieresis .notdef ring cedilla .notdef hungarumlaut ogonek caron
+    %% 0xA0
+    space exclamdown cent sterling currency yen brokenbar section
+    dieresis copyright ordfeminine guillemotleft logicalnot hyphen registered macron
+    degree plusminus twosuperior threesuperior acute mu paragraph periodcentered
+    cedilla onesuperior ordmasculine guillemotright onequarter onehalf threequarters questiondown
+    %% 0xC0
+    Agrave Aacute Acircumflex Atilde Adieresis Aring AE Ccedilla
+    Egrave Eacute Ecircumflex Edieresis Igrave Iacute Icircumflex Idieresis
+    Eth Ntilde Ograve Oacute Ocircumflex Otilde Odieresis multiply
+    Oslash Ugrave Uacute Ucircumflex Udieresis Yacute Thorn germandbls
+    %% 0xE0
+    agrave aacute acircumflex atilde adieresis aring ae ccedilla
+    egrave eacute ecircumflex edieresis igrave iacute icircumflex idieresis
+    eth ntilde ograve oacute ocircumflex otilde odieresis divide
+    oslash ugrave uacute ucircumflex udieresis yacute thorn ydieresis))
 
 
 (define-public (decode-byte-string str)
@@ -15,10 +52,9 @@ assuming that STR is byte-coded using ENCODING-NAME."
 
   (let* ((len (string-length str))
 	 (output-vector (make-vector len '.notdef)))
-
     (do
 	((idx 0 (1+ idx)))
 	((>= idx len) output-vector)
       (vector-set! output-vector idx
-		     (vector-ref latin1-coding-vector
-				 (char->integer (string-ref str idx)))))))
+		   (vector-ref latin1-coding-vector
+			       (char->integer (string-ref str idx)))))))
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