X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frepeat-acknowledge-engraver.cc;h=d11b633fd5cb4b92ffb32af56f83c340056892bd;hb=5944d20489bb5b8e4c4907fa3b3bcae9ec275ccb;hp=6ebb7199940bb30d66765ec19b5bad54a0feb6ba;hpb=f3cacac4bafd2bace7dd23033618895cf11ef695;p=lilypond.git

diff --git a/lily/repeat-acknowledge-engraver.cc b/lily/repeat-acknowledge-engraver.cc
index 6ebb719994..d11b633fd5 100644
--- a/lily/repeat-acknowledge-engraver.cc
+++ b/lily/repeat-acknowledge-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2000--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2000--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -85,13 +85,14 @@ Repeat_acknowledge_engraver::process_music ()
   while (scm_is_pair (cs))
     {
       SCM command = scm_car (cs);
-      if (command == ly_symbol2scm ("start-repeat"))
+      if (scm_is_eq (command, ly_symbol2scm ("start-repeat")))
         start = true;
-      else if (command == ly_symbol2scm ("end-repeat"))
+      else if (scm_is_eq (command, ly_symbol2scm ("end-repeat")))
         end = true;
-      else if (command == ly_symbol2scm ("segno-display"))
+      else if (scm_is_eq (command, ly_symbol2scm ("segno-display")))
         segno = true;
-      else if (scm_is_pair (command) && scm_car (command) == ly_symbol2scm ("volta"))
+      else if (scm_is_pair (command)
+               && scm_is_eq (scm_car (command), ly_symbol2scm ("volta")))
         volta_found = true;
       cs = scm_cdr (cs);
     }
@@ -102,23 +103,20 @@ Repeat_acknowledge_engraver::process_music ()
   if (segno)
     if (start)
       if (end) // { segno, start, end }
-        s = robust_scm2string (get_property ("doubleRepeatSegnoType"), ":|S|:");
+        s = robust_scm2string (get_property ("doubleRepeatSegnoType"), ":|.S.|:");
       else // { segno, start }
-        s = robust_scm2string (get_property ("startRepeatSegnoType"), ".S|:");
-    else
-      if (end) // { segno, end }
-        s = robust_scm2string (get_property ("endRepeatSegnoType"), ":|S");
-      else // { segno }
-        s = robust_scm2string (get_property ("segnoType"), "S");
-  else
-    if (start)
-      if (end) // { start, end }
-        s = robust_scm2string (get_property ("doubleRepeatType"), ":|:");
-      else // { start }
-        s = robust_scm2string (get_property ("startRepeatType"), "|:");
-    else
-      if (end) // { end }
-        s = robust_scm2string (get_property ("endRepeatType"), ":|");
+        s = robust_scm2string (get_property ("startRepeatSegnoType"), "S.|:");
+    else if (end) // { segno, end }
+      s = robust_scm2string (get_property ("endRepeatSegnoType"), ":|.S");
+    else // { segno }
+      s = robust_scm2string (get_property ("segnoType"), "S");
+  else if (start)
+    if (end) // { start, end }
+      s = robust_scm2string (get_property ("doubleRepeatType"), ":|.|:");
+    else // { start }
+      s = robust_scm2string (get_property ("startRepeatType"), ".|:");
+  else if (end) // { end }
+    s = robust_scm2string (get_property ("endRepeatType"), ":|.");
 
   /*
     TODO: line breaks might be allowed if we set whichBar to "".
@@ -137,6 +135,12 @@ Repeat_acknowledge_engraver::process_music ()
     }
 }
 
+void
+Repeat_acknowledge_engraver::boot ()
+{
+
+}
+
 ADD_TRANSLATOR (Repeat_acknowledge_engraver,
                 /* doc */
                 "Acknowledge repeated music, and convert the contents of"