]> git.donarmstrong.com Git - lilypond.git/commitdiff
Merge branch 'master' into dev/jmandereau
authorJohn Mandereau <john.mandereau@gmail.com>
Fri, 29 Feb 2008 16:18:13 +0000 (17:18 +0100)
committerJohn Mandereau <john.mandereau@gmail.com>
Fri, 29 Feb 2008 16:18:13 +0000 (17:18 +0100)
* master:
  Re-enable @version macro.
  add reminder.
  Minor policy update.
  Small updates.
  Updates from Ralph.
  MusicXML: Add double-dotted notes to duration test
  MusicXML: Change time signature in duration test file, so it looks better
  MusicXML: Add support for longa and breve notes, fix error messages
  Fix alignment problem with text crescendi
  Typo in comment
  move ignore-collision to note-column-interface
  Update from Trevor.

Conflicts:

Documentation/user/writing-texinfo.txt

16 files changed:
Documentation/user/editorial.itely
Documentation/user/input.itely
Documentation/user/lilypond-learning.tely
Documentation/user/pitches.itely
Documentation/user/rhythms.itely
Documentation/user/tweaks.itely
input/manual/editorial-headword.ly
input/regression/musicxml/00c-Basics-Durations.xml
lily/line-spanner.cc
lily/module-scheme.cc
lily/note-collision.cc
lily/note-column.cc
python/musicexp.py
python/musicxml.py
scripts/musicxml2ly.py
stepmake/stepmake/texinfo-vars.make

index 99f32bff59fc57ab23631a4868533d68b0d142e4..674605cb26caa2b4804133e15c4501871f2d8735 100644 (file)
@@ -248,7 +248,6 @@ gis a
 gis a
 \override NoteHead #'color = #(x11-color "LimeGreen")
 gis a
-
 % this is deliberate nonsense; note that the stems remain black
 \override Stem #'color = #(x11-color 'Boggle)
 b2 cis
@@ -306,33 +305,20 @@ for details.
 @cindex parentheses
 
 Objects may be parenthesized by prefixing @code{\parenthesize} to
-the music event,
+the music event.  This only functions inside chords; to
+parenthesize a single note it must be enclosed with @code{<>} as
+if it is a chord.
 
 @lilypond[relative=2,fragment,verbatim,ragged-right]
-<
-  c
-  \parenthesize d
-  g
->2-\parenthesize -.
-d g 
-<
-  c,
-  \parenthesize fis
->
+c2 < \parenthesize d>
+<\parenthesize e> d
 @end lilypond
 
-This only functions inside chords, to parenthesize a single note it 
-must be enclosed with @code{<>} as if it is a chord.
-
-@example
-< \parenthesize NOTE>
-@end example
+Non-note objects may be parenthesized as well.
 
 @lilypond[relative=2,fragment,verbatim,ragged-right]
-c4
-<\parenthesize d>
-g
-<\parenthesize d>
+< c \parenthesize d g >2-\parenthesize -. d
+g < c, \parenthesize fis >
 @end lilypond
 
 @seealso
@@ -436,15 +422,19 @@ notes.
 \layout {
   \context {
     \Staff
-    \consists "Grid_point_engraver" %% sets of grid
+    \consists "Grid_point_engraver" 
+    % sets up grids
     gridInterval = #(ly:make-moment 1 4)
+    % this sets the grid interval to 1 quarternote (crotchet)
   }
 }
 
 \new Score \with {
   \consists "Grid_line_span_engraver"
-  %% centers grid lines  horizontally below note heads
+  %% centers grid lines  horizontally below note heads by default 
+  %the grid lines are aligned with the left side of the notehead
   \override NoteColumn #'X-offset = #-0.5
+  % this moves them to the right half a staff space
 }
 
 \new ChoirStaff <<
@@ -455,8 +445,9 @@ notes.
     }
   }
   \new Staff {
-    %% centers grid lines  vertically
     \override Score.GridLine #'extra-offset = #'( 0.0 . 1.0 )
+    % by default the grid lines join the middle line of each staff,
+    % this moves them up one staff space
     \stemDown
     \clef bass
     \relative c {
index 5f2b84131a10911b788b65b0944e2c06f4df213d..0a02af5d3790178f8492aa4b943aae9866ee245d 100644 (file)
@@ -16,6 +16,12 @@ rather than specific notation.
 FIXME: don't complain about anything in this chapter.  It's still
 under heavy development.
 
+FIXME: add comments
+@verbatim
+% %{
+@end verbatim
+to 3.1.
+
 @menu
 * Input files::                 
 * Common syntax issues TODO name?::  
index fac164092e8d9d05d83d0151a6edb38f0b9afda8..ca8f2b0cc431c496fa18833bdcac7555e4d33eac 100644 (file)
@@ -100,7 +100,6 @@ Free Documentation License''.
 @ifnottex
 @node Top
 @top GNU LilyPond --- learning manual
-@c HJJ: Info needs `@top', which is a synonym for `@unnumbered' in TeX.
 
 This is the learning manual for GNU LilyPond version @version{}.
 
index 0ec57da745cad65a171602044234e197cdccb336..05b71b88db4a3859da8d9fa1707fa56ceb6caab0 100644 (file)
@@ -1756,6 +1756,8 @@ ambitus.
 @node Note heads
 @subsection Note heads
 
+This section suggests ways of altering note heads.
+
 @menu
 * Special note heads::          
 * Easy notation note heads::    
index b2f9977731f11178c4d93f520999fe7b0ac1c621..cf4c1a205d9624c119e3fb2f4e6941de1a55723f 100644 (file)
@@ -153,7 +153,7 @@ rests from 128th to maxima (8 x whole) may be printed.
 @cindex triplets
 @funindex \times
 
-Tuplets are made out of a music expression by multiplying all
+Tuplets are made from a music expression by multiplying all the
 durations with a fraction:
 
 @example
@@ -164,7 +164,7 @@ durations with a fraction:
 The duration of @var{musicexpr} will be multiplied by the 
 fraction.  The fraction's denominator will be printed over or 
 under the notes, optionally with a bracket.  The most common 
-tuplet is the triplet in which 3 notes have the length of 2, so 
+tuplet is the triplet in which 3 notes have the duration of 2, so
 the notes are 2/3 of their written length.
 
 @lilypond[quote,ragged-right,fragment,verbatim,relative=2]
@@ -175,11 +175,9 @@ c4 c \times 2/3 {b4 a g}
 
 Tuplets may be nested:
 
-@lilypond[fragment,ragged-right,verbatim,relative=2]
-\relative c'' {
-  \autoBeamOff
-  c4 \times 4/5 { f8 e f \times 2/3 {e[ f g] } } f4 |
-}
+@lilypond[quote,fragment,ragged-right,verbatim,relative=2]
+\autoBeamOff
+c4 \times 4/5 { f8 e f \times 2/3 {e[ f g] } } f4 |
 @end lilypond
 
 Modifying nested tuplets which begin at the same musical moment
@@ -207,21 +205,6 @@ must be done with @code{\tweak}.
 @lilypondfile [verbatim,lilyquote,ragged-right,texidoc]
 {entering-several-tuplets-using-only-one--times-command.ly}
 
-@ignore
-@c TODO Remove when snippet works ok
-@c Sent to Snippet 5 Feb 08
-The property @code{tupletSpannerDuration} specifies how long each
-bracket should last.  With this, you can make lots of tuplets
-while typing @code{\times} only once, thus saving lots of typing.
-In the next example, there are two triplets shown, while
-@code{\times} was only used once.
-
-@lilypond[quote,fragment,relative=2,ragged-right,verbatim]
-\set tupletSpannerDuration = #(ly:make-moment 1 4)
-\times 2/3 { c8 c c c c c }
-@end lilypond
-@end ignore
-
 @noindent
 For more information about @code{make-moment}, see
 @ref{Time administration}.
@@ -381,8 +364,7 @@ full length mode and how to modify what material they cover.
 
 @code{\compressMusic} works similarly to \times, but does not
 create a tuplet bracket.  One application is in polymetric
-notation, as shown in the following example.  See
-@ref{Polymetric notation}.
+notation, see @ref{Polymetric notation}.
 
 @lilypondfile [verbatim,lilyquote,ragged-right,texidoc]
 {printing-music-with-different-time-signatures.ly}
@@ -2616,3 +2598,4 @@ Internals Reference: @internalsref{Timing_translator},
 
 
 
+
index 698a7b30eade6c55c3d0ecc402c8d6f4f2d4a986..a68fd71359e45d46581d889cef45fc804ceb549c 100644 (file)
@@ -424,7 +424,7 @@ the context.  Let's use a very large value for the thickness
 at first, so we can be sure the command is working.  We get:
 
 @example
-  \override Slur #'thickness = #5.0
+\override Slur #'thickness = #5.0
 @end example 
 
 Don't forget the @code{#'} preceding the
@@ -662,7 +662,7 @@ Ok, so the @code{\override} command we need to print the lyrics
 in italics should be
 
 @example
-  \override LyricText #'font-shape = #'italic
+\override LyricText #'font-shape = #'italic
 @end example
 
 @noindent
@@ -703,7 +703,7 @@ object name, as otherwise the two names are run together and
 the interpreter cannot recognise them.  So the command should be:
 
 @example
-  \override Lyrics . LyricText #'font-shape = #'italic
+\override Lyrics . LyricText #'font-shape = #'italic
 @end example
 
 @warning{In lyrics always leave whitespace between the final
@@ -3191,15 +3191,15 @@ To be effective under all circumstances these checks must be enabled
 by placing the overrides in a Score @code{\with} block, rather than
 in-line in music, as follows:
 
-@verbatim
-\new Score \with {
+@example
+\new Score \with @{
   % Makes sure text scripts and lyrics are within the paper margins
   \override PaperColumn #'keep-inside-line = ##t
   \override NonMusicalPaperColumn #'keep-inside-line = ##t
-{
+@} @{
    ..
-}
-@end verbatim
+@}
+@end example
 
 @node Advanced tweaks with Scheme
 @subsection Advanced tweaks with Scheme
@@ -3225,33 +3225,29 @@ the staff.
 #(define (color-notehead grob)
   "Color the notehead according to its position on the staff."
   (let ((mod-position (modulo (ly:grob-property grob 'staff-position) 7)))
-       (case mod-position  ; Set rainbow colors
-         ((1) (ly:grob-set-property! grob 'color (x11-color 'red)))
-         ((2) (ly:grob-set-property! grob 'color (x11-color 'orange)))
-         ((3) (ly:grob-set-property! grob 'color (x11-color 'yellow)))
-         ((4) (ly:grob-set-property! grob 'color (x11-color 'green)))
-         ((5) (ly:grob-set-property! grob 'color (x11-color 'blue)))
-         ((6) (ly:grob-set-property! grob 'color (x11-color 'purple)))
-         ((0) (ly:grob-set-property! grob 'color (x11-color 'violet)))
-       )
+    (case mod-position
+      ;;   Return rainbow colors
+      ((1) (x11-color 'red    ))  ; for C
+      ((2) (x11-color 'orange ))  ; for D
+      ((3) (x11-color 'yellow ))  ; for E
+      ((4) (x11-color 'green  ))  ; for F
+      ((5) (x11-color 'blue   ))  ; for G
+      ((6) (x11-color 'purple ))  ; for A
+      ((0) (x11-color 'violet ))  ; for B
+    )
   )
 )
 
-rainbow = {
-  % Override color so it is obtained from color-notehead Scheme function
-  \override NoteHead #'color = #color-notehead
-}
-
 \relative c' {
-  \rainbow {
-    c2 c' |
-    b4 g8 a b4 c |
-    c,2 a' |
-    g1 |
-  }
+  % Arrange to obtain color from color-notehead procedure
+  \override NoteHead #'color = #color-notehead
+  c2 c' | 
+  b4 g8 a b4 c | 
+  c,2 a' | 
+  g1 |
 }
 \addlyrics {
-  Some -- where o -- ver the Rain -- bow, way up high,
+  Some -- where o -- ver the Rain -- bow way up high,
 }
 @end lilypond
 
index 6022cb472594d4bdd05423c79753bb907029dd6a..340971876f3630d452ad3881d68dcf74657366e3 100644 (file)
       d'8-2 \staccato
       |
       c'4-3
-      r8
-      r16.
-      c'32-3 \pp
-      |
-      c'8-2
-      r16.
-      c'32
-      c'8
-      r16.
-      c'32
-      |
-      c'8
+      r4
    }
    
    % LH Staff
       d8-2 \staccato
       |
       c4-3
-      r8
-      r16.
-      c32-3
-      |
-      c8-2
-      r16.
-      c32
-      c8
-      r16.
-      c32
-      |
-      c8
+      r4
    }
 
 >>
index cbb8dc62ede1a132d4bc56e8bd698287656fba50..c42439e04b8a857a97d49d155344e0b2e4fbf205 100644 (file)
   <part id="P1">
     <measure number="1">
       <attributes>
-        <divisions>32</divisions>
+        <divisions>64</divisions>
         <key>
           <fifths>0</fifths>
           <mode>major</mode>
         </key>
-        <time symbol="common">
-          <beats>4</beats>
+        <time>
+          <beats>16</beats>
           <beat-type>4</beat-type>
         </time>
         <clef>
           <step>C</step>
           <octave>5</octave>
         </pitch>
-        <duration>128</duration>
-        <tie type="start"/>
+        <duration>1024</duration>
         <voice>1</voice>
-        <type>whole</type>
-        <notations>
-          <tied type="start"/>
-        </notations>
+        <type>longa</type>
       </note>
     </measure>
     <!--=======================================================-->
           <step>C</step>
           <octave>5</octave>
         </pitch>
-        <duration>128</duration>
-        <tie type="stop"/>
+        <duration>512</duration>
         <voice>1</voice>
-        <type>whole</type>
-        <notations>
-          <tied type="stop"/>
-        </notations>
+        <type>breve</type>
       </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="3">
       <note>
         <pitch>
           <step>C</step>
           <octave>5</octave>
         </pitch>
-        <duration>128</duration>
+        <duration>256</duration>
         <voice>1</voice>
         <type>whole</type>
       </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="4">
       <note>
         <pitch>
           <step>C</step>
           <octave>5</octave>
         </pitch>
-        <duration>64</duration>
+        <duration>128</duration>
         <voice>1</voice>
         <type>half</type>
         <stem>down</stem>
@@ -89,7 +75,7 @@
           <step>C</step>
           <octave>5</octave>
         </pitch>
-        <duration>32</duration>
+        <duration>64</duration>
         <voice>1</voice>
         <type>quarter</type>
         <stem>down</stem>
@@ -99,7 +85,7 @@
           <step>C</step>
           <octave>5</octave>
         </pitch>
-        <duration>16</duration>
+        <duration>32</duration>
         <voice>1</voice>
         <type>eighth</type>
         <stem>down</stem>
           <step>C</step>
           <octave>5</octave>
         </pitch>
-        <duration>8</duration>
+        <duration>16</duration>
         <voice>1</voice>
         <type>16th</type>
         <stem>down</stem>
           <step>C</step>
           <octave>5</octave>
         </pitch>
-        <duration>4</duration>
+        <duration>8</duration>
         <voice>1</voice>
         <type>32nd</type>
         <stem>down</stem>
           <step>C</step>
           <octave>5</octave>
         </pitch>
-        <duration>2</duration>
+        <duration>4</duration>
         <voice>1</voice>
         <type>64th</type>
         <stem>down</stem>
           <step>C</step>
           <octave>5</octave>
         </pitch>
-        <duration>1</duration>
+        <duration>2</duration>
         <voice>1</voice>
         <type>128th</type>
         <stem>down</stem>
           <step>C</step>
           <octave>5</octave>
         </pitch>
-        <duration>1</duration>
+        <duration>2</duration>
         <voice>1</voice>
         <type>128th</type>
         <stem>down</stem>
       </note>
     </measure>
     <!--=======================================================-->
+    <measure number="4">
+      <attributes>
+        <time>
+          <beats>24</beats>
+          <beat-type>4</beat-type>
+        </time>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1536</duration>
+        <voice>1</voice>
+        <type>longa</type>
+        <dot/>
+      </note>
+    </measure>
+    <!--=======================================================-->
     <measure number="5">
       <note>
         <pitch>
           <step>C</step>
           <octave>5</octave>
         </pitch>
-        <duration>96</duration>
+        <duration>768</duration>
         <voice>1</voice>
-        <type>half</type>
+        <type>breve</type>
         <dot/>
-        <stem>down</stem>
       </note>
       <note>
         <pitch>
           <step>C</step>
           <octave>5</octave>
         </pitch>
-        <duration>32</duration>
+        <duration>384</duration>
         <voice>1</voice>
-        <type>quarter</type>
-        <stem>down</stem>
+        <type>whole</type>
+        <dot/>
       </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="6">
       <note>
         <pitch>
           <step>C</step>
           <octave>5</octave>
         </pitch>
-        <duration>48</duration>
+        <duration>192</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <dot/>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>96</duration>
         <voice>1</voice>
         <type>quarter</type>
         <dot/>
           <step>C</step>
           <octave>5</octave>
         </pitch>
-        <duration>24</duration>
+        <duration>48</duration>
         <voice>1</voice>
         <type>eighth</type>
         <dot/>
           <step>C</step>
           <octave>5</octave>
         </pitch>
-        <duration>12</duration>
+        <duration>24</duration>
         <voice>1</voice>
         <type>16th</type>
         <dot/>
           <step>C</step>
           <octave>5</octave>
         </pitch>
-        <duration>6</duration>
+        <duration>12</duration>
         <voice>1</voice>
         <type>32nd</type>
         <dot/>
           <step>C</step>
           <octave>5</octave>
         </pitch>
-        <duration>3</duration>
+        <duration>6</duration>
         <voice>1</voice>
         <type>64th</type>
         <dot/>
-        <stem>down</stem>
         <beam number="1">continue</beam>
         <beam number="2">continue</beam>
         <beam number="3">continue</beam>
           <step>C</step>
           <octave>5</octave>
         </pitch>
-        <duration>2</duration>
+        <duration>3</duration>
         <voice>1</voice>
         <type>128th</type>
         <dot/>
-        <stem>down</stem>
         <beam number="1">continue</beam>
         <beam number="2">continue</beam>
         <beam number="3">continue</beam>
           <step>C</step>
           <octave>5</octave>
         </pitch>
-        <duration>2</duration>
+        <duration>3</duration>
         <voice>1</voice>
         <type>128th</type>
         <dot/>
-        <stem>down</stem>
         <beam number="1">end</beam>
         <beam number="2">end</beam>
         <beam number="3">end</beam>
         <beam number="4">end</beam>
         <beam number="5">end</beam>
       </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="6">
+      <attributes>
+        <time>
+          <beats>28</beats>
+          <beat-type>4</beat-type>
+        </time>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1792</duration>
+        <voice>1</voice>
+        <type>longa</type>
+        <dot/>
+        <dot/>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="7">
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>896</duration>
+        <voice>1</voice>
+        <type>breve</type>
+        <dot/>
+        <dot/>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>448</duration>
+        <voice>1</voice>
+        <type>whole</type>
+        <dot/>
+        <dot/>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>224</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <dot/>
+        <dot/>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>112</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <dot/>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>56</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <dot/>
+        <dot/>
+        <beam number="1">begin</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>28</duration>
+        <voice>1</voice>
+        <type>16th</type>
+        <dot/>
+        <dot/>
+        <beam number="1">continue</beam>
+        <beam number="2">begin</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>14</duration>
+        <voice>1</voice>
+        <type>32nd</type>
+        <dot/>
+        <dot/>
+        <beam number="1">continue</beam>
+        <beam number="2">continue</beam>
+        <beam number="3">begin</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>7</duration>
+        <voice>1</voice>
+        <type>64th</type>
+        <dot/>
+        <dot/>
+        <beam number="1">continue</beam>
+        <beam number="2">continue</beam>
+        <beam number="3">continue</beam>
+        <beam number="4">begin</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>7</duration>
+        <voice>1</voice>
+        <type>64th</type>
+        <dot/>
+        <dot/>
+        <beam number="1">end</beam>
+        <beam number="2">end</beam>
+        <beam number="3">end</beam>
+        <beam number="4">end</beam>
+      </note>
       <barline location="right">
         <bar-style>light-heavy</bar-style>
       </barline>
index e9f18461a133b332eb204f2aef3288ca93c6387e..7c629297387815c90809610f2144e52517943e9e 100644 (file)
@@ -100,7 +100,7 @@ Line_spanner::calc_bound_info (SCM smob, Direction dir)
        }
       
       details = scm_acons (ly_symbol2scm ("X"),
-                          scm_from_double (bound_grob->extent (commonx, X_AXIS)
+                          scm_from_double (robust_relative_extent (bound_grob, commonx, X_AXIS)
                                            .linear_combination (attach)),
                           details);
     }
@@ -343,7 +343,7 @@ Line_spanner::print (SCM smob)
   line.translate (Offset (-me->relative_coordinate (commonx, X_AXIS),
                          -me->relative_coordinate (my_common_y, Y_AXIS)));
                          
-    
+
   return line.smobbed_copy ();
 }
 
index 9f4832628fb455e8e57169e642490bc9ff340894..07943858a636a18b0248c7475d0c3229c43689e2 100644 (file)
@@ -14,7 +14,7 @@
 
 
 /*
-  If a variable in changed in SRC, we DEST doesn't see the
+  If a variable is changed in SRC, then DEST doesn't see the
   definitions.
 */
 
index 8ee404cb067e5a0d1468ed69112a09d9b88f516a..5ba8fe4872ad9c27f3e70db15aa863a3845a3a5e 100644 (file)
@@ -575,7 +575,6 @@ ADD_INTERFACE (Note_collision_interface,
               "@code{force-hshift} and @code{horizontal-shift}.",
 
               /* properties */
-              "ignore-collision "
               "merge-differently-dotted "
               "merge-differently-headed "
               "positioning-done ");
index 68075fc25001306a2033b529d48fbc34c59053a8..e1a8e695fd16474e616a5cadad5a4bb8e959dc76 100644 (file)
@@ -216,6 +216,7 @@ ADD_INTERFACE (Note_column,
               "arpeggio "
               "force-hshift "
               "horizontal-shift "
+              "ignore-collision "
               "note-heads "
               "rest "
               "rest-collision "
index adce6911013d207cbb5042f068d3ab975ad9b0a5..862b5d8c4f70f5148c0a5b1899588b1859014c59 100644 (file)
@@ -2,9 +2,9 @@ import inspect
 import sys
 import string
 import re
-import lilylib
+import lilylib as ly
 
-_ = lilylib._
+_ = ly._
 
 from rational import Rational
 
@@ -155,8 +155,12 @@ class Duration:
     def ly_expression (self, factor = None):
         if not factor:
             factor = self.factor
-            
-        str = '%d%s' % (1 << self.duration_log, '.'*self.dots)
+
+        if self.duration_log < 0:
+            str = {-1: "\\breve", -2: "\\longa"}.get (self.duration_log, "1")
+        else:
+            str = '%d' % (1 << self.duration_log)
+        str += '.'*self.dots
 
         if factor <> Rational (1,1):
             if factor.denominator () <> 1:
index e9d1ef8bedebd195450a78660f3ff716379dbc5e..7c398e1e5d7a5f73a97b3a25d22bcbf37122f289 100644 (file)
@@ -5,9 +5,9 @@ from rational import *
 import re
 import sys
 import copy
-import lilylib
+import lilylib as ly
 
-_ = lilylib._
+_ = ly._
 
 def error (str):
     ly.stderr_write ((_ ("error: %s") % str) + "\n")
@@ -51,7 +51,7 @@ class Xml_node:
        return ''.join ([c.get_text () for c in self._children])
 
     def message (self, msg):
-        lilylib.stderr_write (msg+'\n')
+        ly.stderr_write (msg+'\n')
 
         p = self
         while p:
@@ -340,7 +340,7 @@ class Note (Measure_element):
                     'half': 1,
                     'whole': 0,
                     'breve': -1,
-                    'long': -2}.get (log, 0)
+                    'longa': -2}.get (log, 0)
        elif self.get_maybe_exist_named_child (u'grace'):
            # FIXME: is it ok to default to eight note for grace notes?
            return 3
@@ -379,7 +379,7 @@ class Part_list (Music_xml_node):
         if instrument_name:
             return instrument_name
         else:
-            lilylib.stderr_write (_ ("Unable to find find instrument for ID=%s\n") % id)
+            ly.stderr_write (_ ("Unable to find find instrument for ID=%s\n") % id)
             return "Grand Piano"
 
 class Part_group (Music_xml_node):
index e594aa7d47bbd6dbfdaacff8b7047c9bef0c0fe9..f808a8325b5a67655ac0cd3ffce223258a332150 100644 (file)
@@ -1386,6 +1386,7 @@ class LilyPondVoiceBuilder:
                 else:
                     duration_factor = Rational (diff.numerator ())
             else:
+                # for skips of a whole or more, simply use s1*factor
                 duration_log = 0
                 duration_factor = diff
             skip.duration.duration_log = duration_log
index 4ee7cefa474dac6762da3b9d4aef10579c0fde2e..bd620ab56cf4348495b62003b11a3cb40c5bd641 100644 (file)
@@ -7,6 +7,7 @@ TEXINFO_SOURCES = $(TEXI_FILES)
 
 OUTTXT_FILES += $(addprefix $(outdir)/,$(TEXI_FILES:.texi=.txt))
 
+TEXI2PDF_FLAGS += --command '@set version $(TOPLEVEL_VERSION)'
 GENERATE_OMF = $(PYTHON) $(buildscript-dir)/texi2omf.py --format $(1) --location $(webdir)/$(tree-dir)/out-www/$(notdir $(basename $@))  --version $(TOPLEVEL_VERSION) $< > $@
 
 TEXI2PDF_FLAGS += --command '@set version $(TOPLEVEL_VERSION)'