lilypond-1.2.14

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/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/scripts/mudela-book.py b/scripts/mudela-book.py
index 97ca4acb055ce7f084607969a760bccde8271db2..13280873875a98b9cbf61e9fa62bad0a95f6fa6f 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))
+               fn = match.group (2)
+               str = find_file (fn)
                opts = match.group (1)
                if opts:
                        opts = opts[1:-1]
@@ -429,16 +430,16 @@ def find_mudela_shorthands (b):
                else:
                        opts = []
 
-               if re.search ('.fly$', full_path):
+               if re.search ('.fly$', fn):
                        opts.append ('fly')
-               elif re.search ('.sly$', full_path):
+               elif re.search ('.sly$', fn):
                        opts = opts + [ 'fly','fragment']
-               elif re.search ('.ly$', full_path):
+               elif re.search ('.ly$', fn):
                        opts .append ('nofly')
                        
                str_opts = string.join (opts, ',')
 
-               str = ("%% copied from file `%s'\n" % full_path) + str 
+               str = ("%% copied from file `%s'\n" % fn) + str 
                return get_output ('output-mudela') % (str_opts, str)
   
        b = get_re('mudela-file').sub (mudela_file, b)