* lily/my-lily-lexer.cc (start_main_input): define input-file-name

[lilypond.git] / ly / chord-modifiers-init.ly

diff --git a/ly/chord-modifiers-init.ly b/ly/chord-modifiers-init.ly
index c12446db3d9dcee995a2b5489310a6fa98fb0012..a5c99754cc5910880389bf0bb2c140cfa14f4daf 100644 (file)
--- a/ly/chord-modifiers-init.ly
+++ b/ly/chord-modifiers-init.ly
@@ -2,31 +2,31 @@
 
 \chordmodifiers #default-chord-modifier-list
 
-whiteTriangleMarkup = #(make-override@\markup
-                       '(font-family . math) (make-simple@\markup "M"))
+whiteTriangleMarkup = #(make-override-markup
+                       '(font-family . math) (make-simple-markup "M"))
 
-blackTriangleMarkup = #(make-override@\markup
-                       '(font-family . math) (make-simple@\markup "N"))
+blackTriangleMarkup = #(make-override-markup
+                       '(font-family . math) (make-simple-markup "N"))
 
 ignatzekExceptionMusic = \notes{
-       <<c e gis>>1\markup { "+" }
-       <<c es ges>>\markup { \super "o" } % should be $\circ$ ?
-       <<c es ges bes>>\markup { \super \combine "o" "/" }
-       <<c es ges beses>>\markup { \super  "o7" }
+       <<c e gis>>1-\markup { "+" }
+       <<c es ges>>-\markup { \super "o" } % should be $\circ$ ?
+       <<c es ges bes>>-\markup { \super \combine "o" "/" }
+       <<c es ges beses>>-\markup { \super  "o7" }
 }
 
 ignatzekExceptions = #(sequential-music-to-chord-exceptions
                       ignatzekExceptionMusic #t)
 
 partialJazzMusic = \notes{
-    <<c d>>1\markup { \normal-size-super "2" }
-    <<c es>>\markup { "m" }
-    <<c f>>\markup { \normal-size-super "sus4" }
-    <<c g>>\markup { \normal-size-super "5" }
+    <<c d>>1-\markup { \normal-size-super "2" }
+    <<c es>>-\markup { "m" }
+    <<c f>>-\markup { \normal-size-super "sus4" }
+    <<c g>>-\markup { \normal-size-super "5" }
     
     %% TODO, partial exceptions
-    <<c es f>>\markup { "m" }\markup { \normal-size-super "sus4" }
-    <<c d es>>\markup { "m" }\markup { \normal-size-super "sus2" }
+    <<c es f>>-\markup { "m" }-\markup { \normal-size-super "sus4" }
+    <<c d es>>-\markup { "m" }-\markup { \normal-size-super "sus2" }
 }
 
 %% TODO: compatibility ignatzek code