X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcustos.cc;h=56259d56a57d768f6e8be72d1828f6121894bf42;hb=efd9256dd40c43b2f141cd34b8830d247643ce2b;hp=0a196792de1a387ba55ae160c24aad5f4e491ec3;hpb=675533acf58b9b863adc830f175696735ca6dc95;p=lilypond.git diff --git a/lily/custos.cc b/lily/custos.cc index 0a196792de..56259d56a5 100644 --- a/lily/custos.cc +++ b/lily/custos.cc @@ -3,127 +3,91 @@ source file of the GNU LilyPond music typesetter - (C) 2000, 2002 Juergen Reuter + (c) 2000--2009 Juergen Reuter */ /* TODO: - - merge create_ledger_line () and Note_head::create_ledger_line () - - - rewrite create_ledger_line () to support short and thin ledger lines - - - do not show if a clef change immediately follows in the next line - - - decide: do or do not print custos if the next line starts with a rest +- do not show if a clef change immediately follows in the next line +- decide: do or do not print custos if the next line starts with a rest */ +#include +#include // rint +using namespace std; -#include +#include "custos.hh" #include "direction.hh" +#include "font-interface.hh" +#include "international.hh" +#include "item.hh" +#include "note-head.hh" #include "staff-symbol-referencer.hh" -#include "custos.hh" -#include "molecule.hh" #include "warn.hh" -#include "note-head.hh" -#include "item.hh" -#include "font-interface.hh" -#include "math.h" // rint -MAKE_SCHEME_CALLBACK (Custos,brew_molecule,1); +MAKE_SCHEME_CALLBACK (Custos, print, 1); SCM -Custos::brew_molecule (SCM smob) +Custos::print (SCM smob) { Item *me = (Item *)unsmob_grob (smob); - SCM scm_style = me->get_grob_property ("style"); - if (gh_symbol_p (scm_style)) - { - String style = ly_scm2string (scm_symbol_to_string (scm_style)); - - /* - * Shall we use a common custos font character regardless if on - * staffline or not, or shall we use individual font characters - * for both cases? - */ - bool adjust = - to_boolean (me->get_grob_property ("adjust-if-on-staffline")); - - String idx = "custodes-" + style + "-"; - - int neutral_pos; - SCM ntr_pos = me->get_grob_property ("neutral-position"); - if (gh_number_p (ntr_pos)) - neutral_pos = gh_scm2int (ntr_pos); - else - neutral_pos = 0; - - Direction neutral_direction = - to_dir (me->get_grob_property ("neutral-direction")); - - int pos = (int)rint (Staff_symbol_referencer::position_f (me)); - int sz = Staff_symbol_referencer::line_count (me)-1; - - if (pos < neutral_pos) - idx += "u"; - else if (pos > neutral_pos) - idx += "d"; - else if (neutral_direction == UP) - idx += "u"; - else if (neutral_direction == DOWN) - idx += "d"; - else // auto direction; not yet supported -> use "d" - idx += "d"; - - if (adjust) - { - idx += (((pos ^ sz) & 0x1) == 0) ? "1" : "0"; - } - else - { - idx += "2"; - } - - Molecule molecule - = Font_interface::get_default_font (me)->find_by_name (idx); - if (molecule.empty_b ()) - { - String message = "no such custos: `" + idx + "'"; - warning (_ (message.ch_C ())); - return SCM_EOL; - } - else - { - // add ledger lines - int pos = (int)rint (Staff_symbol_referencer::position_f (me)); - int interspaces = Staff_symbol_referencer::line_count (me)-1; - if (abs (pos) - interspaces > 1) - { - Molecule ledger_lines = - Note_head::brew_ledger_lines (me, pos, interspaces, - molecule.extent (X_AXIS), true); - molecule.add_molecule (ledger_lines); - } - return molecule.smobbed_copy (); - } - } + SCM scm_style = me->get_property ("style"); + string style; + if (scm_is_symbol (scm_style)) + style = ly_symbol2string (scm_style); else - return SCM_EOL; -} + style = "mensural"; + + /* + * Shall we use a common custos font character regardless if on + * staffline or not, or shall we use individual font characters + * for both cases? + */ + bool adjust = true; + + int neutral_pos = robust_scm2int (me->get_property ("neutral-position"), 0); + Direction neutral_direction + = to_dir (me->get_property ("neutral-direction")); + + int pos = Staff_symbol_referencer::get_rounded_position (me); + int sz = Staff_symbol_referencer::line_count (me) - 1; + + string font_char = "custodes." + style + "."; + if (pos < neutral_pos) + font_char += "u"; + else if (pos > neutral_pos) + font_char += "d"; + else if (neutral_direction == UP) + font_char += "u"; + else if (neutral_direction == DOWN) + font_char += "d"; + else // auto direction; not yet supported -> use "d" + font_char += "d"; + + if (adjust) + font_char += (((pos ^ sz) & 0x1) == 0) ? "1" : "0"; + else + font_char += "2"; + Stencil stencil + = Font_interface::get_default_font (me)->find_by_name (font_char); + if (stencil.is_empty ()) + { + me->warning (_f ("custos `%s' not found", font_char)); + return SCM_EOL; + } -ADD_INTERFACE (Custos, "custos-interface", - "A custos is a staff context symbol that appears at the end of a - staff line with monophonic musical contents (i.e. with a single - voice). It anticipates the pitch of the first note of the following - line and thus helps the player or singer to manage line breaks - during performance, thus enhancing readability of a score. + return stencil.smobbed_copy (); +} - Custodes were frequently used in music notation until the 16th - century. There were different appearences for different notation - styles. Nowadays, they have survived only in special forms of - musical notation such as via the editio vaticana dating back to the - beginning of the 20th century. +ADD_INTERFACE (Custos, + "A custos object. @code{style} can have four valid values:" + " @code{mensural}, @code{vaticana}, @code{medicaea}, and" + " @code{hufnagel}. @code{mensural} is the default style.", -[TODO: add to glossary]", - "style adjust-if-on-staffline neutral-position"); + /* properties */ + "style " + "neutral-position " + "neutral-direction " + );