+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
============
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.
\score {
\notes \relative c'' {
\time 2/4;
- \property Voice.noAutoBeaming=1
+ \property Voice.noAutoBeaming=##t
a4 a8
a32 a a a
}
\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)
}
}
slurVerticalDirection = #1
verticalDirection = -1
- AutoBeam \push (end * * * *) = #(make-moment 1 2)
+ autoBeamSettings \push (end * * * *) = #(make-moment 1 2)
}
}
\midi {
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
}
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
\translator{
\VoiceContext
% consider ending beam at every 1/2 note
- AutoBeam \push #'(end * * * *) = #(make-moment 1 2)
+ autoBeamSettings \push #'(end * * * *) = #(make-moment 1 2)
}
}
}
\translator {
\VoiceContext
beamHeight = ##f
- AutoBeam \push (begin * * * *) = #(make-moment 0 1)
+ autoBeamSettings \push (begin * * * *) = #(make-moment 0 1)
textEmptyDimension = ##t
}
}
\translator {
\VoiceContext
beamHeight = ##f
- AutoBeam \push (begin * * * *) = #(make-moment 0 1)
+ autoBeamSettings \push (begin * * * *) = #(make-moment 0 1)
textEmptyDimension = ##t
}
}
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)
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");
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
((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
;;; \translator{
;;; \VoiceContext
;;; % consider ending beam at every 1 2 note
-;;; AutoBeam \push #'(end * * * *) = #(make-moment 1 2)
+;;; autoBeamSettings \push #'(end * * * *) = #(make-moment 1 2)
;;; }
;;; }
;;;
(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)
(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 ))
(script-priority . 100)
(font-series . bold)
(font-family . dynamic)
+ (font-shape . italic)
(self-alignment-Y . 0)
(meta . ,(element-description "DynamicText" font-interface text-interface ))
))
(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 ))
))
))
(NoteName . (
- (style . default)
(molecule-callback . ,Text_item::brew_molecule)
+ (font-family . roman)
(meta . ,(element-description "NoteName"
note-name-interface font-interface
general-element-interface))
(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)
(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 . (
((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")
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 * * * *)')
############################
--- /dev/null
+
+SCM_FILES := $(wildcard *.scm)
+
+SOURCE_FILES += $(SCM_FILES)
+
+TAGS_FILES += $(SCM_FILES)
+
projects / lilypond.git / commitdiff