]> git.donarmstrong.com Git - lilypond.git/commitdiff
Merge branch 'master' into translation
authorJean-Charles Malahieude <lilyfan@orange.fr>
Fri, 20 Mar 2015 18:15:37 +0000 (19:15 +0100)
committerJean-Charles Malahieude <lilyfan@orange.fr>
Fri, 20 Mar 2015 18:15:37 +0000 (19:15 +0100)
55 files changed:
Documentation/changes.tely
Documentation/css/lilypond-website-ie-fixes.css
Documentation/css/lilypond-website.css
Documentation/pictures/background-image.png [deleted file]
Documentation/pictures/background-top-left.png [new file with mode: 0644]
Documentation/pictures/background-top-right.png [new file with mode: 0644]
Documentation/pictures/color1-active.png [deleted file]
Documentation/pictures/color1-hover.png [deleted file]
Documentation/pictures/color2-active.png [deleted file]
Documentation/pictures/color2-hover.png [deleted file]
Documentation/pictures/color3-active.png [deleted file]
Documentation/pictures/color3-hover.png [deleted file]
Documentation/pictures/color4-active.png [deleted file]
Documentation/pictures/color4-hover.png [deleted file]
Documentation/pictures/lily-home-nav-active.png [deleted file]
Documentation/pictures/lily-home-nav-bg.png [deleted file]
Documentation/pictures/lily-home-nav-hover.png [deleted file]
Documentation/pictures/nav-active-2.png [deleted file]
Documentation/pictures/nav-active.png [deleted file]
Documentation/pictures/nav-bg-2.png [deleted file]
Documentation/pictures/nav-bg.png [deleted file]
Documentation/pictures/nav-hover-2.png [deleted file]
Documentation/pictures/nav-hover.png [deleted file]
Documentation/pictures/old-unused-images/background-image.png [new file with mode: 0644]
Documentation/pictures/old-unused-images/color1-active.png [new file with mode: 0644]
Documentation/pictures/old-unused-images/color1-hover.png [new file with mode: 0644]
Documentation/pictures/old-unused-images/color2-active.png [new file with mode: 0644]
Documentation/pictures/old-unused-images/color2-hover.png [new file with mode: 0644]
Documentation/pictures/old-unused-images/color3-active.png [new file with mode: 0644]
Documentation/pictures/old-unused-images/color3-hover.png [new file with mode: 0644]
Documentation/pictures/old-unused-images/color4-active.png [new file with mode: 0644]
Documentation/pictures/old-unused-images/color4-hover.png [new file with mode: 0644]
Documentation/pictures/old-unused-images/lily-home-nav-active.png [new file with mode: 0644]
Documentation/pictures/old-unused-images/lily-home-nav-bg.png [new file with mode: 0644]
Documentation/pictures/old-unused-images/lily-home-nav-hover.png [new file with mode: 0644]
Documentation/pictures/old-unused-images/nav-active-2.png [new file with mode: 0644]
Documentation/pictures/old-unused-images/nav-active.png [new file with mode: 0644]
Documentation/pictures/old-unused-images/nav-bg-2.png [new file with mode: 0644]
Documentation/pictures/old-unused-images/nav-bg.png [new file with mode: 0644]
Documentation/pictures/old-unused-images/nav-hover-2.png [new file with mode: 0644]
Documentation/pictures/old-unused-images/nav-hover.png [new file with mode: 0644]
Documentation/pictures/old-unused-images/squiggle.jpg [new file with mode: 0644]
Documentation/pictures/old-unused-images/summary-gradient.png [new file with mode: 0644]
Documentation/pictures/squiggle.jpg [deleted file]
Documentation/pictures/summary-gradient.png [deleted file]
Documentation/web/news-front.itexi
Documentation/web/news.itexi
VERSION
lily/beam.cc
lily/relocate.cc
lily/stem.cc
ly/Welcome-to-LilyPond-MacOS.ly
ly/Welcome_to_LilyPond.ly
po/lilypond.pot
scm/output-lib.scm

index 46675428be456f07f0270dbecb8405d17f8a9e48..1a5208fbd07a65590c901022a740e9d7e5c1884e 100644 (file)
@@ -66,8 +66,8 @@ Multi-measure rests have length according to their total duration,
 under the control of @code{MultiMeasureRest.space-increment}.
 @lilypond[quote]
 { \compressFullBarRests
-  \override MultiMeasureRest.space-increment = 2.2
-  R1 R1 R1*2 R1*8 R1*24 R1*80 }
+  \override Staff.MultiMeasureRest.space-increment = 3.0
+  R1*2 R1*12 R1*64 }
 @end lilypond
 
 @item
index 86fe49ad87ec1fdbce214b5d9cbe53548ec2b161..9642c087ee18a08b2e04b58ad23b422a6c3c5709 100644 (file)
@@ -32,20 +32,6 @@ div#tocframe {
   background: url(../pictures/nav2-active.png);
 }
 
-/* Divs */
-
-#quickSummary .subheading {
-  background: #fff url(../pictures/summary-gradient.png) repeat-y 0 0;
-}
-
-a[name="Stable"] + h4 {
-  background: #bdee9d url(../pictures/color1-bg.png) repeat-x top left;
-}
-
-a[name="Unstable"] + h4 {
-  background: #fad58c url(../pictures/color3-bg.png) repeat-x top left;
-}
-
 /* Columns */
 
 .column-center-top h3 {
@@ -54,7 +40,8 @@ a[name="Unstable"] + h4 {
 
 .column-left-top h3,
 .column-left-bottom h3,
-.column-center-middle-color2 h3 {
+.column-center-middle-color2 h3,
+.news-item h3 {
   background: #adce82 url(../pictures/color2-bg.png) repeat-x top left;
 }
 
index 30b7cec9f3e2fc6875bc9fe7437b285991fc841b..0115fbd417aa59500bc3f812aada29bfed2bc14d 100644 (file)
@@ -15,10 +15,16 @@ body {
   max-width: 70em;
   font-size: 95%;
   line-height: 1.5;
-  background: #fff url(../pictures/background-image.png) no-repeat 0 0;
   text-align: justify;
   padding: 0;
   margin: 0 auto;
+  background-color: rgb(245, 252, 242);
+  background-image: url(../pictures/background-top-right.png),
+    url(../pictures/background-top-left.png);
+  background-position: top right, top left;
+  background-repeat: no-repeat, no-repeat;
+  /* fallback for IE8 which doesn't support multiple backgrounds */
+  background: url(../pictures/background-top-left.png) no-repeat top left;
 }
 
 hr {
@@ -96,7 +102,7 @@ div#tocframe {
 }
 
 #tocframe > ul:first-child > li:first-child a span {
-  background: url("../pictures/lily-home-32x32.png") no-repeat scroll 0% 40% transparent;
+  background: url(../pictures/lily-home-32x32.png) no-repeat scroll 0% 40% transparent;
   padding: 16px 0px 16px 38px;
 }
 
@@ -125,7 +131,7 @@ div#tocframe {
   width: 92%;
   font-size: 90%;
   color: rgb(85, 85, 85);
-  background: rgb(200, 230, 200);
+  background: rgb(235, 242, 232);
   padding: 0.1em 0.1em 0.1em 0.6em;
   border: 0;
   margin: 0;
@@ -611,7 +617,7 @@ div.float-right a.clickable {
 .column-right-top,
 .column-right-bottom,
 .news-item {
-  background: #f5fffa;
+  background: #fff;
   border-radius: 5px;
 }
 
diff --git a/Documentation/pictures/background-image.png b/Documentation/pictures/background-image.png
deleted file mode 100644 (file)
index 202cf8b..0000000
Binary files a/Documentation/pictures/background-image.png and /dev/null differ
diff --git a/Documentation/pictures/background-top-left.png b/Documentation/pictures/background-top-left.png
new file mode 100644 (file)
index 0000000..0587791
Binary files /dev/null and b/Documentation/pictures/background-top-left.png differ
diff --git a/Documentation/pictures/background-top-right.png b/Documentation/pictures/background-top-right.png
new file mode 100644 (file)
index 0000000..a8a571a
Binary files /dev/null and b/Documentation/pictures/background-top-right.png differ
diff --git a/Documentation/pictures/color1-active.png b/Documentation/pictures/color1-active.png
deleted file mode 100644 (file)
index 37b464a..0000000
Binary files a/Documentation/pictures/color1-active.png and /dev/null differ
diff --git a/Documentation/pictures/color1-hover.png b/Documentation/pictures/color1-hover.png
deleted file mode 100644 (file)
index 23f29ce..0000000
Binary files a/Documentation/pictures/color1-hover.png and /dev/null differ
diff --git a/Documentation/pictures/color2-active.png b/Documentation/pictures/color2-active.png
deleted file mode 100644 (file)
index 8f6ac57..0000000
Binary files a/Documentation/pictures/color2-active.png and /dev/null differ
diff --git a/Documentation/pictures/color2-hover.png b/Documentation/pictures/color2-hover.png
deleted file mode 100644 (file)
index 3232bce..0000000
Binary files a/Documentation/pictures/color2-hover.png and /dev/null differ
diff --git a/Documentation/pictures/color3-active.png b/Documentation/pictures/color3-active.png
deleted file mode 100644 (file)
index b2aed09..0000000
Binary files a/Documentation/pictures/color3-active.png and /dev/null differ
diff --git a/Documentation/pictures/color3-hover.png b/Documentation/pictures/color3-hover.png
deleted file mode 100644 (file)
index b070274..0000000
Binary files a/Documentation/pictures/color3-hover.png and /dev/null differ
diff --git a/Documentation/pictures/color4-active.png b/Documentation/pictures/color4-active.png
deleted file mode 100644 (file)
index 0daee7f..0000000
Binary files a/Documentation/pictures/color4-active.png and /dev/null differ
diff --git a/Documentation/pictures/color4-hover.png b/Documentation/pictures/color4-hover.png
deleted file mode 100644 (file)
index a966248..0000000
Binary files a/Documentation/pictures/color4-hover.png and /dev/null differ
diff --git a/Documentation/pictures/lily-home-nav-active.png b/Documentation/pictures/lily-home-nav-active.png
deleted file mode 100644 (file)
index f3fe2f2..0000000
Binary files a/Documentation/pictures/lily-home-nav-active.png and /dev/null differ
diff --git a/Documentation/pictures/lily-home-nav-bg.png b/Documentation/pictures/lily-home-nav-bg.png
deleted file mode 100644 (file)
index 9a3e4e8..0000000
Binary files a/Documentation/pictures/lily-home-nav-bg.png and /dev/null differ
diff --git a/Documentation/pictures/lily-home-nav-hover.png b/Documentation/pictures/lily-home-nav-hover.png
deleted file mode 100644 (file)
index aaf1c2e..0000000
Binary files a/Documentation/pictures/lily-home-nav-hover.png and /dev/null differ
diff --git a/Documentation/pictures/nav-active-2.png b/Documentation/pictures/nav-active-2.png
deleted file mode 100644 (file)
index af41a69..0000000
Binary files a/Documentation/pictures/nav-active-2.png and /dev/null differ
diff --git a/Documentation/pictures/nav-active.png b/Documentation/pictures/nav-active.png
deleted file mode 100644 (file)
index 2ef6477..0000000
Binary files a/Documentation/pictures/nav-active.png and /dev/null differ
diff --git a/Documentation/pictures/nav-bg-2.png b/Documentation/pictures/nav-bg-2.png
deleted file mode 100644 (file)
index e1ce827..0000000
Binary files a/Documentation/pictures/nav-bg-2.png and /dev/null differ
diff --git a/Documentation/pictures/nav-bg.png b/Documentation/pictures/nav-bg.png
deleted file mode 100644 (file)
index b893d07..0000000
Binary files a/Documentation/pictures/nav-bg.png and /dev/null differ
diff --git a/Documentation/pictures/nav-hover-2.png b/Documentation/pictures/nav-hover-2.png
deleted file mode 100644 (file)
index 84c436b..0000000
Binary files a/Documentation/pictures/nav-hover-2.png and /dev/null differ
diff --git a/Documentation/pictures/nav-hover.png b/Documentation/pictures/nav-hover.png
deleted file mode 100644 (file)
index 3213900..0000000
Binary files a/Documentation/pictures/nav-hover.png and /dev/null differ
diff --git a/Documentation/pictures/old-unused-images/background-image.png b/Documentation/pictures/old-unused-images/background-image.png
new file mode 100644 (file)
index 0000000..202cf8b
Binary files /dev/null and b/Documentation/pictures/old-unused-images/background-image.png differ
diff --git a/Documentation/pictures/old-unused-images/color1-active.png b/Documentation/pictures/old-unused-images/color1-active.png
new file mode 100644 (file)
index 0000000..37b464a
Binary files /dev/null and b/Documentation/pictures/old-unused-images/color1-active.png differ
diff --git a/Documentation/pictures/old-unused-images/color1-hover.png b/Documentation/pictures/old-unused-images/color1-hover.png
new file mode 100644 (file)
index 0000000..23f29ce
Binary files /dev/null and b/Documentation/pictures/old-unused-images/color1-hover.png differ
diff --git a/Documentation/pictures/old-unused-images/color2-active.png b/Documentation/pictures/old-unused-images/color2-active.png
new file mode 100644 (file)
index 0000000..8f6ac57
Binary files /dev/null and b/Documentation/pictures/old-unused-images/color2-active.png differ
diff --git a/Documentation/pictures/old-unused-images/color2-hover.png b/Documentation/pictures/old-unused-images/color2-hover.png
new file mode 100644 (file)
index 0000000..3232bce
Binary files /dev/null and b/Documentation/pictures/old-unused-images/color2-hover.png differ
diff --git a/Documentation/pictures/old-unused-images/color3-active.png b/Documentation/pictures/old-unused-images/color3-active.png
new file mode 100644 (file)
index 0000000..b2aed09
Binary files /dev/null and b/Documentation/pictures/old-unused-images/color3-active.png differ
diff --git a/Documentation/pictures/old-unused-images/color3-hover.png b/Documentation/pictures/old-unused-images/color3-hover.png
new file mode 100644 (file)
index 0000000..b070274
Binary files /dev/null and b/Documentation/pictures/old-unused-images/color3-hover.png differ
diff --git a/Documentation/pictures/old-unused-images/color4-active.png b/Documentation/pictures/old-unused-images/color4-active.png
new file mode 100644 (file)
index 0000000..0daee7f
Binary files /dev/null and b/Documentation/pictures/old-unused-images/color4-active.png differ
diff --git a/Documentation/pictures/old-unused-images/color4-hover.png b/Documentation/pictures/old-unused-images/color4-hover.png
new file mode 100644 (file)
index 0000000..a966248
Binary files /dev/null and b/Documentation/pictures/old-unused-images/color4-hover.png differ
diff --git a/Documentation/pictures/old-unused-images/lily-home-nav-active.png b/Documentation/pictures/old-unused-images/lily-home-nav-active.png
new file mode 100644 (file)
index 0000000..f3fe2f2
Binary files /dev/null and b/Documentation/pictures/old-unused-images/lily-home-nav-active.png differ
diff --git a/Documentation/pictures/old-unused-images/lily-home-nav-bg.png b/Documentation/pictures/old-unused-images/lily-home-nav-bg.png
new file mode 100644 (file)
index 0000000..9a3e4e8
Binary files /dev/null and b/Documentation/pictures/old-unused-images/lily-home-nav-bg.png differ
diff --git a/Documentation/pictures/old-unused-images/lily-home-nav-hover.png b/Documentation/pictures/old-unused-images/lily-home-nav-hover.png
new file mode 100644 (file)
index 0000000..aaf1c2e
Binary files /dev/null and b/Documentation/pictures/old-unused-images/lily-home-nav-hover.png differ
diff --git a/Documentation/pictures/old-unused-images/nav-active-2.png b/Documentation/pictures/old-unused-images/nav-active-2.png
new file mode 100644 (file)
index 0000000..af41a69
Binary files /dev/null and b/Documentation/pictures/old-unused-images/nav-active-2.png differ
diff --git a/Documentation/pictures/old-unused-images/nav-active.png b/Documentation/pictures/old-unused-images/nav-active.png
new file mode 100644 (file)
index 0000000..2ef6477
Binary files /dev/null and b/Documentation/pictures/old-unused-images/nav-active.png differ
diff --git a/Documentation/pictures/old-unused-images/nav-bg-2.png b/Documentation/pictures/old-unused-images/nav-bg-2.png
new file mode 100644 (file)
index 0000000..e1ce827
Binary files /dev/null and b/Documentation/pictures/old-unused-images/nav-bg-2.png differ
diff --git a/Documentation/pictures/old-unused-images/nav-bg.png b/Documentation/pictures/old-unused-images/nav-bg.png
new file mode 100644 (file)
index 0000000..b893d07
Binary files /dev/null and b/Documentation/pictures/old-unused-images/nav-bg.png differ
diff --git a/Documentation/pictures/old-unused-images/nav-hover-2.png b/Documentation/pictures/old-unused-images/nav-hover-2.png
new file mode 100644 (file)
index 0000000..84c436b
Binary files /dev/null and b/Documentation/pictures/old-unused-images/nav-hover-2.png differ
diff --git a/Documentation/pictures/old-unused-images/nav-hover.png b/Documentation/pictures/old-unused-images/nav-hover.png
new file mode 100644 (file)
index 0000000..3213900
Binary files /dev/null and b/Documentation/pictures/old-unused-images/nav-hover.png differ
diff --git a/Documentation/pictures/old-unused-images/squiggle.jpg b/Documentation/pictures/old-unused-images/squiggle.jpg
new file mode 100644 (file)
index 0000000..68adf60
Binary files /dev/null and b/Documentation/pictures/old-unused-images/squiggle.jpg differ
diff --git a/Documentation/pictures/old-unused-images/summary-gradient.png b/Documentation/pictures/old-unused-images/summary-gradient.png
new file mode 100644 (file)
index 0000000..bb72326
Binary files /dev/null and b/Documentation/pictures/old-unused-images/summary-gradient.png differ
diff --git a/Documentation/pictures/squiggle.jpg b/Documentation/pictures/squiggle.jpg
deleted file mode 100644 (file)
index 68adf60..0000000
Binary files a/Documentation/pictures/squiggle.jpg and /dev/null differ
diff --git a/Documentation/pictures/summary-gradient.png b/Documentation/pictures/summary-gradient.png
deleted file mode 100644 (file)
index bb72326..0000000
Binary files a/Documentation/pictures/summary-gradient.png and /dev/null differ
index de8d555c5026ce78fd83a5c4560ebe5343492a61..f96dab2e0a028e66da39655e4eb5cb3c6ec427bc 100644 (file)
@@ -9,18 +9,15 @@
 @c used for news about the upcoming release; see CG 10.2
 
 @newsItem
-@subheading LilyPond 2.19.16 released  @emph{February 28, 2015}
+@subheading LilyPond 2.19.17 released  @emph{March 15, 2015}
 
-At long last, we are very happy to announce the release of LilyPond
-2.19.16.  This release includes a number of enhancements, and contains some
+We are happy to announce the release of LilyPond
+2.19.17.  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.
 
-We would like to acknowledge and thank Masamichi Hosoda for making this
-release possible with his work on updating GUB, the build tool.
-
 @newsEnd
 
 @newsItem
index 79eb3e60760f97db7a9e9c56b8c84eac6be87ae1..e7112a1656159847cdbed09be25a70c6a9469d4d 100644 (file)
@@ -26,6 +26,21 @@ NOTE:
   * don't duplicate entries from news-front.itexi
 @end ignore
 
+@newsItem
+@subheading LilyPond 2.19.16 released  @emph{February 28, 2015}
+
+At long last, we are very happy to announce the release of LilyPond
+2.19.16.  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.
+
+We would like to acknowledge and thank Masamichi Hosoda for making this
+release possible with his work on updating GUB, the build tool.
+
+@newsEnd
+
 @newsItem
 @subheading LilyPond 2.19.15 released  @emph{September 28, 2014}
 
diff --git a/VERSION b/VERSION
index ac4d72dbf96c1c6d6a1d2bf52c3e2ae71ebf5e2b..2a4331999121179c55d1d214f658541fcc7e757a 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,7 +1,7 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=19
-PATCH_LEVEL=17
+PATCH_LEVEL=18
 MY_PATCH_LEVEL=
 VERSION_STABLE=2.18.2
-VERSION_DEVEL=2.19.16
+VERSION_DEVEL=2.19.17
index a9a19b38c72fae30731caa1f58dea78b65499a6d..83b0c743f950d6e396a278b6a537f5f1560b8669 100644 (file)
@@ -870,11 +870,11 @@ Beam::consider_auto_knees (Grob *me)
     {
       Grob *stem = stems[i];
 
-      Interval head_extents = Stem::head_positions (stem);
-      if (!head_extents.is_empty ())
+      Interval head_extents;
+      if (Stem::head_count (stem))
         {
-          head_extents[LEFT] += -1;
-          head_extents[RIGHT] += 1;
+          head_extents = Stem::head_positions (stem);
+          head_extents.widen (1);
           head_extents *= staff_space * 0.5;
 
           /*
index 2adfb6f2f75c759d9b96b3d36fa383470c5975bd..73fde03f15dd77f656712654da90f1c6f5a05d2c 100644 (file)
@@ -181,7 +181,9 @@ setup_paths (char const *argv0_ptr)
         {
           /* Find absolute ARGV0 name, using PATH.  */
           File_path path;
-          path.parse_path (getenv ("PATH"));
+          char *p = getenv ("PATH");
+          if (p)
+            path.parse_path (p);
 
 #ifndef __MINGW32__
           argv0_abs = path.find (argv0_filename.to_string ());
index 045a90760b29d7e916f211e0c46322b99f433ea2..f21e0de6b5dac5b7dffbd0a3b1da25f4fcbb0562 100644 (file)
@@ -110,10 +110,10 @@ Stem::head_positions (Grob *me)
 Real
 Stem::chord_start_y (Grob *me)
 {
-  Interval hp = head_positions (me);
-  if (!hp.is_empty ())
-    return hp[get_grob_direction (me)] * Staff_symbol_referencer::staff_space (me)
-           * 0.5;
+  if (head_count (me))
+    return Staff_symbol_referencer::get_position (last_head (me))
+      * Staff_symbol_referencer::staff_space (me) * 0.5;
+
   return 0;
 }
 
@@ -658,9 +658,9 @@ Stem::calc_default_direction (SCM smob)
 
   Direction dir = CENTER;
   int staff_center = 0;
-  Interval hp = head_positions (me);
-  if (!hp.is_empty ())
+  if (head_count (me))
     {
+      Interval hp = head_positions (me);
       int udistance = (int) (UP * hp[UP] - staff_center);
       int ddistance = (int) (DOWN * hp[DOWN] - staff_center);
 
index 94f010509fbf221e949f1abd54628f55fabfb664..10bd9371aee8a141b07f9c54004c45c5efb92acf 100644 (file)
@@ -23,7 +23,7 @@ That's it.  For more information, visit http://lilypond.org .
 
 %}
 
-\version "2.19.16"  % necessary for upgrading to future LilyPond versions.
+\version "2.19.17"  % necessary for upgrading to future LilyPond versions.
 
 \header{
   title = "A scale in LilyPond"
index 07d7114bd16af16995ad23721cda20e7b2d9de73..6afad0027c26c1b19da913e13017fb8ad6447d2f 100644 (file)
@@ -32,7 +32,7 @@ Good luck with LilyPond!  Happy engraving.
 
 %}
 
-\version "2.19.16"  % necessary for upgrading to future LilyPond versions.
+\version "2.19.17"  % necessary for upgrading to future LilyPond versions.
 
 \header{
   title = "A scale in LilyPond"
index bf9cf6c87be655c1437883b4c69d94f53a1c8a67..fd3b4e072b52ea829abf9b95ae13652834be173d 100644 (file)
@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: lilypond 2.19.16\n"
+"Project-Id-Version: lilypond 2.19.17\n"
 "Report-Msgid-Bugs-To: http://post.gmane.org/post.php?group=gmane.comp.gnu."
 "lilypond.bugs\n"
-"POT-Creation-Date: 2015-02-28 14:31+0000\n"
+"POT-Creation-Date: 2015-03-15 11:17+0000\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"
@@ -2807,28 +2807,28 @@ msgstr ""
 msgid "Relocation : from cwd: argv0=%s\n"
 msgstr ""
 
-#: relocate.cc:194
+#: relocate.cc:196
 #, c-format
 msgid ""
 "Relocation: from PATH=%s\n"
 "argv0=%s\n"
 msgstr ""
 
-#: relocate.cc:220
+#: relocate.cc:222
 msgid "LILYPONDPREFIX is obsolete, use LILYPOND_DATADIR"
 msgstr ""
 
-#: relocate.cc:345
+#: relocate.cc:347
 #, c-format
 msgid "Relocation file: %s"
 msgstr ""
 
-#: relocate.cc:349 source-file.cc:65
+#: relocate.cc:351 source-file.cc:65
 #, c-format
 msgid "cannot open file: `%s'"
 msgstr ""
 
-#: relocate.cc:379
+#: relocate.cc:381
 #, c-format
 msgid "Unknown relocation command %s"
 msgstr ""
@@ -3408,17 +3408,17 @@ msgstr ""
 msgid "not a valid duration string: ~a - ignoring"
 msgstr ""
 
-#: define-music-types.scm:797
+#: define-music-types.scm:798
 #, scheme-format
 msgid "symbol expected: ~S"
 msgstr ""
 
-#: define-music-types.scm:800
+#: define-music-types.scm:801
 #, scheme-format
 msgid "cannot find music object: ~S"
 msgstr ""
 
-#: define-music-types.scm:820
+#: define-music-types.scm:821
 #, scheme-format
 msgid "bad make-music argument: ~S"
 msgstr ""
@@ -3678,67 +3678,67 @@ msgstr ""
 msgid "negative replication count; ignoring"
 msgstr ""
 
-#: music-functions.scm:311
+#: music-functions.scm:310
 #, scheme-format
 msgid "invalid tremolo repeat count: ~a"
 msgstr ""
 
-#: music-functions.scm:340
+#: music-functions.scm:339
 #, scheme-format
 msgid "unknown repeat type `~S': must be volta, unfold, percent, or tremolo"
 msgstr ""
 
-#: music-functions.scm:344
+#: music-functions.scm:343
 msgid "More alternatives than repeats.  Junking excess alternatives"
 msgstr ""
 
-#: music-functions.scm:480
+#: music-functions.scm:479
 #, scheme-format
 msgid "bad grob property path ~a"
 msgstr ""
 
-#: music-functions.scm:779
+#: music-functions.scm:778
 msgid "Bad chord repetition"
 msgstr ""
 
-#: music-functions.scm:884
+#: music-functions.scm:883
 #, scheme-format
 msgid "music expected: ~S"
 msgstr ""
 
-#: music-functions.scm:1226
+#: music-functions.scm:1225
 #, scheme-format
 msgid "cannot find quoted music: `~S'"
 msgstr ""
 
-#: music-functions.scm:1366
+#: music-functions.scm:1365
 msgid "Add @var{octave-shift} to the octave of @var{pitch}."
 msgstr ""
 
-#: music-functions.scm:1429
+#: music-functions.scm:1428
 #, scheme-format
 msgid "Unknown octaveness type: ~S "
 msgstr ""
 
-#: music-functions.scm:1430
+#: music-functions.scm:1429
 msgid "Defaulting to 'any-octave."
 msgstr ""
 
-#: music-functions.scm:1822
+#: music-functions.scm:1821
 #, scheme-format
 msgid "unknown accidental style: ~S"
 msgstr ""
 
-#: music-functions.scm:2040
+#: music-functions.scm:2039
 msgid "Missing duration"
 msgstr ""
 
-#: music-functions.scm:2549
+#: music-functions.scm:2548
 #, scheme-format
 msgid "not a symbol list: ~a"
 msgstr ""
 
-#: music-functions.scm:2552
+#: music-functions.scm:2551
 #, scheme-format
 msgid "conflicting tag group ~a"
 msgstr ""
index 96456b1b77fb436ae4a90b6b7ae851c30fa01678..2b2a65c719f12ec575c6587c206180e8bf89fb8b 100644 (file)
@@ -1187,8 +1187,19 @@ parent or the parent has no setting."
   (let* ((shift-when-alone (ly:grob-property grob 'toward-stem-shift 0.0))
          (shift-in-column (ly:grob-property grob 'toward-stem-shift-in-column))
          (script-column (ly:grob-object grob 'script-column))
-         (shift (if (and (ly:grob? script-column) (number? shift-in-column))
-                    shift-in-column shift-when-alone))
+         (shift
+           (if (and (ly:grob? script-column)
+                    (number? shift-in-column)
+                    ;; ScriptColumn can contain grobs other than Script.
+                    ;; These should not result in a shift.
+                    (any (lambda (s)
+                           (and (not (eq? s grob))
+                                (grob::has-interface s 'script-interface)
+                                (not (grob::has-interface s
+                                       'accidental-suggestion-interface))))
+                         (ly:grob-array->list
+                           (ly:grob-object script-column 'scripts))))
+               shift-in-column shift-when-alone))
          (note-head-location
           (ly:self-alignment-interface::aligned-on-x-parent grob))
          (note-head-grob (ly:grob-parent grob X))