From d07e63f20466fb287d07c4d8f529c4966b541366 Mon Sep 17 00:00:00 2001 From: fred Date: Wed, 27 Mar 2002 00:01:34 +0000 Subject: [PATCH] lilypond-1.3.99 --- input/bugs/grace-finger.ly | 7 +++ input/test/fingering.ly | 7 +++ input/test/scales-greek.ly | 42 ++++++++++++++++++ input/test/scales.ly | 6 +-- input/trip.ly | 8 ++-- lily/GNUmakefile | 3 +- lily/lily-guile.cc | 2 +- lily/text-item.cc | 39 +++++----------- ly/italiano.ly | 2 +- ly/scale-definitions.ly | 91 +++++++++++++++++++++++++++++++++----- 10 files changed, 156 insertions(+), 51 deletions(-) create mode 100644 input/bugs/grace-finger.ly create mode 100644 input/test/fingering.ly create mode 100644 input/test/scales-greek.ly diff --git a/input/bugs/grace-finger.ly b/input/bugs/grace-finger.ly new file mode 100644 index 0000000000..8b2bb446c4 --- /dev/null +++ b/input/bugs/grace-finger.ly @@ -0,0 +1,7 @@ + + +\score { +\notes \context Voice = VA \relative c'' { + \grace {[b8^1 c^2]} d4^3 +} +\paper {linewidth = -1. ; }} diff --git a/input/test/fingering.ly b/input/test/fingering.ly new file mode 100644 index 0000000000..8b2bb446c4 --- /dev/null +++ b/input/test/fingering.ly @@ -0,0 +1,7 @@ + + +\score { +\notes \context Voice = VA \relative c'' { + \grace {[b8^1 c^2]} d4^3 +} +\paper {linewidth = -1. ; }} diff --git a/input/test/scales-greek.ly b/input/test/scales-greek.ly new file mode 100644 index 0000000000..37f77a94ce --- /dev/null +++ b/input/test/scales-greek.ly @@ -0,0 +1,42 @@ +\header { + crossRefNumber = "1"; + tagline = "Lily was here 1.3.98 -- automatically converted from ABC"; + title = "Scales"; +} +voicedefault = \notes { +\property Score.defaultBarType="empty" + +\key c \major; c'8 -"major" d'8 e'8 f'8 g'8 a'8 b'8 +c''8 \key c \ionian; c'8 -"ionian" d'8 e'8 f'8 g'8 a'8 +b'8 c''8 \key d \dorian; c'8 -"dorian" d'8 e'8 f'8 g'8 +a'8 b'8 c''8 \key e \phrygian; c'8 -"phrygian" d'8 e'8 f'8 + g'8 a'8 b'8 c''8 \key f \lydian; c'8 -"lydian" d'8 e'8 + f'8 g'8 a'8 b'8 c''8 \key g \mixolydian; c'8 -"mixolydian" + d'8 e'8 f'8 g'8 a'8 b'8 c''8 \key a \minor; c'8 +-"minor" d'8 e'8 f'8 g'8 a'8 b'8 c''8 \key a \aeolian; + c'8 -"aeolian" d'8 e'8 f'8 g'8 a'8 b'8 c''8 +\key b \locrian; c'8 -"locrian" d'8 e'8 f'8 g'8 a'8 b'8 +c''8 \key f \major; c'8 -"major" d'8 e'8 f'8 g'8 a'8 +bes'8 c''8 \key f \ionian; c'8 -"ionian" d'8 e'8 f'8 g'8 + a'8 bes'8 c''8 \key g \dorian; c'8 -"dorian" d'8 e'8 f'8 + g'8 a'8 bes'8 c''8 \key a \phrygian; c'8 -"phrygian" d'8 +e'8 f'8 g'8 a'8 bes'8 c''8 \key bes \lydian; c'8 +-"lydian" d'8 e'8 f'8 g'8 a'8 bes'8 c''8 +\key c \mixolydian; c'8 -"mixolydian" d'8 e'8 f'8 g'8 a'8 +bes'8 c''8 \key d \aeolian; c'8 -"aeolian" d'8 e'8 f'8 g'8 + a'8 bes'8 c''8 \key d \minor; c'8 -"minor" d'8 e'8 f'8 + g'8 a'8 bes'8 c''8 \key e \locrian; c'8 -"locrian" d'8 +e'8 f'8 g'8 a'8 bes'8 c''8 +}\score{ + \notes < + + \context Staff="default" + { + \$voicedefault + } + + > + \paper { + } + \midi {} +} diff --git a/input/test/scales.ly b/input/test/scales.ly index f3f8df7c05..9399edf7b5 100644 --- a/input/test/scales.ly +++ b/input/test/scales.ly @@ -100,10 +100,8 @@ es,, f ges as bes ces d es \key as\minor; - as, bes ces des es fes g as - - - } + as, bes ces des es fes g as} + \paper { } \midi { } } diff --git a/input/trip.ly b/input/trip.ly index f943744f35..a8062f7e62 100644 --- a/input/trip.ly +++ b/input/trip.ly @@ -100,22 +100,22 @@ fugaIIRight = \notes \relative c'' { \context Voice=one { \shiftOff \stemUp - e4 + e4 -5 } \context Voice=two { \shiftOn \stemUp - cis + cis-4 } \context Voice=three { \shiftOnn \stemUp - ais + ais-3 } \context Voice=four { \shiftOnnn \stemUp - fis + fis-2 } > diff --git a/lily/GNUmakefile b/lily/GNUmakefile index d81ea7813c..7f88845376 100644 --- a/lily/GNUmakefile +++ b/lily/GNUmakefile @@ -22,5 +22,6 @@ default: $(outdir)/my-lily-parser.o: $(outdir)/parser.hh $(outdir)/my-lily-lexer.o: $(outdir)/parser.hh $(outdir)/lexer.o: $(outdir)/parser.hh -$(outdir)/lily-version.o: $(outdir)/version.hh +$(outdir)/lily-guile.o: $(outdir)/version.hh +$(outdir)/lily-version.o: $(outdir)/version.hh diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index 7b722ba511..87ad033329 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -403,7 +403,7 @@ ly_version () char const* vs = "\'(" MAJOR_VERSION " " MINOR_VERSION " " PATCH_LEVEL " " MY_PATCH_LEVEL ")" ; - return gh_eval_str (vs); + return gh_eval_str ((char*)vs); } static void diff --git a/lily/text-item.cc b/lily/text-item.cc index deada62d30..b6fa571c60 100644 --- a/lily/text-item.cc +++ b/lily/text-item.cc @@ -19,27 +19,11 @@ /* - text: string | (markup sentence) - markup: markup-symbol | (markup-symbol . parameter) - sentence: text | sentence text - - - Properties: - - * Font: - ---* Type: - ------* Series: medium, bold - ------* Shape: upright, italic, slanted - ------* Family: roman, music, orator, typewriter - - ---* Size: - ------* size: ...,-2,-1,0,1,2,... (style-sheet -> cmrXX, fetaXX) - ------* points: 11,13,16,20,23,26 (for feta) - ------* magnification: UNSIGNED - - * Typesetting: - ---* kern: INT (staff-space) - ---* align: horizontal/vertical / lines / rows + TEXT : STRING | (MARKUP SENTENCE) + MARKUP: PROPERTY | ABBREV + SENTENCE: TEXT | SENTENCE TEXT + PROPERTY: (key . value) + ABBREV: rows lines roman music bold italic named super sub text, or any font-style */ Molecule Text_item::text2molecule (Score_element *me, SCM text, SCM properties) @@ -74,22 +58,21 @@ Text_item::string2molecule (Score_element *me, SCM text, SCM properties) if (paper == SCM_EOL) paper = scm_string_to_symbol (me->paper_l ()->get_scmvar ("style_sheet")); - SCM font_name; + // should move fallback to scm + SCM font_name = ly_str02scm ("cmr10"); if (gh_pair_p (style)) { SCM f = get_elt_property (me, "style-to-font-name"); - font_name = gh_call2 (f, paper, gh_cdr (style)); + if (gh_procedure_p (f)) + font_name = gh_call2 (f, paper, gh_cdr (style)); } else { SCM f = get_elt_property (me, "properties-to-font-name"); - font_name = gh_call2 (f, paper, properties); + if (gh_procedure_p (f)) + font_name = gh_call2 (f, paper, properties); } - // should move fallback to scm - if (!gh_string_p (font_name)) - font_name = ly_str02scm ("cmr10"); - SCM lookup = scm_assoc (ly_symbol2scm ("lookup"), properties); Molecule mol; diff --git a/ly/italiano.ly b/ly/italiano.ly index 28bbc05995..4df74b22cc 100644 --- a/ly/italiano.ly +++ b/ly/italiano.ly @@ -10,7 +10,7 @@ % contributed by Paolo Zuliani -\notenames #' +\notenames #'( (dobb . ( -1 0 -2 )) (dob . ( -1 0 -1 )) (do . ( -1 0 0 )) diff --git a/ly/scale-definitions.ly b/ly/scale-definitions.ly index 873f58313b..0b48ce633a 100644 --- a/ly/scale-definitions.ly +++ b/ly/scale-definitions.ly @@ -8,8 +8,8 @@ major = #'( (4 . 0) (5 . 0) (6 . 0) - ) + minor = #'( (0 . 0) (1 . 0) @@ -19,14 +19,81 @@ minor = #'( (5 . -1) (6 . -1) ) - - -%{ OUTDATED: someone please fix these -ionian = 0 -locrian = 1 -aeolian = 3 -mixolydian = 5 -lydian = 7 -phrygian = 8 -dorian = 10 -%} + + +ionian = #'( + (0 . 0) + (1 . 0) + (2 . 0) + (3 . 0) + (4 . 0) + (5 . 0) + (6 . 0) + ) + + +locrian = #'( + (0 . 0) + (1 . -1) + (2 . -1) + (3 . 0) + (4 . -1) + (5 . -1) + (6 . -1) + ) + + +aeolian = #'( + (0 . 0) + (1 . 0) + (2 . -1) + (3 . 0) + (4 . 0) + (5 . -1) + (6 . -1) + ) + + +mixolydian = #'( + (0 . 0) + (1 . 0) + (2 . 0) + (3 . 0) + (4 . 0) + (5 . 0) + (6 . -1) + ) + + +lydian = #'( + (0 . 0) + (1 . 0) + (2 . 0) + (3 . 1) + (4 . 0) + (5 . 0) + (6 . 0) + ) + + +phrygian = #'( + (0 . 0) + (1 . -1) + (2 . -1) + (3 . 0) + (4 . 0) + (5 . -1) + (6 . -1) +) + + +dorian = #'( + (0 . 0) + (1 . 0) + (2 . -1) + (3 . 0) + (4 . 0) + (5 . 0) + (6 . -1) + ) + -- 2.39.5