+2002-05-05 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+
+ * lily/accidental.cc (after_line_breaking): add break tie
+ reminders.
+
+ * lily/text-engraver.cc (try_music): don't typeset fingerings
+
+2002-05-05 Heikki Junes <hjunes@cc.hut.fi>
+
+ * lilypond-font-lock.el: Handle \breve as a note (rest) duration.
+
2002-05-04 Han-Wen <hanwen@cs.uu.nl>
* lily/*.cc: change gh_str02scm() to ly_str02scm().
2002-03-12 Rune Zedeler <rune@zedeler.dk>
- * lily/beam.cc lily/stem.cc lily/beam-engraver.cc allow for
+ * lily/beam.cc lily/stem.cc lily/beam-engraver.cc: allow for
stemLeftBeamCount and stemRightBeamCount to equal 0.
Fixes [c8 c4 c8]
MAJOR_VERSION=1
MINOR_VERSION=5
PATCH_LEVEL=55
-MY_PATCH_LEVEL=hwn1
+MY_PATCH_LEVEL=hjj1
# use the above to send patches: MY_PATCH_LEVEL is always empty for a
# released version.
SCM c0 = get_property ("centralCPosition");
if (gh_number_p (c0))
Staff_symbol_referencer::set_position (key_item_p_, gh_scm2int (c0));
-
+
announce_grob (key_item_p_, SCM_EOL);
}
if (key_item_p_)
{
/*
- We add the accidentals to the support of the arpeggio, so it is put left of the
- accidentals.
+ We add the accidentals to the support of the arpeggio, so it
+ is put left of the accidentals.
*/
for (int i = 0; i < arpeggios_.size (); i++)
{
public:
DECLARE_SCHEME_CALLBACK (brew_molecule, (SCM));
+ DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM));
static bool has_interface (Grob*);
};
return m;
}
+
+MAKE_SCHEME_CALLBACK (Accidental_interface,after_line_breaking,1);
+SCM
+Accidental_interface::after_line_breaking (SCM smob)
+{
+ Grob *me = unsmob_grob (smob);
+ Grob *tie = unsmob_grob (me->get_grob_property ("tie"));
+
+ if (tie && !tie->original_l_)
+ {
+ me->suicide ();
+ }
+ return SCM_UNSPECIFIED;
+}
+
MAKE_SCHEME_CALLBACK (Accidental_interface,brew_molecule,1);
SCM
Accidental_interface::brew_molecule (SCM smob)
ADD_INTERFACE(Accidental_interface, "accidental-interface",
"a single accidental",
- "style accidentals");
+ "style tie accidentals");
cresc_p_->set_grob_property ("edge-text",
gh_cons (s, ly_str02scm ("")));
daddy_trans_l_->set_property ((start_type + "Text").ch_C(),
- SCM_UNDEFINED);
+ SCM_EOL);
}
}
(c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
+
#include "local-key-item.hh"
#include "molecule.hh"
#include "staff-symbol-referencer.hh"
{
/* there should be a better way to delete part of me */
scm_set_car_x (s, scm_list_n (ly_caar (s),
- ly_symbol2scm ("deleted"),
- SCM_UNDEFINED));
+ ly_symbol2scm ("deleted"),
+ SCM_EOL));
me->set_grob_property ("molecule", SCM_EOL);
}
}
*/
if (tie_break_reminder)
- ; // TODO.
+ {
+ // TODO.
+ a->set_grob_property ("tie", tie_break_reminder->self_scm());
+ }
+
support_l->set_grob_property ("accidental-grob", a->self_scm ());
Text_engraver::try_music (Music *m)
{
if (dynamic_cast<Text_script_req*> (m)
+ && m->get_mus_property ("text-type") != ly_symbol2scm ("finger")
&& m->get_mus_property ("text-type") != ly_symbol2scm ("dynamic"))
{
reqs_.push (dynamic_cast<Text_script_req*> (m));
"accent" "accepts" "accompany" "\\(add\\)?lyrics"
"\\(aeol\\|dor\\|ion\\|locr\\|\\(mixo\\)?lyd\\|phryg\\)ian"
"alias" "\\(altern\\|rel\\)ative" "apply" "arpeggio" "autochange" "bar" "break"
-"breathe" "breve" "beamintervals" "broken" "blend" "\\(bc\\|end\\)incipit"
+"breathe" "beamintervals" "broken" "blend" "\\(bc\\|end\\)incipit"
"ch\\(ar\\)?" "cg" "chord\\(s\\|stest\\|\\(chord\\)?modifiers\\)?"
"clef[ \t]*\"?\\(F\\|G\\|alto\\|baritone\\|bass\\|\\(mezzo\\)?soprano\\|treble\\|violin\\|tenor\\)?\"?"
"clipping" "[cm]m" "coda" "complex"
;; ... keywords (defined above, see kwregex)
(cons (concat "\\(\\([_^-]?\\(" kwregex "\\)\\)+\\)\\($\\|[] \t(~{}>\\\\_()^*-]\\)") '(1 font-lock-keyword-face))
-;; ... keyword-type constructs, e.g., ^\abracadabra
- '("\\([_^-]?\\\\[a-zA-Z][a-zA-Z]*\\)" 1 font-lock-constant-face)
+;; ... keyword-type constructs, e.g., ^\abracadabra; not \breve (= a duration)
+ '("\\([_^-]?\\\\\\([^b]\\|b[^r]\\|br[^e]\\|bre[^v]\\|brev[^e]\\|breve[a-zA-Z]\\)[a-zA-Z]*\\)" 1 font-lock-constant-face)
-;; ... the left sid e of '=' -mark
+;; ... the left side of '=' -mark
'("\\([_a-zA-Z.0-9-]+\\)[ \t]*=[ \t]*" 1 font-lock-variable-name-face)
;; ... the right side of '=' -mark
;; ... reserved words (defined above, see rwregex)
(cons (concat "\\(" rwregex "\\)") 'font-lock-variable-name-face)
-;; ... multiplied rests, e.g., R1 *8
- '("\\([sR]\\(128\\|6?4\\|3?2\\|16?\\|8\\)?[.]*[ \t]*[*][ \t]*[0-9]+\\)"1 font-lock-type-face)
-
-;; ... notes and rests, accidentals and duration, e.g., a,?16..
- '("\\(^\\|[ <\{[~(!)\t\\\|]\\)\\(\\(\\(\\(\\(do\\|re\\|[ms]i\\|[fl]a\\|sol\\)\\(bb?\\|dd?\\|ss?\\)?\\)\\|\\([a-h]\\(flat\\(flat\\)?\\|sharp\\(sharp\\)?\\|ff?\\|ss?\\|is\\(siss\\|s\\|is\\)?\\|es\\(sess\\|s\\|es\\)?\\)?\\)\\|\\(as\\(as\\|es\\)?\\)\\|\\(es\\(es\\)?\\)\\|\\(bb\\)\\)[,']*[?!]?\\|[srR]\\)\\(128\\|6?4\\|3?2\\|16?\\|8\\)?[.]*\\)" 2 font-lock-type-face)
+;; ... notes and rests, accidentals and duration (multiplied), e.g., b,?16.*3/4
+ '("\\(^\\|[ <\{[~(!)\t\\\|]\\)\\(\\(\\(\\(\\(do\\|re\\|[ms]i\\|[fl]a\\|sol\\)\\(bb?\\|dd?\\|ss?\\)?\\)\\|\\([a-h]\\(flat\\(flat\\)?\\|sharp\\(sharp\\)?\\|ff?\\|ss?\\|is\\(siss\\|s\\|is\\)?\\|es\\(sess\\|s\\|es\\)?\\)?\\)\\|\\(as\\(as\\|es\\)?\\)\\|\\(es\\(es\\)?\\)\\|\\(bb\\)\\)[,']*[?!]?\\|[srR]\\)\\([ \t]*\\(128\\|6?4\\|3?2\\|16?\\|8\\|\\\\breve\\)[.]*\\([ \t]*[*][ \t]*[0-9]+\\(/[1-9]+\\)?\\)?\\)?\\)" 2 font-lock-type-face)
;; "on top", ... '{[]}'-brackets
'("\\([][}{]\\)" 0 font-lock-warning-face t)
. (
(molecule-callback . ,Accidental_interface::brew_molecule)
(font-family . music)
- (meta . ((interfaces . (accidental-interface font-interface))))
+ (after-line-breaking-callback . ,Accidental_interface::after_line_breaking) (meta . ((interfaces . (accidental-interface font-interface))))
))
(AccidentalPlacement
. (
print only if there is no beam associated with this tuplet bracket.")
(grob-property-description 'number-visibility boolean-or-symbol? "
Like @code{bracket-visibility}, but for the number.")
+(grob-property-description 'tie ly-grob? "")
(grob-property-description 'type symbol? "one of: line, dashed-line or dotted-line.")
(grob-property-description 'visibility-lambda procedure? "a function that takes the break direction and returns a cons of booleans containing (TRANSPARENT . EMPTY).")
(grob-property-description 'when moment? "when does this column happen?.")