Merge branch 'master' into translation

diff --git a/Documentation/web/news-headlines.itexi b/Documentation/web/news-headlines.itexi
index 6c425da20bab9c30e2d7feda886ae80bb7d08dce..8dff7d4e837955039372af63c5ef4611d4db4021 100644 (file)
--- a/Documentation/web/news-headlines.itexi
+++ b/Documentation/web/news-headlines.itexi
@@ -11,7 +11,7 @@
 @ifclear web_version
   @c no anchor links, just link to News page
 
-@ref{News, LilyPond 2.19.57 released - @emph{March 12, 2017}}
+@ref{News, LilyPond 2.19.58 released - @emph{March 26, 2017}}
 
 @ref{News, Two LilyPond projects in Google Summer of Code 2016 - @emph{April 23, 2016}}
 
@@ -23,8 +23,8 @@
 @ifset web_version
   @c anchor links, link to individual news items by their <a> tag
 
-@uref{news.html#LilyPond-2_002e19_002e57-released-March-12_002c-2017,
-  LilyPond 2.19.57 released - @emph{March 12, 2017}}
+@uref{news.html#LilyPond-2_002e19_002e58-released-March-26_002c-2017,
+  LilyPond 2.19.58 released - @emph{March 26, 2017}}
 
 @uref{news.html#Two-LilyPond-projects-in-Google-Summer-of-Code-2016-April-23_002c-2016,
   Two LilyPond projects in Google Summer of Code 2016 - @emph{April 23, 2016}}

diff --git a/Documentation/web/news-new.itexi b/Documentation/web/news-new.itexi
index 2b72da7b921880e6e93012e3def942750f20740e..c20370a91b3d59596ce8b4759ca572a4ea1d0d29 100644 (file)
--- a/Documentation/web/news-new.itexi
+++ b/Documentation/web/news-new.itexi
@@ -9,10 +9,10 @@
 @c used for news about the upcoming release; see CG on Release Work
 
 @newsItem
-@subheading LilyPond 2.19.57 released  @emph{March 12, 2017}
+@subheading LilyPond 2.19.58 released  @emph{March 26, 2017}
 
 We are happy to announce the release of LilyPond
-2.19.57.  This release includes a number of enhancements, and contains some
+2.19.58.  This release includes a number of enhancements, and contains some
 work in progress.  You will have access to the very latest features, but
 some may be incomplete, and you may encounter bugs and crashes.  If you
 require a stable version of LilyPond, we recommend using the 2.18

diff --git a/Documentation/web/news-old.itexi b/Documentation/web/news-old.itexi
index a68b5cc8616ce18d87b5f50b1eccdac1d0444a35..8219c23c879518c552c9a9f2aa569af653813581 100644 (file)
--- a/Documentation/web/news-old.itexi
+++ b/Documentation/web/news-old.itexi
@@ -26,6 +26,18 @@ NOTE:
   * don't duplicate entries from news-new.itexi
 @end ignore
 
+@newsItem
+@subheading LilyPond 2.19.57 released  @emph{March 12, 2017}
+
+We are happy to announce the release of LilyPond
+2.19.57.  This release includes a number of enhancements, and contains some
+work in progress.  You will have access to the very latest features, but
+some may be incomplete, and you may encounter bugs and crashes.  If you
+require a stable version of LilyPond, we recommend using the 2.18
+version.
+
+@newsEnd
+
 @newsItem
 @subheading LilyPond 2.19.56 released  @emph{February 26, 2017}
 

diff --git a/VERSION b/VERSION
index e45a13f4608444f346242dd1c899b07de5338d73..d4b2aa989e9d81eb8c152a75f8d57b60ed156d56 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,7 +1,7 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=19
-PATCH_LEVEL=58
+PATCH_LEVEL=59
 MY_PATCH_LEVEL=
 VERSION_STABLE=2.18.2
-VERSION_DEVEL=2.19.57
+VERSION_DEVEL=2.19.58

diff --git a/input/regression/display-lily-tests.ly b/input/regression/display-lily-tests.ly
index 79f64d4e42dda360c064d2469df351ff58e3cea1..55d86c3516f10c2ef955b7ebfe1ef463978c6a18 100644 (file)
--- a/input/regression/display-lily-tests.ly
+++ b/input/regression/display-lily-tests.ly
@@ -157,6 +157,9 @@ stderr of this run."
 
 %% Marks
 \test ##[ \mark \default #]                    % MarkEvent
+\test ##[ \mark #3 #]
+\test ##[ \mark "Z" #]
+\test ##[ \mark \markup \italic "X" #]
 \test ##[ \mark "Allegro" #]
 \test ##[ \tempo 4 = 120 #]                    % MetronomeChangeEvent
 \test ##[ \tempo 4 = 108 - 116 #]
@@ -212,12 +215,12 @@ stderr of this run."
   \remove "Clef_engraver"
 } { c4 d4 } #]
 %% Context properties
-\test ##[ \once \set Score . skipBars = ##t #]         % PropertySet
+\test ##[ \once \set Score.skipBars = ##t #]           % PropertySet
 \test ##[ \set autoBeaming = ##f #]
-\test ##[ \unset Score . skipBars #]           % PropertyUnset
+\test ##[ \unset Score.skipBars #]                     % PropertyUnset
 \test ##[ \unset autoBeaming #]
 %% Layout properties
-\test ##[ \override Staff.Stem.thickness = #4.0 #]             % OverrideProperty
+\test ##[ \override Staff.Stem.thickness = #4.0 #]     % OverrideProperty
 \test ##[ \once \override Beam.beam-thickness = #0.6 #]
 \test ##[ \revert Staff.Stem.thickness #]              % RevertProperty
 \test ##[ \revert Beam.beam-thickness #]

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 2242a44f22c4ac7d045b0e434e85f4985bde0473..b96ef69182b2ceb80abdb3e141180ca45c1db2e8 100644 (file)
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -146,14 +146,16 @@ Mark_engraver::process_music ()
               m = scm_call_2 (proc, m, context ()->self_scm ());
             }
           else
-            /* FIXME: constant error message.  */
-            warning (_ ("rehearsalMark must have integer value"));
+            /* Score.rehearsalMark is initialized to #1 so we
+               never should see this case without user error */
+            mark_ev_->origin ()->warning
+              (_ ("rehearsalMark must have integer value"));
         }
 
       if (Text_interface::is_markup (m))
         text_->set_property ("text", m);
       else
-        warning (_ ("mark label must be a markup object"));
+        mark_ev_->origin ()->warning (_ ("mark label must be a markup object"));
     }
 }
 

diff --git a/ly/Welcome-to-LilyPond-MacOS.ly b/ly/Welcome-to-LilyPond-MacOS.ly
index 687f5bc6e8dfd7f55d0e2ff2d612a37a0418d1b3..1cb10f1e666fe99cadea5bd67de1ac4cb29b199b 100644 (file)
--- a/ly/Welcome-to-LilyPond-MacOS.ly
+++ b/ly/Welcome-to-LilyPond-MacOS.ly
@@ -23,7 +23,7 @@ That's it.  For more information, visit http://lilypond.org .
 
 %}
 
-\version "2.19.57"  % necessary for upgrading to future LilyPond versions.
+\version "2.19.58"  % necessary for upgrading to future LilyPond versions.
 
 \header{
   title = "A scale in LilyPond"

diff --git a/ly/Welcome_to_LilyPond.ly b/ly/Welcome_to_LilyPond.ly
index be52e680a9ec43e96a37014c1df459cdaef5c7ee..5d18550614bbc44662e7d47dffba869d694806d0 100644 (file)
--- a/ly/Welcome_to_LilyPond.ly
+++ b/ly/Welcome_to_LilyPond.ly
@@ -32,7 +32,7 @@ Good luck with LilyPond!  Happy engraving.
 
 %}
 
-\version "2.19.57"  % necessary for upgrading to future LilyPond versions.
+\version "2.19.58"  % necessary for upgrading to future LilyPond versions.
 
 \header{
   title = "A scale in LilyPond"

diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly
index 4bd7d03fa69fd03fdfa45fe7cb5295470878bc0f..783bed0288437e514e80486317c0f78a2e813744 100644 (file)
--- a/ly/music-functions-init.ly
+++ b/ly/music-functions-init.ly
@@ -830,20 +830,11 @@ transpose from @var{around} to @var{to}.")
    (music-invert around to music))
 
 mark =
-#(define-music-function
-   (label) ((number-or-markup?))
-  "Make the music for the \\mark command."
-  (let* ((set (and (integer? label)
-                   (context-spec-music (make-property-set 'rehearsalMark label)
-                                      'Score)))
-         (ev (make-music 'MarkEvent
-                         'origin (*location*))))
-
-    (if set
-        (make-sequential-music (list set ev))
-        (begin
-          (if label (set! (ly:music-property ev 'label) label))
-          ev))))
+#(define-music-function (label) ((number-or-markup?))
+   "Make the music for the \\mark command."
+   (if label
+       (make-music 'MarkEvent 'label label)
+       (make-music 'MarkEvent)))
 
 markupMap =
 #(define-music-function (path markupfun music)

diff --git a/ly/scheme-sandbox.ly b/ly/scheme-sandbox.ly
index 7dec0dcd1c157aed892b4e152bd54bcc5d2643ac..1f233c0cfa46ce064fcedca2a47bde87408849f3 100644 (file)
--- a/ly/scheme-sandbox.ly
+++ b/ly/scheme-sandbox.ly
@@ -13,4 +13,8 @@
 % requirements may be different.
 
 #(newline)
-#(scm-style-repl)
+#(if (guile-v2)
+     (begin
+       (use-modules (system repl repl))
+       (start-repl))
+     (scm-style-repl))

diff --git a/po/lilypond.pot b/po/lilypond.pot
index 0bfbc678d7917cb943e776537d3d52680cffe513..b00ea2765c2e1c239cb089bc6da73ebc5e1136fa 100644 (file)
--- a/po/lilypond.pot
+++ b/po/lilypond.pot
@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: lilypond 2.19.57\n"
+"Project-Id-Version: lilypond 2.19.58\n"
 "Report-Msgid-Bugs-To: http://post.gmane.org/post.php?group=gmane.comp.gnu."
 "lilypond.bugs\n"
-"POT-Creation-Date: 2017-03-12 11:24+0000\n"
+"POT-Creation-Date: 2017-03-26 11:21+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3387,7 +3387,8 @@ msgid "markup outside of text script or \\lyricmode"
 msgstr ""
 
 #: parser.yy:3603
-msgid "unrecognized string, not in text script or \\lyricmode"
+#, c-format
+msgid "not a note name: %s"
 msgstr ""
 
 #: parser.yy:3755 parser.yy:3764
@@ -3767,17 +3768,17 @@ msgstr ""
 msgid "Exporting font file `~a'."
 msgstr ""
 
-#: framework-ps.scm:543
+#: framework-ps.scm:542
 #, scheme-format
-msgid "Font export directory `~a' already exists."
+msgid "Making font export directory `~a'."
 msgstr ""
 
-#: framework-ps.scm:546
+#: framework-ps.scm:554
 #, scheme-format
-msgid "Making font export directory `~a'."
+msgid "Font export directory `~a' already exists."
 msgstr ""
 
-#: framework-ps.scm:892
+#: framework-ps.scm:901
 msgid ""
 "\n"
 "The PostScript backend does not support the\n"

diff --git a/scm/define-music-display-methods.scm b/scm/define-music-display-methods.scm
index aa87f9978c3ac0ace19b003a34180d2b47ff92f7..a61c2e8b18e9895d7c0d9613f309427cb91d4768 100644 (file)
--- a/scm/define-music-display-methods.scm
+++ b/scm/define-music-display-methods.scm
@@ -537,10 +537,9 @@ expression."
   (music->lily-string (ly:music-property chord 'element)))
 
 (define-display-method MarkEvent (mark)
-  (let ((label (ly:music-property mark 'label)))
-    (if (null? label)
-        "\\mark \\default"
-        (format #f "\\mark ~a" (markup->lily-string label)))))
+  (let ((label (ly:music-property mark 'label #f)))
+    (string-append "\\mark "
+                   (if label (value->lily-string label) "\\default"))))
 
 (define-display-method KeyChangeEvent (key)
   (let ((pitch-alist (ly:music-property key 'pitch-alist))
@@ -785,8 +784,6 @@ Otherwise, return #f."
 (define-public (value->lily-string arg)
   (cond ((ly:music? arg)
          (music->lily-string arg))
-        ((string? arg)
-         (format #f "#~s" arg))
         ((markup? arg)
          (markup->lily-string arg))
         ((ly:duration? arg)
@@ -806,9 +803,9 @@ Otherwise, return #f."
             (if (and (not (null? once)))
                 "\\once "
                 "")
-            (if (eqv? (*current-context*) 'Bottom)
+            (if (eq? (*current-context*) 'Bottom)
                 ""
-                (format #f "~a . " (*current-context*)))
+                (format #f "~a." (*current-context*)))
             property
             (value->lily-string value)
             (new-line->lily-string))))
@@ -816,9 +813,9 @@ Otherwise, return #f."
 (define-display-method PropertyUnset (expr)
   (format #f "~a\\unset ~a~a~a"
           (if (ly:music-property expr 'once #f) "\\once " "")
-          (if (eqv? (*current-context*) 'Bottom)
+          (if (eq? (*current-context*) 'Bottom)
               ""
-              (format #f "~a . " (*current-context*)))
+              (format #f "~a." (*current-context*)))
           (ly:music-property expr 'symbol)
           (new-line->lily-string)))
 

diff --git a/scm/define-music-properties.scm b/scm/define-music-properties.scm
index f8c567d1fa09d50958744e22e18166b8c1ec67d5..211af8afb366b1f5cde58fec3c349a0169dc85f1 100644 (file)
--- a/scm/define-music-properties.scm
+++ b/scm/define-music-properties.scm
@@ -108,7 +108,7 @@ property, e.g., @code{(beamed-lengths details)}.")
      (iterator-ctor ,procedure? "Function to construct a
 @code{music-event-iterator} object for this music.")
 
-     (label ,markup? "Label of a mark.")
+     (label ,number-or-markup? "Label of a mark.")
      (last-pitch ,ly:pitch? "The last pitch after relativization.")
      (length ,ly:moment? "The duration of this music.")
      (length-callback ,procedure? "How to compute the duration of this music.