Use @emph (was: @em).

diff --git a/Documentation/user/programming-interface.itely b/Documentation/user/programming-interface.itely
index 8f8ac35cbce2f12f4d91630375875eaf1dc9c03f..7b08550748a60fbb4a6209a8ebd6a065923ee6d0 100644 (file)
--- a/Documentation/user/programming-interface.itely
+++ b/Documentation/user/programming-interface.itely
@@ -150,7 +150,7 @@ follows the general form of
 @end example
 
 Such syntax can also be defined as user code. To do this, it is
-necessary to create a @em{music function}. This is a specially marked
+necessary to create a @emph{music function}. This is a specially marked
 Scheme function. For example, the music function @code{\applymusic} applies
 a user-defined function to a music expression.  Its syntax is
 

diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index 255b54c59316763ceaa31edf3b667ca434656c24..c47c79cf9614fb2e31df3cce1d2ae8d231a36982 100644 (file)
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -481,8 +481,11 @@ Here are key signatures, accidentals and ties in action
 @}
 @end example
 
+@ignore
+FIXME
+ugr: removing the ignore block, leaving the comment line below
 @c TODO: use relative mode, verbatim, junk \transpose and above @example
-
+@end ignore
 
 
 @lilypond[quote,noindent,linewidth=50\staffspace]

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index fb055fa67f20badff9de8c5dfdc11b38142c525e..73670333a42871a7c224c2a24963276d96531f44 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -1,12 +1,6 @@
 #!@PYTHON@
 
 '''
-TODO:
-      ly-options: intertext, quote ?
-      --linewidth?
-      eps in latex?
-      check latex parameters, twocolumn, multicolumn?
-      
 Example usage:
 
 test:
@@ -18,10 +12,16 @@ convert-ly on book:
 classic lilypond-book:
      lilypond-book --process="lilypond-bin" BOOK.tely
 
-   must substitute:
-     @mbinclude foo.itely -> @include foo.itely
-     \mbinput -> \input
-     
+TODO:
+    *  ly-options: intertext ?
+    *  --linewidth?
+    *  eps in latex / eps by lilypond-bin -fps ?
+    *  check latex parameters, twocolumn, multicolumn?
+      
+    *  Converting from lilypond-book source, substitute:
+       @mbinclude foo.itely -> @include foo.itely
+       \mbinput -> \input
+
 '''
 
 import __main__
@@ -327,11 +327,11 @@ def classic_lilypond_book_compatibility (o):
        m = re.match ('([0-9]+)pt', o)
        if m:
                return 'staffsize=%s' % m.group (1)
-       m = re.match ('indent=([-.0-9]+)(cm|in|mm|pt)', o)
+       m = re.match ('indent=([-.0-9]+)(cm|in|mm|pt|staffspace)', o)
        if m:
                f = float (m.group (1))
                return 'indent=%f\\%s' % (f, m.group (2))
-       m = re.match ('linewidth=([-.0-9]+)(cm|in|mm|pt)', o)
+       m = re.match ('linewidth=([-.0-9]+)(cm|in|mm|pt|staffspace)', o)
        if m:
                f = float (m.group (1))
                return 'linewidth=%f\\%s' % (f, m.group (2))