* mf/parmesan-dots.mf (new), mf/parmesan-generic.mf,

	ly/engraver-init.ly: Added vaticana-style augmentum dot glyph.

	* lily/dots.cc: Added style property for dots.

diff --git a/ChangeLog b/ChangeLog
index 5c61fadec245b9939f0afcaae26a0af81e519e2f..f017e2d158839b564c9af0ca2cd0415b04d478d7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-11  Jürgen Reuter  <reuter@ipd.uka.de>
+
+       * mf/parmesan-dots.mf (new), mf/parmesan-generic.mf,
+       ly/engraver-init.ly: Added vaticana-style augmentum dot glyph.
+
+       * lily/dots.cc: Added style property for dots.
+
 2006-10-10  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
        * scm/output-lib.scm (fingering::calc-text): use origin

diff --git a/lily/dots.cc b/lily/dots.cc
index 1b2c7be8799fc59eba0347cd9d362783cdeaf9f2..f697752e35f9b30f4f46c93bb05328a774244d9a 100644 (file)
--- a/lily/dots.cc
+++ b/lily/dots.cc
@@ -14,6 +14,7 @@
 #include "lookup.hh"
 #include "staff-symbol-referencer.hh"
 #include "directional-element-interface.hh"
+#include "international.hh"
 
 MAKE_SCHEME_CALLBACK (Dots, print, 1);
 SCM
@@ -26,7 +27,17 @@ Dots::print (SCM d)
 
   if (scm_is_number (c))
     {
-      Stencil d = Font_interface::get_default_font (sc)->find_by_name (string ("dots.dot"));
+      SCM scm_style = sc->get_property ("style");
+      string style ="";
+      if (scm_is_symbol (scm_style))
+       style = ly_symbol2string (scm_style);
+      string idx =  "dots.dot" + style;
+      Stencil d = Font_interface::get_default_font (sc)->find_by_name (idx);
+      if (d.is_empty ())
+       {
+         sc->warning (_f ("dot `%s' not found", idx.c_str ()));
+         return SCM_EOL;
+       }
       Real dw = d.extent (X_AXIS).length ();
 
       /*
@@ -55,5 +66,6 @@ ADD_INTERFACE (Dots, "dots-interface",
 
               /* properties */
               "direction "
-              "dot-count");
-
+              "dot-count "
+              "style "
+              );

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 2959ce7187f1fa84f5d5d7009da020657babe211..03e4d54f5a9d56aea0bc4dc466ea3c7c3a78ef6b 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -765,6 +765,7 @@ AncientRemoveEmptyStaffContext = \context {
   \override Custos #'style = #'vaticana
   \override Custos #'neutral-position = #3
   \override Custos #'neutral-direction = #DOWN
+  \override Dots #'style = #'vaticana
 }
 
 \context {

diff --git a/mf/parmesan-dots.mf b/mf/parmesan-dots.mf
new file mode 100644 (file)
index 0000000..9ea6fe0
--- /dev/null
+++ b/mf/parmesan-dots.mf
@@ -0,0 +1,19 @@
+fet_begingroup ("dots");
+
+save dot_diam;
+
+3 dot_diam# = staff_space# - stafflinethickness#;
+define_whole_blacker_pixels (dot_diam);
+
+fet_beginchar ("duration dot", "dotvaticana");
+       pickup pencircle scaled dot_diam;
+
+       lft x0 = 0;
+       top y0 = vround (.5 dot_diam);
+
+       drawdot z0;
+
+       set_char_box (0, dot_diam#, .5 dot_diam#, .5 dot_diam#);
+fet_endchar;
+
+fet_endgroup ("dots");

diff --git a/mf/parmesan-generic.mf b/mf/parmesan-generic.mf
index 85f76a701a2ac086b58d33bcc6704d77a2d77a8f..0ed8a62016f267cecd400b48aa35416f4a588f09 100644 (file)
--- a/mf/parmesan-generic.mf
+++ b/mf/parmesan-generic.mf
@@ -33,6 +33,7 @@ if test = 0:
        input parmesan-flags;
        input parmesan-timesig;
        input parmesan-scripts;
+       input parmesan-dots;
 else:
 
 fi