From: Graham Percival Date: Wed, 7 Nov 2007 19:57:18 +0000 (-0800) Subject: LSR: initial tag support. X-Git-Tag: release/2.11.35-1~41^2~25 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=93ddaa0b7d8db76cc220f7bf9d11a782c16d66e8;p=lilypond.git LSR: initial tag support. --- diff --git a/input/lsr/GNUmakefile b/input/lsr/GNUmakefile index 0aedc718d6..0905ff299c 100644 --- a/input/lsr/GNUmakefile +++ b/input/lsr/GNUmakefile @@ -1,7 +1,8 @@ depth = ../../ -SUBDIRS = ancient chords connecting contemporary education expressive -SUBDIRS += guitar parts pitch repeats spacing staff text vocal scheme other +SUBDIRS = pitches +SUBDIRS += ancient chords connecting contemporary education expressive +SUBDIRS += guitar parts repeats spacing staff text vocal scheme other SUBDIRS += engravers nonmusic instrument STEPMAKE_TEMPLATES=documentation texinfo tex diff --git a/input/new/GNUmakefile b/input/new/GNUmakefile index d212c6cec8..606cf4874f 100644 --- a/input/new/GNUmakefile +++ b/input/new/GNUmakefile @@ -1,7 +1,8 @@ depth = ../../ -SUBDIRS = ancient chords connecting contemporary education expressive -SUBDIRS += guitar parts pitch repeats spacing staff text vocal scheme other +SUBDIRS = pitches +SUBDIRS += ancient chords connecting contemporary education expressive +SUBDIRS += guitar parts repeats spacing staff text vocal scheme other SUBDIRS += engravers nonmusic instrument diff --git a/input/new/pitches/AAA-intro.ly b/input/new/pitches/AAA-intro.ly new file mode 100644 index 0000000000..93c62a94e3 --- /dev/null +++ b/input/new/pitches/AAA-intro.ly @@ -0,0 +1,16 @@ +\version "2.10.0" + +\header{ +texidoc = " +@unnumbered Introduction + +This document shows examples from the +@uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}. + +In the web version of this document, you can click on the file name +or figure for each example to see the corresponding input file." +} + +% make sure .png is generated. +\markup{ "This document is for LilyPond version" #(ly:export(lilypond-version)) } + diff --git a/input/new/pitches/GNUmakefile b/input/new/pitches/GNUmakefile new file mode 100644 index 0000000000..3819fda13a --- /dev/null +++ b/input/new/pitches/GNUmakefile @@ -0,0 +1,15 @@ +depth = ../../../ + +STEPMAKE_TEMPLATES=documentation texinfo tex +LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc + +## Hmm, would this work? No -- if we really want examples, move +## to other dir (input/) comes to mind. +## examples = font20 ancient-font +## LOCALSTEPMAKE_TEMPLATES += ly mutopia + +EXTRA_DIST_FILES= + +include $(depth)/make/stepmake.make + +TITLE=Advanced snippets diff --git a/input/new/pitches/SConscript b/input/new/pitches/SConscript new file mode 100644 index 0000000000..f72bfffc28 --- /dev/null +++ b/input/new/pitches/SConscript @@ -0,0 +1,4 @@ +# -*-python-*- + +Import ('env', 'collate') +collate (title = 'Advanced snippets') diff --git a/input/new/pitches/makam.ly b/input/new/pitches/makam.ly new file mode 100644 index 0000000000..549df765c8 --- /dev/null +++ b/input/new/pitches/makam.ly @@ -0,0 +1,158 @@ +\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 +}