From: Jan Nieuwenhuizen Date: Fri, 3 Nov 2000 13:39:30 +0000 (+0100) Subject: patch::: 1.3.103.jcn2 X-Git-Tag: release/1.3.104~5 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1b80dbfffcca6d22e170eb98ef355ae354d1a7f8;p=lilypond.git patch::: 1.3.103.jcn2 1.3.103.jcn2 ============ * Fixed default font settings for text items, text-item now uses font-interface's alist-chain. * Renamed property AutoBeam to autoBeamSettings to avoid confusion about non-existing AutoBeam element. --- diff --git a/CHANGES b/CHANGES index 9260d79a97..6879a0152d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,12 @@ +1.3.103.jcn2 +============ + +* Fixed default font settings for text items, text-item now uses +font-interface's alist-chain. + +* Renamed property AutoBeam to autoBeamSettings to avoid confusion +about non-existing AutoBeam element. + 1.3.103.jcn1 ============ diff --git a/VERSION b/VERSION index 6fa7b1df33..ba3d51a522 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 PATCH_LEVEL=103 -MY_PATCH_LEVEL=jcn1 +MY_PATCH_LEVEL=jcn2 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/input/bugs/hinterfleisch-gone.ly b/input/bugs/hinterfleisch-gone.ly index 59fd4de8d1..bb838c8cdd 100644 --- a/input/bugs/hinterfleisch-gone.ly +++ b/input/bugs/hinterfleisch-gone.ly @@ -3,7 +3,7 @@ \score { \notes \relative c'' { \time 2/4; - \property Voice.noAutoBeaming=1 + \property Voice.noAutoBeaming=##t a4 a8 a32 a a a } diff --git a/input/scarlatti-test.ly b/input/scarlatti-test.ly index 2da7ab6024..6c3f1b5ec0 100644 --- a/input/scarlatti-test.ly +++ b/input/scarlatti-test.ly @@ -6,10 +6,10 @@ \translator{\VoiceContext %% huh? %%beamAutoBegin=0; - AutoBeam \push #'(end 1 8 * *) = #(make-moment 3 8) - AutoBeam \push #'(end 1 16 * *) = #(make-moment 3 8) - AutoBeam \push #'(end 1 24 * *) = #(make-moment 1 8) - AutoBeam \push #'(end 1 32 * *) = #(make-moment 1 8) + autoBeamSettings \push #'(end 1 8 * *) = #(make-moment 3 8) + autoBeamSettings \push #'(end 1 16 * *) = #(make-moment 3 8) + autoBeamSettings \push #'(end 1 24 * *) = #(make-moment 1 8) + autoBeamSettings \push #'(end 1 32 * *) = #(make-moment 1 8) } } diff --git a/input/test/ac-extra-voice.ly b/input/test/ac-extra-voice.ly index fba60bd225..3f0c131b11 100644 --- a/input/test/ac-extra-voice.ly +++ b/input/test/ac-extra-voice.ly @@ -62,7 +62,7 @@ accompany = \notes \relative c{ slurVerticalDirection = #1 verticalDirection = -1 - AutoBeam \push (end * * * *) = #(make-moment 1 2) + autoBeamSettings \push (end * * * *) = #(make-moment 1 2) } } \midi { diff --git a/input/test/auto-beam-4-8.ly b/input/test/auto-beam-4-8.ly index d962dbf429..24a32da104 100644 --- a/input/test/auto-beam-4-8.ly +++ b/input/test/auto-beam-4-8.ly @@ -18,7 +18,7 @@ x| x| x| x| x| %} %\property Voice.beamAutoEnd = #(make-moment 2 4) - \property Voice.AutoBeam \push #'(end * * * *) = #(make-moment 2 4) + \property Voice.autoBeamSettings \push #'(end * * * *) = #(make-moment 2 4) c8 c c c16 c } diff --git a/input/test/auto-beam-override.ly b/input/test/auto-beam-override.ly index 4b79886fb0..42da5010cf 100644 --- a/input/test/auto-beam-override.ly +++ b/input/test/auto-beam-override.ly @@ -17,7 +17,7 @@ c8 c c c c16 c c c c c c c % from here on consider ending beam every 1/4 note - \property Voice.AutoBeam \push #'(end * * * *) = #(make-moment 1 4) + \property Voice.autoBeamSettings \push #'(end * * * *) = #(make-moment 1 4) c8 c c c % manually override autobeam with weird beaming c8 [c c] c @@ -32,7 +32,7 @@ \translator{ \VoiceContext % consider ending beam at every 1/2 note - AutoBeam \push #'(end * * * *) = #(make-moment 1 2) + autoBeamSettings \push #'(end * * * *) = #(make-moment 1 2) } } } diff --git a/input/test/standchen-as5.ly b/input/test/standchen-as5.ly index 809b0088ba..2abe8a395b 100644 --- a/input/test/standchen-as5.ly +++ b/input/test/standchen-as5.ly @@ -27,7 +27,7 @@ \translator { \VoiceContext beamHeight = ##f - AutoBeam \push (begin * * * *) = #(make-moment 0 1) + autoBeamSettings \push (begin * * * *) = #(make-moment 0 1) textEmptyDimension = ##t } } diff --git a/input/test/standchen-as9.ly b/input/test/standchen-as9.ly index c7d544a713..84c3c7394b 100644 --- a/input/test/standchen-as9.ly +++ b/input/test/standchen-as9.ly @@ -27,7 +27,7 @@ \translator { \VoiceContext beamHeight = ##f - AutoBeam \push (begin * * * *) = #(make-moment 0 1) + autoBeamSettings \push (begin * * * *) = #(make-moment 0 1) textEmptyDimension = ##t } } diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc index e20498a2d8..d703831ed3 100644 --- a/lily/auto-beam-engraver.cc +++ b/lily/auto-beam-engraver.cc @@ -97,7 +97,7 @@ Auto_beam_engraver::consider_end_and_begin (Moment test_mom) SCM type = gh_list (gh_int2scm (test_mom.num_i ()), gh_int2scm (test_mom.den_i ()), SCM_UNDEFINED); - SCM settings = get_property ("AutoBeam"); + SCM settings = get_property ("autoBeamSettings"); /* Determine end moment for auto beaming (and begin, mostly 0==anywhere) diff --git a/lily/text-item.cc b/lily/text-item.cc index 3cec390b49..b7cabd16a9 100644 --- a/lily/text-item.cc +++ b/lily/text-item.cc @@ -199,9 +199,7 @@ Text_item::brew_molecule (SCM smob) SCM text = me->get_elt_property ("text"); - SCM properties = gh_list (me->immutable_property_alist_, - me->mutable_property_alist_, SCM_UNDEFINED); - + SCM properties = Font_interface::font_alist_chain (me); Molecule mol = Text_item::text2molecule (me, text, properties); SCM space = me->get_elt_property ("word-space"); diff --git a/scm/GNUmakefile b/scm/GNUmakefile index 419ac4c97f..c10270ce57 100644 --- a/scm/GNUmakefile +++ b/scm/GNUmakefile @@ -2,13 +2,10 @@ depth = .. -SCM_FILES = $(wildcard *.scm) -EXTRA_DIST_FILES = $(SCM_FILES) - INSTALLATION_DIR=$(datadir)/scm/ INSTALLATION_FILES=$(SCM_FILES) -STEPMAKE_TEMPLATES=install +STEPMAKE_TEMPLATES=install scm include $(depth)/make/stepmake.make diff --git a/scm/auto-beam.scm b/scm/auto-beam.scm index 5bf7ad772c..ec78e2b2f6 100644 --- a/scm/auto-beam.scm +++ b/scm/auto-beam.scm @@ -78,13 +78,13 @@ ((end * * 12 8) . ,(make-moment 3 8)) ((end 1 16 12 8) . ,(make-moment 3 8)) ((end 1 32 12 8) . ,(make-moment 1 8)) - (meta . ,(element-description "AutoBeam")) + (meta . ,(element-description "autoBeamSettings")) )) ;;; Users may override in most cases, simply by issuing ;;; ;;; % from here on consider ending beam every 1 4 note -;;; \property Voice.AutoBeam \push #'(end * * * *) = #(make-moment 1 4) +;;; \property Voice.autoBeamSettings \push #'(end * * * *) = #(make-moment 1 4) ;;; ;;; % no autobeaming ;;; \property Voice.beamAuto = ##f @@ -95,7 +95,7 @@ ;;; \translator{ ;;; \VoiceContext ;;; % consider ending beam at every 1 2 note -;;; AutoBeam \push #'(end * * * *) = #(make-moment 1 2) +;;; autoBeamSettings \push #'(end * * * *) = #(make-moment 1 2) ;;; } ;;; } ;;; diff --git a/scm/element-descriptions.scm b/scm/element-descriptions.scm index b9145a22ef..1e1c570fa6 100644 --- a/scm/element-descriptions.scm +++ b/scm/element-descriptions.scm @@ -12,7 +12,7 @@ (meta . ,(element-description "Arpeggio" arpeggio-interface side-position-interface font-interface)) )) - (AutoBeam . ,auto-beam-settings) + (autoBeamSettings . ,auto-beam-settings) (BarLine . ( (break-align-symbol . Staff_bar) @@ -124,7 +124,6 @@ (Dots . ( (molecule-callback . ,Dots::brew_molecule) (dot-count . 1) - (font-family . music) (staff-position . 0.0) (Y-offset-callbacks . (,Dots::quantised_position_callback ,Staff_symbol_referencer::callback)) (meta . ,(element-description "Dots" font-interface dot-interface )) @@ -136,6 +135,7 @@ (script-priority . 100) (font-series . bold) (font-family . dynamic) + (font-shape . italic) (self-alignment-Y . 0) (meta . ,(element-description "DynamicText" font-interface text-interface )) )) @@ -239,7 +239,6 @@ (word-space . 0.6) (font-family . roman) (font-shape . upright) - (font-relative-size . 0) (meta . ,(element-description "LyricText" lyric-syllable-interface text-interface font-interface )) )) @@ -288,8 +287,8 @@ )) (NoteName . ( - (style . default) (molecule-callback . ,Text_item::brew_molecule) + (font-family . roman) (meta . ,(element-description "NoteName" note-name-interface font-interface general-element-interface)) @@ -463,11 +462,15 @@ (arch-width . 1.5) (bracket-thick . 0.25) (bracket-width . 2.0) - (font-family . braces) - (font-point-size . 20) (Y-extent-callback . #f) + (font-family . braces) + ;; if you want to set point-size, you cannot set + ;; relative-size, as no font will be found for other + ;; sheets than 20 + ;;(font-point-size . 20) + ;;(font-relative-size . #f) (meta . ,(element-description "SystemStartDelimiter" system-start-delimiter font-interface)) - )) + )) (TextScript . ( (molecule-callback . ,Text_item::brew_molecule) @@ -475,7 +478,6 @@ (padding . 0.5) (font-family . roman) (font-shape . italic) - (font-relative-size . 0) (meta . ,(element-description "TextScript" text-script-interface text-interface side-position-interface font-interface )) )) (TextSpanner . ( diff --git a/scm/font.scm b/scm/font.scm index 9454f91ffb..0b8e1f7498 100644 --- a/scm/font.scm +++ b/scm/font.scm @@ -85,11 +85,14 @@ ((0 bold upright roman cmbx 10) . "cmbx10") ((-1 bold upright roman cmbx 8) . "cmbx8") ((-2 bold upright roman cmbx 7) . "cmbx7") + ;; should use the same brace font every where and fix C++ code. - ((2 medium upright braces feta-braces 26) . "feta-braces26") ((1 medium upright braces feta-braces 23) . "feta-braces23") ((0 medium upright braces feta-braces 20) . "feta-braces20") + ((-1 medium upright braces feta-braces 16) . "feta-braces16") + ((-2 medium upright braces feta-braces 13) . "feta-braces13") + ((-3 medium upright braces feta-braces 11) . "feta-braces11") ((3 bold italic dynamic feta-din 13) . "feta-din13") ((2 bold italic dynamic feta-din 13) . "feta-din13") diff --git a/scripts/convert-mudela.py b/scripts/convert-mudela.py index d20850de47..8d86614ddb 100644 --- a/scripts/convert-mudela.py +++ b/scripts/convert-mudela.py @@ -552,15 +552,15 @@ if 1: if 1: def conv (str): - str = re.sub ('beamAutoEnd_([0-9]*) *= *(#\\([^)]*\\))', 'AutoBeam \\push #\'(end 1 \\1 * *) = \\2', str) - str = re.sub ('beamAutoBegin_([0-9]*) *= *(#\\([^)]*\))', 'AutoBeam \\push #\'(begin 1 \\1 * *) = \\2', str) - str = re.sub ('beamAutoEnd *= *(#\\([^)]*\\))', 'AutoBeam \\push #\'(end * * * *) = \\1', str) - str = re.sub ('beamAutoBegin *= *(#\\([^)]*\\))', 'AutoBeam \\push #\'(begin * * * *) = \\1', str) + str = re.sub ('beamAutoEnd_([0-9]*) *= *(#\\([^)]*\\))', 'autoBeamSettings \\push #\'(end 1 \\1 * *) = \\2', str) + str = re.sub ('beamAutoBegin_([0-9]*) *= *(#\\([^)]*\))', 'autoBeamSettings \\push #\'(begin 1 \\1 * *) = \\2', str) + str = re.sub ('beamAutoEnd *= *(#\\([^)]*\\))', 'autoBeamSettings \\push #\'(end * * * *) = \\1', str) + str = re.sub ('beamAutoBegin *= *(#\\([^)]*\\))', 'autoBeamSettings \\push #\'(begin * * * *) = \\1', str) return str - conversions.append ((1,3,102), conv, 'beamAutoEnd -> AutoBeam \\push (end * * * *)') + conversions.append ((1,3,102), conv, 'beamAutoEnd -> autoBeamSettings \\push (end * * * *)') ############################ diff --git a/stepmake/stepmake/scm-rules.make b/stepmake/stepmake/scm-rules.make new file mode 100644 index 0000000000..841db19676 --- /dev/null +++ b/stepmake/stepmake/scm-rules.make @@ -0,0 +1,2 @@ + +#empty diff --git a/stepmake/stepmake/scm-targets.make b/stepmake/stepmake/scm-targets.make new file mode 100644 index 0000000000..841db19676 --- /dev/null +++ b/stepmake/stepmake/scm-targets.make @@ -0,0 +1,2 @@ + +#empty diff --git a/stepmake/stepmake/scm-vars.make b/stepmake/stepmake/scm-vars.make new file mode 100644 index 0000000000..115a05fb18 --- /dev/null +++ b/stepmake/stepmake/scm-vars.make @@ -0,0 +1,7 @@ + +SCM_FILES := $(wildcard *.scm) + +SOURCE_FILES += $(SCM_FILES) + +TAGS_FILES += $(SCM_FILES) +