From aa63a0e806a2f8aa161a068b6e7a1ffded1d0575 Mon Sep 17 00:00:00 2001 From: Graham Percival Date: Wed, 7 Feb 2007 15:18:41 -0800 Subject: [PATCH] First wave of real LSR integration. --- buildscripts/makelsr.py | 2 +- input/lsr/GNUmakefile | 2 +- input/lsr/LSR.ly | 11 ++-- .../advanced/Alternating-beam-directions.ly | 31 --------- .../AAA-intro-advanced.ly | 2 +- input/lsr/ancient/Custodes.ly | 34 ++++++++++ input/lsr/{advanced => ancient}/GNUmakefile | 0 input/lsr/{advanced => ancient}/SConscript | 0 .../AA-intro-chords.ly} | 2 +- input/lsr/chords/Chord-name-exceptions.ly | 27 ++++++++ input/lsr/{trick => chords}/GNUmakefile | 2 +- input/lsr/{trick => chords}/SConscript | 2 +- input/lsr/chords/chord-name-major7.ly | 11 ++++ input/lsr/connecting/AAA-intro-connecting.ly | 21 ++++++ input/lsr/connecting/GNUmakefile | 16 +++++ input/lsr/connecting/Laissez-vibrer-ties.ly | 26 ++++++++ input/lsr/connecting/SConscript | 4 ++ .../contemporary/AAA-intro-contemporary.ly | 21 ++++++ input/lsr/contemporary/Clusters.ly | 18 +++++ input/lsr/contemporary/GNUmakefile | 16 +++++ input/lsr/contemporary/SConscript | 4 ++ .../trick/Caesura-railtracks-with-fermata.ly | 25 ------- .../trick/Tramlines-and-Feta-font-caesurae.ly | 66 ------------------- 23 files changed, 211 insertions(+), 132 deletions(-) delete mode 100644 input/lsr/advanced/Alternating-beam-directions.ly rename input/lsr/{advanced => ancient}/AAA-intro-advanced.ly (90%) create mode 100644 input/lsr/ancient/Custodes.ly rename input/lsr/{advanced => ancient}/GNUmakefile (100%) rename input/lsr/{advanced => ancient}/SConscript (100%) rename input/lsr/{trick/AAA-intro-trick.ly => chords/AA-intro-chords.ly} (91%) create mode 100644 input/lsr/chords/Chord-name-exceptions.ly rename input/lsr/{trick => chords}/GNUmakefile (93%) rename input/lsr/{trick => chords}/SConscript (52%) create mode 100644 input/lsr/chords/chord-name-major7.ly create mode 100644 input/lsr/connecting/AAA-intro-connecting.ly create mode 100644 input/lsr/connecting/GNUmakefile create mode 100644 input/lsr/connecting/Laissez-vibrer-ties.ly create mode 100644 input/lsr/connecting/SConscript create mode 100644 input/lsr/contemporary/AAA-intro-contemporary.ly create mode 100644 input/lsr/contemporary/Clusters.ly create mode 100644 input/lsr/contemporary/GNUmakefile create mode 100644 input/lsr/contemporary/SConscript delete mode 100644 input/lsr/trick/Caesura-railtracks-with-fermata.ly delete mode 100644 input/lsr/trick/Tramlines-and-Feta-font-caesurae.ly diff --git a/buildscripts/makelsr.py b/buildscripts/makelsr.py index 3f70827299..a2ccaa1deb 100755 --- a/buildscripts/makelsr.py +++ b/buildscripts/makelsr.py @@ -4,7 +4,7 @@ import os import os.path import shutil -dirs = ['advanced','trick'] +dirs = ['ancient','chords','connecting','contemporary'] try: in_dir = sys.argv[1] diff --git a/input/lsr/GNUmakefile b/input/lsr/GNUmakefile index 36b2eec4c1..8076405c3d 100644 --- a/input/lsr/GNUmakefile +++ b/input/lsr/GNUmakefile @@ -1,6 +1,6 @@ depth = ../../ -SUBDIRS = advanced trick +SUBDIRS = ancient chords connecting contemporary STEPMAKE_TEMPLATES=documentation texinfo tex LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc diff --git a/input/lsr/LSR.ly b/input/lsr/LSR.ly index b2fe1888e0..9aa73f0c0f 100644 --- a/input/lsr/LSR.ly +++ b/input/lsr/LSR.ly @@ -5,14 +5,17 @@ texidoc = "@unnumbered LilyPond Examples These pages show LilyPond examples (snippets) from the @uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}. -@c @h eading @uref{../trick/collated-files.html,Trick}: -@strong{@uref{trick/collated-files.html,Trick}}: +@strong{@uref{ancient/collated-files.html,Ancient}}: These snippets are blah blah. -@c @h eading @uref{../advanced/collated-files.html,Advanced}: -@strong{@uref{advanced/collated-files.html,Advanced}}: +@strong{@uref{chords/collated-files.html,Chords}}: These snippets are fazzle snap. +@strong{@uref{connecting/collated-files.html,Connecting notes}}: +These snippets are fazzle snap. + +@strong{@uref{contemporary/collated-files.html,Contemporary notation}}: +These snippets are fazzle snap. " } diff --git a/input/lsr/advanced/Alternating-beam-directions.ly b/input/lsr/advanced/Alternating-beam-directions.ly deleted file mode 100644 index 1298e8fb32..0000000000 --- a/input/lsr/advanced/Alternating-beam-directions.ly +++ /dev/null @@ -1,31 +0,0 @@ -\version "2.10.12" - -\header { texidoc = " -

The eighth notes may be seemingly attached to different - beams, and the corresponding notes connected by ties. - Such a situation may occur, for example, in the cello suites. -" } - -wipeNote = { - \once \override NoteHead #'transparent = ##t - \once \override Stem #'transparent = ##t -} -\layout { raggedright = ##t } - - -\relative c''<< { - c8[~ - \wipeNote - c8 - c8~ - \wipeNote - c - c]~ - \wipeNote - c\noBeam -}\\ - { s8 c8 [ s c s c] } - - ->> - diff --git a/input/lsr/advanced/AAA-intro-advanced.ly b/input/lsr/ancient/AAA-intro-advanced.ly similarity index 90% rename from input/lsr/advanced/AAA-intro-advanced.ly rename to input/lsr/ancient/AAA-intro-advanced.ly index ce1540cdd1..b907dd0d52 100644 --- a/input/lsr/advanced/AAA-intro-advanced.ly +++ b/input/lsr/ancient/AAA-intro-advanced.ly @@ -7,7 +7,7 @@ texidoc = #(string-append " @unnumbered Introduction -This document shows all kinds of advanced snippets from the +This document shows examples from the @uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}. In the web version of this document, you can click on the file name diff --git a/input/lsr/ancient/Custodes.ly b/input/lsr/ancient/Custodes.ly new file mode 100644 index 0000000000..09e5a55ca2 --- /dev/null +++ b/input/lsr/ancient/Custodes.ly @@ -0,0 +1,34 @@ +\version "2.10.12" + +\header { texidoc = " +Custodes may be engraved in various styles. +" } + +\layout { + \context { + \Staff + \consists Custos_engraver + } + ragged-right = ##t +} + +{ + \override Staff.Custos #'neutral-position = #4 + + \override Staff.Custos #'style = #'hufnagel + c'1^"hufnagel" + \break < d' a' f''>1 + + \override Staff.Custos #'style = #'medicaea + c'1^"medicaea" + \break < d' a' f''>1 + + \override Staff.Custos #'style = #'vaticana + c'1^"vaticana" + \break < d' a' f''>1 + + \override Staff.Custos #'style = #'mensural + c'1^"mensural" + \break < d' a' f''>1 +} + diff --git a/input/lsr/advanced/GNUmakefile b/input/lsr/ancient/GNUmakefile similarity index 100% rename from input/lsr/advanced/GNUmakefile rename to input/lsr/ancient/GNUmakefile diff --git a/input/lsr/advanced/SConscript b/input/lsr/ancient/SConscript similarity index 100% rename from input/lsr/advanced/SConscript rename to input/lsr/ancient/SConscript diff --git a/input/lsr/trick/AAA-intro-trick.ly b/input/lsr/chords/AA-intro-chords.ly similarity index 91% rename from input/lsr/trick/AAA-intro-trick.ly rename to input/lsr/chords/AA-intro-chords.ly index ae4b6b0a6a..b907dd0d52 100644 --- a/input/lsr/trick/AAA-intro-trick.ly +++ b/input/lsr/chords/AA-intro-chords.ly @@ -7,7 +7,7 @@ texidoc = #(string-append " @unnumbered Introduction -This document shows all kinds of tricks from the +This document shows examples from the @uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}. In the web version of this document, you can click on the file name diff --git a/input/lsr/chords/Chord-name-exceptions.ly b/input/lsr/chords/Chord-name-exceptions.ly new file mode 100644 index 0000000000..b8f25b8779 --- /dev/null +++ b/input/lsr/chords/Chord-name-exceptions.ly @@ -0,0 +1,27 @@ +\version "2.10.12" + +\header { texidoc = " +The property @{chordNameExceptions@} can used to store a list of special notations for specific chords. +" } + +% 7sus4 denoted with ^7 wahh +chExceptionMusic = { + 1-\markup { \super "7" "wahh" }} + + % add to existing exceptions. +chExceptions = #(append + (sequential-music-to-chord-exceptions chExceptionMusic #t) + ignatzekExceptions) + +theMusic = \chordmode { + c:7sus4 c:dim7/+f + \set chordNameExceptions = #chExceptions + c:7sus4 c:dim7/+f +} + +\layout { ragged-right = ##t } + +<< \context ChordNames \theMusic + \context Voice \theMusic +>> + diff --git a/input/lsr/trick/GNUmakefile b/input/lsr/chords/GNUmakefile similarity index 93% rename from input/lsr/trick/GNUmakefile rename to input/lsr/chords/GNUmakefile index a8293cbb73..43325ab698 100644 --- a/input/lsr/trick/GNUmakefile +++ b/input/lsr/chords/GNUmakefile @@ -13,4 +13,4 @@ EXTRA_DIST_FILES= include $(depth)/make/stepmake.make -TITLE=Trick snippets +TITLE=Advanced snippets diff --git a/input/lsr/trick/SConscript b/input/lsr/chords/SConscript similarity index 52% rename from input/lsr/trick/SConscript rename to input/lsr/chords/SConscript index 3845b7b8c6..f72bfffc28 100644 --- a/input/lsr/trick/SConscript +++ b/input/lsr/chords/SConscript @@ -1,4 +1,4 @@ # -*-python-*- Import ('env', 'collate') -collate (title = 'Trick snippets') +collate (title = 'Advanced snippets') diff --git a/input/lsr/chords/chord-name-major7.ly b/input/lsr/chords/chord-name-major7.ly new file mode 100644 index 0000000000..4c8785a638 --- /dev/null +++ b/input/lsr/chords/chord-name-major7.ly @@ -0,0 +1,11 @@ +\version "2.10.12" + +\header { texidoc = " +The layout of the major 7 can be tuned with @{majorSevenSymbol@} +" } + +\chords { + c:7+ + \set majorSevenSymbol = \markup { "j7" } + c:7+ +} diff --git a/input/lsr/connecting/AAA-intro-connecting.ly b/input/lsr/connecting/AAA-intro-connecting.ly new file mode 100644 index 0000000000..b907dd0d52 --- /dev/null +++ b/input/lsr/connecting/AAA-intro-connecting.ly @@ -0,0 +1,21 @@ +\version "2.10.0" +%% +.ly: Be the first .ly file for lys-to-tely.py. +%% Better to make lys-to-tely.py include "introduction.texi" or +%% other .texi documents too? + +\header{ +texidoc = #(string-append " +@unnumbered Introduction + +This document shows examples from the +@uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}. + +In the web version of this document, you can click on the file name +or figure for each example to see the corresponding input file. + +This document is for LilyPond version +" (lilypond-version) "." ) +} + +% make sure .png is generated. +\lyrics { " " } diff --git a/input/lsr/connecting/GNUmakefile b/input/lsr/connecting/GNUmakefile new file mode 100644 index 0000000000..43325ab698 --- /dev/null +++ b/input/lsr/connecting/GNUmakefile @@ -0,0 +1,16 @@ + +depth = ../../../ + +STEPMAKE_TEMPLATES=documentation texinfo tex +LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc + +## Hmm, would this work? No -- if we really want examples, move +## to other dir (input/) comes to mind. +## examples = font20 ancient-font +## LOCALSTEPMAKE_TEMPLATES += ly mutopia + +EXTRA_DIST_FILES= + +include $(depth)/make/stepmake.make + +TITLE=Advanced snippets diff --git a/input/lsr/connecting/Laissez-vibrer-ties.ly b/input/lsr/connecting/Laissez-vibrer-ties.ly new file mode 100644 index 0000000000..a589c6e8fe --- /dev/null +++ b/input/lsr/connecting/Laissez-vibrer-ties.ly @@ -0,0 +1,26 @@ +\version "2.10.12" + +\header { texidoc = " +l.v. ties should avoid dots and staff lines, similar to normal ties. They have fixed size. Their formatting can be tuned with +@code{tie-configuration} +" } + +\paper { + ragged-right = ##t +} + +\relative { + \laissezVibrer r4 + \laissezVibrer r + \laissezVibrer r + 4.\laissezVibrer r + + 4\laissezVibrer r + \override LaissezVibrerTieColumn #'tie-configuration + = #'((-7 . -1) + (-5 . -1) + (-3 . 1) + (-1 . 1)) + 4\laissezVibrer r +} + diff --git a/input/lsr/connecting/SConscript b/input/lsr/connecting/SConscript new file mode 100644 index 0000000000..f72bfffc28 --- /dev/null +++ b/input/lsr/connecting/SConscript @@ -0,0 +1,4 @@ +# -*-python-*- + +Import ('env', 'collate') +collate (title = 'Advanced snippets') diff --git a/input/lsr/contemporary/AAA-intro-contemporary.ly b/input/lsr/contemporary/AAA-intro-contemporary.ly new file mode 100644 index 0000000000..b907dd0d52 --- /dev/null +++ b/input/lsr/contemporary/AAA-intro-contemporary.ly @@ -0,0 +1,21 @@ +\version "2.10.0" +%% +.ly: Be the first .ly file for lys-to-tely.py. +%% Better to make lys-to-tely.py include "introduction.texi" or +%% other .texi documents too? + +\header{ +texidoc = #(string-append " +@unnumbered Introduction + +This document shows examples from the +@uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}. + +In the web version of this document, you can click on the file name +or figure for each example to see the corresponding input file. + +This document is for LilyPond version +" (lilypond-version) "." ) +} + +% make sure .png is generated. +\lyrics { " " } diff --git a/input/lsr/contemporary/Clusters.ly b/input/lsr/contemporary/Clusters.ly new file mode 100644 index 0000000000..ea45a8c059 --- /dev/null +++ b/input/lsr/contemporary/Clusters.ly @@ -0,0 +1,18 @@ +\version "2.10.12" + +\header { texidoc = " +Clusters are a device to denote that a complete range of notes is to be played. +" } + +\layout { ragged-right = ##t } + +fragment = \relative c' { + c4 f4 4 + 8 a4 c2 4 e4 + c4 +} + +<< + \new Staff \fragment + \new Staff \makeClusters \fragment +>> diff --git a/input/lsr/contemporary/GNUmakefile b/input/lsr/contemporary/GNUmakefile new file mode 100644 index 0000000000..43325ab698 --- /dev/null +++ b/input/lsr/contemporary/GNUmakefile @@ -0,0 +1,16 @@ + +depth = ../../../ + +STEPMAKE_TEMPLATES=documentation texinfo tex +LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc + +## Hmm, would this work? No -- if we really want examples, move +## to other dir (input/) comes to mind. +## examples = font20 ancient-font +## LOCALSTEPMAKE_TEMPLATES += ly mutopia + +EXTRA_DIST_FILES= + +include $(depth)/make/stepmake.make + +TITLE=Advanced snippets diff --git a/input/lsr/contemporary/SConscript b/input/lsr/contemporary/SConscript new file mode 100644 index 0000000000..f72bfffc28 --- /dev/null +++ b/input/lsr/contemporary/SConscript @@ -0,0 +1,4 @@ +# -*-python-*- + +Import ('env', 'collate') +collate (title = 'Advanced snippets') diff --git a/input/lsr/trick/Caesura-railtracks-with-fermata.ly b/input/lsr/trick/Caesura-railtracks-with-fermata.ly deleted file mode 100644 index d466facfb6..0000000000 --- a/input/lsr/trick/Caesura-railtracks-with-fermata.ly +++ /dev/null @@ -1,25 +0,0 @@ -\version "2.10.12" - -\header { texidoc = " -A caesura is sometimes denoted with a double \"railtracks\" breath mark with a fermata sign positioned over the top of the railtracks. This snippet should present an optically pleasing combination of railtracks and a fermata. - -It works for lilypond 2.5 and above. -" } - -{ - \context Voice { - c''2. - % use some scheme code to construct the symbol - \override BreathingSign #'text = #(markup #:line - (#:musicglyph "scripts.caesura" - #:translate (cons -1.75 1.6) - #:musicglyph "scripts.ufermata" - )) - \breathe c''4 - % set the breathe mark back to normal - \revert BreathingSign #'text - c''2. \breathe c''4 - \bar "|." - } -} - diff --git a/input/lsr/trick/Tramlines-and-Feta-font-caesurae.ly b/input/lsr/trick/Tramlines-and-Feta-font-caesurae.ly deleted file mode 100644 index 6d8fb0af80..0000000000 --- a/input/lsr/trick/Tramlines-and-Feta-font-caesurae.ly +++ /dev/null @@ -1,66 +0,0 @@ -\version "2.10.12" - -\header { texidoc = " -This snippet shows a way to insert available Feta font symbols as caesurae and ways to create tramlines. Normally a caesura is indicated by a pair of oblique lines lying through the top line of the staff, also called a fetura, tramlines, railroad tracks, or a cut-off. LilyPond provides several alternatives. A stylized version of tramlines is called caesura. The normal tramline form, here called fetura, is not in the Feta font set, but can be constructed using the / character. -" } - -\version "2.8.4" -%{ This snippet shows a way to insert available Feta font symbols as caesurae - and ways to create tramlines. Normally a caesura is indicated by a pair of - oblique lines lying through the top line of the staff, also called a fetura, - tramlines, railroad tracks, or a cut-off. LilyPond provides several - alternatives. A stylized version of tramlines is called caesura. The normal - tramline form, here called fetura, is not in the Feta font set, but can be - constructed using the / character.%} - \relative c'' { -\time 3/4 -e4 d e - % default -e_\markup { "default - breathe" } - \breathe d e | - % rcomma - % by default, \breathe uses the rcomma, just as if saying: - \override BreathingSign #'text = - #(make-musicglyph-markup "scripts.rcomma") -e_\markup rcomma \breathe d e | - % lcomma - \override BreathingSign #'text = - #(make-musicglyph-markup "scripts.lcomma") -e_\markup lcomma \breathe d e | - % rvarcomma - \override BreathingSign #'text = - #(make-musicglyph-markup "scripts.rvarcomma") -e_\markup rvarcomma \breathe d e | \break - % lvarcomma - \override BreathingSign #'text = - #(make-musicglyph-markup "scripts.lvarcomma") -e_\markup lvarcomma \breathe d e | - % upbow or wedge - \override BreathingSign #'text = - #(make-musicglyph-markup "scripts.upbow") -e_\markup upbow \breathe d e | - % caesura - \override BreathingSign #'text = - #(make-musicglyph-markup "scripts.caesura") -e_\markup caesura \breathe d e | - % fetura, tramlines, or railroad tracks -<<{ -\hideNotes a16 a a a a4 a \unHideNotes -}\\{ - \once\override TextScript #'extra-offset = #'(4.0 . -2.7) -e^\markup {\fontsize #2 {\bold "/" \hspace #-1.4 \bold "/"}} -d_\markup { \hspace #-10 "fetura" } e | -}>> - \once\override TextScript #'font-name = #"cmb10" - \once\override TextScript #'extra-offset = #'(4.0 . -2.2) -e^\markup {\magnify #1.3 { "/" \hspace #-1.5 "/"}} - \once \override Score.SeparationItem #'padding = #4 -d_\markup { \hspace #-10 "fetura" } e | - -e d e \bar "||" - }%end relative - \layout{ -indent = 0.00\in - }%end layout - - -- 2.39.5