(write_header_fields_to_file):

only dump value if it is a string.

diff --git a/ChangeLog b/ChangeLog
index 123b9031973d43a4e3eb9229ed2c49198b1ac03d..2ea9edcd272b04af8f026c0b26ab4c9f2379ca6c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
+2003-08-20  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * lily/paper-outputter.cc (write_header_fields_to_file): 
+       only dump value if it is a string.
+

 n2003-08-20  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
 n2003-08-20  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 

+
+       * flower/include/dictionary.hh: remove.
+       

        * Documentation/ChangeLog-1.5: add back old log.
 
        * Documentation/topdocs/INSTALL.texi (Top): explain how to get
        * Documentation/ChangeLog-1.5: add back old log.
 
        * Documentation/topdocs/INSTALL.texi (Top): explain how to get

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index cba52fd95bee4f7a613b038fc4bb3e5eaf1be758..401a2b39ca63c3d5e48162e413a90a3b2ca70b4a 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -2098,25 +2098,25 @@ longer be computed.
 @node Grace notes
 @subsection Grace notes
 
 @node Grace notes
 @subsection Grace notes
 

+
+@c should have blurb about accaciatura / appogiatura
+

 @cindex @code{\grace}
 @cindex ornaments
 @cindex grace notes
 
 @cindex @code{\grace}
 @cindex ornaments
 @cindex grace notes
 

-Grace notes are ornaments that are written out:
-
+Grace notes are ornaments that are written out, like accaciatura and
+appogiatura notes.

 @lilypond[relative=2,verbatim,fragment] c4 \grace c16 c4 \grace {
 [c16 d16] } c4
 @end lilypond
 
 @lilypond[relative=2,verbatim,fragment] c4 \grace c16 c4 \grace {
 [c16 d16] } c4
 @end lilypond
 

-In normal notation, grace notes take up no logical
-time in a measure. Such an idea is practical for normal notation, but
-is not strict enough to put it into a program. The model that LilyPond
-uses for grace notes internally is that all timing is done in two
-steps:
-
-Every point in musical time consists of two rational numbers: one
-denotes the logical time, one denotes the grace timing. The above
-example is shown here with timing tuples:
+From the point of view of typesetting, their characteristic is that
+grace notes take up take up no logical time in a measure.  Internally,
+timing for grace notes is done using a second time. Every point in
+musical time consists of two rational numbers: one denotes the logical
+time, one denotes the grace timing. The above example is shown here
+with timing tuples:

 
 @lilypond[]
 \score { \notes \relative c''{ 
 
 @lilypond[]
 \score { \notes \relative c''{ 


@@ -2139,9 +2139,14 @@ every eighth grace note:
 
 
 Unbeamed eighth notes and shorter by default have a slash through the
 
 
 Unbeamed eighth notes and shorter by default have a slash through the

-stem. This can be controlled with object property @code{stroke-style} of
-@internalsref{Stem}. For proper  matching of override and reverts of
-such properties, it is necessary to use a Scheme function.
+stem. These notes are called accaciaturas, and should generally be
+played as short as possible. An appogiatura takes a fixed fraction of
+the main note, is and denoted without a slash. 
+
+Such slashless notes are obtained by setting the object property
+@code{stroke-style} of the @internalsref{Stem} object. For proper
+matching of override and reverts of such properties, it is necessary
+to use a Scheme function.

 
 The following fragment overrides the default formatting Grace style stems:
 @example
 
 The following fragment overrides the default formatting Grace style stems:
 @example


@@ -7949,7 +7954,7 @@ are chosen whenever the page gets full.
 @cindex staff distance
 @cindex between staves, distance
 @cindex staffs per page
 @cindex staff distance
 @cindex between staves, distance
 @cindex staffs per page

-
+@cindex space between staves

 
 The height of each system is determined automatically by LilyPond, to
 keep systems from bumping into each other, some minimum distances are
 
 The height of each system is determined automatically by LilyPond, to
 keep systems from bumping into each other, some minimum distances are

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 5f681a6bfff7231d67d7c0d8a4ca2f9985d35726..e3ae43ae4caece7244ded04811d716b81a7aae3d 100644 (file)
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -193,7 +193,7 @@ Paper_outputter::write_header_fields_to_file (SCM mod)
          SCM val = gh_assoc (ly_symbol2scm (key.to_str0 ()), fields);
          String s;
          /* Only write header field to file if it exists */
          SCM val = gh_assoc (ly_symbol2scm (key.to_str0 ()), fields);
          String s;
          /* Only write header field to file if it exists */

-         if (gh_pair_p (val))
+         if (gh_pair_p (val) && gh_string_p (ly_cdr (val)))

            {
              s = ly_scm2string (ly_cdr (val));
              /* Always write header field file, even if string is empty ... */
            {
              s = ly_scm2string (ly_cdr (val));
              /* Always write header field file, even if string is empty ... */