* buildscripts/pfx2ttf.fontforge: remove No. glyph from TTF file.

* Documentation/topdocs/NEWS.tely (Top): simplify NEWS entry, add
credits to Nicolas.

diff --git a/ChangeLog b/ChangeLog
index 2c11907350425e005275c40721d72992087b22b2..6d61e3a4e780d7b4f1fd35a1347db248e6b50fb6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,9 @@
 2006-01-30  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * buildscripts/pfx2ttf.fontforge: remove No. glyph from TTF file.
+
        * Documentation/topdocs/NEWS.tely (Top): simplify NEWS entry, add
-       Nicolas.
+       credits to Nicolas.
 
        * scm/define-markup-commands.scm (epsfile): add scaling to \epsfile.
 

diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely
index 5e3fd267ff955ed8a9cb5c8a148ab2443435801a..27dafed49022add0559989f970cd96d020041f6c 100644 (file)
--- a/Documentation/topdocs/NEWS.tely
+++ b/Documentation/topdocs/NEWS.tely
@@ -53,19 +53,16 @@ This is done with the \parallelMusic function,
   
 @lilypond[verbatim,raggedright]
 \parallelMusic #'(voiceA voiceB) {
-  %% first bar group
   r8     g'16[ c''] e''[ g' c'' e''] r8     g'16[ c''] e''[ g' c'' e''] |
   c'2                                c'2                                |
   r8     a'16[ d''] f''[ a' d'' f''] r8     a'16[ d''] f''[ a' d'' f''] |
   c'2                                c'2                                |
 }
 \new StaffGroup <<
-  \context Staff = "up" <<
+  \new Staff
     \new Voice \voiceA 
-  >>
-  \context Staff = "down" <<
+  \new Staff
     \new Voice \voiceC 
-  >>
 >> 
 @end lilypond
 

diff --git a/VERSION b/VERSION
index cdc66fdd01c302e864094b30052ba20cd1d579bc..e2a6db2c1de033fcb6807dafc73b480190d3ab93 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=7
-PATCH_LEVEL=29
+PATCH_LEVEL=30
 MY_PATCH_LEVEL=
 

diff --git a/buildscripts/pfx2ttf.fontforge b/buildscripts/pfx2ttf.fontforge
index dc1eb58723c7396fc60fcb9d6db56913a801954b..6be20b5dcbf0cbfa40f6086738f3a140adb9018b 100644 (file)
--- a/buildscripts/pfx2ttf.fontforge
+++ b/buildscripts/pfx2ttf.fontforge
@@ -2,5 +2,9 @@
 
 Open($1);
 MergeKern($2)
+
+# Remove the No. glyph - for want of better FF fix.  
+Select("afii61352")
+Cut();
 Generate($3 + $fontname + ".ttf");
 

diff --git a/input/GNUmakefile b/input/GNUmakefile
index 0bdb55a4787e8f5debe7334506ea6b7b7ba7b119..35d42859e9e18bf4d27db1ad6f5cebeb978c9f0b 100644 (file)
--- a/input/GNUmakefile
+++ b/input/GNUmakefile
@@ -2,8 +2,7 @@ depth = ..
 
 SUBDIRS = test regression tutorial no-notation mutopia 
 
-examples = typography-demo les-nereides wilhelmus sakura-sakura proportional
-#xiao-haizi-guai-guai
+examples = typography-demo les-nereides wilhelmus proportional bach-schenker
 
 LOCALSTEPMAKE_TEMPLATES=ly mutopia
 EXTRA_DIST_FILES=paddy.abc

diff --git a/input/bach-schenker.ly b/input/bach-schenker.ly
new file mode 100644 (file)
index 0000000..af1a973
--- /dev/null
+++ b/input/bach-schenker.ly
@@ -0,0 +1,286 @@
+% -*-coding: utf-8 -*-
+
+\header{
+
+ composer ="J.S. Bach"
+ title = "Wenn wir in hoechsten Noten sein"
+ subtitle = "Analysis from Gene Biringer's Schenker Text, Ex. 5-27"
+ opus = "BWV641"
+ enteredby = "Kris Shaffer"
+ 
+}
+
+
+\version "2.7.28"
+
+staffPiano = \new PianoStaff {
+  \set Score.timing = ##f
+  \set PianoStaff.followVoice = ##t
+
+  <<
+    \context Staff = "RH" {  % Right hand 
+      \clef treble
+      \key g \major
+      \relative c'' {
+       \override Staff.NoteCollision
+       #'merge-differently-headed = ##t
+       <<
+         {
+           \override Beam  #'positions = #'(8 . 8)
+           \override NoteHead #'transparent = ##t
+           s1 b8[^\markup {
+             \override #'(baseline-skip . 0.5)
+             \column { \small {^ 3} }
+           }
+                 s4. s1 a8^\markup {
+                   \override #'(baseline-skip . 0.5)
+                   \column { \small {^ 2} }
+                 } s4. s2 g8]^\markup {
+                   \override #'(baseline-skip . 0.5)
+                   \column {
+                     \small {^ 1}
+                   }
+                 }
+           s4.
+           \revert Beam #'positions
+           \revert NoteHead #'transparent
+         } 
+         \\
+         {
+           \override Stem #'transparent = ##t
+           \slurDown
+           \override Staff.Slur #'height-limit = #6
+           \slurDashed
+           s1 
+           \once \override Slur #'extra-offset = #'(1.25 . 0)
+           b2( s2
+           \revert Staff.Slur #'height-limit
+           \override NoteHead #'transparent = ##t
+           b4) s 
+           \revert NoteHead #'transparent
+           \override Staff.Slur #'height-limit = #3.25
+           \once \override Slur #'extra-offset = #'(.75 . 0)
+           \slurDashed
+           a2( s4
+           \override NoteHead #'transparent = ##t
+           a) 
+           \revert NoteHead #'transparent
+           g2 
+           \revert Stem #'transparent
+         }
+         \\
+         \override Staff.NoteCollision
+         #'merge-differently-headed = ##t
+         {
+           \override Beam #'positions = #'(4 . -3.25)
+           \stemUp 
+           g8[ s s4 s2 
+               \stemDown 
+               \override NoteHead #'transparent = ##t
+               b8] s8
+           \revert NoteHead #'transparent
+           \override Beam #'positions = #'(3 . -2.75)
+           \stemUp
+           a8[ s s4
+               \stemDown
+               c8] s s2 s s
+           \revert Stem #'length
+         }
+         \\
+         {
+           \override Stem #'transparent = ##t
+           \override NoteHead #'transparent = ##t
+           \override Stem #'length = #0
+           \phrasingSlurDown
+           \slurUp            
+           g4\( 
+             \revert NoteHead #'transparent
+             \once \override TextScript #'padding = #1.5
+             \once\override Slur #'extra-offset = #'(0 . -0.35)
+             fis(_\markup { \tiny N } g)\) \slurUp a(^\markup { \tiny P } b2)
+           b4(^\markup { \tiny P }
+           \stemUp 
+           \revert Stem #'transparent
+           \override Stem #'length = #10
+           c8[])( s 
+         \override Stem #'length = #14
+         b4) s s
+         \override Stem #'length = #0
+         \override Stem #'transparent = ##t
+         \phrasingSlurUp \slurDown 
+         \override Slur #'extra-offset = #'(0 . 0.35)
+         c4\(
+           \once \override TextScript #'padding = #1.25
+           b(_\markup { \tiny P } a)\) s2
+         \revert Stem #'length
+         \revert Slur #'extra-offset
+       }
+        \\
+        {
+          \override Stem #'transparent = ##t
+          \override NoteHead #'transparent = ##t
+          \override Stem #'length = #0
+          s1 s4 e4 s 
+          \change Staff=LH
+          fis,4 s2     
+          \revert Stem #'transparent
+          \revert NoteHead #'transparent
+          \revert Stem #'length
+        }
+        \\
+        {
+          \override Stem #'transparent = ##t
+          \override NoteHead #'transparent = ##t
+          \override Stem #'length = #0
+          s1 s s2
+          fis'4 s
+          \change Staff=LH
+          g,4 s s2
+          \revert Stem #'transparent
+          \revert NoteHead #'transparent
+          \revert Stem #'length
+        }
+       >>
+      \bar "|."
+    }
+  }
+   \context Staff = "LH" {  % Left hand                        
+     \clef bass
+     \key g \major
+     \relative c' {
+       \override Staff.NoteCollision
+       #'merge-differently-headed = ##t
+       <<
+        {
+          \override Beam  #'positions = #'(-8 . -8)
+          \override NoteHead #'transparent = ##t
+          \stemDown
+          g8[_\markup { \bold I } s4. s1 s s2
+             d8_\markup { \bold V } s4.
+             g,8]_\markup { \bold I } s4.
+          \revert Beam #'positions
+          \revert NoteHead #'transparent
+        }
+        \\
+        {
+          \override Stem #'transparent = ##t
+          \stemDown
+          \override TextScript #'extra-offset = #'(-11.75 . -12.25)
+          g'2 s1 s s2 d2 g,2
+          \revert Stem #'transparent
+        }
+        \\
+        {
+          \override Stem #'transparent = ##t
+          \override NoteHead #'transparent = ##t
+          \override Stem #'length = #0
+          g'4
+          \revert NoteHead #'transparent
+          \slurDown
+          \once \override TextScript #'padding = #0.25
+          a4(^\markup { \tiny P } b)
+          \slurUp
+          fis4(^\markup { \tiny P } e)
+          \override NoteHead #'transparent = ##t
+          c4( 
+          \revert NoteHead #'transparent
+          d)^\markup { \tiny N }
+          \slurDown
+          \override NoteHead #'transparent = ##t
+          \once \override Slur #'extra-offset = #'(0 . 0.5)
+          fis,4(
+          \revert NoteHead #'transparent
+          \revert Stem #'transparent
+          \override Stem #'length = #12
+          \stemDown
+          g4) s
+          \override Stem #'length = #10
+          \once \override Slur #'extra-offset = #'(0 . 0.25)
+          c8( s
+          \override Stem #'transparent = ##t
+          \revert Stem #'length
+          a4)
+          \override NoteHead #'transparent = ##t
+          \slurUp
+          d4(
+          \revert NoteHead #'transparent
+          d,4) s2
+        }
+        \\
+        {
+          \override Stem #'transparent = ##t
+          \override NoteHead #'transparent = ##t
+          \slurUp
+          \override Staff.Slur #'height-limit = #3.5
+          g'4( s b) s2
+          \revert Staff.Slur #'height-limit
+          \revert Stem #'transparent
+          \revert NoteHead #'transparent
+          \override Beam #'positions = #'(-4 . 1)
+          \stemDown
+          c,8[ s s4
+               \stemUp
+               fis,8] s
+          \override Beam #'positions = #'(1 . -4)
+          g8[ s
+              \stemDown
+              b8] s
+          \revert Beam #'positions
+          \override Stem #'transparent = ##t
+          \override NoteHead #'transparent = ##t
+          \slurUp
+          c4( s d4) s s2
+        }
+        \\
+        {
+          \override Stem #'transparent = ##t
+          \override NoteHead #'transparent = ##t
+          \slurDown
+          \override Stem #'length = #0
+          \stemDown
+          \override Slur #'height-limit = #3
+          \once \override Slur #'extra-offset = #'(0 . 0.25)
+          g4( s2. e4) s2. s2 s1 s2
+          \revert Stem #'transparent
+          \revert NoteHead #'transparent
+          \revert Staff.Slur #'height-limit
+        }
+        \\
+        {
+          \override Stem #'transparent = ##t
+          \override NoteHead #'transparent = ##t
+          \slurDown \slurDashed        
+          \override Staff.Slur #'height-limit = #6.0
+          \override Slur #'extra-offset = #'(0.5 . -0.25)
+          \override Stem #'length = #0
+          g4( s2. s1 g,4) s s1 s2
+          \revert Stem #'transparent
+          \revert NoteHead #'transparent
+          \revert Staff.Slur #'height-limit
+        }
+       >>
+       \bar "|."
+     }
+   }
+ >>
+}
+
+
+
+\score {
+  <<
+    \staffPiano
+  >>
+  
+  \midi {
+  }
+
+  \layout  {
+    raggedright = ##t
+    \context { \Staff \remove "Time_signature_engraver" }
+  }
+}
+
+\paper {
+}
+