From 917f05c8cc3e540a43adc35f6ba3912de87ec7aa Mon Sep 17 00:00:00 2001 From: John Mandereau Date: Sat, 5 Jan 2008 14:57:42 +0100 Subject: [PATCH] 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. --- buildscripts/makelsr.py | 37 +++++++++++---- input/lsr/other-intro.itely | 5 -- input/lsr/other.snippet-list | 6 --- input/lsr/snippets.tely | 4 -- input/new/GNUmakefile | 18 +------- input/new/README | 12 +++++ input/new/ancient-notation/GNUmakefile | 7 --- input/new/ancient-notation/SConscript | 4 -- input/new/bagpipes/GNUmakefile | 7 --- input/new/bagpipes/SConscript | 5 -- input/new/chords/GNUmakefile | 7 --- input/new/chords/SConscript | 4 -- .../{paper-and-layout => }/clip-systems.ly | 26 +++++------ .../creating-music-with-scheme-music-box.ly | 10 ++-- .../{other => }/drawing-boxes-around-grobs.ly | 18 ++++---- .../drawing-circles-around-various-objects.ly | 26 +++++++++++ .../editorial-and-educational-use/GNUmakefile | 7 --- .../editorial-and-educational-use/SConscript | 5 -- input/new/expressive-marks/GNUmakefile | 7 --- input/new/expressive-marks/SConscript | 4 -- input/new/guitar/GNUmakefile | 7 --- input/new/guitar/SConscript | 4 -- .../letter-tablature-formatting.ly | 10 ++-- .../new/{expressive-marks => }/line-arrows.ly | 10 ++-- input/new/{pitches => }/makam.ly | 30 +++--------- ...nvisible-with-the-transparent-property.ly} | 23 ++++++---- input/new/{text => }/markup-lines.ly | 2 + input/new/move-specific-text.ly | 23 ++++++++++ input/new/other/GNUmakefile | 7 --- input/new/other/SConscript | 5 -- ...yles-depending-on-the-step-of-the-scale.ly | 46 ------------------- .../drawing-circles-around-various-objects.ly | 23 ---------- .../other/outputting-the-version-number.ly | 19 -------- input/new/outputting-the-version-number.ly | 18 ++++++++ input/new/{spacing => }/page-label.ly | 4 +- input/new/paper-and-layout/GNUmakefile | 7 --- input/new/paper-and-layout/SConscript | 4 -- input/new/parts/GNUmakefile | 7 --- input/new/parts/SConscript | 4 -- input/new/percussion/GNUmakefile | 7 --- input/new/percussion/SConscript | 4 -- input/new/piano-music/GNUmakefile | 7 --- input/new/piano-music/SConscript | 5 -- input/new/pitches/GNUmakefile | 7 --- input/new/pitches/SConscript | 4 -- input/new/pitches/volta-multi-staff.ly | 22 --------- ...oting-another-voice-with-transposition.ly} | 18 +++----- .../quote.ly => quoting-another-voice.ly} | 18 +++----- input/new/real-music/GNUmakefile | 7 --- input/new/real-music/SConscript | 4 -- input/new/repeats/GNUmakefile | 7 --- input/new/repeats/SConscript | 4 -- input/new/rhythms/GNUmakefile | 7 --- input/new/rhythms/SConscript | 4 -- input/new/schemelanguage/GNUmakefile | 7 --- input/new/schemelanguage/SConscript | 4 -- .../new/schemelanguage/move-specific-text.ly | 20 -------- input/new/simultaneous-notes/GNUmakefile | 7 --- input/new/simultaneous-notes/SConscript | 5 -- input/new/spacing/GNUmakefile | 7 --- input/new/spacing/SConscript | 4 -- input/new/staff-notation/GNUmakefile | 7 --- input/new/staff-notation/SConscript | 4 -- input/new/strings/GNUmakefile | 7 --- input/new/strings/SConscript | 5 -- .../toc.ly => table-of-contents.ly} | 6 ++- input/new/text/GNUmakefile | 7 --- input/new/text/SConscript | 4 -- ...tweak-command-to-tweak-individual-grobs.ly | 14 +++--- input/new/{text => }/utf-8.ly | 5 +- input/new/vocal-music/GNUmakefile | 7 --- input/new/vocal-music/SConscript | 4 -- input/new/{repeats => }/volta-multi-staff.ly | 12 +++-- 73 files changed, 205 insertions(+), 528 deletions(-) delete mode 100644 input/lsr/other-intro.itely delete mode 100644 input/lsr/other.snippet-list delete mode 100644 input/new/ancient-notation/GNUmakefile delete mode 100644 input/new/ancient-notation/SConscript delete mode 100644 input/new/bagpipes/GNUmakefile delete mode 100644 input/new/bagpipes/SConscript delete mode 100644 input/new/chords/GNUmakefile delete mode 100644 input/new/chords/SConscript rename input/new/{paper-and-layout => }/clip-systems.ly (80%) rename input/new/{pitches => }/creating-music-with-scheme-music-box.ly (65%) rename input/new/{other => }/drawing-boxes-around-grobs.ly (71%) create mode 100644 input/new/drawing-circles-around-various-objects.ly delete mode 100644 input/new/editorial-and-educational-use/GNUmakefile delete mode 100644 input/new/editorial-and-educational-use/SConscript delete mode 100644 input/new/expressive-marks/GNUmakefile delete mode 100644 input/new/expressive-marks/SConscript delete mode 100644 input/new/guitar/GNUmakefile delete mode 100644 input/new/guitar/SConscript rename input/new/{guitar => }/letter-tablature-formatting.ly (50%) rename input/new/{expressive-marks => }/line-arrows.ly (90%) rename input/new/{pitches => }/makam.ly (97%) rename input/new/{other/making-an-object-invisibile-with-the-transparent-property.ly => making-an-object-invisible-with-the-transparent-property.ly} (66%) rename input/new/{text => }/markup-lines.ly (97%) create mode 100644 input/new/move-specific-text.ly delete mode 100644 input/new/other/GNUmakefile delete mode 100644 input/new/other/SConscript delete mode 100644 input/new/other/applying-noteheads-styles-depending-on-the-step-of-the-scale.ly delete mode 100644 input/new/other/drawing-circles-around-various-objects.ly delete mode 100644 input/new/other/outputting-the-version-number.ly create mode 100644 input/new/outputting-the-version-number.ly rename input/new/{spacing => }/page-label.ly (93%) delete mode 100644 input/new/paper-and-layout/GNUmakefile delete mode 100644 input/new/paper-and-layout/SConscript delete mode 100644 input/new/parts/GNUmakefile delete mode 100644 input/new/parts/SConscript delete mode 100644 input/new/percussion/GNUmakefile delete mode 100644 input/new/percussion/SConscript delete mode 100644 input/new/piano-music/GNUmakefile delete mode 100644 input/new/piano-music/SConscript delete mode 100644 input/new/pitches/GNUmakefile delete mode 100644 input/new/pitches/SConscript delete mode 100644 input/new/pitches/volta-multi-staff.ly rename input/new/{parts/quote-transposition.ly => quoting-another-voice-with-transposition.ly} (76%) rename input/new/{parts/quote.ly => quoting-another-voice.ly} (75%) delete mode 100644 input/new/real-music/GNUmakefile delete mode 100644 input/new/real-music/SConscript delete mode 100644 input/new/repeats/GNUmakefile delete mode 100644 input/new/repeats/SConscript delete mode 100644 input/new/rhythms/GNUmakefile delete mode 100644 input/new/rhythms/SConscript delete mode 100644 input/new/schemelanguage/GNUmakefile delete mode 100644 input/new/schemelanguage/SConscript delete mode 100644 input/new/schemelanguage/move-specific-text.ly delete mode 100644 input/new/simultaneous-notes/GNUmakefile delete mode 100644 input/new/simultaneous-notes/SConscript delete mode 100644 input/new/spacing/GNUmakefile delete mode 100644 input/new/spacing/SConscript delete mode 100644 input/new/staff-notation/GNUmakefile delete mode 100644 input/new/staff-notation/SConscript delete mode 100644 input/new/strings/GNUmakefile delete mode 100644 input/new/strings/SConscript rename input/new/{paper-and-layout/toc.ly => table-of-contents.ly} (74%) delete mode 100644 input/new/text/GNUmakefile delete mode 100644 input/new/text/SConscript rename input/new/{other => }/using-the--tweak-command-to-tweak-individual-grobs.ly (66%) rename input/new/{text => }/utf-8.ly (96%) delete mode 100644 input/new/vocal-music/GNUmakefile delete mode 100644 input/new/vocal-music/SConscript rename input/new/{repeats => }/volta-multi-staff.ly (63%) 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/paper-and-layout/clip-systems.ly b/input/new/clip-systems.ly similarity index 80% rename from input/new/paper-and-layout/clip-systems.ly rename to input/new/clip-systems.ly index 06247e76b5..1eaead2f34 100644 --- a/input/new/paper-and-layout/clip-systems.ly +++ b/input/new/clip-systems.ly @@ -1,26 +1,26 @@ +\version "2.10.0" +\layout { ragged-right= ##t } \header { - texidoc = "Clipping snippets from a finished score + 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. -Notes: +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 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) diff --git a/input/new/pitches/creating-music-with-scheme-music-box.ly b/input/new/creating-music-with-scheme-music-box.ly similarity index 65% rename from input/new/pitches/creating-music-with-scheme-music-box.ly rename to input/new/creating-music-with-scheme-music-box.ly index 72ce0dc7d1..ea13878b5d 100644 --- a/input/new/pitches/creating-music-with-scheme-music-box.ly +++ b/input/new/creating-music-with-scheme-music-box.ly @@ -1,11 +1,13 @@ -%% Do not edit this file; it is auto-generated from LSR! \version "2.11.35" - -\header { texidoc = " +\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/other/drawing-boxes-around-grobs.ly b/input/new/drawing-boxes-around-grobs.ly similarity index 71% rename from input/new/other/drawing-boxes-around-grobs.ly rename to input/new/drawing-boxes-around-grobs.ly index 7a4400292b..23e11fe75c 100644 --- a/input/new/other/drawing-boxes-around-grobs.ly +++ b/input/new/drawing-boxes-around-grobs.ly @@ -1,12 +1,15 @@ \version "2.11.23" - -\header { texidoc = " +\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'' { +arbitrary grob. +" +} +\relative c'' { \override TextScript #'stencil = #(make-stencil-boxer 0.1 0.3 ly:text-interface::print) @@ -20,8 +23,5 @@ arbitrary grob. 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/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/letter-tablature-formatting.ly similarity index 50% rename from input/new/guitar/letter-tablature-formatting.ly rename to input/new/letter-tablature-formatting.ly index 11fe42f8c1..628eb17b59 100644 --- a/input/new/guitar/letter-tablature-formatting.ly +++ b/input/new/letter-tablature-formatting.ly @@ -1,10 +1,12 @@ -%% Do not edit this file; it is auto-generated from LSR! \version "2.11.35" -\header { texidoc = " +\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. -" } +BROKEN IN 2.11, COMMENTED OUT." +} { c'4 } diff --git a/input/new/expressive-marks/line-arrows.ly b/input/new/line-arrows.ly similarity index 90% rename from input/new/expressive-marks/line-arrows.ly rename to input/new/line-arrows.ly index 7512711cb1..f58c336147 100644 --- a/input/new/expressive-marks/line-arrows.ly +++ b/input/new/line-arrows.ly @@ -1,13 +1,11 @@ +\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)" } -\version "2.10.0" - -\paper { - ragged-right = ##t -} - \relative c'' { \override TextSpanner #'bound-padding = #1.0 \override TextSpanner #'dash-fraction = #'() diff --git a/input/new/pitches/makam.ly b/input/new/makam.ly similarity index 97% rename from input/new/pitches/makam.ly rename to input/new/makam.ly index 549df765c8..504a80d433 100644 --- a/input/new/pitches/makam.ly +++ b/input/new/makam.ly @@ -1,30 +1,21 @@ +\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." - } - -\version "2.11.6" - -%{ - -Define 1/9 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 -%} +% Define pitch names makamPitchNames = #`( (c . ,(ly:make-pitch -1 0 NATURAL)) @@ -102,17 +93,10 @@ makamPitchNames = #`( ) - %% 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") @@ -129,7 +113,6 @@ makamGlyphs = #'((1 . "accidentals.doublesharp") \relative { %{ define alteration <-> symbol mapping. The following glyphs are available. - accidentals.sharp accidentals.sharp.slashslash.stem accidentals.sharp.slashslashslash.stemstem @@ -144,7 +127,6 @@ makamGlyphs = #'((1 . "accidentals.doublesharp") accidentals.flatflat accidentals.flatflat.slash accidentals.doublesharp - %} \override Accidental #'glyph-name-alist = \makamGlyphs diff --git a/input/new/other/making-an-object-invisibile-with-the-transparent-property.ly b/input/new/making-an-object-invisible-with-the-transparent-property.ly similarity index 66% rename from input/new/other/making-an-object-invisibile-with-the-transparent-property.ly rename to input/new/making-an-object-invisible-with-the-transparent-property.ly index fab655ccd7..543debc168 100644 --- a/input/new/other/making-an-object-invisibile-with-the-transparent-property.ly +++ b/input/new/making-an-object-invisible-with-the-transparent-property.ly @@ -1,6 +1,9 @@ \version "2.11.23" - -\header { texidoc = " +\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 @@ -13,11 +16,11 @@ 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] -} >> -} +\relative c'' << + { + \once \override Stem #'transparent = ##t + b8~ b8\noBeam + } \\ { + b[ g8] + } +>> diff --git a/input/new/text/markup-lines.ly b/input/new/markup-lines.ly similarity index 97% rename from input/new/text/markup-lines.ly rename to input/new/markup-lines.ly index 752dcf3bcb..1d809989cd 100644 --- a/input/new/text/markup-lines.ly +++ b/input/new/markup-lines.ly @@ -1,6 +1,8 @@ \version "2.11.25" \header { + doctitle = "Markup lines" + lsrtags = "text" texidoc = "Text that can spread over pages is entered with the @code{\\markuplines} command." } 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-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/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/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/spacing/page-label.ly b/input/new/page-label.ly similarity index 93% rename from input/new/spacing/page-label.ly rename to input/new/page-label.ly index e4f9cc6947..1eb75e0d2f 100644 --- a/input/new/spacing/page-label.ly +++ b/input/new/page-label.ly @@ -1,6 +1,8 @@ \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." } 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/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/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/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/parts/quote-transposition.ly b/input/new/quoting-another-voice-with-transposition.ly similarity index 76% rename from input/new/parts/quote-transposition.ly rename to input/new/quoting-another-voice-with-transposition.ly index eb94ea08ce..88c261edf3 100644 --- a/input/new/parts/quote-transposition.ly +++ b/input/new/quoting-another-voice-with-transposition.ly @@ -1,19 +1,14 @@ -\header -{ - - texidoc = "Quotations take into account the transposition of both +\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. " - +quoted ones) will transposed as well." } -\version "2.11.10" - -\layout { ragged-right = ##t } - - \addQuote clarinet { \transposition bes d'16 d'16 d'8 @@ -35,7 +30,6 @@ quoteTest = { << \quoteDuring #"sax" { \skip 4 } s4^"sax" >> } - << \quoteTest \new Staff << \transpose c' d' \quoteTest diff --git a/input/new/parts/quote.ly b/input/new/quoting-another-voice.ly similarity index 75% rename from input/new/parts/quote.ly rename to input/new/quoting-another-voice.ly index 1f29585f3c..9a1c58eea3 100644 --- a/input/new/parts/quote.ly +++ b/input/new/quoting-another-voice.ly @@ -1,17 +1,13 @@ -\header -{ - - texidoc = "With @code{\\quote}, fragments of previously entered +\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 rests is not quoted, since +things are quoted. In this example, a 16th rest 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 } 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/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/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/paper-and-layout/toc.ly b/input/new/table-of-contents.ly similarity index 74% rename from input/new/paper-and-layout/toc.ly rename to input/new/table-of-contents.ly index 93886b2a70..30ad7ccce8 100644 --- a/input/new/paper-and-layout/toc.ly +++ b/input/new/table-of-contents.ly @@ -1,8 +1,10 @@ \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 +@code{\\markuplines \\table-of-contents}. The TOC items are added with the @code{\\tocItem} command." } 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/other/using-the--tweak-command-to-tweak-individual-grobs.ly b/input/new/using-the--tweak-command-to-tweak-individual-grobs.ly similarity index 66% rename from input/new/other/using-the--tweak-command-to-tweak-individual-grobs.ly rename to input/new/using-the--tweak-command-to-tweak-individual-grobs.ly index 149b108f00..e079b27b10 100644 --- a/input/new/other/using-the--tweak-command-to-tweak-individual-grobs.ly +++ b/input/new/using-the--tweak-command-to-tweak-individual-grobs.ly @@ -1,14 +1,12 @@ \version "2.11.23" - -\header { texidoc = " +\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. - - -" } - -\paper { - ragged-right = ##t +" } { diff --git a/input/new/text/utf-8.ly b/input/new/utf-8.ly similarity index 96% rename from input/new/text/utf-8.ly rename to input/new/utf-8.ly index c057887ca1..b2981fbef4 100644 --- a/input/new/text/utf-8.ly +++ b/input/new/utf-8.ly @@ -19,7 +19,8 @@ Debian GNU/Linux %} \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 @@ -53,7 +54,7 @@ portuguese = \lyricmode { } \paper { - ragged-right = ##T + ragged-right = ##t } \relative { 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/repeats/volta-multi-staff.ly b/input/new/volta-multi-staff.ly similarity index 63% rename from input/new/repeats/volta-multi-staff.ly rename to input/new/volta-multi-staff.ly index fdda342f7c..7f1a489971 100644 --- a/input/new/repeats/volta-multi-staff.ly +++ b/input/new/volta-multi-staff.ly @@ -1,15 +1,17 @@ +\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." +can be put over staves other than the topmost one in a score." } -\version "2.11.36" - -vmus = { +vmus = \relative c'' { \repeat volta 2 c1 \alternative { d e } } -\relative c'' << +<< \new StaffGroup << \context Staff \vmus \new Staff \vmus -- 2.39.2