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 95a8240546ff6f343be84455b6ff90b653f66e40..ea58f737f6265aba8d18968243a86bbe28536e81 100644 (file)
--- a/Documentation/snippets/fretted-string-harmonics-in-tablature.ly
+++ b/Documentation/snippets/fretted-string-harmonics-in-tablature.ly
@@ -1,52 +1,44 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.13.49
-\version "2.13.49"
+%% DO NOT EDIT this file manually; it is automatically
+%% 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.18.0"
 
 \header {
-%% Translation of GIT committish: 69d7781c6ab26df02bc81ff1eb294d47fa673491
-  texidoces = "
-Armónicos sobre cuerdas pisadas (armónicos artificiales):
-"
-  doctitlees = "Armónicos sobre cuerdas pisadas en tablatura"
-
-
-
   lsrtags = "fretted-strings"
+
   texidoc = "
-Fretted-string harmonics:
+Demonstrates fretted-string harmonics in tablature
+
 "
   doctitle = "Fretted-string harmonics in tablature"
 } % begin verbatim
 
-
 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 = {
   %artificial harmonics (AH)
   \textLengthOn
-  <\parenthesize b b''\harmonic>4_\markup{ \teeny "AH 16" }
-  <\parenthesize g g''\harmonic>4_\markup{ \teeny "AH 17" }
-  <\parenthesize d' d'''\harmonic>2_\markup{ \teeny "AH 19" }
+  <\parenthesize b b'\harmonic>4_\markup{ \teeny "AH 16" }
+  <\parenthesize g g'\harmonic>4_\markup{ \teeny "AH 17" }
+  <\parenthesize d' d''\harmonic>2_\markup{ \teeny "AH 19" }
   %pinched harmonics (PH)
   \pinchedHarmonics
   <a'\harmonic>2\startTextSpan
-  <g'\harmonic>4
+  <d''\harmonic>4
   <e'\harmonic>4\stopTextSpan
   %tapped harmonics (TH)
   <\parenthesize g\4 g'\harmonic>4_\markup{ \teeny "TH 17" }
@@ -67,15 +59,16 @@ frettedStrings = {
   \harmonicByFret #7 a4\5
   %tapped harmonics (TH)
   \harmonicByFret #5 d4\4
-  \harmonicByFret #5 d4\4
-  \harmonicByFret #4 g2\3
+  \harmonicByFret #7 d4\4
+  \harmonicByFret #5 g2\3
   %touch harmonics (TCH)
   a4 \harmonicByFret #9 g2.\3
 }
 
 \score {
   <<
-    \new Staff {
+    \new Staff
+    \with { \omit StringNumber } {
       \new Voice {
         \clef "treble_8"
         \harmonics