From: Neil Puttock Date: Fri, 4 Mar 2011 22:59:38 +0000 (+0000) Subject: Docs: Rename new snippets to ensure doctitles match file names. X-Git-Tag: release/2.13.53-1~12 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=da34fdfe2057ebaae080e20b5875f35e96010f40;p=lilypond.git Docs: Rename new snippets to ensure doctitles match file names. This is important for when these snippets are migrated to LSR since it uses the titles to generate the file names in the docs tarball. --- diff --git a/Documentation/notation/fretted-strings.itely b/Documentation/notation/fretted-strings.itely index 3c5161ebe6..c60ddd4e4e 100644 --- a/Documentation/notation/fretted-strings.itely +++ b/Documentation/notation/fretted-strings.itely @@ -434,16 +434,16 @@ ratioHarmonics = { {polyphony-in-tablature.ly} @lilypondfile[verbatim,lilyquote,texidoc,doctitle] -{tablature-open-string-harmonics.ly} +{open-string-harmonics-in-tablature.ly} @lilypondfile[verbatim,lilyquote,texidoc,doctitle] -{tablature-fretted-string-harmonics.ly} +{fretted-string-harmonics-in-tablature.ly} @lilypondfile[verbatim,lilyquote,texidoc,doctitle] -{tablature-slides.ly} +{slides-in-tablature.ly} @lilypondfile[verbatim,lilyquote,texidoc,doctitle] -{tablature-chord-glissando.ly} +{chord-glissando-in-tablature.ly} @seealso diff --git a/Documentation/snippets/new/chord-glissando-in-tablature.ly b/Documentation/snippets/new/chord-glissando-in-tablature.ly new file mode 100644 index 0000000000..e3d3f610ae --- /dev/null +++ b/Documentation/snippets/new/chord-glissando-in-tablature.ly @@ -0,0 +1,31 @@ +\version "2.13.53" + +\header { + lsrtags = "fretted-strings" + texidoc = " +Slides for chords can be indicated in both Staff and TabStaff. +String numbers are necessary for TabStaff because automatic +string calculations are different for chords and for single notes, +and @code{\chordGlissando} draws lines between single notes. +" + doctitle = "Chord glissando in tablature" +} + +\include "chord-glissando-init.ly" + +myMusic = \relative c' { + \chordGlissando + 8 +} + +\score { + << + \new Staff { + \clef "treble_8" + \myMusic + } + \new TabStaff { + \myMusic + } + >> +} diff --git a/Documentation/snippets/new/fretted-string-harmonics-in-tablature.ly b/Documentation/snippets/new/fretted-string-harmonics-in-tablature.ly new file mode 100644 index 0000000000..44ce72ceb2 --- /dev/null +++ b/Documentation/snippets/new/fretted-string-harmonics-in-tablature.ly @@ -0,0 +1,74 @@ +\version "2.13.49" + +\header { + lsrtags = "fretted-strings" + texidoc = " +Fretted-string harmonics: +" + doctitle = "Fretted-string harmonics in tablature" +} + +pinchedHarmonics = { + \textSpannerDown + \override TextSpanner #'bound-details #'left #'text = + \markup {\halign #-0.5 \teeny "PH" } + \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 = + \markup { \draw-line #'(0 . 1) } + \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" } + %pinched harmonics (PH) + \pinchedHarmonics + 2\startTextSpan + 4 + 4\stopTextSpan + %tapped harmonics (TH) + <\parenthesize g\4 g'\harmonic>4_\markup{ \teeny "TH 17" } + <\parenthesize a\4 a'\harmonic>4_\markup{ \teeny "TH 19" } + <\parenthesize c'\3 c''\harmonic>2_\markup{ \teeny "TH 17" } + %touch harmonics (TCH) + a4( 2. )_\markup{ \teeny "TCH" } +} + +frettedStrings = { + %artificial harmonics (AH) + \harmonicByFret #4 g4\3 + \harmonicByFret #5 d4\4 + \harmonicByFret #7 g2\3 + %pinched harmonics (PH) + \harmonicByFret #7 d2\4 + \harmonicByFret #5 d4\4 + \harmonicByFret #7 a4\5 + %tapped harmonics (TH) + \harmonicByFret #5 d4\4 + \harmonicByFret #5 d4\4 + \harmonicByFret #4 g2\3 + %touch harmonics (TCH) + a4 \harmonicByFret #9 g2.\3 +} + +\score { + << + \new Staff { + \new Voice { + \clef "treble_8" + \harmonics + } + } + \new TabStaff { + \new TabVoice { + \frettedStrings + } + } + >> +} diff --git a/Documentation/snippets/new/open-string-harmonics-in-tablature.ly b/Documentation/snippets/new/open-string-harmonics-in-tablature.ly new file mode 100644 index 0000000000..3524d28db8 --- /dev/null +++ b/Documentation/snippets/new/open-string-harmonics-in-tablature.ly @@ -0,0 +1,64 @@ +\version "2.13.49" + +\header { + lsrtags = "fretted-strings" + texidoc = " +Reference for open-string harmonics: +" + doctitle = "Reference for open-string harmonics" +} + +openStringHarmonics = { + %first harmonic + \harmonicByFret #12 e,2\6_\markup{"1st harm."} + \harmonicByRatio #1/2 e,\6 + %second harmonic + \harmonicByFret #7 e,\6_\markup{"2nd harm. - - - -"} + \harmonicByRatio #1/3 e,\6 + \harmonicByFret #19 e,\6 + \harmonicByRatio #2/3 e,\6 + %\harmonicByFret #19 < e,\6 a,\5 d\4 > + %\harmonicByRatio #2/3 < e,\6 a,\5 d\4 > + %third harmonic + \harmonicByFret #5 e,\6_\markup{"3rd harm. - - - -"} + \harmonicByRatio #1/4 e,\6 + \harmonicByFret #24 e,\6 + \harmonicByRatio #3/4 e,\6 + \break + %fourth harmonic + \harmonicByFret #4 e,\6_\markup{"4th harm. - - - - - - - - - - - - -"} + \harmonicByRatio #1/5 e,\6 + \harmonicByFret #9 e,\6 + \harmonicByRatio #2/5 e,\6 + \harmonicByFret #16 e,\6 + \harmonicByRatio #3/5 e,\6 + %fifth harmonic + \harmonicByFret #3 e,\6_\markup{"5th harm."} + \harmonicByRatio #1/6 e,\6 + \break + %sixth harmonic + \harmonicByFret #2.7 e,\6_\markup{"6th harm."} + \harmonicByRatio #1/7 e,\6 + %seventh harmonic + \harmonicByFret #2.3 e,\6_\markup{"7th harm."} + \harmonicByRatio #1/8 e,\6 + %eighth harmonic + \harmonicByFret #2 e,\6_\markup{"8th harm."} + \harmonicByRatio #1/9 e,\6 +} + +\score { + << + \new Staff { + \new Voice { + \clef "treble_8" + \openStringHarmonics + } + } + \new TabStaff { + \new TabVoice { + \openStringHarmonics + } + } + >> +} diff --git a/Documentation/snippets/new/slides-in-tablature.ly b/Documentation/snippets/new/slides-in-tablature.ly new file mode 100644 index 0000000000..da6b4f2383 --- /dev/null +++ b/Documentation/snippets/new/slides-in-tablature.ly @@ -0,0 +1,38 @@ +\version "2.13.49" + +\header { + lsrtags = "fretted-strings" + texidoc = " +Slides can be typeset in both @code{Staff} and @code{TabStaff} contexts: +" + doctitle = "Slides in tablature" +} + +slides = { + c'8\3(\glissando d'8\3) + c'8\3\glissando d'8\3 + \hideNotes + \grace { g16\3\glissando } + \unHideNotes + c'4\3 + \afterGrace d'4\3\glissando { + \stemDown \hideNotes + g16\3 } + \unHideNotes +} + +\score { + << + \new Staff { \clef "treble_8" \slides } + \new TabStaff { \slides } + >> + \layout { + \context { + \Score + \override Glissando #'minimum-length = #4 + \override Glissando #'springs-and-rods = + #ly:spanner::set-spacing-rods + \override Glissando #'thickness = #2 + } + } +} diff --git a/Documentation/snippets/new/tablature-chord-glissando.ly b/Documentation/snippets/new/tablature-chord-glissando.ly deleted file mode 100644 index 6466dcb626..0000000000 --- a/Documentation/snippets/new/tablature-chord-glissando.ly +++ /dev/null @@ -1,31 +0,0 @@ -\version "2.13.49" - -\header { - lsrtags = "fretted-strings" - texidoc = " -Slides for chords can be indicated in both Staff and TabStaff. -String numbers are necessary for TabStaff because automatic -string calculations are different for chords and for single notes, -and @code{\chordGlissando} draws lines between single notes. -" - doctitle = "Chord glissando in tablature" -} - -\include "chord-glissando-init.ly" - -myMusic = \relative c' { - \chordGlissando - 8 -} - -\score { - << - \new Staff { - \clef "treble_8" - \myMusic - } - \new TabStaff { - \myMusic - } - >> -} diff --git a/Documentation/snippets/new/tablature-fretted-string-harmonics.ly b/Documentation/snippets/new/tablature-fretted-string-harmonics.ly deleted file mode 100644 index 44ce72ceb2..0000000000 --- a/Documentation/snippets/new/tablature-fretted-string-harmonics.ly +++ /dev/null @@ -1,74 +0,0 @@ -\version "2.13.49" - -\header { - lsrtags = "fretted-strings" - texidoc = " -Fretted-string harmonics: -" - doctitle = "Fretted-string harmonics in tablature" -} - -pinchedHarmonics = { - \textSpannerDown - \override TextSpanner #'bound-details #'left #'text = - \markup {\halign #-0.5 \teeny "PH" } - \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 = - \markup { \draw-line #'(0 . 1) } - \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" } - %pinched harmonics (PH) - \pinchedHarmonics - 2\startTextSpan - 4 - 4\stopTextSpan - %tapped harmonics (TH) - <\parenthesize g\4 g'\harmonic>4_\markup{ \teeny "TH 17" } - <\parenthesize a\4 a'\harmonic>4_\markup{ \teeny "TH 19" } - <\parenthesize c'\3 c''\harmonic>2_\markup{ \teeny "TH 17" } - %touch harmonics (TCH) - a4( 2. )_\markup{ \teeny "TCH" } -} - -frettedStrings = { - %artificial harmonics (AH) - \harmonicByFret #4 g4\3 - \harmonicByFret #5 d4\4 - \harmonicByFret #7 g2\3 - %pinched harmonics (PH) - \harmonicByFret #7 d2\4 - \harmonicByFret #5 d4\4 - \harmonicByFret #7 a4\5 - %tapped harmonics (TH) - \harmonicByFret #5 d4\4 - \harmonicByFret #5 d4\4 - \harmonicByFret #4 g2\3 - %touch harmonics (TCH) - a4 \harmonicByFret #9 g2.\3 -} - -\score { - << - \new Staff { - \new Voice { - \clef "treble_8" - \harmonics - } - } - \new TabStaff { - \new TabVoice { - \frettedStrings - } - } - >> -} diff --git a/Documentation/snippets/new/tablature-open-string-harmonics.ly b/Documentation/snippets/new/tablature-open-string-harmonics.ly deleted file mode 100644 index 3524d28db8..0000000000 --- a/Documentation/snippets/new/tablature-open-string-harmonics.ly +++ /dev/null @@ -1,64 +0,0 @@ -\version "2.13.49" - -\header { - lsrtags = "fretted-strings" - texidoc = " -Reference for open-string harmonics: -" - doctitle = "Reference for open-string harmonics" -} - -openStringHarmonics = { - %first harmonic - \harmonicByFret #12 e,2\6_\markup{"1st harm."} - \harmonicByRatio #1/2 e,\6 - %second harmonic - \harmonicByFret #7 e,\6_\markup{"2nd harm. - - - -"} - \harmonicByRatio #1/3 e,\6 - \harmonicByFret #19 e,\6 - \harmonicByRatio #2/3 e,\6 - %\harmonicByFret #19 < e,\6 a,\5 d\4 > - %\harmonicByRatio #2/3 < e,\6 a,\5 d\4 > - %third harmonic - \harmonicByFret #5 e,\6_\markup{"3rd harm. - - - -"} - \harmonicByRatio #1/4 e,\6 - \harmonicByFret #24 e,\6 - \harmonicByRatio #3/4 e,\6 - \break - %fourth harmonic - \harmonicByFret #4 e,\6_\markup{"4th harm. - - - - - - - - - - - - -"} - \harmonicByRatio #1/5 e,\6 - \harmonicByFret #9 e,\6 - \harmonicByRatio #2/5 e,\6 - \harmonicByFret #16 e,\6 - \harmonicByRatio #3/5 e,\6 - %fifth harmonic - \harmonicByFret #3 e,\6_\markup{"5th harm."} - \harmonicByRatio #1/6 e,\6 - \break - %sixth harmonic - \harmonicByFret #2.7 e,\6_\markup{"6th harm."} - \harmonicByRatio #1/7 e,\6 - %seventh harmonic - \harmonicByFret #2.3 e,\6_\markup{"7th harm."} - \harmonicByRatio #1/8 e,\6 - %eighth harmonic - \harmonicByFret #2 e,\6_\markup{"8th harm."} - \harmonicByRatio #1/9 e,\6 -} - -\score { - << - \new Staff { - \new Voice { - \clef "treble_8" - \openStringHarmonics - } - } - \new TabStaff { - \new TabVoice { - \openStringHarmonics - } - } - >> -} diff --git a/Documentation/snippets/new/tablature-slides.ly b/Documentation/snippets/new/tablature-slides.ly deleted file mode 100644 index da6b4f2383..0000000000 --- a/Documentation/snippets/new/tablature-slides.ly +++ /dev/null @@ -1,38 +0,0 @@ -\version "2.13.49" - -\header { - lsrtags = "fretted-strings" - texidoc = " -Slides can be typeset in both @code{Staff} and @code{TabStaff} contexts: -" - doctitle = "Slides in tablature" -} - -slides = { - c'8\3(\glissando d'8\3) - c'8\3\glissando d'8\3 - \hideNotes - \grace { g16\3\glissando } - \unHideNotes - c'4\3 - \afterGrace d'4\3\glissando { - \stemDown \hideNotes - g16\3 } - \unHideNotes -} - -\score { - << - \new Staff { \clef "treble_8" \slides } - \new TabStaff { \slides } - >> - \layout { - \context { - \Score - \override Glissando #'minimum-length = #4 - \override Glissando #'springs-and-rods = - #ly:spanner::set-spacing-rods - \override Glissando #'thickness = #2 - } - } -}