From: John Mandereau Date: Sat, 5 Jan 2008 13:57:42 +0000 (+0100) Subject: Clean up further input/new X-Git-Tag: release/2.11.38-1~124^2~3 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=917f05c8cc3e540a43adc35f6ba3912de87ec7aa;p=lilypond.git Clean up further input/new It's definitely easier to maintain input/new if there is no subdirectory, so it's worth a bit extra coding in makelsr.py. Tag 'other' in input/new has been junked. Snippets in input/new have been cleaned up and/or updated in LSR, further checking and cleaning up may be needed. --- diff --git a/buildscripts/makelsr.py b/buildscripts/makelsr.py index 61317729cb..8ef81972a3 100755 --- a/buildscripts/makelsr.py +++ b/buildscripts/makelsr.py @@ -12,11 +12,10 @@ it updates snippets input/lsr with snippets in input/new or LSR_SNIPPETS_DIR. LY_HEADER_LSR = '''%%%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %%%% This file is in the public domain. -%%%% Tags: %s +%%%% Tags: %(tags)s ''' LY_HEADER_NEW = '''%%%% Do not edit this file; it is auto-generated from input/new -%%%% Tags: %s ''' DEST = os.path.join ('input', 'lsr') @@ -33,7 +32,7 @@ TAGS.extend (['vocal-music', 'chords', 'piano-music', # other TAGS.extend (['contexts-and-engravers', 'tweaks-and-overrides', -'paper-and-layout', 'breaks', 'spacing', 'midi', 'titles', 'template', 'other']) +'paper-and-layout', 'breaks', 'spacing', 'midi', 'titles', 'template']) def exit_with_usage (n=0): sys.stderr.write (USAGE) @@ -49,6 +48,7 @@ if not (os.path.isdir (DEST) and os.path.isdir (NEW_LYS)): unsafe = [] unconverted = [] +notags_files = [] # mark the section that will be printed verbatim by lilypond-book end_header_re = re.compile ('(\\header {.*?}\n)\n', re.M | re.S) @@ -78,7 +78,7 @@ def copy_ly (srcdir, name, tags): if e: unsafe.append (dest) -def read_source (src): +def read_source_with_dirs (src): s = {} l = {} for tag in TAGS: @@ -91,6 +91,23 @@ def read_source (src): s[f] = (srcdir, [tag]) return s, l + +tags_re = re.compile ('lsrtags\\s*=\\s*"(.+?)"') + +def read_source (src): + s = {} + l = dict ([(tag, set()) for tag in TAGS]) + for f in glob.glob (os.path.join (src, '*.ly')): + m = tags_re.search (open (f, 'r').read ()) + if m: + file_tags = [tag.strip() for tag in m.group (1). split(',')] + s[f] = (src, file_tags) + [l[tag].add (f) for tag in file_tags if tag in TAGS] + else: + notags_files.append (f) + return s, l + + def dump_file_list (file, list): f = open (file, 'w') f.write ('\n'.join (list) + '\n') @@ -99,9 +116,9 @@ def dump_file_list (file, list): map (os.remove, glob.glob (os.path.join (DEST, '*.ly')) + glob.glob (os.path.join (DEST, '*.snippet-list'))) -# read LSR source -snippets, tag_lists = read_source (in_dir) -# read input/new +# read LSR source where tags are defined by subdirs +snippets, tag_lists = read_source_with_dirs (in_dir) +# read input/new where tags are directly s, l = read_source (NEW_LYS) snippets.update (s) for t in TAGS: @@ -115,7 +132,11 @@ for (tag, file_set) in tag_lists.items (): if unconverted: sys.stderr.write ('These files could not be converted successfully by convert-ly:\n') - sys.stderr.write ('\n'.join (unconverted)) + sys.stderr.write ('\n'.join (unconverted) + '\n\n') + +if notags_files: + sys.stderr.write ('No tags could be found in these files:\n') + sys.stderr.write ('\n'.join (notags_files) + '\n\n') dump_file_list ('lsr-unsafe.txt', unsafe) sys.stderr.write (''' diff --git a/input/lsr/other-intro.itely b/input/lsr/other-intro.itely deleted file mode 100644 index 795a15b8e3..0000000000 --- a/input/lsr/other-intro.itely +++ /dev/null @@ -1,5 +0,0 @@ -@node Other -@unnumbered Other - -@lysnippets - diff --git a/input/lsr/other.snippet-list b/input/lsr/other.snippet-list deleted file mode 100644 index ac51e07a1f..0000000000 --- a/input/lsr/other.snippet-list +++ /dev/null @@ -1,6 +0,0 @@ -applying-noteheads-styles-depending-on-the-step-of-the-scale.ly -using-the--tweak-command-to-tweak-individual-grobs.ly -drawing-circles-around-various-objects.ly -making-an-object-invisibile-with-the-transparent-property.ly -drawing-boxes-around-grobs.ly -outputting-the-version-number.ly diff --git a/input/lsr/snippets.tely b/input/lsr/snippets.tely index 92f400ac4a..8a9cf9359c 100644 --- a/input/lsr/snippets.tely +++ b/input/lsr/snippets.tely @@ -112,7 +112,6 @@ Other collections * Spacing:: * MIDI:: * Templates:: -* Other:: @end menu @@ -146,7 +145,4 @@ Other collections @include midi.itely @include template.itely -@c temporary input/new tag, will be deleted -@include other.itely - @bye diff --git a/input/new/GNUmakefile b/input/new/GNUmakefile index 24e4bb0472..bc32848ae7 100644 --- a/input/new/GNUmakefile +++ b/input/new/GNUmakefile @@ -1,21 +1,7 @@ -depth = ../../ - -# NR 1 -SUBDIRS = pitches rhythms expressive-marks repeats simultaneous-notes staff-notation editorial-and-educational-use text -# NR 2 -SUBDIRS += vocal-music chords piano-music percussion guitar strings bagpipes ancient-notation - - -SUBDIRS += other - - -# old -SUBDIRS += parts spacing schemelanguage -SUBDIRS += real-music paper-and-layout - +depth = ../.. STEPMAKE_TEMPLATES=documentation EXTRA_DIST_FILES=README +EXTRA_DIST_FILES+=$(call src-wildcard,*.ly) include $(depth)/make/stepmake.make - diff --git a/input/new/README b/input/new/README index 0ceb46066f..16b744fbe0 100644 --- a/input/new/README +++ b/input/new/README @@ -2,3 +2,15 @@ This directory is for examples of new features in the current unstable development series. These snippets will be added to LSR when it supports a version of LilyPond that includes these features. +When adding a file to this directory, please start the file with + +\version "2.x.y" +\header { + doctitle = "Snippet title" + lsrtags = "rhythms,expressive-marks" % use existing LSR tags other than +% 'docs'; see makelsr.py for the list of tags used to sort snippets. + texidoc = "This code demonstrates ..." % this will be formated by Texinfo +} + + +and name the file snippet-title.ly. diff --git a/input/new/ancient-notation/GNUmakefile b/input/new/ancient-notation/GNUmakefile deleted file mode 100644 index eb18cb2518..0000000000 --- a/input/new/ancient-notation/GNUmakefile +++ /dev/null @@ -1,7 +0,0 @@ -depth = ../../.. - -STEPMAKE_TEMPLATES=documentation - -EXTRA_DIST_FILES=$(call src-wildcard,*.ly) - -include $(depth)/make/stepmake.make diff --git a/input/new/ancient-notation/SConscript b/input/new/ancient-notation/SConscript deleted file mode 100644 index f72bfffc28..0000000000 --- a/input/new/ancient-notation/SConscript +++ /dev/null @@ -1,4 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Advanced snippets') diff --git a/input/new/bagpipes/GNUmakefile b/input/new/bagpipes/GNUmakefile deleted file mode 100644 index eb18cb2518..0000000000 --- a/input/new/bagpipes/GNUmakefile +++ /dev/null @@ -1,7 +0,0 @@ -depth = ../../.. - -STEPMAKE_TEMPLATES=documentation - -EXTRA_DIST_FILES=$(call src-wildcard,*.ly) - -include $(depth)/make/stepmake.make diff --git a/input/new/bagpipes/SConscript b/input/new/bagpipes/SConscript deleted file mode 100644 index cb39d4eab0..0000000000 --- a/input/new/bagpipes/SConscript +++ /dev/null @@ -1,5 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Sample snippets from LSR') - diff --git a/input/new/chords/GNUmakefile b/input/new/chords/GNUmakefile deleted file mode 100644 index eb18cb2518..0000000000 --- a/input/new/chords/GNUmakefile +++ /dev/null @@ -1,7 +0,0 @@ -depth = ../../.. - -STEPMAKE_TEMPLATES=documentation - -EXTRA_DIST_FILES=$(call src-wildcard,*.ly) - -include $(depth)/make/stepmake.make diff --git a/input/new/chords/SConscript b/input/new/chords/SConscript deleted file mode 100644 index f72bfffc28..0000000000 --- a/input/new/chords/SConscript +++ /dev/null @@ -1,4 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Advanced snippets') diff --git a/input/new/clip-systems.ly b/input/new/clip-systems.ly new file mode 100644 index 0000000000..1eaead2f34 --- /dev/null +++ b/input/new/clip-systems.ly @@ -0,0 +1,85 @@ +\version "2.10.0" +\layout { ragged-right= ##t } +\header { + doctitle = "Clip systems" + lsrtags = "paper-and-layout" % a new tag like "Mixing text and music" or +% "Special output" might be more adequate -jm + texidoc = " +This code shows how to clip (extracts) snippets from a full score. + +This file needs to be run separately with @code{-dclip-systems}; the +snippets page may not adequately show the results. + +The result will be files named +@file{@var{base}-from-@var{start}-to-@var{end}[-@var{count}].eps}. + +@itemize @bullet +@item If system starts and ends are included, they include extents of the System grob, eg. instrument names. +@item Grace notes at the end point of the region are not included. +@item Regions can span multiple systems. In this case, multiple EPS files are generated. +@end itemize +" +} + +#(ly:set-option 'clip-systems) + +#(set! output-count 1) + +origScore = \score{ + \relative { + \set Staff.instrumentName = #"bla" + c1 + d + \grace c16 + e1 + \key d\major + + f + \break \clef bass + g, + fis + } +} + +\book { + \score { + \origScore + \layout { + + %% each clip-region is a (START . END) pair + %% where both are rhythmic-locations. + + %% (make-rhythmic-locations BAR-NUMBER NUM DEN) + %% means NUM/DEN whole-notes into bar numbered BAR-NUMBER + + clip-regions + = #(list + (cons + (make-rhythmic-location 2 0 1) + (make-rhythmic-location 4 0 1)) + + (cons + (make-rhythmic-location 0 0 1) + (make-rhythmic-location 4 0 1)) + + (cons + (make-rhythmic-location 0 0 1) + (make-rhythmic-location 6 0 1)) + ) + } + } +} + +#(set! output-count 0) +#(ly:set-option 'clip-systems #f) + +\book { + \score { \origScore } + \markup { \bold \fontsize #6 clips } + \score { + \lyrics { + \markup { from-2.0.1-to-4.0.1-clip.eps } + \markup { \epsfile #X #30.0 #(format #f "~a-1-from-2.0.1-to-4.0.1-clip.eps" (ly:parser-output-name parser)) } + } + } +} diff --git a/input/new/creating-music-with-scheme-music-box.ly b/input/new/creating-music-with-scheme-music-box.ly new file mode 100644 index 0000000000..ea13878b5d --- /dev/null +++ b/input/new/creating-music-with-scheme-music-box.ly @@ -0,0 +1,13 @@ +\version "2.11.35" +\header { + doctitle = "Creating music with Scheme music box" + lsrtags = "pitches" + texidoc = " +This example shows prelude in C major of Bach's Well-Tempered Klavier +1, but coded using Scheme functions to avoid typing work. + +BROKEN (?) IN 2.11, COMMENTED OUT. +" +} + +{ c'4 } diff --git a/input/new/drawing-boxes-around-grobs.ly b/input/new/drawing-boxes-around-grobs.ly new file mode 100644 index 0000000000..23e11fe75c --- /dev/null +++ b/input/new/drawing-boxes-around-grobs.ly @@ -0,0 +1,27 @@ +\version "2.11.23" +\layout { ragged-right= ##t } +\header { + doctitle = "Drawing boxes around grobs" + lsrtags = "tweaks-and-overrides" + texidoc = " +The @code{print-function} can be overridden to draw a box around an +arbitrary grob. +" +} + +\relative c'' { + \override TextScript #'stencil = + #(make-stencil-boxer 0.1 0.3 ly:text-interface::print) + + c'4^"foo" + + \override Stem #'stencil = + #(make-stencil-boxer 0.05 0.25 ly:stem::print) + + \override Score.RehearsalMark #'stencil = + #(make-stencil-boxer 0.15 0.3 ly:text-interface::print) + b8 + \revert Stem #'stencil + + c4. c4 \mark "F" c1 +} diff --git a/input/new/drawing-circles-around-various-objects.ly b/input/new/drawing-circles-around-various-objects.ly new file mode 100644 index 0000000000..07b9033b38 --- /dev/null +++ b/input/new/drawing-circles-around-various-objects.ly @@ -0,0 +1,26 @@ +\version "2.11.23" +\layout { ragged-right= ##t } +\header { + doctitle = "Drawing circles around various objects" + lsrtags = "tweaks-and-overrides" + texidoc = " +The @code{\circle} command allows you to draw circles around various objects, +for example fingering indications. However, some objects require +specific tweaks: rehearsal marks depend on the @code{Score.markFormatter} +context, bar numbers on the @code{Score.BarNumber} context, and so on. + +You can tweak the printing of your circles by setting some properties +such as @code{#'thickness}, @code{#'circle-padding} or @code{#'font-size}. +" } + +\relative c'{ +c1 +\set Score.markFormatter + = #(lambda (mark context) + (make-circle-markup (format-mark-numbers mark context))) +\mark \default +c2 d^\markup{\circle \finger "2"} +\override Score.BarNumber #'break-visibility = #all-visible +\override Score.BarNumber #'stencil + = #(make-stencil-circler 0.1 0.25 ly:text-interface::print) +} diff --git a/input/new/editorial-and-educational-use/GNUmakefile b/input/new/editorial-and-educational-use/GNUmakefile deleted file mode 100644 index eb18cb2518..0000000000 --- a/input/new/editorial-and-educational-use/GNUmakefile +++ /dev/null @@ -1,7 +0,0 @@ -depth = ../../.. - -STEPMAKE_TEMPLATES=documentation - -EXTRA_DIST_FILES=$(call src-wildcard,*.ly) - -include $(depth)/make/stepmake.make diff --git a/input/new/editorial-and-educational-use/SConscript b/input/new/editorial-and-educational-use/SConscript deleted file mode 100644 index cb39d4eab0..0000000000 --- a/input/new/editorial-and-educational-use/SConscript +++ /dev/null @@ -1,5 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Sample snippets from LSR') - diff --git a/input/new/expressive-marks/GNUmakefile b/input/new/expressive-marks/GNUmakefile deleted file mode 100644 index eb18cb2518..0000000000 --- a/input/new/expressive-marks/GNUmakefile +++ /dev/null @@ -1,7 +0,0 @@ -depth = ../../.. - -STEPMAKE_TEMPLATES=documentation - -EXTRA_DIST_FILES=$(call src-wildcard,*.ly) - -include $(depth)/make/stepmake.make diff --git a/input/new/expressive-marks/SConscript b/input/new/expressive-marks/SConscript deleted file mode 100644 index f72bfffc28..0000000000 --- a/input/new/expressive-marks/SConscript +++ /dev/null @@ -1,4 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Advanced snippets') diff --git a/input/new/expressive-marks/line-arrows.ly b/input/new/expressive-marks/line-arrows.ly deleted file mode 100644 index 7512711cb1..0000000000 --- a/input/new/expressive-marks/line-arrows.ly +++ /dev/null @@ -1,28 +0,0 @@ -\header { - texidoc = "Arrows can be applied to text-spanners and line-spanners (such as the Glissando)" -} - -\version "2.10.0" - -\paper { - ragged-right = ##t -} - -\relative c'' { - \override TextSpanner #'bound-padding = #1.0 - \override TextSpanner #'dash-fraction = #'() - \override TextSpanner #'bound-details #'right #'arrow = ##t - \override TextSpanner #'bound-details #'left #'text = #"fof" - \override TextSpanner #'bound-details #'right #'text = #"gag" - \override TextSpanner #'bound-details #'right #'padding = #0.6 - - \override TextSpanner #'bound-details #'right #'stencil-align-dir-y = #CENTER - \override TextSpanner #'bound-details #'left #'stencil-align-dir-y = #CENTER - - \override Glissando #'bound-details #'right #'arrow = ##t - \override Glissando #'arrow-length = #0.5 - \override Glissando #'arrow-width = #0.25 - - a8\startTextSpan gis8 a4 b4\glissando - b,4 | g' c\stopTextSpan c -} diff --git a/input/new/guitar/GNUmakefile b/input/new/guitar/GNUmakefile deleted file mode 100644 index eb18cb2518..0000000000 --- a/input/new/guitar/GNUmakefile +++ /dev/null @@ -1,7 +0,0 @@ -depth = ../../.. - -STEPMAKE_TEMPLATES=documentation - -EXTRA_DIST_FILES=$(call src-wildcard,*.ly) - -include $(depth)/make/stepmake.make diff --git a/input/new/guitar/SConscript b/input/new/guitar/SConscript deleted file mode 100644 index f72bfffc28..0000000000 --- a/input/new/guitar/SConscript +++ /dev/null @@ -1,4 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Advanced snippets') diff --git a/input/new/guitar/letter-tablature-formatting.ly b/input/new/guitar/letter-tablature-formatting.ly deleted file mode 100644 index 11fe42f8c1..0000000000 --- a/input/new/guitar/letter-tablature-formatting.ly +++ /dev/null @@ -1,10 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.35" - -\header { texidoc = " -You can format a tablature with letters instead of numbers - so that -0->a, 1->b, 2->c, etc. - -BROKEN IN 2.11, COMMENTED OUT. -" } -{ c'4 } diff --git a/input/new/letter-tablature-formatting.ly b/input/new/letter-tablature-formatting.ly new file mode 100644 index 0000000000..628eb17b59 --- /dev/null +++ b/input/new/letter-tablature-formatting.ly @@ -0,0 +1,12 @@ +\version "2.11.35" + +\header { + doctitle = "Letter tablature formatting" + lsrtags = "guitar" + texidoc = " +You can format a tablature with letters instead of numbers - so that +0->a, 1->b, 2->c, etc. + +BROKEN IN 2.11, COMMENTED OUT." +} +{ c'4 } diff --git a/input/new/line-arrows.ly b/input/new/line-arrows.ly new file mode 100644 index 0000000000..f58c336147 --- /dev/null +++ b/input/new/line-arrows.ly @@ -0,0 +1,26 @@ +\version "2.10.0" +\layout { ragged-right= ##t } +\header { + doctitle = "Line arrows" + lsrtags = "expressive-marks" + texidoc = "Arrows can be applied to text-spanners and line-spanners (such as the Glissando)" +} + +\relative c'' { + \override TextSpanner #'bound-padding = #1.0 + \override TextSpanner #'dash-fraction = #'() + \override TextSpanner #'bound-details #'right #'arrow = ##t + \override TextSpanner #'bound-details #'left #'text = #"fof" + \override TextSpanner #'bound-details #'right #'text = #"gag" + \override TextSpanner #'bound-details #'right #'padding = #0.6 + + \override TextSpanner #'bound-details #'right #'stencil-align-dir-y = #CENTER + \override TextSpanner #'bound-details #'left #'stencil-align-dir-y = #CENTER + + \override Glissando #'bound-details #'right #'arrow = ##t + \override Glissando #'arrow-length = #0.5 + \override Glissando #'arrow-width = #0.25 + + a8\startTextSpan gis8 a4 b4\glissando + b,4 | g' c\stopTextSpan c +} diff --git a/input/new/makam.ly b/input/new/makam.ly new file mode 100644 index 0000000000..504a80d433 --- /dev/null +++ b/input/new/makam.ly @@ -0,0 +1,140 @@ +\version "2.11.6" +\layout { ragged-right= ##t } +\header { + doctitle = "Makam" + lsrtags = "pitches" + texidoc = "Makam is Turkish type of melody that uses 1/9 tone + microtonal alterations." +} + +% Define 1/9 alterations. + +#(define-public KOMA 1/9) +#(define-public BAKIYE 4/9) +#(define-public KUCUK 5/9) +#(define-public BUYUKMUCENNEB 8/9) + + +% Define pitch names + +makamPitchNames = #`( + (c . ,(ly:make-pitch -1 0 NATURAL)) + (d . ,(ly:make-pitch -1 1 NATURAL)) + (e . ,(ly:make-pitch -1 2 NATURAL)) + (f . ,(ly:make-pitch -1 3 NATURAL)) + (g . ,(ly:make-pitch -1 4 NATURAL)) + (a . ,(ly:make-pitch -1 5 NATURAL)) + (b . ,(ly:make-pitch -1 6 NATURAL)) + + (cc . ,(ly:make-pitch -1 0 KOMA)) + (dc . ,(ly:make-pitch -1 1 KOMA)) + (ec . ,(ly:make-pitch -1 2 KOMA)) + (fc . ,(ly:make-pitch -1 3 KOMA)) + (gc . ,(ly:make-pitch -1 4 KOMA)) + (ac . ,(ly:make-pitch -1 5 KOMA)) + (bc . ,(ly:make-pitch -1 6 KOMA)) + + (cb . ,(ly:make-pitch -1 0 BAKIYE)) + (db . ,(ly:make-pitch -1 1 BAKIYE)) + (eb . ,(ly:make-pitch -1 2 BAKIYE)) + (fb . ,(ly:make-pitch -1 3 BAKIYE)) + (gb . ,(ly:make-pitch -1 4 BAKIYE)) + (ab . ,(ly:make-pitch -1 5 BAKIYE)) + (bb . ,(ly:make-pitch -1 6 BAKIYE)) + + (ck . ,(ly:make-pitch -1 0 KUCUK)) + (dk . ,(ly:make-pitch -1 1 KUCUK)) + (ek . ,(ly:make-pitch -1 2 KUCUK)) + (fk . ,(ly:make-pitch -1 3 KUCUK)) + (gk . ,(ly:make-pitch -1 4 KUCUK)) + (ak . ,(ly:make-pitch -1 5 KUCUK)) + (bk . ,(ly:make-pitch -1 6 KUCUK)) + + (cbm . ,(ly:make-pitch -1 0 BUYUKMUCENNEB)) + (dbm . ,(ly:make-pitch -1 1 BUYUKMUCENNEB)) + (ebm . ,(ly:make-pitch -1 2 BUYUKMUCENNEB)) + (fbm . ,(ly:make-pitch -1 3 BUYUKMUCENNEB)) + (gbm . ,(ly:make-pitch -1 4 BUYUKMUCENNEB)) + (abm . ,(ly:make-pitch -1 5 BUYUKMUCENNEB)) + (bbm . ,(ly:make-pitch -1 6 BUYUKMUCENNEB)) + + ;; f for flat. + (cfc . ,(ly:make-pitch -1 0 (- KOMA))) + (dfc . ,(ly:make-pitch -1 1 (- KOMA))) + (efc . ,(ly:make-pitch -1 2 (- KOMA))) + (ffc . ,(ly:make-pitch -1 3 (- KOMA))) + (gfc . ,(ly:make-pitch -1 4 (- KOMA))) + (afc . ,(ly:make-pitch -1 5 (- KOMA))) + (bfc . ,(ly:make-pitch -1 6 (- KOMA))) + + (cfb . ,(ly:make-pitch -1 0 (- BAKIYE))) + (dfb . ,(ly:make-pitch -1 1 (- BAKIYE))) + (efb . ,(ly:make-pitch -1 2 (- BAKIYE))) + (ffb . ,(ly:make-pitch -1 3 (- BAKIYE))) + (gfb . ,(ly:make-pitch -1 4 (- BAKIYE))) + (afb . ,(ly:make-pitch -1 5 (- BAKIYE))) + (bfb . ,(ly:make-pitch -1 6 (- BAKIYE))) + + (cfk . ,(ly:make-pitch -1 0 (- KUCUK))) + (dfk . ,(ly:make-pitch -1 1 (- KUCUK))) + (efk . ,(ly:make-pitch -1 2 (- KUCUK))) + (ffk . ,(ly:make-pitch -1 3 (- KUCUK))) + (gfk . ,(ly:make-pitch -1 4 (- KUCUK))) + (afk . ,(ly:make-pitch -1 5 (- KUCUK))) + (bfk . ,(ly:make-pitch -1 6 (- KUCUK))) + + (cfbm . ,(ly:make-pitch -1 0 (- BUYUKMUCENNEB))) + (dfbm . ,(ly:make-pitch -1 1 (- BUYUKMUCENNEB))) + (efbm . ,(ly:make-pitch -1 2 (- BUYUKMUCENNEB))) + (ffbm . ,(ly:make-pitch -1 3 (- BUYUKMUCENNEB))) + (gfbm . ,(ly:make-pitch -1 4 (- BUYUKMUCENNEB))) + (afbm . ,(ly:make-pitch -1 5 (- BUYUKMUCENNEB))) + (bfbm . ,(ly:make-pitch -1 6 (- BUYUKMUCENNEB))) + +) + +%% set pitch names. +pitchnames = \makamPitchNames +#(ly:parser-set-note-names parser makamPitchNames) + +makamGlyphs = #'((1 . "accidentals.doublesharp") + (8/9 . "accidentals.sharp.slashslashslash.stemstem") + (5/9 . "accidentals.sharp.slashslashslash.stem") + (4/9 . "accidentals.sharp") + (1/9 . "accidentals.sharp.slashslash.stem") + (0 . "accidentals.natural") + (-1/9 . "accidentals.mirroredflat") + (-4/9 . "accidentals.flat.slash") + (-5/9 . "accidentals.flat") + (-8/9 . "accidentals.flat.slashslash") + (-1 . "accidentals.flatflat") + ) + +\relative { + + %{ define alteration <-> symbol mapping. The following glyphs are available. + accidentals.sharp + accidentals.sharp.slashslash.stem + accidentals.sharp.slashslashslash.stemstem + accidentals.sharp.slashslashslash.stem + accidentals.sharp.slashslash.stemstemstem + accidentals.natural + accidentals.flat + accidentals.flat.slash + accidentals.flat.slashslash + accidentals.mirroredflat.flat + accidentals.mirroredflat + accidentals.flatflat + accidentals.flatflat.slash + accidentals.doublesharp + %} + + \override Accidental #'glyph-name-alist = \makamGlyphs + + \override Staff.KeySignature #'glyph-name-alist = \makamGlyphs + \set Staff.keySignature = #'( + (3 . 4/9) + (6 . -1/9)) + + c cc db fk gbm gfc gfb efk dfbm +} diff --git a/input/new/making-an-object-invisible-with-the-transparent-property.ly b/input/new/making-an-object-invisible-with-the-transparent-property.ly new file mode 100644 index 0000000000..543debc168 --- /dev/null +++ b/input/new/making-an-object-invisible-with-the-transparent-property.ly @@ -0,0 +1,26 @@ +\version "2.11.23" +\layout { ragged-right= ##t } +\header { + doctitle = "Making an object invisible with the transparent property" + lsrtags = "rhythms,tweaks-and-overrides" + texidoc = " +Setting the @code{transparent} property will cause an object to be +printed in `invisible ink': the object is not printed, but all its +other behavior is retained. The object still takes up space, it takes +part in collisions, and slurs, and ties and beams can be attached to it. + + +The snippet demonstrates how to connect different voices using ties. +Normally, ties only connect two notes in the same voice. By +introducing a tie in a different voice, and blanking the first up-stem +in that voice, the tie appears to cross voices. +" } + +\relative c'' << + { + \once \override Stem #'transparent = ##t + b8~ b8\noBeam + } \\ { + b[ g8] + } +>> diff --git a/input/new/markup-lines.ly b/input/new/markup-lines.ly new file mode 100644 index 0000000000..1d809989cd --- /dev/null +++ b/input/new/markup-lines.ly @@ -0,0 +1,40 @@ +\version "2.11.25" + +\header { + doctitle = "Markup lines" + lsrtags = "text" + texidoc = "Text that can spread over pages is entered with the +@code{\\markuplines} command." +} + +#(set-default-paper-size "a6") + +#(define-markup-list-command (paragraph layout props args) (markup-list?) + (interpret-markup-list layout props + (make-justified-lines-markup-list (cons (make-hspace-markup 2) args)))) + +%% Candide, Voltaire +\markuplines \override-lines #'(baseline-skip . 2.5) { + \paragraph { + Il y avait en Westphalie, dans le château de M. le baron de + Thunder-ten-tronckh, un jeune garçon à qui la nature avait donné + les mœurs les plus douces. Sa physionomie annonçait son âme. + Il avait le jugement assez droit, avec l'esprit le plus simple ; + c'est, je crois, pour cette raison qu'on le nommait Candide. Les + anciens domestiques de la maison soupçonnaient qu'il était fils + de la sœur de monsieur le baron et d'un bon et honnête + gentilhomme du voisinage, que cette demoiselle ne voulut jamais + épouser parce qu'il n'avait pu prouver que soixante et onze + quartiers, et que le reste de son arbre généalogique avait été + perdu par l'injure du temps. + } + \paragraph { + Monsieur le baron était un des plus puissants seigneurs de la + Westphalie, car son château avait une porte et des fenêtres. Sa + grande salle même était ornée d'une tapisserie. Tous les chiens + de ses basses-cours composaient une meute dans le besoin ; ses + palefreniers étaient ses piqueurs; le vicaire du village était + son grand-aumônier. Ils l'appelaient tous monseigneur, et ils + riaient quand il faisait des contes. + } +} diff --git a/input/new/move-specific-text.ly b/input/new/move-specific-text.ly new file mode 100644 index 0000000000..268995a975 --- /dev/null +++ b/input/new/move-specific-text.ly @@ -0,0 +1,23 @@ +\version "2.10.0" +% possible rename to scheme- or something like that. -gp +\header { + doctitle = "Move specific text" + lsrtags = "tweaks-and-overrides" + texidoc = "@cindex Scheme Move Text +Objects of the same type, like text, can be moved around by using some Scheme code. +" } + +#(define (make-text-checker text) + (lambda (grob) (equal? text (ly:grob-property grob 'text)))) + +\score { + \relative c''' { + \stemUp + \applyOutput #'Voice + #(outputproperty-compatibility + (make-text-checker (make-simple-markup "m.d.")) + 'extra-offset '(-3.5 . -4.5)) + a^2^"m.d." + } + \layout { ragged-right = ##t} +} diff --git a/input/new/other/GNUmakefile b/input/new/other/GNUmakefile deleted file mode 100644 index eb18cb2518..0000000000 --- a/input/new/other/GNUmakefile +++ /dev/null @@ -1,7 +0,0 @@ -depth = ../../.. - -STEPMAKE_TEMPLATES=documentation - -EXTRA_DIST_FILES=$(call src-wildcard,*.ly) - -include $(depth)/make/stepmake.make diff --git a/input/new/other/SConscript b/input/new/other/SConscript deleted file mode 100644 index cb39d4eab0..0000000000 --- a/input/new/other/SConscript +++ /dev/null @@ -1,5 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Sample snippets from LSR') - diff --git a/input/new/other/applying-noteheads-styles-depending-on-the-step-of-the-scale.ly b/input/new/other/applying-noteheads-styles-depending-on-the-step-of-the-scale.ly deleted file mode 100644 index b151ea7cfb..0000000000 --- a/input/new/other/applying-noteheads-styles-depending-on-the-step-of-the-scale.ly +++ /dev/null @@ -1,46 +0,0 @@ -\version "2.11.23" - -\header { texidoc = " -The shapeNoteStyles property gives you the ability to define various -note heads styles for each step of the scale (as defined by the key -signature or the \"tonic\" property). - -This property requires a set of symbols, which can be purely arbitrary -(geometrical expressions such as triangle, cross, xcircle etc. are -allowed) or based on old American engraving tradition (you can use some -latin note names as well). - -That said, if you're trying to imitate old American song books, you may -also want to try LilyPond's predefined note heads styles, through -shortcut commands such as \aikenHeads or \sacredHarpHeads. - -This exemple shows different ways to obtain shape note heads, and -demonstrates the ability to transpose a melody without losing the -correspondance between harmonic functions and note heads styles. -" } - -fragment = { - \key c \major - c1 d e f g a b c - \break -} - -\relative { - \set shapeNoteStyles = ##(do re mi fa #f la ti) - \fragment -} - -% temporary change help LSR integration -gp -%{ -\transpose c d - \relative { - \set shapeNoteStyles = ##(do re mi fa #f la ti) - \fragment -} - -\relative { - \set shapeNoteStyles = ##(cross triangle fa #f mensural xcircle diamond) - \fragment -} -%} - diff --git a/input/new/other/drawing-boxes-around-grobs.ly b/input/new/other/drawing-boxes-around-grobs.ly deleted file mode 100644 index 7a4400292b..0000000000 --- a/input/new/other/drawing-boxes-around-grobs.ly +++ /dev/null @@ -1,27 +0,0 @@ -\version "2.11.23" - -\header { texidoc = " -The @code{print-function} can be overridden to draw a box around an -arbitrary grob. -" } - -\relative c'' { - - \override TextScript #'stencil = - #(make-stencil-boxer 0.1 0.3 ly:text-interface::print) - - c'4^"foo" - - \override Stem #'stencil = - #(make-stencil-boxer 0.05 0.25 ly:stem::print) - - \override Score.RehearsalMark #'stencil = - #(make-stencil-boxer 0.15 0.3 ly:text-interface::print) - b8 - \revert Stem #'stencil - - - c4. c4 \mark "F" c1 -} - - diff --git a/input/new/other/drawing-circles-around-various-objects.ly b/input/new/other/drawing-circles-around-various-objects.ly deleted file mode 100644 index 9ea318d4f5..0000000000 --- a/input/new/other/drawing-circles-around-various-objects.ly +++ /dev/null @@ -1,23 +0,0 @@ -\version "2.11.23" - -\header { texidoc = " -The \circle command allows you to draw circles around various objects -(for example fingering indications). However, some objects require -specific tweaks: rehearsal marks depend on the Score.markFormatter -context, bar numbers on the Score.BarNumber context, and so on. - -You can tweak the printing of your circles by setting some properties -such as #'thickness, #'circle-padding or #'font-size. -" } - -\relative c'{ -c1 -\set Score.markFormatter - = #(lambda (mark context) - (make-circle-markup (format-mark-numbers mark context))) -\mark \default -c2 d^\markup{\circle \finger "2"} -\override Score.BarNumber #'break-visibility = #all-visible -\override Score.BarNumber #'stencil - = #(make-stencil-circler 0.1 0.25 ly:text-interface::print) -} diff --git a/input/new/other/making-an-object-invisibile-with-the-transparent-property.ly b/input/new/other/making-an-object-invisibile-with-the-transparent-property.ly deleted file mode 100644 index fab655ccd7..0000000000 --- a/input/new/other/making-an-object-invisibile-with-the-transparent-property.ly +++ /dev/null @@ -1,23 +0,0 @@ -\version "2.11.23" - -\header { texidoc = " -Setting the @code{transparent} property will cause an object to be -printed in `invisible ink': the object is not printed, but all its -other behavior is retained. The object still takes up space, it takes -part in collisions, and slurs, and ties and beams can be attached to it. - - -The snippet demonstrates how to connect different voices using ties. -Normally, ties only connect two notes in the same voice. By -introducing a tie in a different voice, and blanking the first up-stem -in that voice, the tie appears to cross voices. -" } - -\relative c'' { -<< { - \once \override Stem #'transparent = ##t - b8~ b8\noBeam -} \\ { - b[ g8] -} >> -} diff --git a/input/new/other/outputting-the-version-number.ly b/input/new/other/outputting-the-version-number.ly deleted file mode 100644 index f43704c446..0000000000 --- a/input/new/other/outputting-the-version-number.ly +++ /dev/null @@ -1,19 +0,0 @@ -\version "2.11.23" - -\header { texidoc = " -By putting the output of - @code{lilypond-version} into a lyric, it is possible to print the - version number of LilyPond in a score, or in a document generated - with @code{lilypond-book}. Another possibility is to append the - version number to the doc-string, in this manner: -" } - -\score { \context Lyrics { - \override Score.RehearsalMark #'self-alignment-X = #LEFT - \mark #(ly:export (string-append "Processed with LilyPond version " (lilypond-version))) - s2 - } -} - - - diff --git a/input/new/other/using-the--tweak-command-to-tweak-individual-grobs.ly b/input/new/other/using-the--tweak-command-to-tweak-individual-grobs.ly deleted file mode 100644 index 149b108f00..0000000000 --- a/input/new/other/using-the--tweak-command-to-tweak-individual-grobs.ly +++ /dev/null @@ -1,22 +0,0 @@ -\version "2.11.23" - -\header { texidoc = " -With the @code{\tweak} command, you can tune every grob directly. Here -are some examples of available tweaks. - - -" } - -\paper { - ragged-right = ##t -} - -{ - \set fingeringOrientations = #'(right) - < - \tweak #'font-size #3 c - \tweak #'color #red d-\tweak #'font-size #8 -4 - \tweak #'style #'cross g - \tweak #'duration-log #1 a - >4 -} diff --git a/input/new/outputting-the-version-number.ly b/input/new/outputting-the-version-number.ly new file mode 100644 index 0000000000..0d32f6bdf1 --- /dev/null +++ b/input/new/outputting-the-version-number.ly @@ -0,0 +1,18 @@ +\version "2.11.23" + +\header { + doctitle = "Outputting the version number" + lsrtags = "text" + texidoc = " +By putting the output of @code{lilypond-version} into a lyric or a +text markup, it is possible to print the version number of LilyPond in +a score, or in a document generated with @code{lilypond-book}. +" +} + +\score { \context Lyrics { + \override Score.RehearsalMark #'self-alignment-X = #LEFT + \mark #(ly:export (string-append "Processed with LilyPond version " (lilypond-version))) + s2 + } +} diff --git a/input/new/page-label.ly b/input/new/page-label.ly new file mode 100644 index 0000000000..1eb75e0d2f --- /dev/null +++ b/input/new/page-label.ly @@ -0,0 +1,48 @@ +\version "2.11.26" +\layout { ragged-right= ##t } +\header { + doctitle = "Page label" + lsrtags = "spacing" + texidoc = "Page labels may be placed inside music or at top-level, +and refered to in markups." +} + +#(set-default-paper-size "a6") + +#(define-markup-command (toc-line layout props label text) (symbol? markup?) + (interpret-markup layout props + (markup #:fill-line (text #:page-ref label "8" "?")))) + +\book { + \markup \huge \fill-line { \null "Title Page" \null } + + \pageBreak + + \label #'toc + \markup \column { + \large \fill-line { \null "Table of contents" \null } + \toc-line #'toc "Table of contents" + \toc-line #'firstScore "First Score" + \toc-line #'markA "Mark A" + \toc-line #'markB "Mark B" + \toc-line #'markC "Mark C" + \toc-line #'unknown "Unknown label" + } + + \pageBreak + + \label #'firstScore + \score { + { c'2 c' + \mark \markup { A (page \concat { \page-ref #'markA "0" "?" ) }} \label #'markA + c' c' + \pageBreak + \mark "B" \label #'markB + d' d' + d' d' + \once \override Score . RehearsalMark #'break-visibility = #begin-of-line-invisible + \mark "C" \label #'markC + } + \header { piece = "First score" } + } +} diff --git a/input/new/paper-and-layout/GNUmakefile b/input/new/paper-and-layout/GNUmakefile deleted file mode 100644 index eb18cb2518..0000000000 --- a/input/new/paper-and-layout/GNUmakefile +++ /dev/null @@ -1,7 +0,0 @@ -depth = ../../.. - -STEPMAKE_TEMPLATES=documentation - -EXTRA_DIST_FILES=$(call src-wildcard,*.ly) - -include $(depth)/make/stepmake.make diff --git a/input/new/paper-and-layout/SConscript b/input/new/paper-and-layout/SConscript deleted file mode 100644 index f72bfffc28..0000000000 --- a/input/new/paper-and-layout/SConscript +++ /dev/null @@ -1,4 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Advanced snippets') diff --git a/input/new/paper-and-layout/clip-systems.ly b/input/new/paper-and-layout/clip-systems.ly deleted file mode 100644 index 06247e76b5..0000000000 --- a/input/new/paper-and-layout/clip-systems.ly +++ /dev/null @@ -1,85 +0,0 @@ -\header { - texidoc = "Clipping snippets from a finished score - -Notes: - -@itemize @bullet -@item If system starts and ends are included, they include extents of the System grob, eg. instrument names. -@item Grace notes at the end point of the region are not included -@item Regions can span multiple systems. In this case, multiple EPS files are generated. -@end itemize - -This file needs to be run separately with @code{-dclip-systems}; the -collated-files.html of the regression test does not adequately show -the results. - -The result will be files named -@file{@var{base}-from-@var{start}-to-@var{end}[-@var{count}].eps}. -" - -} - -\version "2.10.0" - -#(ly:set-option 'clip-systems) - -#(set! output-count 1) - -origScore = \score{ - \relative { - \set Staff.instrumentName = #"bla" - c1 - d - \grace c16 - e1 - \key d\major - - f - \break \clef bass - g, - fis - } -} - -\book { - \score { - \origScore - \layout { - - %% each clip-region is a (START . END) pair - %% where both are rhythmic-locations. - - %% (make-rhythmic-locations BAR-NUMBER NUM DEN) - %% means NUM/DEN whole-notes into bar numbered BAR-NUMBER - - clip-regions - = #(list - (cons - (make-rhythmic-location 2 0 1) - (make-rhythmic-location 4 0 1)) - - (cons - (make-rhythmic-location 0 0 1) - (make-rhythmic-location 4 0 1)) - - (cons - (make-rhythmic-location 0 0 1) - (make-rhythmic-location 6 0 1)) - ) - } - } -} - -#(set! output-count 0) -#(ly:set-option 'clip-systems #f) - -\book { - \score { \origScore } - \markup { \bold \fontsize #6 clips } - \score { - \lyrics { - \markup { from-2.0.1-to-4.0.1-clip.eps } - \markup { \epsfile #X #30.0 #(format #f "~a-1-from-2.0.1-to-4.0.1-clip.eps" (ly:parser-output-name parser)) } - } - } -} diff --git a/input/new/paper-and-layout/toc.ly b/input/new/paper-and-layout/toc.ly deleted file mode 100644 index 93886b2a70..0000000000 --- a/input/new/paper-and-layout/toc.ly +++ /dev/null @@ -1,29 +0,0 @@ -\version "2.11.26" - -\header { - texidoc = "A table of contents is included using -@code{\\markuplines \\table-of-contents}. The toc items are added with -the @code{\\tocItem} command." -} - -#(set-default-paper-size "a6") - -\book { - \markuplines \table-of-contents - \pageBreak - - \tocItem \markup "The first score" - \score { - { - c'1 \pageBreak - \mark "A" \tocItem \markup "Mark A" - d' - } - } - \pageBreak - \tocItem \markup "The second score" - \score { - { e' } - \header { piece = "Second score" } - } -} diff --git a/input/new/parts/GNUmakefile b/input/new/parts/GNUmakefile deleted file mode 100644 index eb18cb2518..0000000000 --- a/input/new/parts/GNUmakefile +++ /dev/null @@ -1,7 +0,0 @@ -depth = ../../.. - -STEPMAKE_TEMPLATES=documentation - -EXTRA_DIST_FILES=$(call src-wildcard,*.ly) - -include $(depth)/make/stepmake.make diff --git a/input/new/parts/SConscript b/input/new/parts/SConscript deleted file mode 100644 index f72bfffc28..0000000000 --- a/input/new/parts/SConscript +++ /dev/null @@ -1,4 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Advanced snippets') diff --git a/input/new/parts/quote-transposition.ly b/input/new/parts/quote-transposition.ly deleted file mode 100644 index eb94ea08ce..0000000000 --- a/input/new/parts/quote-transposition.ly +++ /dev/null @@ -1,44 +0,0 @@ -\header -{ - - texidoc = "Quotations take into account the transposition of both -source and target. In this example, all instruments play sounding -central C, the target is a instrument in F. The target part may be -@code{\\transpose}d. In this case, all the pitches (including the -quoted ones) will transposed as well. " - -} - -\version "2.11.10" - -\layout { ragged-right = ##t } - - -\addQuote clarinet { - \transposition bes - d'16 d'16 d'8 - d'16 d'16 d'8 - d'16 d'16 d'8 - d'16 d'16 d'8 -} - -\addQuote sax { - \transposition es' - a8 a a a a a a a -} - -quoteTest = { - \transposition f % french horn - - g'4 - << \quoteDuring #"clarinet" { \skip 4 } s4^"clar" >> - << \quoteDuring #"sax" { \skip 4 } s4^"sax" >> -} - - -<< \quoteTest - \new Staff - << \transpose c' d' \quoteTest - s4_"up 1 tone" - >> ->> diff --git a/input/new/parts/quote.ly b/input/new/parts/quote.ly deleted file mode 100644 index 1f29585f3c..0000000000 --- a/input/new/parts/quote.ly +++ /dev/null @@ -1,41 +0,0 @@ -\header -{ - - texidoc = "With @code{\\quote}, fragments of previously entered -music may be quoted. @code{quotedEventTypes} will determines what -things are quoted. In this example, a 16th rests is not quoted, since -@code{rest-event} is not in @code{quotedEventTypes}." - -} -\version "2.11.10" -\layout { - ragged-right = ##t -} - - -quoteMe = \relative c' { fis4 r16 a8.-> b4-\ff c } - -\addQuote quoteMe \quoteMe -original = \relative c'' { c8 d s2 es8 gis8 } - -<< - \new Staff { - \set Staff.instrumentName = "quoteMe" - \quoteMe - } - \new Staff { - \set Staff.instrumentName = "orig" - \original - } - \new Staff \relative c'' << - \set Staff.instrumentName = "orig+quote" - \set Staff.quotedEventTypes = #'(note-event articulation-event) - \original - \new Voice { - s4 - \set fontSize = #-4 - \override Stem #'length-fraction = #(magstep -4) - \quoteDuring #"quoteMe" { \skip 2. } - } - >> ->> diff --git a/input/new/percussion/GNUmakefile b/input/new/percussion/GNUmakefile deleted file mode 100644 index eb18cb2518..0000000000 --- a/input/new/percussion/GNUmakefile +++ /dev/null @@ -1,7 +0,0 @@ -depth = ../../.. - -STEPMAKE_TEMPLATES=documentation - -EXTRA_DIST_FILES=$(call src-wildcard,*.ly) - -include $(depth)/make/stepmake.make diff --git a/input/new/percussion/SConscript b/input/new/percussion/SConscript deleted file mode 100644 index f72bfffc28..0000000000 --- a/input/new/percussion/SConscript +++ /dev/null @@ -1,4 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Advanced snippets') diff --git a/input/new/piano-music/GNUmakefile b/input/new/piano-music/GNUmakefile deleted file mode 100644 index eb18cb2518..0000000000 --- a/input/new/piano-music/GNUmakefile +++ /dev/null @@ -1,7 +0,0 @@ -depth = ../../.. - -STEPMAKE_TEMPLATES=documentation - -EXTRA_DIST_FILES=$(call src-wildcard,*.ly) - -include $(depth)/make/stepmake.make diff --git a/input/new/piano-music/SConscript b/input/new/piano-music/SConscript deleted file mode 100644 index cb39d4eab0..0000000000 --- a/input/new/piano-music/SConscript +++ /dev/null @@ -1,5 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Sample snippets from LSR') - diff --git a/input/new/pitches/GNUmakefile b/input/new/pitches/GNUmakefile deleted file mode 100644 index eb18cb2518..0000000000 --- a/input/new/pitches/GNUmakefile +++ /dev/null @@ -1,7 +0,0 @@ -depth = ../../.. - -STEPMAKE_TEMPLATES=documentation - -EXTRA_DIST_FILES=$(call src-wildcard,*.ly) - -include $(depth)/make/stepmake.make diff --git a/input/new/pitches/SConscript b/input/new/pitches/SConscript deleted file mode 100644 index f72bfffc28..0000000000 --- a/input/new/pitches/SConscript +++ /dev/null @@ -1,4 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Advanced snippets') diff --git a/input/new/pitches/creating-music-with-scheme-music-box.ly b/input/new/pitches/creating-music-with-scheme-music-box.ly deleted file mode 100644 index 72ce0dc7d1..0000000000 --- a/input/new/pitches/creating-music-with-scheme-music-box.ly +++ /dev/null @@ -1,11 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.11.35" - -\header { texidoc = " -This example shows prelude in C major of Bach's Well-Tempered Klavier -1, but coded using Scheme functions to avoid typing work. - -BROKEN (?) IN 2.11, COMMENTED OUT. -" } - -{ c'4 } diff --git a/input/new/pitches/makam.ly b/input/new/pitches/makam.ly deleted file mode 100644 index 549df765c8..0000000000 --- a/input/new/pitches/makam.ly +++ /dev/null @@ -1,158 +0,0 @@ -\header { - - texidoc = "Makam is Turkish type of melody that uses 1/9 tone - microtonal alterations." - -} - - -\version "2.11.6" - -%{ - -Define 1/9 alterations. - -%} - - -#(define-public KOMA 1/9) -#(define-public BAKIYE 4/9) -#(define-public KUCUK 5/9) -#(define-public BUYUKMUCENNEB 8/9) - -%{ - -Define pitch names - -%} - -makamPitchNames = #`( - (c . ,(ly:make-pitch -1 0 NATURAL)) - (d . ,(ly:make-pitch -1 1 NATURAL)) - (e . ,(ly:make-pitch -1 2 NATURAL)) - (f . ,(ly:make-pitch -1 3 NATURAL)) - (g . ,(ly:make-pitch -1 4 NATURAL)) - (a . ,(ly:make-pitch -1 5 NATURAL)) - (b . ,(ly:make-pitch -1 6 NATURAL)) - - (cc . ,(ly:make-pitch -1 0 KOMA)) - (dc . ,(ly:make-pitch -1 1 KOMA)) - (ec . ,(ly:make-pitch -1 2 KOMA)) - (fc . ,(ly:make-pitch -1 3 KOMA)) - (gc . ,(ly:make-pitch -1 4 KOMA)) - (ac . ,(ly:make-pitch -1 5 KOMA)) - (bc . ,(ly:make-pitch -1 6 KOMA)) - - (cb . ,(ly:make-pitch -1 0 BAKIYE)) - (db . ,(ly:make-pitch -1 1 BAKIYE)) - (eb . ,(ly:make-pitch -1 2 BAKIYE)) - (fb . ,(ly:make-pitch -1 3 BAKIYE)) - (gb . ,(ly:make-pitch -1 4 BAKIYE)) - (ab . ,(ly:make-pitch -1 5 BAKIYE)) - (bb . ,(ly:make-pitch -1 6 BAKIYE)) - - (ck . ,(ly:make-pitch -1 0 KUCUK)) - (dk . ,(ly:make-pitch -1 1 KUCUK)) - (ek . ,(ly:make-pitch -1 2 KUCUK)) - (fk . ,(ly:make-pitch -1 3 KUCUK)) - (gk . ,(ly:make-pitch -1 4 KUCUK)) - (ak . ,(ly:make-pitch -1 5 KUCUK)) - (bk . ,(ly:make-pitch -1 6 KUCUK)) - - (cbm . ,(ly:make-pitch -1 0 BUYUKMUCENNEB)) - (dbm . ,(ly:make-pitch -1 1 BUYUKMUCENNEB)) - (ebm . ,(ly:make-pitch -1 2 BUYUKMUCENNEB)) - (fbm . ,(ly:make-pitch -1 3 BUYUKMUCENNEB)) - (gbm . ,(ly:make-pitch -1 4 BUYUKMUCENNEB)) - (abm . ,(ly:make-pitch -1 5 BUYUKMUCENNEB)) - (bbm . ,(ly:make-pitch -1 6 BUYUKMUCENNEB)) - - ;; f for flat. - (cfc . ,(ly:make-pitch -1 0 (- KOMA))) - (dfc . ,(ly:make-pitch -1 1 (- KOMA))) - (efc . ,(ly:make-pitch -1 2 (- KOMA))) - (ffc . ,(ly:make-pitch -1 3 (- KOMA))) - (gfc . ,(ly:make-pitch -1 4 (- KOMA))) - (afc . ,(ly:make-pitch -1 5 (- KOMA))) - (bfc . ,(ly:make-pitch -1 6 (- KOMA))) - - (cfb . ,(ly:make-pitch -1 0 (- BAKIYE))) - (dfb . ,(ly:make-pitch -1 1 (- BAKIYE))) - (efb . ,(ly:make-pitch -1 2 (- BAKIYE))) - (ffb . ,(ly:make-pitch -1 3 (- BAKIYE))) - (gfb . ,(ly:make-pitch -1 4 (- BAKIYE))) - (afb . ,(ly:make-pitch -1 5 (- BAKIYE))) - (bfb . ,(ly:make-pitch -1 6 (- BAKIYE))) - - (cfk . ,(ly:make-pitch -1 0 (- KUCUK))) - (dfk . ,(ly:make-pitch -1 1 (- KUCUK))) - (efk . ,(ly:make-pitch -1 2 (- KUCUK))) - (ffk . ,(ly:make-pitch -1 3 (- KUCUK))) - (gfk . ,(ly:make-pitch -1 4 (- KUCUK))) - (afk . ,(ly:make-pitch -1 5 (- KUCUK))) - (bfk . ,(ly:make-pitch -1 6 (- KUCUK))) - - (cfbm . ,(ly:make-pitch -1 0 (- BUYUKMUCENNEB))) - (dfbm . ,(ly:make-pitch -1 1 (- BUYUKMUCENNEB))) - (efbm . ,(ly:make-pitch -1 2 (- BUYUKMUCENNEB))) - (ffbm . ,(ly:make-pitch -1 3 (- BUYUKMUCENNEB))) - (gfbm . ,(ly:make-pitch -1 4 (- BUYUKMUCENNEB))) - (afbm . ,(ly:make-pitch -1 5 (- BUYUKMUCENNEB))) - (bfbm . ,(ly:make-pitch -1 6 (- BUYUKMUCENNEB))) - -) - - -%% set pitch names. -pitchnames = \makamPitchNames -#(ly:parser-set-note-names parser makamPitchNames) - -\paper -{ - ragged-right = ##t -} - - -makamGlyphs = #'((1 . "accidentals.doublesharp") - (8/9 . "accidentals.sharp.slashslashslash.stemstem") - (5/9 . "accidentals.sharp.slashslashslash.stem") - (4/9 . "accidentals.sharp") - (1/9 . "accidentals.sharp.slashslash.stem") - (0 . "accidentals.natural") - (-1/9 . "accidentals.mirroredflat") - (-4/9 . "accidentals.flat.slash") - (-5/9 . "accidentals.flat") - (-8/9 . "accidentals.flat.slashslash") - (-1 . "accidentals.flatflat") - ) - -\relative { - - %{ define alteration <-> symbol mapping. The following glyphs are available. - - accidentals.sharp - accidentals.sharp.slashslash.stem - accidentals.sharp.slashslashslash.stemstem - accidentals.sharp.slashslashslash.stem - accidentals.sharp.slashslash.stemstemstem - accidentals.natural - accidentals.flat - accidentals.flat.slash - accidentals.flat.slashslash - accidentals.mirroredflat.flat - accidentals.mirroredflat - accidentals.flatflat - accidentals.flatflat.slash - accidentals.doublesharp - - %} - - \override Accidental #'glyph-name-alist = \makamGlyphs - - \override Staff.KeySignature #'glyph-name-alist = \makamGlyphs - \set Staff.keySignature = #'( - (3 . 4/9) - (6 . -1/9)) - - c cc db fk gbm gfc gfb efk dfbm -} diff --git a/input/new/pitches/volta-multi-staff.ly b/input/new/pitches/volta-multi-staff.ly deleted file mode 100644 index fdda342f7c..0000000000 --- a/input/new/pitches/volta-multi-staff.ly +++ /dev/null @@ -1,22 +0,0 @@ -\header { - texidoc = "By adding @code{Volta_engraver}, repeat brackets - can be put over staves other than the topmost one in a score." -} - -\version "2.11.36" - -vmus = { - \repeat volta 2 c1 \alternative { d e } -} - -\relative c'' << - \new StaffGroup << - \context Staff \vmus - \new Staff \vmus - >> - \new StaffGroup << - \new Staff \with { \consists Volta_engraver } - \vmus - \new Staff \vmus - >> ->> diff --git a/input/new/quoting-another-voice-with-transposition.ly b/input/new/quoting-another-voice-with-transposition.ly new file mode 100644 index 0000000000..88c261edf3 --- /dev/null +++ b/input/new/quoting-another-voice-with-transposition.ly @@ -0,0 +1,38 @@ +\version "2.11.10" +\header { + doctitle = "Quoting another voice with transposition" + lsrtags = "pitches,staff-notation" + texidoc = "Quotations take into account the transposition of both +source and target. In this example, all instruments play sounding +central C, the target is a instrument in F. The target part may be +@code{\\transpose}d. In this case, all the pitches (including the +quoted ones) will transposed as well." +} + +\addQuote clarinet { + \transposition bes + d'16 d'16 d'8 + d'16 d'16 d'8 + d'16 d'16 d'8 + d'16 d'16 d'8 +} + +\addQuote sax { + \transposition es' + a8 a a a a a a a +} + +quoteTest = { + \transposition f % french horn + + g'4 + << \quoteDuring #"clarinet" { \skip 4 } s4^"clar" >> + << \quoteDuring #"sax" { \skip 4 } s4^"sax" >> +} + +<< \quoteTest + \new Staff + << \transpose c' d' \quoteTest + s4_"up 1 tone" + >> +>> diff --git a/input/new/quoting-another-voice.ly b/input/new/quoting-another-voice.ly new file mode 100644 index 0000000000..9a1c58eea3 --- /dev/null +++ b/input/new/quoting-another-voice.ly @@ -0,0 +1,37 @@ +\version "2.11.10" +\layout { ragged-right= ##t } +\header { + doctitle = "Quoting another voice" + lsrtags = "staff-notation" + texidoc = "With @code{\\quote}, fragments of previously entered +music may be quoted. @code{quotedEventTypes} will determines what +things are quoted. In this example, a 16th rest is not quoted, since +@code{rest-event} is not in @code{quotedEventTypes}." +} + +quoteMe = \relative c' { fis4 r16 a8.-> b4-\ff c } + +\addQuote quoteMe \quoteMe +original = \relative c'' { c8 d s2 es8 gis8 } + +<< + \new Staff { + \set Staff.instrumentName = "quoteMe" + \quoteMe + } + \new Staff { + \set Staff.instrumentName = "orig" + \original + } + \new Staff \relative c'' << + \set Staff.instrumentName = "orig+quote" + \set Staff.quotedEventTypes = #'(note-event articulation-event) + \original + \new Voice { + s4 + \set fontSize = #-4 + \override Stem #'length-fraction = #(magstep -4) + \quoteDuring #"quoteMe" { \skip 2. } + } + >> +>> diff --git a/input/new/real-music/GNUmakefile b/input/new/real-music/GNUmakefile deleted file mode 100644 index eb18cb2518..0000000000 --- a/input/new/real-music/GNUmakefile +++ /dev/null @@ -1,7 +0,0 @@ -depth = ../../.. - -STEPMAKE_TEMPLATES=documentation - -EXTRA_DIST_FILES=$(call src-wildcard,*.ly) - -include $(depth)/make/stepmake.make diff --git a/input/new/real-music/SConscript b/input/new/real-music/SConscript deleted file mode 100644 index f72bfffc28..0000000000 --- a/input/new/real-music/SConscript +++ /dev/null @@ -1,4 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Advanced snippets') diff --git a/input/new/repeats/GNUmakefile b/input/new/repeats/GNUmakefile deleted file mode 100644 index eb18cb2518..0000000000 --- a/input/new/repeats/GNUmakefile +++ /dev/null @@ -1,7 +0,0 @@ -depth = ../../.. - -STEPMAKE_TEMPLATES=documentation - -EXTRA_DIST_FILES=$(call src-wildcard,*.ly) - -include $(depth)/make/stepmake.make diff --git a/input/new/repeats/SConscript b/input/new/repeats/SConscript deleted file mode 100644 index f72bfffc28..0000000000 --- a/input/new/repeats/SConscript +++ /dev/null @@ -1,4 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Advanced snippets') diff --git a/input/new/repeats/volta-multi-staff.ly b/input/new/repeats/volta-multi-staff.ly deleted file mode 100644 index fdda342f7c..0000000000 --- a/input/new/repeats/volta-multi-staff.ly +++ /dev/null @@ -1,22 +0,0 @@ -\header { - texidoc = "By adding @code{Volta_engraver}, repeat brackets - can be put over staves other than the topmost one in a score." -} - -\version "2.11.36" - -vmus = { - \repeat volta 2 c1 \alternative { d e } -} - -\relative c'' << - \new StaffGroup << - \context Staff \vmus - \new Staff \vmus - >> - \new StaffGroup << - \new Staff \with { \consists Volta_engraver } - \vmus - \new Staff \vmus - >> ->> diff --git a/input/new/rhythms/GNUmakefile b/input/new/rhythms/GNUmakefile deleted file mode 100644 index eb18cb2518..0000000000 --- a/input/new/rhythms/GNUmakefile +++ /dev/null @@ -1,7 +0,0 @@ -depth = ../../.. - -STEPMAKE_TEMPLATES=documentation - -EXTRA_DIST_FILES=$(call src-wildcard,*.ly) - -include $(depth)/make/stepmake.make diff --git a/input/new/rhythms/SConscript b/input/new/rhythms/SConscript deleted file mode 100644 index f72bfffc28..0000000000 --- a/input/new/rhythms/SConscript +++ /dev/null @@ -1,4 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Advanced snippets') diff --git a/input/new/schemelanguage/GNUmakefile b/input/new/schemelanguage/GNUmakefile deleted file mode 100644 index eb18cb2518..0000000000 --- a/input/new/schemelanguage/GNUmakefile +++ /dev/null @@ -1,7 +0,0 @@ -depth = ../../.. - -STEPMAKE_TEMPLATES=documentation - -EXTRA_DIST_FILES=$(call src-wildcard,*.ly) - -include $(depth)/make/stepmake.make diff --git a/input/new/schemelanguage/SConscript b/input/new/schemelanguage/SConscript deleted file mode 100644 index f72bfffc28..0000000000 --- a/input/new/schemelanguage/SConscript +++ /dev/null @@ -1,4 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Advanced snippets') diff --git a/input/new/schemelanguage/move-specific-text.ly b/input/new/schemelanguage/move-specific-text.ly deleted file mode 100644 index 53dbec836f..0000000000 --- a/input/new/schemelanguage/move-specific-text.ly +++ /dev/null @@ -1,20 +0,0 @@ - -\version "2.10.0" -% possible rename to scheme- or something like that. -gp -\header { texidoc = "@cindex Scheme Move Text -Objects, like text, can be moved around by using some Scheme code. -" } - -#(define (make-text-checker text) - (lambda (grob) (equal? text (ly:grob-property grob 'text)))) - -\score { - \relative c''' { - \stemUp - \applyOutput #'Voice #(outputproperty-compatibility (make-text-checker (make-simple-markup "m.d.")) - 'extra-offset '(-3.5 . -4.5)) - a^2^"m.d." - } - \layout { ragged-right = ##t} -} - diff --git a/input/new/simultaneous-notes/GNUmakefile b/input/new/simultaneous-notes/GNUmakefile deleted file mode 100644 index eb18cb2518..0000000000 --- a/input/new/simultaneous-notes/GNUmakefile +++ /dev/null @@ -1,7 +0,0 @@ -depth = ../../.. - -STEPMAKE_TEMPLATES=documentation - -EXTRA_DIST_FILES=$(call src-wildcard,*.ly) - -include $(depth)/make/stepmake.make diff --git a/input/new/simultaneous-notes/SConscript b/input/new/simultaneous-notes/SConscript deleted file mode 100644 index cb39d4eab0..0000000000 --- a/input/new/simultaneous-notes/SConscript +++ /dev/null @@ -1,5 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Sample snippets from LSR') - diff --git a/input/new/spacing/GNUmakefile b/input/new/spacing/GNUmakefile deleted file mode 100644 index eb18cb2518..0000000000 --- a/input/new/spacing/GNUmakefile +++ /dev/null @@ -1,7 +0,0 @@ -depth = ../../.. - -STEPMAKE_TEMPLATES=documentation - -EXTRA_DIST_FILES=$(call src-wildcard,*.ly) - -include $(depth)/make/stepmake.make diff --git a/input/new/spacing/SConscript b/input/new/spacing/SConscript deleted file mode 100644 index f72bfffc28..0000000000 --- a/input/new/spacing/SConscript +++ /dev/null @@ -1,4 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Advanced snippets') diff --git a/input/new/spacing/page-label.ly b/input/new/spacing/page-label.ly deleted file mode 100644 index e4f9cc6947..0000000000 --- a/input/new/spacing/page-label.ly +++ /dev/null @@ -1,46 +0,0 @@ -\version "2.11.26" - -\header { - texidoc = "Page labels may be placed inside music or at top-level, -and refered to in markups." -} - -#(set-default-paper-size "a6") - -#(define-markup-command (toc-line layout props label text) (symbol? markup?) - (interpret-markup layout props - (markup #:fill-line (text #:page-ref label "8" "?")))) - -\book { - \markup \huge \fill-line { \null "Title Page" \null } - - \pageBreak - - \label #'toc - \markup \column { - \large \fill-line { \null "Table of contents" \null } - \toc-line #'toc "Table of contents" - \toc-line #'firstScore "First Score" - \toc-line #'markA "Mark A" - \toc-line #'markB "Mark B" - \toc-line #'markC "Mark C" - \toc-line #'unknown "Unknown label" - } - - \pageBreak - - \label #'firstScore - \score { - { c'2 c' - \mark \markup { A (page \concat { \page-ref #'markA "0" "?" ) }} \label #'markA - c' c' - \pageBreak - \mark "B" \label #'markB - d' d' - d' d' - \once \override Score . RehearsalMark #'break-visibility = #begin-of-line-invisible - \mark "C" \label #'markC - } - \header { piece = "First score" } - } -} diff --git a/input/new/staff-notation/GNUmakefile b/input/new/staff-notation/GNUmakefile deleted file mode 100644 index eb18cb2518..0000000000 --- a/input/new/staff-notation/GNUmakefile +++ /dev/null @@ -1,7 +0,0 @@ -depth = ../../.. - -STEPMAKE_TEMPLATES=documentation - -EXTRA_DIST_FILES=$(call src-wildcard,*.ly) - -include $(depth)/make/stepmake.make diff --git a/input/new/staff-notation/SConscript b/input/new/staff-notation/SConscript deleted file mode 100644 index f72bfffc28..0000000000 --- a/input/new/staff-notation/SConscript +++ /dev/null @@ -1,4 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Advanced snippets') diff --git a/input/new/strings/GNUmakefile b/input/new/strings/GNUmakefile deleted file mode 100644 index eb18cb2518..0000000000 --- a/input/new/strings/GNUmakefile +++ /dev/null @@ -1,7 +0,0 @@ -depth = ../../.. - -STEPMAKE_TEMPLATES=documentation - -EXTRA_DIST_FILES=$(call src-wildcard,*.ly) - -include $(depth)/make/stepmake.make diff --git a/input/new/strings/SConscript b/input/new/strings/SConscript deleted file mode 100644 index cb39d4eab0..0000000000 --- a/input/new/strings/SConscript +++ /dev/null @@ -1,5 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Sample snippets from LSR') - diff --git a/input/new/table-of-contents.ly b/input/new/table-of-contents.ly new file mode 100644 index 0000000000..30ad7ccce8 --- /dev/null +++ b/input/new/table-of-contents.ly @@ -0,0 +1,31 @@ +\version "2.11.26" +\layout { ragged-right= ##t } +\header { + doctitle = "Table of contents" + lsrtags = "paper-and-layout" + texidoc = "A table of contents is included using +@code{\\markuplines \\table-of-contents}. The TOC items are added with +the @code{\\tocItem} command." +} + +#(set-default-paper-size "a6") + +\book { + \markuplines \table-of-contents + \pageBreak + + \tocItem \markup "The first score" + \score { + { + c'1 \pageBreak + \mark "A" \tocItem \markup "Mark A" + d' + } + } + \pageBreak + \tocItem \markup "The second score" + \score { + { e' } + \header { piece = "Second score" } + } +} diff --git a/input/new/text/GNUmakefile b/input/new/text/GNUmakefile deleted file mode 100644 index eb18cb2518..0000000000 --- a/input/new/text/GNUmakefile +++ /dev/null @@ -1,7 +0,0 @@ -depth = ../../.. - -STEPMAKE_TEMPLATES=documentation - -EXTRA_DIST_FILES=$(call src-wildcard,*.ly) - -include $(depth)/make/stepmake.make diff --git a/input/new/text/SConscript b/input/new/text/SConscript deleted file mode 100644 index f72bfffc28..0000000000 --- a/input/new/text/SConscript +++ /dev/null @@ -1,4 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Advanced snippets') diff --git a/input/new/text/markup-lines.ly b/input/new/text/markup-lines.ly deleted file mode 100644 index 752dcf3bcb..0000000000 --- a/input/new/text/markup-lines.ly +++ /dev/null @@ -1,38 +0,0 @@ -\version "2.11.25" - -\header { - texidoc = "Text that can spread over pages is entered with the -@code{\\markuplines} command." -} - -#(set-default-paper-size "a6") - -#(define-markup-list-command (paragraph layout props args) (markup-list?) - (interpret-markup-list layout props - (make-justified-lines-markup-list (cons (make-hspace-markup 2) args)))) - -%% Candide, Voltaire -\markuplines \override-lines #'(baseline-skip . 2.5) { - \paragraph { - Il y avait en Westphalie, dans le château de M. le baron de - Thunder-ten-tronckh, un jeune garçon à qui la nature avait donné - les mœurs les plus douces. Sa physionomie annonçait son âme. - Il avait le jugement assez droit, avec l'esprit le plus simple ; - c'est, je crois, pour cette raison qu'on le nommait Candide. Les - anciens domestiques de la maison soupçonnaient qu'il était fils - de la sœur de monsieur le baron et d'un bon et honnête - gentilhomme du voisinage, que cette demoiselle ne voulut jamais - épouser parce qu'il n'avait pu prouver que soixante et onze - quartiers, et que le reste de son arbre généalogique avait été - perdu par l'injure du temps. - } - \paragraph { - Monsieur le baron était un des plus puissants seigneurs de la - Westphalie, car son château avait une porte et des fenêtres. Sa - grande salle même était ornée d'une tapisserie. Tous les chiens - de ses basses-cours composaient une meute dans le besoin ; ses - palefreniers étaient ses piqueurs; le vicaire du village était - son grand-aumônier. Ils l'appelaient tous monseigneur, et ils - riaient quand il faisait des contes. - } -} diff --git a/input/new/text/utf-8.ly b/input/new/text/utf-8.ly deleted file mode 100644 index c057887ca1..0000000000 --- a/input/new/text/utf-8.ly +++ /dev/null @@ -1,65 +0,0 @@ -\version "2.10.0" - -%% Edit this file using a Unicode aware editor, such as GVIM, GEDIT, Emacs - -%{ - -You may have to install additional fonts. - -Red Hat Fedora - - taipeifonts fonts-xorg-truetype ttfonts-ja fonts-arabic \ - ttfonts-zh_CN fonts-ja fonts-hebrew - -Debian GNU/Linux - - apt-get install emacs-intl-fonts xfonts-intl-.* \ - ttf-kochi-gothic ttf-kochi-mincho \ - xfonts-bolkhov-75dpi xfonts-cronyx-100dpi xfonts-cronyx-75dpi -%} - -\header { - - texidoc = "Various scripts may be used for texts (like titles and -lyrics) introduced by entering them in UTF-8 encoding, and using a -Pango based backend. Depending on the fonts installed, this fragment -will render Bulgarian (Cyrillic), Hebrew, Japanese and Portuguese. - -" - -} - -% end verbatim - this comment is a hack to prevent texinfo.tex -% from choking on non-European UTF-8 subsets -% Cyrillic font -bulgarian = \lyricmode { - Жълтата дюля беше щастлива, че пухът, който цъфна, замръзна като гьон. -} - -hebrew = \lyricmode { - זה כיף סתם לשמוע איך תנצח קרפד עץ טוב בגן. -} - -japanese = \lyricmode { - いろはにほへど ちりぬるを - わがよたれぞ つねならむ - うゐのおくや まけふこえて - あさきゆめみじ ゑひもせず -} - -% "a legal song to you" -portuguese = \lyricmode { - à vo -- cê uma can -- ção legal -} - -\paper { - ragged-right = ##T -} - -\relative { - c2 d e f g f e -} -\addlyrics { \bulgarian } -\addlyrics { \hebrew } -\addlyrics { \japanese } -\addlyrics { \portuguese } diff --git a/input/new/using-the--tweak-command-to-tweak-individual-grobs.ly b/input/new/using-the--tweak-command-to-tweak-individual-grobs.ly new file mode 100644 index 0000000000..e079b27b10 --- /dev/null +++ b/input/new/using-the--tweak-command-to-tweak-individual-grobs.ly @@ -0,0 +1,20 @@ +\version "2.11.23" +\layout { ragged-right= ##t } +\header { + doctitle = "Using the @code{\tweak} command to tweak individual grobs" + lsrtags = "tweaks-and-overrides" + texidoc = " +With the @code{\tweak} command, you can tune every grob directly. Here +are some examples of available tweaks. +" +} + +{ + \set fingeringOrientations = #'(right) + < + \tweak #'font-size #3 c + \tweak #'color #red d-\tweak #'font-size #8 -4 + \tweak #'style #'cross g + \tweak #'duration-log #1 a + >4 +} diff --git a/input/new/utf-8.ly b/input/new/utf-8.ly new file mode 100644 index 0000000000..b2981fbef4 --- /dev/null +++ b/input/new/utf-8.ly @@ -0,0 +1,66 @@ +\version "2.10.0" + +%% Edit this file using a Unicode aware editor, such as GVIM, GEDIT, Emacs + +%{ + +You may have to install additional fonts. + +Red Hat Fedora + + taipeifonts fonts-xorg-truetype ttfonts-ja fonts-arabic \ + ttfonts-zh_CN fonts-ja fonts-hebrew + +Debian GNU/Linux + + apt-get install emacs-intl-fonts xfonts-intl-.* \ + ttf-kochi-gothic ttf-kochi-mincho \ + xfonts-bolkhov-75dpi xfonts-cronyx-100dpi xfonts-cronyx-75dpi +%} + +\header { + doctitle = "UTF-8" + lsrtags = "text" + texidoc = "Various scripts may be used for texts (like titles and +lyrics) introduced by entering them in UTF-8 encoding, and using a +Pango based backend. Depending on the fonts installed, this fragment +will render Bulgarian (Cyrillic), Hebrew, Japanese and Portuguese. + +" + +} + +% end verbatim - this comment is a hack to prevent texinfo.tex +% from choking on non-European UTF-8 subsets +% Cyrillic font +bulgarian = \lyricmode { + Жълтата дюля беше щастлива, че пухът, който цъфна, замръзна като гьон. +} + +hebrew = \lyricmode { + זה כיף סתם לשמוע איך תנצח קרפד עץ טוב בגן. +} + +japanese = \lyricmode { + いろはにほへど ちりぬるを + わがよたれぞ つねならむ + うゐのおくや まけふこえて + あさきゆめみじ ゑひもせず +} + +% "a legal song to you" +portuguese = \lyricmode { + à vo -- cê uma can -- ção legal +} + +\paper { + ragged-right = ##t +} + +\relative { + c2 d e f g f e +} +\addlyrics { \bulgarian } +\addlyrics { \hebrew } +\addlyrics { \japanese } +\addlyrics { \portuguese } diff --git a/input/new/vocal-music/GNUmakefile b/input/new/vocal-music/GNUmakefile deleted file mode 100644 index eb18cb2518..0000000000 --- a/input/new/vocal-music/GNUmakefile +++ /dev/null @@ -1,7 +0,0 @@ -depth = ../../.. - -STEPMAKE_TEMPLATES=documentation - -EXTRA_DIST_FILES=$(call src-wildcard,*.ly) - -include $(depth)/make/stepmake.make diff --git a/input/new/vocal-music/SConscript b/input/new/vocal-music/SConscript deleted file mode 100644 index f72bfffc28..0000000000 --- a/input/new/vocal-music/SConscript +++ /dev/null @@ -1,4 +0,0 @@ -# -*-python-*- - -Import ('env', 'collate') -collate (title = 'Advanced snippets') diff --git a/input/new/volta-multi-staff.ly b/input/new/volta-multi-staff.ly new file mode 100644 index 0000000000..7f1a489971 --- /dev/null +++ b/input/new/volta-multi-staff.ly @@ -0,0 +1,24 @@ +\version "2.11.36" +\layout { ragged-right= ##t } +\header { + doctitle = "Volta multi-staff" + lsrtags = "repeats,staff-notation" + texidoc = "By adding @code{Volta_engraver}, repeat brackets +can be put over staves other than the topmost one in a score." +} + +vmus = \relative c'' { + \repeat volta 2 c1 \alternative { d e } +} + +<< + \new StaffGroup << + \context Staff \vmus + \new Staff \vmus + >> + \new StaffGroup << + \new Staff \with { \consists Volta_engraver } + \vmus + \new Staff \vmus + >> +>>