patch::: 1.2.13.jcn1

13.jcn1
	- bf: mudela-book

diff --git a/CHANGES b/CHANGES
index 8acd8145cb7a506c084b728f1624ca087cfa51b0..46a78d2ff97315f0c4f208626f6acc56ca2e49b1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+13.jcn1
+       - bf: mudela-book
+
 12.jcn1
        - auto-knees, input/test/auto-knee.ly
 

diff --git a/Documentation/faq.texi b/Documentation/faq.texi
index 5a7fce5510a4a54c81f903f22fd5aea7e8209b8b..da64d5cc5203e08226d9a6bfa8c11d3310c14c4a 100644 (file)
--- a/Documentation/faq.texi
+++ b/Documentation/faq.texi
@@ -221,7 +221,7 @@ Yes. See @file{input/test/grace.ly}
 
 See @file{lilyponddefs.tex}, it has some comments.  Or use @file{ly2dvi}.
 
-subsubsection(How do I place lyrics under @emph{each} of the staves in a score, as choral music. I can work out how to put lyrics for each line all under the top line, or at the bottom but not between!) 
+@subsubsection How do I place lyrics under @emph{each} of the staves in a score, as choral music. I can work out how to put lyrics for each line all under the top line, or at the bottom but not between!
 
 You change the order lyrics and staves.  You have to name all
 staves (lyric and melodic), otherwise they will end up in the same
@@ -316,7 +316,7 @@ to get a bit less frivolous tagging.
 @node Development, Running, How do I -, FAQ - GNU LilyPond FAQs
 @section Development
 
-subsubsection(Could you implement feature XXXX? It is really easy, just extend the syntax to allow YYYY!) 
+@subsubsection Could you implement feature XXXX? It is really easy, just extend the syntax to allow YYYY!
 
 If it is reasonable, I'll add XXXX to the TODO list. In general
 finding a cute syntax (such as YYYY) isn't very hard. The complicated
@@ -466,7 +466,7 @@ output, use TeX and @code{dvips}.
 The beams and slurs are done in PostScript.  XDvi doesn't show
 PostScript in the magnifying glass.  Complain to the XDvi maintainers.
 
-@subsubsection I don't get midi-output, even if I use @strong{-M}!
+@subsubsection I don't get midi-output, even if I use @strong{-m}!
 
 Your \score should include a \midi block, eg.
 @example 
@@ -482,10 +482,10 @@ Your \score should include a \midi block, eg.
  
 @end example 
 
-The @strong{-M} option was added to LilyPond because processing the \paper
-block is so slow.
+The @strong{-m} option was added to LilyPond to suppress paper output,
+because processing the \paper block is so slow.
 
-subsubsection(A lot of musical stuff doesn't make it to the MIDI file, eg.  dynamics, articulation, etc.) 
+@subsubsection A lot of musical stuff doesn't make it to the MIDI file, eg.  dynamics, articulation, etc.
 
 The MIDI output was originally put in as a proof that MIDI could be
 done, and as a method of proof"reading" the input.  The MIDI support
@@ -531,7 +531,7 @@ signature changes, time compression (original in 4/1, playing edition
 in 4/4, for example, with all semibreves replaced with crotchets)
 Copyright is in the arranger/editor.
 
-subsubsection(How does copyright for sheet music work? Can I enter and spread my newly bought Bach urtext?) 
+@subsubsection How does copyright for sheet music work? Can I enter and spread my newly bought Bach urtext?
 
 Silas S. Brown <ssb22@@hermes.cam.ac.uk>:
 

diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index aedec6a853715a65385da76b997354a1cbb5b426..ebe9ad88b261ede683d3dd547c1b582702809504 100644 (file)
--- a/Documentation/topdocs/INSTALL.texi
+++ b/Documentation/topdocs/INSTALL.texi
@@ -346,8 +346,8 @@ A Debian package is also available; contact Anthony Fok
 Separate instructions on building for W32 are available; See file
 README-W32, included with the sources.
 
-@section Problems
-
+@c I detest the use of euphemisms, esp. for BUGS
+@section Bugs and Problems
 
 For help and questions use @email{help-gnu-music@@gnu.org} and
 @email{gnu-music-discuss@@gnu.org}.  Please consult the faq before

diff --git a/Documentation/topdocs/README.texi b/Documentation/topdocs/README.texi
index a6b9c70cb9a231acd94e3c77186f0d23903f288f..afaf35fb75189bb665b248f7b6f18a61c29855a1 100644 (file)
--- a/Documentation/topdocs/README.texi
+++ b/Documentation/topdocs/README.texi
@@ -24,7 +24,7 @@ may not produce good or nice scores.
 For the compilation and running of LilyPond you need some additional
 packages.  Please refer to the installation instructions.
 
-NOTE: If you downloaded a binary (.rpm or a W95/NT .zip file), then
+NOTE: If you downloaded a binary (.rpm or a W95/NT .zip file),
 you don't have to compile LilyPond.
 
 @section Installation
@@ -73,7 +73,7 @@ more info.
 @section Windows 32
 
 If you have received this file as part of a DOS/Window32 distribution
-(@file{LilyPond-*.zip}), then it is advisable to also download the
+(@file{LilyPond-*.zip}), it is advisable to also download the
 source package, since it might contain more documentation
 @uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/}
 
@@ -99,8 +99,8 @@ installation instructions before mailing your problems.
 
 @section CDROM distributions
 
-if you have received LilyPond on a cdrom, chances are that development
-has moved a some patchlevels up.  Please check the latest version of
+If you have received LilyPond on a cdrom, chances are that development
+has moved some patchlevels up.  Please check the latest version of
 LilyPond before reporting bugs.
 
 

diff --git a/VERSION b/VERSION
index 124a01bd46b9e43fa62435bb181ea2d19c2bf175..d63ffea93adf41b39ccce06e5929dc6525a12771 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=2
 PATCH_LEVEL=13
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/scripts/mudela-book.py b/scripts/mudela-book.py
index 97ca4acb055ce7f084607969a760bccde8271db2..5e8fc00a5c47510743c21f8dbbc75d94dbbd0d5d 100644 (file)
--- a/scripts/mudela-book.py
+++ b/scripts/mudela-book.py
@@ -421,7 +421,8 @@ def find_mudela_shorthands (b):
 
        def mudela_file (match):
                "Find \mudelafile, and substitute appropriate \begin / \end blocks."
-               str = find_file (match.group (2))
+               full_path = match.group (2)
+               str = find_file (full_path)
                opts = match.group (1)
                if opts:
                        opts = opts[1:-1]