Merge remote-tracking branch 'origin/master' into translation

[lilypond.git] / Documentation / snippets / fretted-string-harmonics-in-tablature.ly

diff --git a/Documentation/snippets/fretted-string-harmonics-in-tablature.ly b/Documentation/snippets/fretted-string-harmonics-in-tablature.ly
index 1878ecf648f9797ddf3ca8df1d22dab472bb2a74..ea58f737f6265aba8d18968243a86bbe28536e81 100644 (file)
--- a/Documentation/snippets/fretted-string-harmonics-in-tablature.ly
+++ b/Documentation/snippets/fretted-string-harmonics-in-tablature.ly
@@ -1,35 +1,14 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.2"
+\version "2.18.0"
 
 \header {
   lsrtags = "fretted-strings"
 
-%% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
-  texidoces = "
-Armónicos sobre cuerdas pisadas (armónicos artificiales):
-"
-  doctitlees = "Armónicos sobre cuerdas pisadas en tablatura"
-
-
-
-%% Translation of GIT committish: f86f00c1a8de0f034ba48506de2801c074bd5422
-  texidocde = "
-Flageolett für Bundinstrumente:
-"
-  doctitlede = "Flageolett von Bundinstrumenten in einer Tabulatur"
-
-%% Translation of GIT committish: 40bf2b38d674c43f38058494692d1a0993fad0bd
-  texidocfr = "
-Harmoniques et tablature (harmoniques artificielles)
-"
-  doctitlefr = "Harmoniques et tablature"
-
-
   texidoc = "
 Demonstrates fretted-string harmonics in tablature
 
@@ -39,15 +18,15 @@ Demonstrates fretted-string harmonics in tablature
 
 pinchedHarmonics = {
    \textSpannerDown
-   \override TextSpanner #'bound-details #'left #'text =
+   \override TextSpanner.bound-details.left.text =
       \markup {\halign #-0.5 \teeny "PH" }
-      \override TextSpanner #'style =
+      \override TextSpanner.style =
          #'dashed-line
-   \override TextSpanner #'dash-period = #0.6
-   \override TextSpanner #'bound-details #'right #'attach-dir = #1
-   \override TextSpanner #'bound-details #'right #'text =
+   \override TextSpanner.dash-period = #0.6
+   \override TextSpanner.bound-details.right.attach-dir = #1
+   \override TextSpanner.bound-details.right.text =
       \markup { \draw-line #'(0 . 1) }
-   \override TextSpanner #'bound-details #'right #'padding = #-0.5
+   \override TextSpanner.bound-details.right.padding = #-0.5
 }
 
 harmonics = {
@@ -88,7 +67,8 @@ frettedStrings = {
 
 \score {
   <<
-    \new Staff {
+    \new Staff
+    \with { \omit StringNumber } {
       \new Voice {
         \clef "treble_8"
         \harmonics