* lily/key-signature-interface.cc: add style.

* Documentation/user/notation.itely (Automatic staff changes):
document new behavior.

diff --git a/ChangeLog b/ChangeLog
index f6f5b02f998f03ec9c22416a4000b5d37fdf84b2..cf395f8e94f79b8861e4bbb9422a3641c4fde1b5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-08-28  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * lily/key-signature-interface.cc: add style.
+
        * Documentation/user/notation.itely (Automatic staff changes):
        document new behavior.
 

diff --git a/Documentation/user/converters.itely b/Documentation/user/converters.itely
index a29909591939e5cadd9755ce619d077bfeade658..b84ef3f496d5355efb4d675c21cab5c7fc5594ee 100644 (file)
--- a/Documentation/user/converters.itely
+++ b/Documentation/user/converters.itely
@@ -17,6 +17,7 @@ sequencers and XML converters. Refer to the
 * Invoking etf2ly::             Importing Finale.
 * Invoking abc2ly::             Importing ABC.          
 * Invoking mup2ly::             Importing MUP. 
+* Other formats::               
 @end menu
 
 
@@ -98,12 +99,13 @@ this. It is therefore not recommended to use midi2ly for
 human-generated midi files.
 
 
-It is invoked as follows:
+It is invoked from the command-line as follows,
 @example
-        midi2ly [@var{option}]@dots{} @var{midi-file}
+midi2ly [@var{option}]@dots{} @var{midi-file}
 @end example
 
-The following options are supported by midi2ly:
+
+The following options are supported by midi2ly.
 
 @table @code
 @item -a, --absolute-pitches
@@ -153,7 +155,7 @@ ETF (Enigma Transport Format) is a format used by Coda Music
 Technology's Finale product. etf2ly will convert part of an ETF
 file to a ready-to-use LilyPond file.
 
-It is invoked as follows:
+It is invoked from the command-line as follows.
 @example
         etf2ly [@var{option}]@dots{} @var{etf-file}
 @end example
@@ -245,6 +247,7 @@ format. It is invoked as follows:
 @cindex Mup
 @cindex Arkkra
 
+It is invoked from the command-line as follows.
 @example
         mup2ly [@var{option}]@dots{} @var{mup-file}
 @end example
@@ -275,4 +278,21 @@ Only plain notes (pitches, durations), voices, and staves are
 converted.
 
 
+@node Other formats
+@section Other formats
+
+LilyPond itself does not come with support for other formats, but
+there are also external tools that generate LilyPond files.
+
+These tools include
+http://denemo.sourceforge.net/
 
+@itemize @bullet
+@item @uref{http://www.nongnu.org/xml2ly/, xml2ly}, that imports
+@uref{http://www.musicxml.com/,MusicXML}
+@item
+@uref{http://rnvs.informatik.tu-chemnitz.de/~jan/noteedit/noteedit.html,NoteEdit}
+which imports MusicXML
+@item @uref{http://www.all-day-breakfast.com/rosegarden/,Rosegarden},
+which imports MIDI
+@end itemize

diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index 45528f7d0ee13b8520c2eee973c470de3062452a..04cb3b13a0045b3429ad1ae44678101a42500fc7 100644 (file)
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -1228,7 +1228,7 @@ c4 \bar "|:" c4
 @end lilypond
 
 The following bar types are available
-@lilypondfile[notexidoc]{bar-lines.ly}
+@lilypondfile[]{bar-lines.ly}
 
 For allowing line breaks, there is a special command,
 @example
@@ -3337,10 +3337,11 @@ point), and it looks ahead skipping over rests to switch in
 advance. Here is a practical example
         
 @lilypond[quote,verbatim,raggedright]
-\context PianoStaff <<
-    \autochange \relative c' {
-       g4 a  b c d r4 a g } }
- >>
+\context PianoStaff
+  \autochange \relative c'
+  {
+    g4 a  b c d r4 a g
+  }
 @end lilypond
 
 
@@ -4631,7 +4632,7 @@ The predefined variables @code{\germanChords},
 @code{\semiGermanChords} set these variables. The effect is
 demonstrated here,
 
-@lilypondfile[notexidoc]{chord-names-german.ly}
+@lilypondfile[]{chord-names-german.ly}
 
 There are also two other chord name schemes implemented: an alternate
 Jazz chord notation, and a systematic scheme called Banter chords. The

diff --git a/input/test/title-markup.ly b/input/test/title-markup.ly
index 5cca51435df6e1adab85571ddba635d9bade74ce..f4f2c7f792f95520522c24a267b07153c1b47a6a 100644 (file)
--- a/input/test/title-markup.ly
+++ b/input/test/title-markup.ly
@@ -32,7 +32,9 @@ For century schoolbook font:
     inputencoding = #"latin1"
 }
 
-latinTest = \markup { \latin-i "Hellö" }
+latinTest = \markup {
+    "Hellö"
+}
     
 sizeTest = \markup {
        \column <
@@ -56,6 +58,8 @@ sizeTest = \markup {
        >
 }
 
+\encoding "latin1"
+
 spaceTest = \markup { "two space chars" }
 \header {
     texidoc = "Make titles using markup.  Only in direct PostScript output."
@@ -67,7 +71,7 @@ spaceTest = \markup { "two space chars" }
     % ugh: encoding char-size
     %dedication = "For my öòóôõø so dear Lily"
     dedication = \markup { "For my "
-                          \latin-i { "öòóôõø" }
+                          "öòóôõø"
                           " so dear Lily" }
     title = "Title"
     subtitle = "(and (the) subtitle)"
@@ -85,9 +89,6 @@ spaceTest = \markup { "two space chars" }
     %% bookTitle = \markup { \fill-line < \huge\bold \title > > }
 }
 
-%% suggest harder :-)
-%% noPagebreak = #(make-event-chord (list (make-penalty-music 0 1e9)))
-
 \book {
     
     \score {
@@ -108,7 +109,7 @@ spaceTest = \markup { "two space chars" }
            
            %% FIXME: TODO factor \pagebreak \noPagebreak into regtest
            %% Without this, page breaks are better, after measure: 12
-           \noPagebreak
+           \noPageBreak
            \repeat unfold 30 { a b c d \break }
            c1
        }

diff --git a/lily/key-signature-interface.cc b/lily/key-signature-interface.cc
index 1990b336a5a3606f0b7a26065c18b3d20a608489..14008669491601e87255fd3db72384a3c6c81354 100644 (file)
--- a/lily/key-signature-interface.cc
+++ b/lily/key-signature-interface.cc
@@ -196,4 +196,4 @@ Key_signature_interface::print (SCM smob)
 
 ADD_INTERFACE (Key_signature_interface, "key-signature-interface",
   "A group of accidentals, to be printed as signature sign.",
-  "c0-position old-accidentals new-accidentals");
+  "style c0-position old-accidentals new-accidentals");

diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index 69da77fe4f68a8bae6cdf441f54161cf5e2f67f6..5b763322442edabb00184caed3306e35bb33a3aa 100644 (file)
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -616,17 +616,14 @@ markup."
         (m (interpret-markup paper props arg)))
     (box-stencil m th pad)))
 
-(if #f
-    (def-markup-command (strut paper props) ()
-      
-      "Create a box of the same height as the space in the current font.
-
-FIXME: is this working? 
-"
-      
-      (let ((m (Text_item::interpret_markup paper props " ")))
-       (ly:stencil-set-extent! m X '(1000 . -1000))
-       m)))
+;FIXME: is this working? 
+(def-markup-command (strut paper props) ()
+  
+  "Create a box of the same height as the space in the current font."
+  
+  (let ((m (Text_item::interpret_markup paper props " ")))
+    (ly:stencil-set-extent! m X '(1000 . -1000))
+    m))
 
 (define number->mark-letter-vector (make-vector 25 #\A))