resolve merge

[lilypond.git] / input / lsr / how-to-change-fret-diagram-position.ly

diff --git a/input/lsr/how-to-change-fret-diagram-position.ly b/input/lsr/how-to-change-fret-diagram-position.ly
deleted file mode 100644 (file)
index 17997e9..0000000
--- a/input/lsr/how-to-change-fret-diagram-position.ly
+++ /dev/null
@@ -1,58 +0,0 @@
-%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
-%% This file is in the public domain.
-\version "2.12.3"
-
-\header {
-  lsrtags = "fretted-strings, tweaks-and-overrides"
-
-  texidoc = "
-If you want to move the position of a fret diagram, for example, to
-avoid collision, or to place it between two notes, you have various
-possibilities:
-
-1) modify #'padding or #'extra-offset values (as shown in the first
-snippet)
-
-2) you can add an invisible voice and attach the fret diagrams to the
-invisible notes in that voice (as shown in the second example).
-
- If you need to move the fret according with a rythmic position inside
-the bar (in the example, the third beat of the measure) the second
-example is better, because the fret is aligned with the third beat
-itself.  
-
-"
-  doctitle = "How to change fret diagram position"
-} % begin verbatim
-
-harmonies = \chordmode
-{
-  a8:13
-% THE FOLLOWING IS THE COMMAND TO MOVE THE CHORD NAME
-  \once \override ChordNames.ChordName #'extra-offset = #'(10 . 0)
-  b8:13 s2.
-% THIS LINE IS THE SECOND METHOD
-    s4 s4  b4:13
-}
-
-\score
-{
-  <<
-    \context ChordNames \harmonies
-    \context Staff
-    {a8^\markup { \fret-diagram  #"6-x;5-0;4-2;3-0;2-0;1-2;"  }
-% THE FOLLOWING IS THE COMMAND TO MOVE THE FRET DIAGRAM
-     \once \override TextScript #'extra-offset = #'(10 . 0)
-     b4.~^\markup { \fret-diagram  #"6-x;5-2;4-4;3-2;2-2;1-4;"  } b4. a8\break
-% HERE IS THE SECOND METHOD
-     <<
-       { a8 b4.~ b4. a8} 
-       { s4 s4 s4^\markup { \fret-diagram  #"6-x;5-2;4-4;3-2;2-2;1-4;"  }
-       }
-     >>
-   }
-  >>
-}
-
-
-