From 6d143896ed61a7171a8faba2d10f0605b8b14d10 Mon Sep 17 00:00:00 2001 From: Mats Bengtsson Date: Mon, 1 May 2000 19:14:05 +0200 Subject: [PATCH] patch::: 1.3.47.mb2 1.3.47.mb2 =========== * Corrected glossary.tely * Corrected \mark font handling. feta-nummer font only of the string is all numeric. * Implemented noteHeadStyle lookup in Guile. Reintroduced the style "harmonic" and added "baroque" (normal note shapes except for brevis and longa which are square). --- CHANGES | 12 ++++++++++++ Documentation/user/glossary.tely | 18 ++++++++++-------- VERSION | 2 +- input/test/incipit.ly | 1 + input/test/mark.ly | 3 ++- input/test/noteheadstyle.ly | 14 +++++++++----- lily/mark-engraver.cc | 15 ++++++++++++--- lily/note-head.cc | 11 +++++++---- ly/property.ly | 2 +- scm/lily.scm | 10 ++++++++++ tex/fetdefs.tex | 2 ++ 11 files changed, 67 insertions(+), 23 deletions(-) diff --git a/CHANGES b/CHANGES index 7bdea74a21..ab9660cfbf 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,15 @@ +1.3.47.mb2 +=========== + +* Corrected glossary.tely + +* Corrected \mark font handling. feta-nummer font only of the + string is all numeric. + +* Implemented noteHeadStyle lookup in Guile. Reintroduced the style + "harmonic" and added "baroque" (normal note shapes except for + brevis and longa which are square). + 1.3.47.mb1 =========== diff --git a/Documentation/user/glossary.tely b/Documentation/user/glossary.tely index 20924c7e96..65b8be9ad4 100644 --- a/Documentation/user/glossary.tely +++ b/Documentation/user/glossary.tely @@ -47,7 +47,8 @@ The stress of one tone over others. @item accidental I: alterazione, accidente, F: alt@'eration accidentelle, D: Vorzeichen, -Versetzungszeichen, NL: voorteken, DK: l@o{}st fortegn, S: f@"ortecken, N: +Versetzungszeichen, NL: voorteken, DK: l@o{}st fortegn, S: tillf@"alligt +f@"ortecken, N: @c F: alt@'eration accidentelle, D: Vorzeichen, Versetzungszeichen, @c Akzidenz, NL: toevallig teken, I: accidento. @@ -848,7 +849,7 @@ S:@w{ }diminuendo, N:@w{ }diminuendo. @item disjunct movement I: moto disgiunto, F: mouvement disjoint, D: , NL: , DK: springende -bev@ae{}gelse, S: hoppande r@"orelse, N: +bev@ae{}gelse, S: spr@aa{}ngvis r@"orelse, N: Melody moving in steps greater than those of the scale. Opposite of @ar{}@strong{conjunct movement}. @@ -892,7 +893,7 @@ The fifth @w{@ar{}@strong{scale degree}} @w{@ar{}@strong{functional harmony}} @item dorian mode I: modo dorico, F: mode dorien, D: Dorischer Kirchenton, NL: dorische -toonladder, dorischer Kirchenton, DK: dorisk skala, S: dorisk skala, N: +toonladder, dorischer Kirchenton, DK: dorisk skala, S: dorisk tonart, N: @w{@ar{}@strong{diatonic scale}} @@ -1242,7 +1243,7 @@ halvnode, S: halvnot, N: . @item half rest I: pausa di minima, F: demi-pause, UK: minim rest, D: halbe Pause, NL: halve -rust, DK: halvnodespause, S: halvnotspaus, N: . +rust, DK: halvnodespause, S: halvpaus, N: . @w{@ar{}@strong{note value}} @@ -1425,7 +1426,8 @@ keys, one on c, one on c-sharp etc. @w{@ar{}@strong{key signature}} @item key signature I: armatura di chiave, F: armure, armature [de la cl@'e], D: Vorzeichen, -Tonart, NL: @w{ }toon@-soort (voortekens), DK: faste fortegn, S: largo, N: . +Tonart, NL: @w{ }toon@-soort (voortekens), DK: faste fortegn, +S: tonartssignatur, N: . The sharps or flats appearing at the beginning of each staff indicating the key of the music. @w{@ar{}@strong{accidental}} @@ -1448,7 +1450,7 @@ upwards) to the tonic scale degree. @item ledger line; leger line I: tagli addizionali, F: ligne suppl@'ementaire, D: Hilfslinie, NL: -hulplijntje, DK: hj@ae{}lpelinie, S: hj@"alpstreck, N: . +hulplijntje, DK: hj@ae{}lpelinie, S: hj@"alplinje, N: . A ledger line is an extension of the staff. @@ -2065,7 +2067,7 @@ I: scala, F: gamme, D: Tonleiter, NL: toonladder, DK: Skala, S: skala, N: . @item scale degree I: grado della scala, F: degr@'e [de la gamme], D: Tonleiterstufe, NL: trap -[van de toonladder], DK: skalatrin, S: skalatrin (?), N: . +[van de toonladder], DK: skalatrin, S: skalsteg (?), N: . Names and symbols used in harmonic analysis to denote tones of the scale as roots of chords. The most important are degrees I = tonic (T), IV = @@ -2621,7 +2623,7 @@ DK: helnode, S: helnot, N: . @item whole rest I: pausa di semibreve, F: pause, UK: semibreve rest, D: Ganze Pause, NL: hele -rust, DK: helnodespause, S: helnotspaus, N: . +rust, DK: helnodespause, S: helpaus, N: . @w{@ar{}@strong{note value}} diff --git a/VERSION b/VERSION index 9c4c574e39..f9cb3f73e6 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 PATCH_LEVEL=47 -MY_PATCH_LEVEL=mb1 +MY_PATCH_LEVEL=mb2 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/input/test/incipit.ly b/input/test/incipit.ly index b2cf14733f..d0f5b7f030 100644 --- a/input/test/incipit.ly +++ b/input/test/incipit.ly @@ -15,6 +15,7 @@ incipit = \notes\relative c'{ violin = \notes\relative c''{ \specialkey \keysignature f' fis'' g' gis''; \time 2/2; + \clef "treble"; \key; a4. b8 c4 fis | diff --git a/input/test/mark.ly b/input/test/mark.ly index da4369262a..2a46b75f39 100644 --- a/input/test/mark.ly +++ b/input/test/mark.ly @@ -4,11 +4,12 @@ global = \notes { s1 | \mark "A"; s1 | \mark ; s1 | \mark "12"; + s1 | \mark "A2"; s1 } one = \notes \relative c { - c''1 c c c + c''1 c c c c } diff --git a/input/test/noteheadstyle.ly b/input/test/noteheadstyle.ly index 813b396418..9ff6337dcf 100644 --- a/input/test/noteheadstyle.ly +++ b/input/test/noteheadstyle.ly @@ -1,13 +1,17 @@ \score { \notes \relative c{ -c''4 c2 c8 c16 c16 c1 +c''4 c2 c8 c16 c16 c1 c\breve \property Voice.noteHeadStyle = "diamond" -c4 c2 c8 c16 c16 c1 +c4 c2 c8 c16 c16 c1 c\breve \property Voice.noteHeadStyle = "transparent" -c4 c2 c8 c16 c16 c1 +c4 c2 c8 c16 c16 c1 c\breve \property Voice.noteHeadStyle = "cross" -c4 c2 c8 c16 c16 c1 +c4 c2 c8 c16 c16 c1 c\breve \property Voice.noteHeadStyle = "mensural" -c4 c2 c8 c16 c16 c1 +c4 c2 c8 c16 c16 c1 c\breve c\longa +\property Voice.noteHeadStyle = "harmonic" +c4 c2 c8 c16 c16 c1 c\breve +\property Voice.noteHeadStyle = "baroque" +c4 c2 c8 c16 c16 c1 c\breve c\longa \context Voice < \context Thread = TA diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc index 0c2b543d46..3cc91cdbbf 100644 --- a/lily/mark-engraver.cc +++ b/lily/mark-engraver.cc @@ -21,7 +21,7 @@ #include "staff-symbol-referencer.hh" #include "staff-symbol.hh" #include "text-item.hh" - +#include /** put stuff over or next to bars. Examples: bar numbers, marginal notes, rehearsal marks. @@ -206,8 +206,17 @@ Mark_engraver::do_process_music () text_p_->set_elt_property ("text", ly_str02scm ( t.ch_C())); - SCM st = ly_str02scm ((t.index_any_i ("0123456789") >= 0 ) - ? "mark" : "large"); + + String style = "mark"; + for (int i=0; i < t.length_i(); i++) + { + if (!isdigit(t[i])) + { + style = "large"; + break; + } + } + SCM st = ly_str02scm (style.ch_C()); text_p_->set_elt_property ("style", st); } } diff --git a/lily/note-head.cc b/lily/note-head.cc index ea39db1104..5f88f5c52d 100644 --- a/lily/note-head.cc +++ b/lily/note-head.cc @@ -91,14 +91,17 @@ Note_head::do_brew_molecule() const ? 0 : (abs((int)p) - sz) /2; - String type; SCM style = get_elt_property ("style"); - if (gh_string_p (style)) + if (style == SCM_UNDEFINED) { - type = ly_scm2string (style); + style = ly_str02scm(""); } - Molecule out = lookup_l()->afm_find (String ("noteheads-") + to_str (balltype_i ()) + type); + Molecule out = lookup_l()->afm_find (String ("noteheads-") + + ly_scm2string (scm_eval (gh_list (ly_symbol2scm("noteheadsymbol"), + gh_int2scm(balltype_i ()), + style, + SCM_UNDEFINED)))); Box ledgerless = out.dim_; diff --git a/ly/property.ly b/ly/property.ly index 0599e32c31..b3fd74191a 100644 --- a/ly/property.ly +++ b/ly/property.ly @@ -114,7 +114,7 @@ specialkey = { endincipit = \notes{ \partial 16; s16 % Hack to handle e.g. \bar ".|"; \endincipit \property Staff.clefStyle = #"fullSizeChanges" - \nobreak \bar ""; + \bar ""; } autoBeamOff = \property Voice.noAutoBeaming = ##t diff --git a/scm/lily.scm b/scm/lily.scm index 677c0e44e7..ab6d5ff38e 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -146,6 +146,16 @@ '(minimum-space 0.0))))) +(define (noteheadsymbol duration style) + (cond + ((equal? style "cross") "2cross") + ((equal? style "harmonic") "0mensural") + ((equal? style "baroque") + (string-append (number->string duration) + (if (< duration 0) "mensural" ""))) + (else + (string-append (number->string duration) style)))) + ;;;;;;;; TeX diff --git a/tex/fetdefs.tex b/tex/fetdefs.tex index 076cee8885..54afa936fb 100644 --- a/tex/fetdefs.tex +++ b/tex/fetdefs.tex @@ -6,10 +6,12 @@ \def#1{\hbox{\char#2}}} \fetdef\sharp{16} +\fetdef\natural{17} \fetdef\flat{18} \font\fetasixteenfont=feta16 \def\fetafont{\fetasixteenfont} \def\textflat{{\fetafont\raise 1ex\hbox{\flat}}} +\def\textnatural{{\fetafont\raise 1ex\hbox{\natural}}} \def\textsharp{{\fetafont\raise1ex\hbox{\sharp}}} \endinput -- 2.39.5