lilypond-1.2.1

diff --git a/Documentation/tex/tutorial.yo b/Documentation/tex/tutorial.yo
index 4f0d662ec9f6fda424cd4a00c79da8e0b8a25813..5d5c11bac0b6f4ca73851447613418ae8e3fac38 100644 (file)
--- a/Documentation/tex/tutorial.yo
+++ b/Documentation/tex/tutorial.yo
@@ -102,9 +102,9 @@ mudela(verbatim)(% lines preceded by a percent are comments.
 \include "paper16.ly"
 \score {
     \notes                        
-    \relative c'' {                
-            \key g;
+    \relative c'' \sequential{                
             \time 3/4;                
+            \key g;
 
         \repeat "volta" 2 {
             d4 g,8 a b c d4 g, g |
@@ -245,7 +245,7 @@ note is code(d'').  The code(4) designates the duration of the note
         a b
 )COMMENT(
 
-)These are notes with pitch code(a') and code(b').  Because their
+)These are notes with pitch code(a) and code(b).  Because their
 duration is the same as the code(g), there is no need to enter the
 duration (You may enter it anyway, eg. code(a4 b4)) COMMENT(
 
@@ -256,13 +256,8 @@ duration (You may enter it anyway, eg. code(a4 b4)) COMMENT(
 ) Three more notes.  The `code(|)' character is a `barcheck'.  When
 processing the music, LilyPond will verify that barchecks are found at
 the start of a measure.  This can help you track down errors.
-COMMENT(
-
-)verb(
-        e'4 
-) COMMENT(
 
-) So far, no notes were chromatically altered.  Here is the first one
+ So far, no notes were chromatically altered.  Here is the first one
 that is: code(fis). Mudela by default uses Dutch note names, and
 ``Fis'' is the Dutch note name for ``F sharp''.  However, there is no
 sharp sign in the output. The program keeps track of key signatures,
@@ -511,14 +506,14 @@ assignment is finished with a semicolon.COMMENT(
 
 )The structure of the file will be the same as the previous one, a
 code(\score) block with music in it.  To keep things readable, we will
-give the different parts of music names, and use names to construct
-music within the score block.
+give names to the different parts of music, and use the names to
+construct the music within the score block.
 
 verb(
         \partial 8;
 )
 
-The piece starts an anacrusis of one eighth.  COMMENT(
+The piece starts with an anacrusis of one eighth.  COMMENT(
 
 )verb(
         c4 c8 d [es () d] c4 | f4 f8 g [es() d] c g |
@@ -824,7 +819,7 @@ chord.  code(\f) places a forte symbol  under the chord.COMMENT(
 controls the directions of stems, articulations marks and other
 symbols.
   If code(verticalDirection) is set to code(\down)
-(identifier for the integer -1) the stems go down
+(identifier for the integer -1) the stems go down,
 code(\up) (identifier for the integer 1) makes the stems go up.COMMENT(
 
 )verb(        g'8. b,16)COMMENT(
@@ -837,7 +832,7 @@ note of the previous chord (the central C).
 verb(s1 s2. r4)COMMENT(
 
 )code(s) is a `spacer' rest.  It does not print anything,  but it does
-have duration of a rest.   COMMENT(
+have the duration of a rest.   COMMENT(
 
 )verb(oboes = \notes \relative c'' \context Voice = oboe {)COMMENT(
 

diff --git a/aclocal.m4 b/aclocal.m4
index 602d77213ae3deb0becaa0fd24480ff64026f68c..5d6b023d4004ffcf68c2a3974569daa5856ae11c 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -2,6 +2,8 @@ dnl WARNING WARNING WARNING WARNING
 dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4
 dnl WARNING WARNING WARNING WARNING
 dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4
+dnl WARNING WARNING WARNING WARNING
+dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4
 dnl aclocal.m4   -*-shell-script-*-
 dnl StepMake subroutines for configure.in
 
@@ -173,7 +175,14 @@ AC_DEFUN(AC_STEPMAKE_GUILE, [
       AC_DEFINE(HAVE_LIBGUILE)], , $GUILE_LDFLAGS dnl
     )
     if test "$ac_cv_lib_guile_gh_scm2doubles" != yes ; then
-       AC_STEPMAKE_WARN(You should install guile 1.3 or newer)
+      GUILE_LDFLAGS="`echo $GUILE_LDFLAGS | sed -e 's/-lreadline//g'`"
+      AC_CHECK_LIB(guile, gh_doubles2scm,
+        [LIBS="`echo $GUILE_LDFLAGS | sed -e 's/-L[[/-_a-zA-Z0-9]]\+ //g'` $LIBS"
+       AC_DEFINE(HAVE_LIBGUILE)], , $GUILE_LDFLAGS dnl
+      )
+      if test "$ac_cv_lib_guile_gh_doubles2scm" != yes ; then
+       AC_STEPMAKE_WARN(You should install guile 1.3 or newer)
+      fi
     fi
 ])
 

diff --git a/buildscripts/lilypond-login.sh b/buildscripts/lilypond-login.sh
index feb3dfc8bda91a808a8b8f49428b1d2edfb7e4b4..d7e8e972d8d7a4284cf328ec13bf195f96025b90 100644 (file)
--- a/buildscripts/lilypond-login.sh
+++ b/buildscripts/lilypond-login.sh
@@ -9,6 +9,20 @@ setenv GS_FONTPATH "@datadir@/afm"
 setenv LILYPONDPREFIX "@datadir@"
 
 # include an empty path component for the system wide includes.
-setenv MFINPUTS "@datadir@/mf:$MFINPUTS::"
-setenv TEXINPUTS "@datadir@/tex:$TEXINPUTS::"
-setenv GUILE_LOAD_PATH "@datadir@/scm:$GUILE_LOAD_PATH"
+if ($?MFINPUTS) then
+        setenv MFINPUTS "/usr/share/lilypond/mf:${MFINPUTS}::"
+else
+        setenv MFINPUTS "/usr/share/lilypond/mf::"
+endif
+if ($?TEXINPUTS) then
+        setenv TEXINPUTS "/usr/share/lilypond/tex:${TEXINPUTS}::"
+else
+        setenv TEXINPUTS "/usr/share/lilypond/tex::"
+endif
+if ($?GUILE_LOAD_PATH) then
+        setenv GUILE_LOAD_PATH "/usr/share/lilypond/scm:${GUILE_LOAD_PATH}"
+else
+        setenv GUILE_LOAD_PATH "/usr/share/lilypond/scm"
+endif
+
+

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index 121d55fdfb6d5271343f99b782f178668dc57073..9a4996c6fd29a9afb8e65550d3531885ee0f9223 100644 (file)
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -7,7 +7,6 @@
 */
 #include "debug.hh"
 #include "crescendo.hh"
-#include "dynamic-engraver.hh"
 #include "musical-request.hh"
 #include "lookup.hh"
 #include "paper-def.hh"
@@ -134,7 +133,7 @@ Dynamic_engraver::do_process_requests()
              staff_side_p_->dir_ = Direction (int (prop));
            }
 
-         prop = get_property ("dynamicDir", 0);
+         prop = get_property ("dynamicDirection", 0);
          if (prop.isnum_b ())
            {
              staff_side_p_->dir_ = (Direction) (int) prop;
@@ -179,7 +178,7 @@ Dynamic_engraver::do_process_requests()
                    {
                      to_end_ss_span_p_->dir_ = Direction (int (prop));
                    }
-                 prop = get_property ("dynamicDir", 0);
+                 prop = get_property ("dynamicDirection", 0);
                  if (prop.isdir_b ())
                    {
                      to_end_ss_span_p_->dir_ = (Direction) (int) prop;

diff --git a/lily/lookup.cc b/lily/lookup.cc
index d82c1f55baec45046d2ef0b9fa204b0910561038..e2b81bfa6c70e2741d7cea31fc6e7700071306fe 100644 (file)
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -132,6 +132,8 @@ Lookup::notehead (int j, String type) const
 {
   if (j > 2)
     j = 2;
+  if (type == "harmonic" || type == "cross")
+    j = 2;
 
   return afm_find (String ("noteheads-") + to_str (j) + type);
 }
@@ -393,7 +395,7 @@ Lookup::text (String style, String text, Paper_def *paper_l) const
   /*
     UGH.
   */
-  SCM l = gh_eval_str (("(style-to-cmr \"" + style + "\")").ch_C());
+  SCM l = ly_ch_C_eval_scm (("(style-to-cmr \"" + style + "\")").ch_C());
   if (l != SCM_BOOL_F)
     {
       style = ly_scm2string (SCM_CDR(l)) +to_str  ((int)font_h);
@@ -422,7 +424,7 @@ Lookup::text (String style, String text, Paper_def *paper_l) const
            brace_count ++;
          else if (text[i] == '}')
            brace_count --;
-          Character_metric *c = afm_l->get_char ((unsigned char)text[i],false);
+          Character_metric *c = (Character_metric*)afm_l->get_char ((unsigned char)text[i],false);
 
          w += c->dimensions()[X_AXIS].length ();
          ydims.unite (c->dimensions()[Y_AXIS]);
@@ -449,7 +451,7 @@ Lookup::text (String style, String text, Paper_def *paper_l) const
 
   
   Atom at  (gh_list (text_scm_sym,
-                    gh_str02scm (text.ch_C()),
+                    ly_ch_C_to_scm (text.ch_C()),
                     SCM_UNDEFINED));
   at.font_ = ly_symbol (style);
   at.magn_ = gh_int2scm (font_mag);

diff --git a/lily/midi-item.cc b/lily/midi-item.cc
index 703a66ff21f0a624b610a1b8cac92a44286cfcd8..39883f8328e138f2b9065dbf32a4f2d5d3c8f5ce 100644 (file)
--- a/lily/midi-item.cc
+++ b/lily/midi-item.cc
@@ -437,13 +437,10 @@ Midi_note_off::Midi_note_off (Midi_note* n)
   channel_i_ = n->channel_i_;
 
   // Anybody who hears any difference, or knows how this works?
-  
-  // 0x64 is supposed to be neutral, but let's try
-  //aftertouch_byte_ = 0x64;
+  //  0 should definitely be avoided, notes stick on some sound cards.
+  // 64 is supposed to be neutral
+  aftertouch_byte_ = 64;
 
-  static int i = 0;
-  aftertouch_byte_ = i;
-  i += 0x10;
 }
 
 String

diff --git a/ly/paper.ly b/ly/paper.ly
index 794a69b345287165210aad359b94f209deb80db0..145d1e050502aa91386835dbc93970ffabf54895 100644 (file)
--- a/ly/paper.ly
+++ b/ly/paper.ly
@@ -1,9 +1,13 @@
 % paper.ly
 
-linewidth20 = \hsize - 2.5 * \staffheight;
-textheight20 = \vsize - 5.0 * \staffheight;
-linewidth = \staffheight/20.0 * \linewidth20;
-textheight = \staffheight/20.0 * \textheight20;
+%% Why som complicated?  /MB
+%linewidth20 = \hsize - 2.5 * \staffheight;
+%textheight20 = \vsize - 5.0 * \staffheight;
+%linewidth = \staffheight/20.0 * \linewidth20;
+%textheight = \staffheight/20.0 * \textheight20;
+
+linewidth = \hsize - 2.\cm;
+textheight = \vsize - 4.\cm;
 
 indent = \linewidth / 14.0;
 

diff --git a/ly/params.ly b/ly/params.ly
index 12f1c34a3f14920f5eeca0df0702d2bd7d27d6b3..203169f394078ff9cbcbcfa206afbf2045862fcb 100644 (file)
--- a/ly/params.ly
+++ b/ly/params.ly
@@ -232,7 +232,7 @@ hyphen_height = 0.2*\font_normal;
 hyphen_minimum_length = 0.25*\font_normal;
 
 % Multi-measure rests
-mmrest_x_minimum = 2.0*\staffheight;
+mmrest_x_minimum = 1.4*\staffheight;
 
 
 % chop off this much when next to pp / ff sign.
@@ -253,7 +253,7 @@ stemSpacingCorrection = 0.5*\interline;
 %{
  relative strength of space following breakable columns (eg. prefatory matter)
  %}
-breakable_column_space_strength = 8.0; 
+breakable_column_space_strength = 2.0; 
 
 % space after inline clefs and such get this much stretched
 decrease_nonmus_spacing_factor = 1.0 ;

diff --git a/mutopia/N.W.Gade/brass.ly b/mutopia/N.W.Gade/brass.ly
index 61f61b0b1f0177bc2c54440156ffeabfee9e8e4b..9094208b4ad2f7bae732391356902087e0ad04a6 100644 (file)
--- a/mutopia/N.W.Gade/brass.ly
+++ b/mutopia/N.W.Gade/brass.ly
@@ -548,7 +548,9 @@ r4^"Flauto" r8 [c'16 ( d] |
 trpIIhelp=\notes\relative c'' {
 \tiny
 
-s2.*32 |
+[c8.^"Oboe" ( d16] ) c2 |
+[c8. ( d16] ) c2 |
+s2.*30 |
 s2*9 |
 r4^"Clar. I" r8 c-. |
 [bes-. a-. g-. f-. ] |

diff --git a/mutopia/N.W.Gade/global.tex b/mutopia/N.W.Gade/global.tex
index 81d102135fa93e01ed290471c89ad489bc6d61e4..003def855ac551c82e5546105ce16a9c9bcba7b4 100644 (file)
--- a/mutopia/N.W.Gade/global.tex
+++ b/mutopia/N.W.Gade/global.tex
@@ -1,8 +1,8 @@
-\def\fetdef#1#2{%
-  \def#1{\hbox{\fetchar{#2}}}}
-\font\fetasixteen = feta16
-\def\fetchar#1{{\fetasixteen\char#1}}
-\input{feta20}         %%% Add lilypond-xxx/mf/out/ to TEXINPUTS
+%\def\fetdef#1#2{%
+%  \def#1{\hbox{\fetchar{#2}}}}
+%\font\fetasixteen = feta16
+%\def\fetchar#1{{\fetasixteen\char#1}}
+%\input{feta20}         %%% Add lilypond-xxx/mf/out/ to TEXINPUTS
 
 \newcommand{\okt}{$8^{va}$}
 
@@ -18,7 +18,7 @@
 \advance\topmargin-5mm
 \advance\headsep-4mm
 \addtolength{\textheight}{17mm}
-\advance\footskip-3mm
+\advance\footskip-5mm
 
 \usepackage{fancyheadings}
 \lhead{\textbf{\large\theinstrument}}
@@ -52,7 +52,7 @@
         \end{flushright}%
   \end{minipage}\par
   \parskip\saveparskip
-  {\flushleft{\Large\textbf\thepiece}\par}%
+  {\flushleft{\Large\textbf\thepiece}\\}%
 %  \leavevmode%
-  \enlargethispage*{5mm}%
+%  \enlargethispage*{7mm}%
 }

diff --git a/mutopia/N.W.Gade/parts.ly b/mutopia/N.W.Gade/parts.ly
index 31846c0113f8b93438d33ee6fcf3b943db172919..f9326fc15559819b2913f577cc3153847202b1a4 100644 (file)
--- a/mutopia/N.W.Gade/parts.ly
+++ b/mutopia/N.W.Gade/parts.ly
@@ -19,15 +19,15 @@ copyright = "Mats Bengtsson, 1999. Free circulation permitted and " +
 \include "strings.ly"
 
 my_paper = \paper {
-  textheight = 275.0 \mm;
+  textheight = 265.0 \mm;
   \translator {
     \OrchestralPartStaffContext
   }
   \translator { 
     \ScoreContext
     skipBars = 1;
-    markScriptPadding = "6.0";
-    barNumberScriptPadding = "11.0";
+    barNumberScriptPadding = "12.0";
+    markScriptPadding = "20.0";
     dynamicPadding = 3.0;
     textScriptPadding = 5.0;
     textStyle = "italic";
@@ -85,7 +85,7 @@ my_paper = \paper {
     \clarI
   >
   \header{
-    instrument = "Clarinetto I in B\\flat";
+    instrument = "Clarinetto I in B\\textflat";
   }
   \paper{
     \my_paper
@@ -103,7 +103,7 @@ my_paper = \paper {
     \clarII
   >
   \header{
-    instrument = "Clarinetto II in B\\flat";
+    instrument = "Clarinetto II in B\\textflat";
   }
   \paper{
     \my_paper
@@ -184,7 +184,7 @@ my_paper = \paper {
     \context Voice = help \trpIhelp
   >
   \header{
-    instrument = "Tromba I in B\\flat";
+    instrument = "Tromba I in B\\textflat";
   }
   \paper{
     \my_paper
@@ -205,7 +205,7 @@ my_paper = \paper {
     \context Voice = help \trpIIhelp
   >
   \header{
-    instrument = "Tromba II in B\\flat";
+    instrument = "Tromba II in B\\textflat";
   }
   \paper{
     \my_paper

diff --git a/mutopia/N.W.Gade/score.ly b/mutopia/N.W.Gade/score.ly
index be35e29f73b286df7550f20afaf9cf0f916e1251..67ace5a781e7265c597e07b9a85dbeb2e4ee1fe0 100644 (file)
--- a/mutopia/N.W.Gade/score.ly
+++ b/mutopia/N.W.Gade/score.ly
@@ -14,8 +14,7 @@ copyright =   "Mats Bengtsson, 1999. Free circulation permitted and " +
 \include "wood.ly"
 \include "brass.ly"
 \include "strings.ly"
-\include "paper16.ly";
-
+\include "paper16.ly"
 
 \score{ <
   \context StaffGroup = wood <
@@ -33,13 +32,13 @@ copyright = "Mats Bengtsson, 1999. Free circulation permitted and " +
       \oboe
     >
     \context Voice = clarI <
-      \property Staff.instrument = "Clar. I in B\\flat  "
+      \property Staff.instrument = "Clar. I in B\\textflat  "
       \property Staff.instr = "Cl. I"
       \globalNoKey
       \clarI
     >
     \context Voice = clarII <
-      \property Staff.instrument = "Clar. II  in B\\flat  "
+      \property Staff.instrument = "Clar. II  in B\\textflat  "
       \property Staff.instr = "Cl. II"
       \globalNoKey
       \clarII
@@ -68,7 +67,7 @@ copyright =   "Mats Bengtsson, 1999. Free circulation permitted and " +
       }
     >
     \context Staff = trp <
-      \property Staff.instrument = "2 Trp. in B\\flat  "
+      \property Staff.instrument = "2 Trp. in B\\textflat  "
       \property Staff.instr = "Trp."
       \context Voice = trpI <
        \globalNoKey
@@ -85,7 +84,7 @@ copyright =   "Mats Bengtsson, 1999. Free circulation permitted and " +
   >
     \context StaffGroup = percussion <\context Voice = timpani <
       \property Staff.instrument = "Timp. \& Triang."
-      \property Staff.instr = "Tmp\&{}Trg"
+      \property Staff.instr = "\qquad Tmp\& Trg"
       \global
       \timpani
     >
@@ -135,7 +134,9 @@ copyright = "Mats Bengtsson, 1999. Free circulation permitted and " +
         barNumberScriptPadding = "12.0";
         markScriptPadding = "20.0";
     }
-    \translator { \StaffContext
+    \translator { 
+%        \HaraKiriStaffContext % Gives lost bar lines and misplaced marks!!
+        \StaffContext
        \consists "Staff_margin_engraver";
         marginScriptPadding = "15.0";
         dynamicPadding = 3.0;

diff --git a/mutopia/N.W.Gade/wood.ly b/mutopia/N.W.Gade/wood.ly
index bc6b44c6bcbedbdbbd28fe98cbab78d8334e7688..0221e01cc5a21a1676b23fd7d45af27e41920af6 100644 (file)
--- a/mutopia/N.W.Gade/wood.ly
+++ b/mutopia/N.W.Gade/wood.ly
@@ -649,8 +649,8 @@ b r b r |
 b r b r |
 a r r4 |
 R2 |
-g!4 \p \< ( a |
-\! b!2 ~ |
+g4 \p \< ( a |
+\! b2 ~ |
 b4 \> a ~ |
 a \! ) fis8 r |
 g4 \p \< ( a |

diff --git a/scripts/convert-mudela.py b/scripts/convert-mudela.py
index 7395958a0ff980ffd89db12b2e405447d7553e71..09bc18962e6426a7f4be3ec96ec539272afab550 100644 (file)
--- a/scripts/convert-mudela.py
+++ b/scripts/convert-mudela.py
@@ -419,6 +419,16 @@ if 1:
        conversions.append ((1,2,0), conv,
                            'automaticMelismas -> automaticMelismata')
 
+if 1:
+       def conv(lines):
+               newlines =[]
+               for x in lines:
+                       x =  re.sub ('dynamicDir', 'dynamicDirection', x)
+                       newlines.append (x)
+               return newlines
+
+       conversions.append ((1,2,1), conv,
+                           'dynamicDir -> dynamicDirection')
 
 ############################
        

diff --git a/tex/titledefs.tex b/tex/titledefs.tex
index fd18c5b60615e103ea3fea90b6720402dc8d835e..876dff52139b82896293b82a6144872a22e83d7c 100644 (file)
--- a/tex/titledefs.tex
+++ b/tex/titledefs.tex
@@ -66,12 +66,16 @@
   {\center{\large\theinstrument}\par}
   {\flushleft{\large\normalfont\scshape\thepiece}}
 %  \leavevmode
+  \global\let\theopus\relax%
+  \global\let\thepiece\relax%
 }
 \def\makelilypiecetitle
 {
   \bigskip
   {\flushright{\theopus}\par}
   {\flushleft{\large\normalfont\scshape\thepiece}}
+  \global\let\theopus\relax%
+  \global\let\thepiece\relax%
 }
 \endinput