X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frepeat-acknowledge-engraver.cc;h=3d988c2c4963b3a3f79ecce2b55fd91770523d9c;hb=1fbcdfde9bd883e77cbf8e334ec22ad366bbabf4;hp=cf42756f144d2729146a09d412a305cd8fbb9d81;hpb=def21b306e2b8fa2d5630fab0878e9922e197f0c;p=lilypond.git

diff --git a/lily/repeat-acknowledge-engraver.cc b/lily/repeat-acknowledge-engraver.cc
index cf42756f14..3d988c2c49 100644
--- a/lily/repeat-acknowledge-engraver.cc
+++ b/lily/repeat-acknowledge-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  repeat-acknowledge-engraver.cc -- implement Repeat_acknowledge_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2000--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2000--2007 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "engraver.hh"
@@ -74,16 +85,16 @@ Repeat_acknowledge_engraver::process_music ()
     {
       SCM command = scm_car (cs);
       if (command == ly_symbol2scm ("start-repeat"))
-	start = true;
+        start = true;
       else if (command == ly_symbol2scm ("end-repeat"))
-	end = true;
+        end = true;
       else if (scm_is_pair (command) && scm_car (command) == ly_symbol2scm ("volta"))
-	volta_found = true;
+        volta_found = true;
       cs = scm_cdr (cs);
     }
 
   if (start && end)
-    s = ":|:";
+    s = robust_scm2string (get_property ("doubleRepeatType"), ":|:");
   else if (start)
     s = "|:";
   else if (end)
@@ -102,23 +113,24 @@ Repeat_acknowledge_engraver::process_music ()
   if (!scm_is_string (wb) || ly_is_equal (db, wb))
     {
       if (s != "" || (volta_found && !scm_is_string (wb)))
-	context ()->set_property ("whichBar", ly_string2scm (s));
+        context ()->set_property ("whichBar", ly_string2scm (s));
     }
 }
 
 ADD_TRANSLATOR (Repeat_acknowledge_engraver,
-		/* doc */
-		"Acknowledge repeated music, and convert the contents of"
-		" @code{repeatCommands} into an appropriate setting for"
-		" @code{whichBar}.",
-
-		/* create */
-		"",
-
-		/* read */
-		"repeatCommands "
-		"whichBar ",
-
-		/* write */
-		""
-		);
+                /* doc */
+                "Acknowledge repeated music, and convert the contents of"
+                " @code{repeatCommands} into an appropriate setting for"
+                " @code{whichBar}.",
+
+                /* create */
+                "",
+
+                /* read */
+                "doubleRepeatType "
+                "repeatCommands "
+                "whichBar ",
+
+                /* write */
+                ""
+               );