From 7e699099fa96a91fba232b7f2ca57c41676b471c Mon Sep 17 00:00:00 2001 From: Graham Percival Date: Fri, 9 Nov 2007 20:14:16 -0800 Subject: [PATCH] LSR: add real-music. --- buildscripts/makelsr.py | 5 +- input/lsr/GNUmakefile | 4 + input/lsr/rhythms/AAA-intro.ly | 1 - input/lsr/rhythms/makam.ly | 159 --------------------------------- input/new/rhythms/AAA-intro.ly | 13 +-- 5 files changed, 16 insertions(+), 166 deletions(-) delete mode 100644 input/lsr/rhythms/makam.ly diff --git a/buildscripts/makelsr.py b/buildscripts/makelsr.py index 348e7c99ea..8e8339818b 100755 --- a/buildscripts/makelsr.py +++ b/buildscripts/makelsr.py @@ -4,7 +4,10 @@ import os import os.path import shutil -dirs = ['pitches', 'rhythms'] +dirs = [] +dirs.extend(['pitches', 'rhythms']) + +dirs.extend(['real-music']) #dirs = ['ancient','chords','connecting','contemporary','expressive','education','guitar','parts','pitch','repeats','scheme','spacing','staff','text','vocal','other','nonmusic','engravers','instrument'] notsafe=[] diff --git a/input/lsr/GNUmakefile b/input/lsr/GNUmakefile index 4c12ed94b5..eaf7decc93 100644 --- a/input/lsr/GNUmakefile +++ b/input/lsr/GNUmakefile @@ -1,6 +1,10 @@ depth = ../../ SUBDIRS = pitches rhythms + +SUBDIRS += real-music + +# old stuffs 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/lsr/rhythms/AAA-intro.ly b/input/lsr/rhythms/AAA-intro.ly index 9ff14a90d7..e76ef854bd 100644 --- a/input/lsr/rhythms/AAA-intro.ly +++ b/input/lsr/rhythms/AAA-intro.ly @@ -1,4 +1,3 @@ -%% Do not edit this file; it is auto-generated from LSR! \version "2.11.23" \header{ texidoc = " diff --git a/input/lsr/rhythms/makam.ly b/input/lsr/rhythms/makam.ly deleted file mode 100644 index f5d2d6548f..0000000000 --- a/input/lsr/rhythms/makam.ly +++ /dev/null @@ -1,159 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\header { - - texidoc = "Makam is Turkish type of melody that uses 1/9 tone - microtonal alterations." - -} - - -\version "2.11.23" - -%{ - -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/rhythms/AAA-intro.ly b/input/new/rhythms/AAA-intro.ly index 93c62a94e3..e76ef854bd 100644 --- a/input/new/rhythms/AAA-intro.ly +++ b/input/new/rhythms/AAA-intro.ly @@ -1,15 +1,18 @@ -\version "2.10.0" +\version "2.11.23" -\header{ -texidoc = " +\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." -} +or figure for each example to see the corresponding input file. + +@ifhtml +Also available as a @uref{collated-files.pdf,PDF} +@end ifhtml +"} % make sure .png is generated. \markup{ "This document is for LilyPond version" #(ly:export(lilypond-version)) } -- 2.39.5