lilypond ./ChangeLog Documentation/user/instrum...

2005-04-18 Thread Han-Wen Nienhuys 
CVSROOT:/cvsroot/lilypond
Module name:lilypond
Branch: 
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]>05/04/18 11:27:22

Modified files:
.  : ChangeLog 
Documentation/user: instrument-notation.itely 
input/test : chord-names-german.ly 

Log message:


CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3452&tr2=1.3453&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/user/instrument-notation.itely.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/test/chord-names-german.ly.diff?tr1=1.34&tr2=1.35&r1=text&r2=text

Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3452 lilypond/ChangeLog:1.3453
--- lilypond/ChangeLog:1.3452   Mon Apr 18 00:36:44 2005
+++ lilypond/ChangeLog  Mon Apr 18 11:27:22 2005
@@ -1,3 +1,9 @@
+2005-04-18  Mathieu Giraud  <[EMAIL PROTECTED]>
+
+   * input/test/chord-names-german.ly: update for italian/french chords
+   
+   * Documentation/user/instrument-notation.itely (Printing chord names): 
update
+
 2005-04-18  Han-Wen Nienhuys  <[EMAIL PROTECTED]>
 
* lily/include/paper-score.hh (class Paper_score): remove unused 
prototypes.
Index: lilypond/Documentation/user/instrument-notation.itely
diff -u lilypond/Documentation/user/instrument-notation.itely:1.17 
lilypond/Documentation/user/instrument-notation.itely:1.18
--- lilypond/Documentation/user/instrument-notation.itely:1.17  Tue Apr  5 
15:10:55 2005
+++ lilypond/Documentation/user/instrument-notation.itely   Mon Apr 18 
11:27:22 2005
@@ -585,10 +585,18 @@
 to a specialized function to change this behavior.  For example, the
 base can be printed in lower case.
 
[EMAIL PROTECTED] @code{chordPrefixSpacer}
[EMAIL PROTECTED] chordPrefixSpacer
+The ``m'' for minor chords is usually printed right after the root of 
+the chord. By setting @code{chordPrefixSpacer}, you can fix a spacer 
+between the root and ``m''. The spacer is not used when the root
+is altered.
+
 @end table
 
 The predefined variables @code{\germanChords},
[EMAIL PROTECTED] set these variables.  The effect is
[EMAIL PROTECTED], @code{\italianChords} and @code{\frenchChords} 
+set these variables.  The effect is
 demonstrated here,
 
 @lilypondfile[raggedright]{chord-names-german.ly}
@@ -610,6 +618,10 @@
 @code{\germanChords},
 @cindex @code{\semiGermanChords}
 @code{\semiGermanChords}.
[EMAIL PROTECTED] @code{\italianChords}
[EMAIL PROTECTED]
[EMAIL PROTECTED] @code{\frenchChords}
[EMAIL PROTECTED]
 
 
 
Index: lilypond/input/test/chord-names-german.ly
diff -u lilypond/input/test/chord-names-german.ly:1.34 
lilypond/input/test/chord-names-german.ly:1.35
--- lilypond/input/test/chord-names-german.ly:1.34  Sat Oct 30 20:55:16 2004
+++ lilypond/input/test/chord-names-german.ly   Mon Apr 18 11:27:22 2005
@@ -2,13 +2,16 @@
 \header  {
 texidoc = "@cindex Chord Names German
 The english naming of chords (default) can be changed to german 
-(@code{\germanChords} replaces B and Bes to H and B) or semi-german 
-(@code{\semiGermanChords} replaces B and Bes to H and Bb).
+(@code{\germanChords} replaces B and Bes to H and B), semi-german 
+(@code{\semiGermanChords} replaces B and Bes to H and Bb), italian
+(@code{\italianChords} uses Do Re Mi Fa Sol La Si), or french
+(@code{\frenchChords} replaces Re to Ré).
 
 " }
 
 scm = \chordmode {
-c1/c cis/cis
+e1/d c:m
+% c/c cis/cis
 % yeah, we get the idea. -hwn
 
 % cisis/cisis ces/ces ceses/ceses
@@ -33,5 +36,12 @@
 \new ChordNames {
\set instrument = #"semi-german"
\semiGermanChords \scm }
+\new ChordNames {
+   \set instrument = #"italian"
+   \italianChords \scm }
+\new ChordNames {
+   \set instrument = #"french"
+   \frenchChords \scm }
+
 \context Voice { \scm }
 >>


___
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

lilypond ./ChangeLog ./THANKS lily/line-interfa...

2005-04-18 Thread Han-Wen Nienhuys 
CVSROOT:/cvsroot/lilypond
Module name:lilypond
Branch: 
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]>05/04/18 12:06:36

Modified files:
.  : ChangeLog THANKS 
lily   : line-interface.cc line-spanner.cc 
 paper-score.cc text-spanner.cc 
lily/include   : line-interface.hh paper-score.hh 
scm: define-grob-properties.scm 

Log message:
* lily/paper-score.cc (process): run get_paper_systems() only once.

* lily/line-interface.cc (make_arrow): new function. Patch by
Jonatan Liljedahl 
(arrows): idem.

* lily/line-spanner.cc (line_stencil): add arrows.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3453&tr2=1.3454&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/THANKS.diff?tr1=1.107&tr2=1.108&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/line-interface.cc.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/line-spanner.cc.diff?tr1=1.59&tr2=1.60&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/paper-score.cc.diff?tr1=1.81&tr2=1.82&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/text-spanner.cc.diff?tr1=1.111&tr2=1.112&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/line-interface.hh.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/paper-score.hh.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-grob-properties.scm.diff?tr1=1.99&tr2=1.100&r1=text&r2=text

Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3453 lilypond/ChangeLog:1.3454
--- lilypond/ChangeLog:1.3453   Mon Apr 18 11:27:22 2005
+++ lilypond/ChangeLog  Mon Apr 18 12:06:34 2005
@@ -1,3 +1,14 @@
+2005-04-18  Han-Wen Nienhuys  <[EMAIL PROTECTED]>
+
+   * lily/paper-score.cc (process): run get_paper_systems() only once.
+
+   * lily/line-interface.cc (make_arrow): new function. Patch by
+   Jonatan Liljedahl 
+   (arrows): idem.
+
+   * lily/line-spanner.cc (line_stencil): add arrows.
+   
+
 2005-04-18  Mathieu Giraud  <[EMAIL PROTECTED]>
 
* input/test/chord-names-german.ly: update for italian/french chords
Index: lilypond/THANKS
diff -u lilypond/THANKS:1.107 lilypond/THANKS:1.108
--- lilypond/THANKS:1.107   Sun Apr 17 21:09:45 2005
+++ lilypond/THANKS Mon Apr 18 12:06:35 2005
@@ -21,6 +21,7 @@
 Heikki Junes
 Jeff Smith
 John Williams
+Jonatan Liljedahl
 Juergen Reuter
 Juliusz Chroboczek
 Matthias Neeracher
Index: lilypond/lily/include/line-interface.hh
diff -u lilypond/lily/include/line-interface.hh:1.5 
lilypond/lily/include/line-interface.hh:1.6
--- lilypond/lily/include/line-interface.hh:1.5 Thu Mar 10 14:36:12 2005
+++ lilypond/lily/include/line-interface.hh Mon Apr 18 12:06:36 2005
@@ -17,6 +17,12 @@
   static bool has_interface (Grob *);
   static Stencil make_dashed_line (Real th, Offset from, Offset to, Real, 
Real);
   static Stencil make_line (Real th, Offset from, Offset to);
+  static Stencil make_arrow (Offset beg, Offset end, Real thick,
+Real length, Real width);
+  static Stencil arrows (Grob *me, Offset from, Offset to,
+bool from_arrow,
+bool to_arrow);
+
 };
 
 #endif /* LINE_INTERFACE_HH */
Index: lilypond/lily/include/paper-score.hh
diff -u lilypond/lily/include/paper-score.hh:1.30 
lilypond/lily/include/paper-score.hh:1.31
--- lilypond/lily/include/paper-score.hh:1.30   Mon Apr 18 00:36:45 2005
+++ lilypond/lily/include/paper-score.hhMon Apr 18 12:06:36 2005
@@ -18,6 +18,7 @@
   Output_def *layout_;
   System *system_;
   SCM systems_;
+  SCM paper_systems_;
 
 public:
   Paper_score (Output_def *);
Index: lilypond/lily/line-interface.cc
diff -u lilypond/lily/line-interface.cc:1.19 
lilypond/lily/line-interface.cc:1.20
--- lilypond/lily/line-interface.cc:1.19Thu Mar 10 14:36:13 2005
+++ lilypond/lily/line-interface.cc Mon Apr 18 12:06:36 2005
@@ -13,6 +13,30 @@
 #include "output-def.hh"
 
 Stencil
+Line_interface::make_arrow (Offset beg, Offset end,
+   Real thick,
+   Real length, Real width)
+{
+  Real angle = (end - beg).arg();
+  Array points;
+  
+  //construct the arrow
+  points.push (Offset (0, 0));
+  points.push (Offset (length, width));
+  points.push (Offset (length, -width));
+
+  // rotate and translate the arrow
+  for (int i = 0; i < points.size(); i++)
+points[i] = points[i] * complex_exp (Offset (0, angle)) + beg;
+
+  // we must shorten the line half of arrow length
+  // to prevent the line from sticking out
+  beg = beg + Offse

lilypond ChangeLog

2005-04-18 Thread Han-Wen Nienhuys 
CVSROOT:/cvsroot/lilypond
Module name:lilypond
Branch: 
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]>05/04/18 12:13:33

Modified files:
.  : ChangeLog 

Log message:


CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3455&tr2=1.3456&r1=text&r2=text

Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3455 lilypond/ChangeLog:1.3456
--- lilypond/ChangeLog:1.3455   Mon Apr 18 12:10:36 2005
+++ lilypond/ChangeLog  Mon Apr 18 12:13:33 2005
@@ -1,5 +1,8 @@
 2005-04-18  Han-Wen Nienhuys  <[EMAIL PROTECTED]>
 
+   * lily/paper-book.cc (systems): accept Paper_score
+   iso. Paper_system vector. 
+
* input/regression/line-arrows.ly: new file.
 
* lily/paper-score.cc (process): run get_paper_systems() only once.


___
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

lilypond ./ChangeLog lily/book.cc lily/paper-bo...

2005-04-18 Thread Han-Wen Nienhuys 
CVSROOT:/cvsroot/lilypond
Module name:lilypond
Branch: 
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]>05/04/18 12:10:37

Modified files:
.  : ChangeLog 
lily   : book.cc paper-book.cc paper-score.cc 
lily/include   : paper-score.hh 
Added files:
input/regression: line-arrows.ly 

Log message:
* input/regression/line-arrows.ly: new file.

* lily/paper-score.cc (process): run get_paper_systems() only once.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3454&tr2=1.3455&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/regression/line-arrows.ly?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/book.cc.diff?tr1=1.39&tr2=1.40&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/paper-book.cc.diff?tr1=1.103&tr2=1.104&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/paper-score.cc.diff?tr1=1.82&tr2=1.83&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/paper-score.hh.diff?tr1=1.31&tr2=1.32&r1=text&r2=text

Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3454 lilypond/ChangeLog:1.3455
--- lilypond/ChangeLog:1.3454   Mon Apr 18 12:06:34 2005
+++ lilypond/ChangeLog  Mon Apr 18 12:10:36 2005
@@ -1,5 +1,7 @@
 2005-04-18  Han-Wen Nienhuys  <[EMAIL PROTECTED]>
 
+   * input/regression/line-arrows.ly: new file.
+
* lily/paper-score.cc (process): run get_paper_systems() only once.
 
* lily/line-interface.cc (make_arrow): new function. Patch by
Index: lilypond/lily/book.cc
diff -u lilypond/lily/book.cc:1.39 lilypond/lily/book.cc:1.40
--- lilypond/lily/book.cc:1.39  Mon Apr 18 00:36:45 2005
+++ lilypond/lily/book.cc   Mon Apr 18 12:10:37 2005
@@ -121,7 +121,7 @@
}
  else if (Paper_score *pscore = dynamic_cast 
(output)) 
{
- SCM systems = pscore->get_systems ();
+ SCM systems = pscore->get_paper_systems ();
  if (ly_c_module_p (score->header_))
paper_book->add_score (score->header_);
  paper_book->add_score (systems);
Index: lilypond/lily/include/paper-score.hh
diff -u lilypond/lily/include/paper-score.hh:1.31 
lilypond/lily/include/paper-score.hh:1.32
--- lilypond/lily/include/paper-score.hh:1.31   Mon Apr 18 12:06:36 2005
+++ lilypond/lily/include/paper-score.hhMon Apr 18 12:10:37 2005
@@ -29,7 +29,7 @@
   void typeset_system (System *);
   Array calc_breaking ();
 
-  SCM get_systems () const;
+  SCM get_paper_systems () const;
 protected:
   virtual void process ();
   virtual void derived_mark () const;
Index: lilypond/lily/paper-book.cc
diff -u lilypond/lily/paper-book.cc:1.103 lilypond/lily/paper-book.cc:1.104
--- lilypond/lily/paper-book.cc:1.103   Tue Apr 12 22:49:28 2005
+++ lilypond/lily/paper-book.cc Mon Apr 18 12:10:37 2005
@@ -7,7 +7,7 @@
 */
 
 #include "paper-book.hh"
-
+#include "paper-score.hh"
 #include "main.hh"
 #include "output-def.hh"
 #include "paper-score.hh"
@@ -250,8 +250,10 @@
  if (header_0_ == SCM_EOL)
header_0_ = header;
}
-  else if (scm_is_vector (scm_car (s)))
+  else if (Paper_score *pscore
+  = dynamic_cast (unsmob_music_output (scm_car 
(s
{
+ 
  Stencil title = score_title (header);
  if (title.is_empty ())
title = score_title (header_);
@@ -264,7 +266,8 @@
}
  header = SCM_EOL;
 
- SCM system_list = scm_vector_to_list (scm_car (s));
+ 
+ SCM system_list = scm_vector_to_list (pscore->get_paper_systems ());
  system_list = scm_reverse (system_list);
  systems_ = scm_append (scm_list_2 (system_list, systems_));
}
Index: lilypond/lily/paper-score.cc
diff -u lilypond/lily/paper-score.cc:1.82 lilypond/lily/paper-score.cc:1.83
--- lilypond/lily/paper-score.cc:1.82   Mon Apr 18 12:06:36 2005
+++ lilypond/lily/paper-score.ccMon Apr 18 12:10:37 2005
@@ -109,7 +109,7 @@
   
 
 SCM
-Paper_score::get_systems () const
+Paper_score::get_paper_systems () const
 {
   return paper_systems_;
 }


___
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

lilypond/input/regression line-arrows.ly

2005-04-18 Thread Han-Wen Nienhuys 
CVSROOT:/cvsroot/lilypond
Module name:lilypond
Branch: 
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]>05/04/18 12:31:20

Modified files:
input/regression: line-arrows.ly 

Log message:
new file.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/regression/line-arrows.ly.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: lilypond/input/regression/line-arrows.ly
diff -u lilypond/input/regression/line-arrows.ly:1.1 
lilypond/input/regression/line-arrows.ly:1.2
--- lilypond/input/regression/line-arrows.ly:1.1Mon Apr 18 12:10:37 2005
+++ lilypond/input/regression/line-arrows.lyMon Apr 18 12:31:20 2005
@@ -1,23 +1,23 @@
-%%
-\version "2.5.18"
+\header {
+  texidoc = "Arrows can be applied to text-spanners and line-spanners (such as 
the Glissando)"
+}
 
-%% demonstration of line arrows
-%% By Jonatan Liljedahl 
+\version "2.5.20"
 
-\relative c'' {
-%% Arrow between two texts
-\override TextSpanner #'edge-text = #'("foo" . "bar")
-\override TextSpanner #'dash-fraction = #'()
-\override TextSpanner #'style = #'line
-\override TextSpanner #'arrow = ##t
-
-%% Default arrow size
-%\override TextSpanner #'arrow-length = #1.3
-%\override TextSpanner #'arrow-width = #0.5
+\paper {
+  raggedright = ##t
+}
 
-%% We can put arrows to a glissando line
-\override Glissando #'arrow = ##t
-
-a8\startTextSpan gis8\< a2 b4\glissando
-c,4 g'\! c\stopTextSpan c
+\relative c'' {
+  \override TextSpanner #'edge-text = #'("foo" . "bar")
+  \override TextSpanner #'bound-padding = #1.0
+  \override TextSpanner #'dash-fraction = #'()
+  \override TextSpanner #'arrow = ##t
+  
+  \override Glissando #'arrow = ##t
+  \override Glissando #'arrow-length = #0.5
+  \override Glissando #'arrow-width = #0.25
+  
+  a8\startTextSpan gis8 a4 b4\glissando
+  b,4 | g' c\stopTextSpan c
 }


___
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

lilypond ./ChangeLog lily/line-interface.cc lil...

2005-04-18 Thread Han-Wen Nienhuys 
CVSROOT:/cvsroot/lilypond
Module name:lilypond
Branch: 
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]>05/04/18 12:29:24

Modified files:
.  : ChangeLog 
lily   : line-interface.cc line-spanner.cc paper-book.cc 
 text-spanner.cc 
lily/include   : paper-book.hh 

Log message:
* lily/text-spanner.cc: add bound-padding.

* lily/paper-book.cc (systems): accept Paper_score
iso. Paper_system vector.

* lily/line-interface.cc (make_arrow): new function. Patch by
Jonatan Liljedahl 
(arrows): idem.

* lily/line-spanner.cc (line_stencil): add arrows.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3456&tr2=1.3457&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/line-interface.cc.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/line-spanner.cc.diff?tr1=1.60&tr2=1.61&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/paper-book.cc.diff?tr1=1.104&tr2=1.105&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/text-spanner.cc.diff?tr1=1.112&tr2=1.113&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/paper-book.hh.diff?tr1=1.31&tr2=1.32&r1=text&r2=text

Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3456 lilypond/ChangeLog:1.3457
--- lilypond/ChangeLog:1.3456   Mon Apr 18 12:13:33 2005
+++ lilypond/ChangeLog  Mon Apr 18 12:29:24 2005
@@ -1,5 +1,7 @@
 2005-04-18  Han-Wen Nienhuys  <[EMAIL PROTECTED]>
 
+   * lily/text-spanner.cc: add bound-padding.
+
* lily/paper-book.cc (systems): accept Paper_score
iso. Paper_system vector. 
 
@@ -12,7 +14,6 @@
(arrows): idem.
 
* lily/line-spanner.cc (line_stencil): add arrows.
-   
 
 2005-04-18  Mathieu Giraud  <[EMAIL PROTECTED]>
 
Index: lilypond/lily/include/paper-book.hh
diff -u lilypond/lily/include/paper-book.hh:1.31 
lilypond/lily/include/paper-book.hh:1.32
--- lilypond/lily/include/paper-book.hh:1.31Thu Mar 10 14:36:12 2005
+++ lilypond/lily/include/paper-book.hh Mon Apr 18 12:29:24 2005
@@ -26,6 +26,7 @@
   SCM systems_;
   SCM pages_;
 
+  void add_score_title (SCM);
 public:
   SCM header_;
   SCM header_0_;
Index: lilypond/lily/line-interface.cc
diff -u lilypond/lily/line-interface.cc:1.20 
lilypond/lily/line-interface.cc:1.21
--- lilypond/lily/line-interface.cc:1.20Mon Apr 18 12:06:36 2005
+++ lilypond/lily/line-interface.cc Mon Apr 18 12:29:24 2005
@@ -13,26 +13,22 @@
 #include "output-def.hh"
 
 Stencil
-Line_interface::make_arrow (Offset beg, Offset end,
+Line_interface::make_arrow (Offset begin, Offset end,
Real thick,
Real length, Real width)
 {
-  Real angle = (end - beg).arg();
+  Real angle = (end - begin).arg();
   Array points;
   
   //construct the arrow
   points.push (Offset (0, 0));
-  points.push (Offset (length, width));
-  points.push (Offset (length, -width));
+  points.push (Offset (-length, width));
+  points.push (Offset (-length, -width));
 
   // rotate and translate the arrow
   for (int i = 0; i < points.size(); i++)
-points[i] = points[i] * complex_exp (Offset (0, angle)) + beg;
+points[i] = points[i] * complex_exp (Offset (0, angle)) + end;
 
-  // we must shorten the line half of arrow length
-  // to prevent the line from sticking out
-  beg = beg + Offset (length/2,0) * complex_exp (Offset (0, angle));
-  
   return (Lookup::round_filled_polygon (points, thick));
 }
 
Index: lilypond/lily/line-spanner.cc
diff -u lilypond/lily/line-spanner.cc:1.60 lilypond/lily/line-spanner.cc:1.61
--- lilypond/lily/line-spanner.cc:1.60  Mon Apr 18 12:06:36 2005
+++ lilypond/lily/line-spanner.cc   Mon Apr 18 12:29:24 2005
@@ -144,7 +144,7 @@
   if (to_boolean (me->get_property ("arrow")))
 line.add_stencil (Line_interface::arrows (me, from, to, false, true));
   
-  return Stencil ();
+  return line;
 }
 
 /*
@@ -188,7 +188,7 @@
 
   Real gap = robust_scm2double (me->get_property ("gap"), 0.0);
 
-  Offset ofxy (gap, 0); /*offset from start point to start of line*/
+  Offset ofxy (gap, 0); /* offset from start point to start of line */
   Offset dxy;
   Offset my_off;
   Offset his_off;
Index: lilypond/lily/paper-book.cc
diff -u lilypond/lily/paper-book.cc:1.104 lilypond/lily/paper-book.cc:1.105
--- lilypond/lily/paper-book.cc:1.104   Mon Apr 18 12:10:37 2005
+++ lilypond/lily/paper-book.cc Mon Apr 18 12:29:24 2005
@@ -219,6 +219,21 @@
 }
 }
 
+void
+Paper_book::add_score_title (SCM header)
+{
+  Stencil title = score_title (header);
+  if (title.is_empty ())
+title = score_title (header_);
+  if (!title.is_empty ())
+{
+  Paper_system *ps = new Paper_system (title, true);
+  systems_

lilypond/lily line-interface.cc

2005-04-18 Thread Han-Wen Nienhuys 
CVSROOT:/cvsroot/lilypond
Module name:lilypond
Branch: 
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]>05/04/18 12:33:36

Modified files:
lily   : line-interface.cc 

Log message:
(make_arrow): new function. Patch by
Jonatan Liljedahl 
(arrows): idem.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/line-interface.cc.diff?tr1=1.21&tr2=1.22&r1=text&r2=text

Patches:
Index: lilypond/lily/line-interface.cc
diff -u lilypond/lily/line-interface.cc:1.21 
lilypond/lily/line-interface.cc:1.22
--- lilypond/lily/line-interface.cc:1.21Mon Apr 18 12:29:24 2005
+++ lilypond/lily/line-interface.cc Mon Apr 18 12:33:36 2005
@@ -20,16 +20,14 @@
   Real angle = (end - begin).arg();
   Array points;
   
-  //construct the arrow
   points.push (Offset (0, 0));
   points.push (Offset (-length, width));
   points.push (Offset (-length, -width));
 
-  // rotate and translate the arrow
   for (int i = 0; i < points.size(); i++)
 points[i] = points[i] * complex_exp (Offset (0, angle)) + end;
 
-  return (Lookup::round_filled_polygon (points, thick));
+  return Lookup::round_filled_polygon (points, thick);
 }
 
 Stencil
@@ -91,8 +89,10 @@
 {
   Real thick = Staff_symbol_referencer::line_thickness (me)
* robust_scm2double (me->get_property ("thickness"), 1);
-  Real len = robust_scm2double (me->get_property ("arrow-length"), 1.3);
-  Real wid = robust_scm2double (me->get_property ("arrow-width"), 0.5);
+  Real ss =  Staff_symbol_referencer::staff_space (me);
+  
+  Real len = robust_scm2double (me->get_property ("arrow-length"), 1.3 * 
ss);
+  Real wid = robust_scm2double (me->get_property ("arrow-width"), 0.5 * 
ss);
 
   if (to_arrow)
 a.add_stencil (make_arrow (from, to, thick, len, wid));


___
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

lilypond/lily paper-book.cc

2005-04-18 Thread Han-Wen Nienhuys 
CVSROOT:/cvsroot/lilypond
Module name:lilypond
Branch: 
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]>05/04/18 12:47:17

Modified files:
lily   : paper-book.cc 

Log message:
* lily/text-spanner.cc: add bound-padding.

* lily/paper-book.cc (systems): accept Paper_score
iso. Paper_system vector.

* lily/line-interface.cc (make_arrow): new function. Patch by
Jonatan Liljedahl 
(arrows): idem.

* lily/line-spanner.cc (line_stencil): add arrows.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/paper-book.cc.diff?tr1=1.105&tr2=1.106&r1=text&r2=text

Patches:
Index: lilypond/lily/paper-book.cc
diff -u lilypond/lily/paper-book.cc:1.105 lilypond/lily/paper-book.cc:1.106
--- lilypond/lily/paper-book.cc:1.105   Mon Apr 18 12:29:24 2005
+++ lilypond/lily/paper-book.cc Mon Apr 18 12:47:17 2005
@@ -265,23 +265,31 @@
  if (header_0_ == SCM_EOL)
header_0_ = header;
}
-  else if (Paper_score *pscore
-  = dynamic_cast (unsmob_music_output (scm_car 
(s
+  else if (Music_output *mop = unsmob_music_output (scm_car (s)))
+   
{
- add_score_title (header);
+ if (Paper_score *pscore = dynamic_cast (mop))
+   {
+ add_score_title (header);
  
- header = SCM_EOL;
-
+ header = SCM_EOL;
  
- SCM system_list = scm_vector_to_list (pscore->get_paper_systems ());
- system_list = scm_reverse (system_list);
- systems_ = scm_append (scm_list_2 (system_list, systems_));
+ SCM system_list = scm_vector_to_list (pscore->get_paper_systems 
());
+ system_list = scm_reverse (system_list);
+ systems_ = scm_append (scm_list_2 (system_list, systems_));
+   }
+ else
+   {
+ /*
+   Ignore MIDI
+ */
+   }
}
   else if (scm_is_vector (scm_car (s)))
{
  /*
UGH. code dup.  
-  */
+ */
  add_score_title (header);
  header = SCM_EOL;
  


___
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

lilypond ./ChangeLog Documentation/topdocs/NEWS...

2005-04-18 Thread Han-Wen Nienhuys 
CVSROOT:/cvsroot/lilypond
Module name:lilypond
Branch: 
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]>05/04/18 12:37:16

Modified files:
.  : ChangeLog 
Documentation/topdocs: NEWS.tely 
Documentation/user: instrument-notation.itely 
Added files:
input/test : chord-names-languages.ly 
Removed files:
input/test : chord-names-german.ly 

Log message:
* input/test/chord-names-languages.ly (Module): rename file.

* lily/text-spanner.cc: add bound-padding.

* lily/paper-book.cc (systems): accept Paper_score
iso. Paper_system vector.

* lily/line-interface.cc (make_arrow): new function. Patch by
Jonatan Liljedahl 
(arrows): idem.

* lily/line-spanner.cc (line_stencil): add arrows.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3457&tr2=1.3458&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/topdocs/NEWS.tely.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/user/instrument-notation.itely.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/test/chord-names-languages.ly?rev=1.1

Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3457 lilypond/ChangeLog:1.3458
--- lilypond/ChangeLog:1.3457   Mon Apr 18 12:29:24 2005
+++ lilypond/ChangeLog  Mon Apr 18 12:37:16 2005
@@ -1,5 +1,7 @@
 2005-04-18  Han-Wen Nienhuys  <[EMAIL PROTECTED]>
 
+   * input/test/chord-names-languages.ly (Module): rename file.
+
* lily/text-spanner.cc: add bound-padding.
 
* lily/paper-book.cc (systems): accept Paper_score
Index: lilypond/Documentation/topdocs/NEWS.tely
diff -u lilypond/Documentation/topdocs/NEWS.tely:1.26 
lilypond/Documentation/topdocs/NEWS.tely:1.27
--- lilypond/Documentation/topdocs/NEWS.tely:1.26   Thu Apr 14 10:23:39 2005
+++ lilypond/Documentation/topdocs/NEWS.telyMon Apr 18 12:37:16 2005
@@ -34,6 +34,16 @@
 @itemize @bullet
 
 @item
+Lines, such glissandi or Text-spanner lines can have arrows at the end,
+
[EMAIL PROTECTED],fragment]
+\override Glissando #'arrow = ##t
+b''2 \glissando b'
[EMAIL PROTECTED] lilypond
+
[EMAIL PROTECTED]
+Chord names may now be rendered in Italian and French.
+
 @file{lilypond-book} now makes @file{lilypond} print line numbers
 relative to the input file for every error message.
 
Index: lilypond/Documentation/user/instrument-notation.itely
diff -u lilypond/Documentation/user/instrument-notation.itely:1.18 
lilypond/Documentation/user/instrument-notation.itely:1.19
--- lilypond/Documentation/user/instrument-notation.itely:1.18  Mon Apr 18 
11:27:22 2005
+++ lilypond/Documentation/user/instrument-notation.itely   Mon Apr 18 
12:37:16 2005
@@ -599,7 +599,7 @@
 set these variables.  The effect is
 demonstrated here,
 
[EMAIL PROTECTED]
[EMAIL PROTECTED]
 
 There are also two other chord name schemes implemented: an alternate
 Jazz chord notation, and a systematic scheme called Banter chords.  The


___
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

lilypond ./ChangeLog site/switch/index.html

2005-04-18 Thread Han-Wen Nienhuys 
CVSROOT:/cvsroot/lilypond
Module name:lilypond
Branch: 
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]>05/04/18 12:55:12

Modified files:
.  : ChangeLog 
site/switch: index.html 

Log message:
9 years ago already.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/newweb/ChangeLog.diff?tr1=1.188&tr2=1.189&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/newweb/site/switch/index.html.diff?tr1=1.18&tr2=1.19&r1=text&r2=text

Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3458 lilypond/ChangeLog:1.3459
--- lilypond/ChangeLog:1.3458   Mon Apr 18 12:37:16 2005
+++ lilypond/ChangeLog  Mon Apr 18 12:53:17 2005
@@ -1,5 +1,7 @@
 2005-04-18  Han-Wen Nienhuys  <[EMAIL PROTECTED]>
 
+   * lily/score.cc (default_rendering): use Music_output too.
+
* input/test/chord-names-languages.ly (Module): rename file.
 
* lily/text-spanner.cc: add bound-padding.


___
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

lilypond ./ChangeLog lily/score.cc

2005-04-18 Thread Han-Wen Nienhuys 
CVSROOT:/cvsroot/lilypond
Module name:lilypond
Branch: 
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]>05/04/18 12:53:17

Modified files:
.  : ChangeLog 
lily   : score.cc 

Log message:
* lily/score.cc (default_rendering): use Music_output too.

* lily/text-spanner.cc: add bound-padding.

* lily/line-interface.cc (make_arrow): new function. Patch by
Jonatan Liljedahl 
(arrows): idem.

* lily/line-spanner.cc (line_stencil): add arrows.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3458&tr2=1.3459&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/score.cc.diff?tr1=1.161&tr2=1.162&r1=text&r2=text

Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3458 lilypond/ChangeLog:1.3459
--- lilypond/ChangeLog:1.3458   Mon Apr 18 12:37:16 2005
+++ lilypond/ChangeLog  Mon Apr 18 12:53:17 2005
@@ -1,5 +1,7 @@
 2005-04-18  Han-Wen Nienhuys  <[EMAIL PROTECTED]>
 
+   * lily/score.cc (default_rendering): use Music_output too.
+
* input/test/chord-names-languages.ly (Module): rename file.
 
* lily/text-spanner.cc: add bound-padding.
Index: lilypond/lily/score.cc
diff -u lilypond/lily/score.cc:1.161 lilypond/lily/score.cc:1.162
--- lilypond/lily/score.cc:1.161Mon Apr 18 00:36:45 2005
+++ lilypond/lily/score.cc  Mon Apr 18 12:53:17 2005
@@ -116,27 +116,25 @@
 }
 
   SCM context = ly_run_translator (music, scaled_def, key);
-  if (Global_context *g = dynamic_cast
-  (unsmob_context (context)))
+  Music_output *output = unsmob_music_output (ly_format_output (context));
+  
+  if (Paper_score *pscore = dynamic_cast (output))
 {
-  SCM systems = ly_format_output (context);
-  Music_output *output = g->get_output ();
-  if (systems != SCM_UNDEFINED)
-   {
- /* ugh, this is strange, Paper_book without a Book object. */
- Paper_book *paper_book = new Paper_book ();
- paper_book->header_ = header;
- paper_book->paper_ = unsmob_output_def (scaled_bookdef);
-
- if (ly_c_module_p (header))
-   paper_book->add_score (header);
- paper_book->add_score (systems);
+  /* ugh, this is strange, Paper_book without a Book object. */
+  Paper_book *paper_book = new Paper_book ();
+  paper_book->header_ = header;
+  paper_book->paper_ = unsmob_output_def (scaled_bookdef);
 
- paper_book->classic_output (ly_scm2string (outname));
- scm_gc_unprotect_object (paper_book->self_scm ());
-   }
-  scm_gc_unprotect_object (output->self_scm ());
+  if (ly_c_module_p (header))
+   paper_book->add_score (header);
+
+  SCM systems = pscore->get_paper_systems ();
+  paper_book->add_score (systems);
+
+  paper_book->classic_output (ly_scm2string (outname));
+  scm_gc_unprotect_object (paper_book->self_scm ());
 }
+  scm_gc_unprotect_object (output->self_scm ());
 
   scm_remember_upto_here_1 (scaled_def);
   scm_remember_upto_here_1 (scaled_bookdef);


___
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

lilypond ttftool/SConscript python/SConscript m...

2005-04-18 Thread Jan Nieuwenhuizen 
CVSROOT:/cvsroot/lilypond
Module name:lilypond
Branch: 
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]>   05/04/18 13:35:14

Modified files:
ttftool: SConscript 
python : SConscript 
mf : SConscript 
make   : lilypond-vars.make 
lily   : parser.yy paper-book.cc line-interface.cc 
 SConscript 
buildscripts   : builder.py 
Documentation/user: SConscript 
.  : SConstruct ChangeLog 

Log message:
Scons stuff

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ttftool/SConscript.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/python/SConscript.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/mf/SConscript.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/make/lilypond-vars.make.diff?tr1=1.60&tr2=1.61&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/parser.yy.diff?tr1=1.465&tr2=1.466&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/paper-book.cc.diff?tr1=1.106&tr2=1.107&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/line-interface.cc.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/SConscript.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/buildscripts/builder.py.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/user/SConscript.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/SConstruct.diff?tr1=1.73&tr2=1.74&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3461&tr2=1.3462&r1=text&r2=text

Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3461 lilypond/ChangeLog:1.3462
--- lilypond/ChangeLog:1.3461   Mon Apr 18 13:29:15 2005
+++ lilypond/ChangeLog  Mon Apr 18 13:35:14 2005
@@ -1,3 +1,7 @@
+2005-04-17  Jan Nieuwenhuizen  <[EMAIL PROTECTED]>
+
+   * SCons updates.
+
 2005-04-18  Han-Wen Nienhuys  <[EMAIL PROTECTED]>
 
* scm/backend-library.scm (postscript->png): newline after
@@ -29,13 +33,16 @@
 
 2005-04-18  Mathieu Giraud  <[EMAIL PROTECTED]>
 
-   * input/test/chord-names-german.ly: update for italian/french chords
+   * input/test/chord-names-german.ly: update for italian/french
+   chords.

-   * Documentation/user/instrument-notation.itely (Printing chord names): 
update
+   * Documentation/user/instrument-notation.itely (Printing chord
+   names): update.
 
 2005-04-18  Han-Wen Nienhuys  <[EMAIL PROTECTED]>
 
-   * lily/include/paper-score.hh (class Paper_score): remove unused 
prototypes.
+   * lily/include/paper-score.hh (class Paper_score): remove unused
+   prototypes.
 
* lily/book.cc (process): add -COUNT to midi output.
 
@@ -44,21 +51,23 @@
 
* lily/global-context-scheme.cc (LY_DEFINE): remove outname argument.
 
-   * lily/book.cc (process): loop over Music_outputs returned from 
Score::book_rendering().
+   * lily/book.cc (process): loop over Music_outputs returned from
+   Score::book_rendering().
 
* lily/*.cc (width_callback): remove spurious "unused" warnings
for assert (axis==[XY]_AXIS); 
 
* lily/include/music-output.hh (class Music_output): smobify class.
 
-   * lily/include/paper-score.hh (class Paper_score): make members private.
+   * lily/include/paper-score.hh (class Paper_score): make members
+   private.
 
* lily/performance.cc (process): return #f iso. #. This
prevents # leaking into GUILE-userspace.
 
 2005-04-17  Han-Wen Nienhuys  <[EMAIL PROTECTED]>
 
-   * config.hh.in: remove HAVE_PANGO_FC_FONT_MAP_ADD_DECODER_FIND_FUNC
+   * config.hh.in: remove HAVE_PANGO_FC_FONT_MAP_ADD_DECODER_FIND_FUNC.
 
 2005-04-17  Mathieu Giraud  <[EMAIL PROTECTED]>
 
Index: lilypond/Documentation/user/SConscript
diff -u lilypond/Documentation/user/SConscript:1.19 
lilypond/Documentation/user/SConscript:1.20
--- lilypond/Documentation/user/SConscript:1.19 Fri Jul 16 16:13:21 2004
+++ lilypond/Documentation/user/SConscript  Mon Apr 18 13:35:14 2005
@@ -8,8 +8,8 @@
 png = base_glob ('*.png')
 
 # We need lily and mf to build these.
-env.Depends ('lilypond.texi', ['#/lily', '#/mf'])
-env.Depends ('music-glossary.texi', ['#/lily', '#/mf'])
+env.Depends ('lilypond.texi', ['#/lily', '#/mf', '#/python'])
+env.Depends ('music-glossary.texi', ['#/lily', '#/mf', '#/python'])
 
 env.Depends ('lilypond.texi', 'lilypond-internals.texi')
 
@@ -17,13 +17,13 @@
 env.Depends ('lilypond.texi', eps)
 
 e = env.Copy (
-   LILYPOND_BOOK_FLAGS = '''--process="lilypond-bin -I#/input/tes

lilypond ./ChangeLog scm/backend-library.scm

2005-04-18 Thread Han-Wen Nienhuys 
CVSROOT:/cvsroot/lilypond
Module name:lilypond
Branch: 
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]>05/04/18 13:29:15

Modified files:
.  : ChangeLog 
scm: backend-library.scm 

Log message:
* scm/backend-library.scm (postscript->png): newline after
finishing command.

* lily/paper-score-scheme.cc (LY_DEFINE): new file.
(LY_DEFINE): ly:paper-score-paper-systems: new function

* lily/score-scheme.cc (LY_DEFINE): require music argument.

* lily/score.cc (default_rendering): use Music_output too.

* lily/paper-score.cc (process): run get_paper_systems() only once.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3460&tr2=1.3461&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/backend-library.scm.diff?tr1=1.17&tr2=1.18&r1=text&r2=text

Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3460 lilypond/ChangeLog:1.3461
--- lilypond/ChangeLog:1.3460   Mon Apr 18 13:27:48 2005
+++ lilypond/ChangeLog  Mon Apr 18 13:29:15 2005
@@ -1,5 +1,8 @@
 2005-04-18  Han-Wen Nienhuys  <[EMAIL PROTECTED]>
 
+   * scm/backend-library.scm (postscript->png): newline after
+   finishing command.
+
* lily/paper-score-scheme.cc (LY_DEFINE): new file.
(LY_DEFINE): ly:paper-score-paper-systems: new function 
 
Index: lilypond/scm/backend-library.scm
diff -u lilypond/scm/backend-library.scm:1.17 
lilypond/scm/backend-library.scm:1.18
--- lilypond/scm/backend-library.scm:1.17   Tue Apr 12 22:49:26 2005
+++ lilypond/scm/backend-library.scmMon Apr 18 13:29:15 2005
@@ -63,8 +63,8 @@
 ;;(ly:message (_ "Converting to `~a'...")
 ;; (string-append (basename name ".ps") "-page1.png" )))
 (ly:message (_ "Converting to ~a...") "PNG")
-(ly:progress "\n")
-(ly:system cmd)))
+(ly:system cmd)
+(ly:progress "\n")))
 
 (define-public (postprocess-output paper-book module filename formats)
   (for-each


___
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

lilypond ./ChangeLog lily/music-output.cc lily/...

2005-04-18 Thread Han-Wen Nienhuys 
CVSROOT:/cvsroot/lilypond
Module name:lilypond
Branch: 
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]>05/04/18 13:27:48

Modified files:
.  : ChangeLog 
lily   : music-output.cc paper-score.cc score-scheme.cc 
scm: define-markup-commands.scm 
Added files:
lily   : paper-score-scheme.cc 

Log message:
* lily/paper-score-scheme.cc (LY_DEFINE): new file.
(LY_DEFINE): ly:paper-score-paper-systems: new function

* lily/score-scheme.cc (LY_DEFINE): require music argument.

* lily/score.cc (default_rendering): use Music_output too.

* lily/paper-score.cc (process): run get_paper_systems() only once.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3459&tr2=1.3460&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/paper-score-scheme.cc?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/music-output.cc.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/paper-score.cc.diff?tr1=1.83&tr2=1.84&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/score-scheme.cc.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-markup-commands.scm.diff?tr1=1.85&tr2=1.86&r1=text&r2=text

Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3459 lilypond/ChangeLog:1.3460
--- lilypond/ChangeLog:1.3459   Mon Apr 18 12:53:17 2005
+++ lilypond/ChangeLog  Mon Apr 18 13:27:48 2005
@@ -1,5 +1,10 @@
 2005-04-18  Han-Wen Nienhuys  <[EMAIL PROTECTED]>
 
+   * lily/paper-score-scheme.cc (LY_DEFINE): new file.
+   (LY_DEFINE): ly:paper-score-paper-systems: new function 
+
+   * lily/score-scheme.cc (LY_DEFINE): require music argument. 
+
* lily/score.cc (default_rendering): use Music_output too.
 
* input/test/chord-names-languages.ly (Module): rename file.
Index: lilypond/lily/music-output.cc
diff -u lilypond/lily/music-output.cc:1.2 lilypond/lily/music-output.cc:1.3
--- lilypond/lily/music-output.cc:1.2   Mon Apr 18 00:36:45 2005
+++ lilypond/lily/music-output.cc   Mon Apr 18 13:27:48 2005
@@ -32,7 +32,7 @@
 
 IMPLEMENT_SMOBS (Music_output);
 IMPLEMENT_DEFAULT_EQUAL_P (Music_output);
-IMPLEMENT_TYPE_P (Music_output, "ly:score?");
+IMPLEMENT_TYPE_P (Music_output, "ly:music-output?");
 
 SCM
 Music_output::mark_smob (SCM s)
Index: lilypond/lily/paper-score.cc
diff -u lilypond/lily/paper-score.cc:1.83 lilypond/lily/paper-score.cc:1.84
--- lilypond/lily/paper-score.cc:1.83   Mon Apr 18 12:10:37 2005
+++ lilypond/lily/paper-score.ccMon Apr 18 13:27:48 2005
@@ -74,8 +74,8 @@
 {
   if (be_verbose_global)
 message (_f ("Element count %d (spanners %d) ",
-system_->element_count (),
-system_->spanner_count ()));
+system_->element_count (),
+system_->spanner_count ()));
 
   message (_ ("Preprocessing graphical objects...") + " ");
 
Index: lilypond/lily/score-scheme.cc
diff -u lilypond/lily/score-scheme.cc:1.7 lilypond/lily/score-scheme.cc:1.8
--- lilypond/lily/score-scheme.cc:1.7   Mon Apr 18 00:36:45 2005
+++ lilypond/lily/score-scheme.cc   Mon Apr 18 13:27:48 2005
@@ -14,15 +14,17 @@
 LY_DEFINE (ly_music_scorify, "ly:music-scorify",
   2, 0, 0,
   (SCM music, SCM parser),
-  "Return MUSIC with TEXTS encapsulated in SCORE.")
+  "Return @var{music} with @var{texts} encapsulated in @var{score}.")
 {
-#if 0
-  SCM_ASSERT_TYPE (ly_c_music_p (music), music, SCM_ARG1, __FUNCTION__, 
"music");
-#endif
+  Music *mus = unsmob_music (music);
+  SCM_ASSERT_TYPE (mus, music, SCM_ARG1, __FUNCTION__, "music");
+  
   Score *score = new Score;
   score->set_music (music, parser);
-  scm_gc_unprotect_object (score->self_scm ());
-  return score->self_scm ();
+
+  SCM self = score->self_scm ();
+  scm_gc_unprotect_object (self);
+  return self;
 }
 
 LY_DEFINE (ly_score_embedded_format, "ly:score-embedded-format",
@@ -50,7 +52,7 @@
   score_def = sc->defs_[i];
 
   if (!score_def)
-return scm_c_make_vector (0, SCM_EOL);
+return SCM_BOOL_F;
 
   score_def = score_def->clone ();
   SCM prot = score_def->self_scm ();
@@ -62,8 +64,8 @@
 
   SCM context = ly_run_translator (sc->get_music (), score_def->self_scm (),
   key);
-  SCM lines = ly_format_output (context);
+  SCM output = ly_format_output (context);
 
   scm_remember_upto_here_1 (prot);
-  return lines;
+  return output;
 }
Index: lilypond/scm/define-markup-commands.scm
diff -u lilypond/scm/define-markup-commands.scm:1.85 
lilypond/scm/define-markup-commands.scm:1.86
--- lilypond/scm/define-markup-commands.scm:1.85Sat Apr 16 14:55:31 2005
+++ lilypond/scm/define-markup-commands.scm Mon Apr 18 13:27:48 2005

lilypond/bugs markup-space.ly

2005-04-18 Thread Han-Wen Nienhuys 
CVSROOT:/cvsroot/lilypond
Module name:lilypond
Branch: 
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]>05/04/18 14:57:48

Modified files:
bugs   : markup-space.ly 

Log message:


CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lily-bugs/bugs/markup-space.ly.diff?tr1=1.6&tr2=1.7&r1=text&r2=text



___
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

lilypond ./ChangeLog ./config.make.in input/tes...

2005-04-18 Thread Han-Wen Nienhuys 
CVSROOT:/cvsroot/lilypond
Module name:lilypond
Branch: 
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]>05/04/18 14:57:41

Modified files:
.  : ChangeLog config.make.in 
input/test : ancient-font.ly 
stepmake   : aclocal.m4 

Log message:


CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3462&tr2=1.3463&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/config.make.in.diff?tr1=1.77&tr2=1.78&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/test/ancient-font.ly.diff?tr1=1.72&tr2=1.73&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/stepmake/aclocal.m4.diff?tr1=1.136&tr2=1.137&r1=text&r2=text

Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3462 lilypond/ChangeLog:1.3463
--- lilypond/ChangeLog:1.3462   Mon Apr 18 13:35:14 2005
+++ lilypond/ChangeLog  Mon Apr 18 14:57:41 2005
@@ -4,6 +4,12 @@
 
 2005-04-18  Han-Wen Nienhuys  <[EMAIL PROTECTED]>
 
+   * config.make.in (TTFTOOL_ENDIAN): rm TFM_PATH
+
+   * aclocal.m4: remove --enable-tfm-path configure option
+
+   * input/test/ancient-font.ly (lowerStaff): clef name errors.
+
* scm/backend-library.scm (postscript->png): newline after
finishing command.
 
Index: lilypond/config.make.in
diff -u lilypond/config.make.in:1.77 lilypond/config.make.in:1.78
--- lilypond/config.make.in:1.77Tue Apr 12 22:49:29 2005
+++ lilypond/config.make.in Mon Apr 18 14:57:41 2005
@@ -106,7 +106,6 @@
 SHELL = @SHELL@
 SPLITTING_MAKEINFO = @SPLITTING_MAKEINFO@
 TAR = @TAR@
-TFM_PATH = @TFM_PATH@
 TTFTOOL_ENDIAN = @TTFTOOL_ENDIAN@
 YACC = @YACC@
 ZIP = @ZIP@
Index: lilypond/input/test/ancient-font.ly
diff -u lilypond/input/test/ancient-font.ly:1.72 
lilypond/input/test/ancient-font.ly:1.73
--- lilypond/input/test/ancient-font.ly:1.72Sat Jan  1 19:46:55 2005
+++ lilypond/input/test/ancient-font.ly Mon Apr 18 14:57:41 2005
@@ -263,7 +263,7 @@
\override Custos #'style = #'mensural
\override Custos #'neutral-position = #3
\override Custos #'neutral-direction = #-1
-   clefGlyph = #"clefs.petrucci-c2"
+   clefGlyph = #"clefs.petrucci.c2"
clefPosition = #-2
clefOctavation = #0 
}
@@ -281,7 +281,7 @@
\override Custos #'style = #'vaticana
\override Custos #'neutral-position = #4
\override Custos #'neutral-direction = #-1
-   clefGlyph = #"clefs.vaticana-do"
+   clefGlyph = #"clefs.vaticana.do"
clefPosition = #1
clefOctavation = #0 
}
Index: lilypond/stepmake/aclocal.m4
diff -u lilypond/stepmake/aclocal.m4:1.136 lilypond/stepmake/aclocal.m4:1.137
--- lilypond/stepmake/aclocal.m4:1.136  Sun Apr 17 09:38:04 2005
+++ lilypond/stepmake/aclocal.m4Mon Apr 18 14:57:41 2005
@@ -994,36 +994,12 @@
 ])
 
 
+
 AC_DEFUN(STEPMAKE_TEXMF_DIRS, [
-AC_ARG_ENABLE(tfm-path,
-[  --enable-tfm-path=PATH  set path of tex directories where tfm files 
live,
-esp.: cmr10.tfm.  Default: use kpsewhich],
-[tfm_path=$enableval],
-[tfm_path=auto] )
 
 # ugh
 STEPMAKE_PROGS(KPSEWHICH, kpsewhich, OPTIONAL)
-AC_MSG_CHECKING(for tfm path)
-
-TFM_FONTS="cmr msam"
-
-if test "x$tfm_path" = xauto ; then
-   if test "x$KPSEWHICH" != "xno" ; then
-   for i in $TFM_FONTS; do
-   dir=`$KPSEWHICH tfm ${i}10.tfm`
-   TFM_PATH="$TFM_PATH `dirname $dir`"
-   done
-   else
-   STEPMAKE_WARN(Please specify where cmr10.tfm lives:
-./configure --enable-tfm-path=/usr/local/TeX/lib/tex/fonts)
-   fi
-else
- TFM_PATH=$tfm_path
-fi
-
-TFM_PATH=`echo $TFM_PATH | tr ':' ' '`
-AC_MSG_RESULT($TFM_PATH)
-AC_SUBST(TFM_PATH)
+   
 ])
 
 


___
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

lilypond ./ChangeLog lily/stem.cc

2005-04-18 Thread Han-Wen Nienhuys 
CVSROOT:/cvsroot/lilypond
Module name:lilypond
Branch: 
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]>05/04/18 15:28:33

Modified files:
.  : ChangeLog 
lily   : stem.cc 

Log message:
(calc_stem_info): add minimum Y extent of
stem-tremolo.  Fixes: bugs/tremolo-stem-length-beamed

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3464&tr2=1.3465&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/stem.cc.diff?tr1=1.269&tr2=1.270&r1=text&r2=text

Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3464 lilypond/ChangeLog:1.3465
--- lilypond/ChangeLog:1.3464   Mon Apr 18 15:18:16 2005
+++ lilypond/ChangeLog  Mon Apr 18 15:28:33 2005
@@ -1,5 +1,8 @@
 2005-04-18  Han-Wen Nienhuys  <[EMAIL PROTECTED]>
 
+   * lily/stem.cc (calc_stem_info): add minimum Y extent of
+   stem-tremolo.  Fixes: bugs/tremolo-stem-length-beamed
+
* lily/percent-repeat-engraver.cc (try_music): add measure before
next_moment to future processing moment. Fixes:
percent-repeat-mm-rest.ly
Index: lilypond/lily/stem.cc
diff -u lilypond/lily/stem.cc:1.269 lilypond/lily/stem.cc:1.270
--- lilypond/lily/stem.cc:1.269 Tue Apr 12 22:49:27 2005
+++ lilypond/lily/stem.cc   Mon Apr 18 15:28:33 2005
@@ -878,6 +878,13 @@
 /* stem only extends to center of beam */
 - 0.5 * beam_thickness;
 
+  if (Grob *tremolo = unsmob_grob (me->get_property ("tremolo-flag")))
+{
+  Interval y_ext = tremolo->extent (tremolo, Y_AXIS);
+  y_ext.widen (0.5);   // FIXME. Should be tunable? 
+  minimum_length = minimum_length >? y_ext.length ();
+}
+  
   ideal_y *= my_dir;
   Real minimum_y = note_start + minimum_length;
   Real shortest_y = minimum_y * my_dir;


___
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

lilypond/lily percent-repeat-engraver.cc

2005-04-18 Thread Han-Wen Nienhuys 
CVSROOT:/cvsroot/lilypond
Module name:lilypond
Branch: 
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]>05/04/18 15:18:57

Modified files:
lily   : percent-repeat-engraver.cc 

Log message:
(try_music): add measure before
next_moment to future processing moment. Fixes:
percent-repeat-mm-rest.ly
(process_music): don't add moment for 2nd time.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/percent-repeat-engraver.cc.diff?tr1=1.39&tr2=1.40&r1=text&r2=text

Patches:
Index: lilypond/lily/percent-repeat-engraver.cc
diff -u lilypond/lily/percent-repeat-engraver.cc:1.39 
lilypond/lily/percent-repeat-engraver.cc:1.40
--- lilypond/lily/percent-repeat-engraver.cc:1.39   Mon Apr 18 15:18:16 2005
+++ lilypond/lily/percent-repeat-engraver.ccMon Apr 18 15:18:56 2005
@@ -139,11 +139,14 @@
   else if (repeat_sign_type_ == DOUBLE_MEASURE)
{
  double_percent_ = make_item ("DoublePercentRepeat", repeat_->self_scm 
());
+ 
  /*
forbid breaks on a % line. Should forbid all breaks, really.
- */
 
- get_score_engraver ()->forbid_breaks ();  // guh. Use properties! 
 
+   Ugh. Why can't this be regular communication between
+   contexts?
+ */
+ get_score_engraver ()->forbid_breaks ();
}
   next_moment_ = next_moment_ + body_length_;
 }


___
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

lilypond ./ChangeLog input/regression/repeat-pe...

2005-04-18 Thread Han-Wen Nienhuys 
CVSROOT:/cvsroot/lilypond
Module name:lilypond
Branch: 
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]>05/04/18 15:18:16

Modified files:
.  : ChangeLog 
input/regression: repeat-percent.ly 
lily   : axis-group-engraver.cc 
 percent-repeat-engraver.cc 
ly : engraver-init.ly 
scm: define-context-properties.scm 

Log message:
* lily/percent-repeat-engraver.cc (try_music): add measure before
next_moment to future processing moment. Fixes:
percent-repeat-mm-rest.ly
(process_music): don't add moment for 2nd time.

* input/regression/repeat-percent.ly: add mmrests as extra test.

* lily/axis-group-engraver.cc (acknowledge_grob): read
keepAliveInterfaces to decide what to kill.

* ly/engraver-init.ly (AncientRemoveEmptyStaffContext): add
percent-repeat-interface to keepAliveInterfaces. This fixes
percent-repeat-harakiri.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3463&tr2=1.3464&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/regression/repeat-percent.ly.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/axis-group-engraver.cc.diff?tr1=1.85&tr2=1.86&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/percent-repeat-engraver.cc.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ly/engraver-init.ly.diff?tr1=1.225&tr2=1.226&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-context-properties.scm.diff?tr1=1.37&tr2=1.38&r1=text&r2=text

Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3463 lilypond/ChangeLog:1.3464
--- lilypond/ChangeLog:1.3463   Mon Apr 18 14:57:41 2005
+++ lilypond/ChangeLog  Mon Apr 18 15:18:16 2005
@@ -1,3 +1,19 @@
+2005-04-18  Han-Wen Nienhuys  <[EMAIL PROTECTED]>
+
+   * lily/percent-repeat-engraver.cc (try_music): add measure before
+   next_moment to future processing moment. Fixes:
+   percent-repeat-mm-rest.ly
+   (process_music): don't add moment for 2nd time.
+
+   * input/regression/repeat-percent.ly: add mmrests as extra test.
+
+   * lily/axis-group-engraver.cc (acknowledge_grob): read
+   keepAliveInterfaces to decide what to kill.
+
+   * ly/engraver-init.ly (AncientRemoveEmptyStaffContext): add
+   percent-repeat-interface to keepAliveInterfaces. This fixes
+   percent-repeat-harakiri.
+
 2005-04-17  Jan Nieuwenhuizen  <[EMAIL PROTECTED]>
 
* SCons updates.
Index: lilypond/input/regression/repeat-percent.ly
diff -u lilypond/input/regression/repeat-percent.ly:1.20 
lilypond/input/regression/repeat-percent.ly:1.21
--- lilypond/input/regression/repeat-percent.ly:1.20Sat Oct 30 20:55:16 2004
+++ lilypond/input/regression/repeat-percent.ly Mon Apr 18 15:18:16 2005
@@ -1,13 +1,19 @@
 \version "2.4.0"
 \header {
-texidoc = "Measure repeats may be nested with beat repeats."
+  texidoc = "Measure repeats may be nested with beat repeats."
 }
-   
-\score {  \relative c'' \context Voice { \time 4/4
-   % riff
-   \repeat "percent" 2 { r8. a16 g8. a16 bes8. a16 f8 d |  a c8 ~ c8 d8 ~ d8 
r8 r4 }
-   
-   \repeat "percent" 2 { \repeat "percent" 4 { c8 es } }   
-  }
+
+\paper {
+  raggedright = ##t
+}
+\relative c'' \context Voice {
+  \set Score.skipBars = ##t
+  \time 4/4
+   % riff
+  \repeat "percent" 2 { r8. a16 g8. a16 bes8. a16 f8 d |  a c8 ~ c8 d8 ~ d8 r8 
r4 }
+
+  R1*2
+  \repeat "percent" 2 { \repeat "percent" 4 { c8 es } }
+  R1*2
 }
 
Index: lilypond/lily/axis-group-engraver.cc
diff -u lilypond/lily/axis-group-engraver.cc:1.85 
lilypond/lily/axis-group-engraver.cc:1.86
--- lilypond/lily/axis-group-engraver.cc:1.85   Tue Apr 12 22:49:29 2005
+++ lilypond/lily/axis-group-engraver.ccMon Apr 18 15:18:16 2005
@@ -154,11 +154,22 @@
   virtual Spanner *get_spanner ();
   virtual void acknowledge_grob (Grob_info);
   virtual void add_element (Grob *e);
+  virtual void start_translation_timestep ();
+
+  SCM interesting_;
 public:
   TRANSLATOR_DECLARATIONS (Hara_kiri_engraver);
 };
 
 void
+Hara_kiri_engraver::start_translation_timestep ()
+{
+  Axis_group_engraver::start_translation_timestep ();
+  interesting_ = get_property ("keepAliveInterfaces");
+}
+
+
+void
 Hara_kiri_engraver::add_element (Grob *e)
 {
   Hara_kiri_group_spanner::add_element (staffline_, e);
@@ -176,16 +187,19 @@
 Hara_kiri_engraver::acknowledge_grob (Grob_info i)
 {
   Axis_group_engraver::acknowledge_grob (i);
-  if (staffline_
-  && (i.grob_->internal_has_interface (ly_symbol2scm 
("rhythmic-grob-interface"))
- || i.grob_->internal_has_interface (ly_symbol2scm 
("lyric-interface"
+  if (staffline_)
 {
-  Hara_kiri

lilypond/bugs warn-partcombine-barcheck.ly

2005-04-18 Thread Han-Wen Nienhuys 
CVSROOT:/cvsroot/lilypond
Module name:lilypond
Branch: 
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]>05/04/18 15:41:28

Modified files:
bugs   : warn-partcombine-barcheck.ly 

Log message:


CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lily-bugs/bugs/warn-partcombine-barcheck.ly.diff?tr1=1.1&tr2=1.2&r1=text&r2=text



___
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

lilypond/input/regression stem-tremolo.ly

2005-04-18 Thread Han-Wen Nienhuys 
CVSROOT:/cvsroot/lilypond
Module name:lilypond
Branch: 
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]>05/04/18 15:35:13

Modified files:
input/regression: stem-tremolo.ly 

Log message:


CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/regression/stem-tremolo.ly.diff?tr1=1.28&tr2=1.29&r1=text&r2=text

Patches:
Index: lilypond/input/regression/stem-tremolo.ly
diff -u lilypond/input/regression/stem-tremolo.ly:1.28 
lilypond/input/regression/stem-tremolo.ly:1.29
--- lilypond/input/regression/stem-tremolo.ly:1.28  Sat Oct 30 20:55:16 2004
+++ lilypond/input/regression/stem-tremolo.ly   Mon Apr 18 15:35:11 2005
@@ -27,6 +27,7 @@
c,16:32 c: c c a16:32 a: a a
c8:16 g: d: a:
c8:32 f: b: e:
+   \transpose c c { f''8:256[ f'8: f'':] }
}
 }
 


___
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

lilypond/bugs instrument-center-pedal.ly

2005-04-18 Thread Han-Wen Nienhuys 
CVSROOT:/cvsroot/lilypond
Module name:lilypond
Branch: 
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]>05/04/18 15:31:04

Modified files:
bugs   : instrument-center-pedal.ly 

Log message:


CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lily-bugs/bugs/instrument-center-pedal.ly.diff?tr1=1.1&tr2=1.2&r1=text&r2=text



___
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

lilypond ChangeLog

2005-04-18 Thread Han-Wen Nienhuys 
CVSROOT:/cvsroot/lilypond
Module name:lilypond
Branch: 
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]>05/04/18 17:02:29

Modified files:
.  : ChangeLog 

Log message:
release commit

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3465&tr2=1.3466&r1=text&r2=text

Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3465 lilypond/ChangeLog:1.3466
--- lilypond/ChangeLog:1.3465   Mon Apr 18 15:28:33 2005
+++ lilypond/ChangeLog  Mon Apr 18 17:02:29 2005
@@ -1,5 +1,7 @@
 2005-04-18  Han-Wen Nienhuys  <[EMAIL PROTECTED]>
 
+   * VERSION (PACKAGE_NAME): release 2.5.20
+
* lily/stem.cc (calc_stem_info): add minimum Y extent of
stem-tremolo.  Fixes: bugs/tremolo-stem-length-beamed
 


___
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

lilypond po/lilypond.pot mf/SConscript buildscr...

2005-04-18 Thread Jan Nieuwenhuizen 
CVSROOT:/cvsroot/lilypond
Module name:lilypond
Branch: 
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]>   05/04/18 18:22:35

Modified files:
po : lilypond.pot 
mf : SConscript 
buildscripts   : builder.py 
.  : SConstruct ChangeLog 

Log message:
scons update

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/po/lilypond.pot.diff?tr1=1.69&tr2=1.70&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/mf/SConscript.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/buildscripts/builder.py.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/SConstruct.diff?tr1=1.74&tr2=1.75&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3466&tr2=1.3467&r1=text&r2=text

Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3466 lilypond/ChangeLog:1.3467
--- lilypond/ChangeLog:1.3466   Mon Apr 18 17:02:29 2005
+++ lilypond/ChangeLog  Mon Apr 18 18:22:35 2005
@@ -1,3 +1,7 @@
+2005-04-18  Jan Nieuwenhuizen  <[EMAIL PROTECTED]>
+
+   * SCons updates.
+
 2005-04-18  Han-Wen Nienhuys  <[EMAIL PROTECTED]>
 
* VERSION (PACKAGE_NAME): release 2.5.20
Index: lilypond/SConstruct
diff -u lilypond/SConstruct:1.74 lilypond/SConstruct:1.75
--- lilypond/SConstruct:1.74Mon Apr 18 13:35:14 2005
+++ lilypond/SConstruct Mon Apr 18 18:22:35 2005
@@ -95,16 +95,24 @@
 EnsureSConsVersion (0, 95)
 
 usage = r'''Usage:
-scons [KEY=VALUE].. [TARGET|DIR]..
+[ENVVAR=VALUE]... scons [OPTION=VALUE]... [TARGET|DIR]...
 
 TARGETS: clean, config, doc, dist, install, mf-essential, po-update,
  realclean, release, sconsclean, tar, TAGS
 
+ENVVARS: BASH, CCFLAGS, CC, CXX, LIBS, PYTHON, SH...
+ (see SConstruct:config_vars)
+
+OPTIONS:
 '''
   
 
 config_cache = 'scons.cache'
 
+# All config_vars can be set as ENVVAR, eg:
+#
+#CXX=g++-4.0 GS=~/usr/pkg/gs/bin/gs scons config
+#
 # append test_program variables automagically?
 config_vars = [
'BASH',
@@ -116,12 +124,15 @@
'CXX',
'CXXFLAGS',
'DEFINES',
+   'DVIPS',
'FONTFORGE',
'GCC',
'GXX',
+   'GS',
'LIBS',
'LINKFLAGS',
-   'METAFONT',
+   'MF',
+   'MFTRACE',
'PERL',
'PYTHON',
'SH',
@@ -162,24 +173,16 @@
 version = packagepython.version_tuple_to_str (package.version)
 
 ENV = { 'PATH' : os.environ['PATH'] }
-for key in ['LD_LIBRARY_PATH', 'GUILE_LOAD_PATH', 'PKG_CONFIG_PATH']:
-   if os.environ.has_key (key):
-   ENV[key] = os.environ[key]
-
-for key in config_vars:
+for key in ['LD_LIBRARY_PATH', 'GUILE_LOAD_PATH', 'PKG_CONFIG_PATH', 'TEXMF']:
if os.environ.has_key (key):
ENV[key] = os.environ[key]
 
 env = Environment (
ENV = ENV,
-
-   #BASH = '/bin/bash',
BYTEORDER = sys.byteorder.upper (),
+   CC = '$GCC',
+   CXX = '$GXX',
CPPDEFINES = '-DHAVE_CONFIG_H',
-   #PERL = '/usr/bin/perl',
-   #PYTHON = '/usr/bin/python',
-   #SH = '/bin/sh',
-
MAKEINFO = 'LANG= makeinfo',
MF_TO_TABLE_PY = srcdir + '/buildscripts/mf-to-table.py',

@@ -192,14 +195,17 @@
TOPLEVEL_VERSION = version,
)
 
+Help (usage + opts.GenerateHelpText (env))
+
 # Add all config_vars to opts, so that they will be read and saved
 # together with the other configure options.
 map (lambda x: opts.AddOptions ((x,)), config_vars)
-
-Help (usage + opts.GenerateHelpText (env))
-
 opts.Update (env)
 
+for key in config_vars:
+   if os.environ.has_key (key):
+   env[key] = os.environ[key]
+
 if env['fast']:
# Usability switch (Anthony Roach).
# See http://www.scons.org/cgi-bin/wiki/GoFastButton
@@ -260,7 +266,7 @@
 
 
 def configure (target, source, env):
-   vre = re.compile ('^.*[^-.0-9]([0-9][0-9]*\.[0-9][.0-9]*).*$',
+   vre = re.compile ('^.*[^-.0-9]([0-9][0-9]*\.[0-9]([.0-9]*[0-9])*).*$',
  re.DOTALL)
def get_version (program):
command = '(pkg-config --modversion %(program)s || %(program)s 
--version || %(program)s -V) 2>&1' % vars ()
@@ -291,19 +297,23 @@
return 1
 
def test_program (lst, program, minimal, description, package):
+   key = program.upper ()
+   if key.find ('+-'):
+   key = re.sub ('\+', 'X', key)
+   key = re.sub ('-', '_', key)
sys.stdout.write ('Checking for %s ... ' % program)
-   f = WhereIs (program)
+   if env.has_key (key):
+   f = env[key]
+   sys.stdout.write ('(cached) ')
+   else:
+   f = WhereIs (program)
+   env[key] = f
if not f:

lilypond SConstruct

2005-04-18 Thread Jan Nieuwenhuizen 
CVSROOT:/cvsroot/lilypond
Module name:lilypond
Branch: 
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]>   05/04/18 18:36:08

Modified files:
.  : SConstruct 

Log message:


CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/SConstruct.diff?tr1=1.75&tr2=1.76&r1=text&r2=text

Patches:
Index: lilypond/SConstruct
diff -u lilypond/SConstruct:1.75 lilypond/SConstruct:1.76
--- lilypond/SConstruct:1.75Mon Apr 18 18:22:35 2005
+++ lilypond/SConstruct Mon Apr 18 18:36:08 2005
@@ -108,6 +108,8 @@
   
 
 config_cache = 'scons.cache'
+if os.path.exists (config_cache) and 'config' in COMMAND_LINE_TARGETS:
+   os.unlink (config_cache)
 
 # All config_vars can be set as ENVVAR, eg:
 #
@@ -571,10 +573,17 @@
sys.stdout.write ('\n')
sys.stdout.write ('LilyPond configured')
sys.stdout.write ('\n')
-   sys.stdout.write ('now run')
+   sys.stdout.write ('Now run')
sys.stdout.write ('\n')
sys.stdout.write ('scons [TARGET|DIR]...')
sys.stdout.write ('\n')
+   sys.stdout.write ('\n')
+   sys.stdout.write ('Examples:')
+   sys.stdout.write ('scons lily# build lilypond')
+   sys.stdout.write ('scons all # build everything')
+   sys.stdout.write ('scons doc # build documentation')
+   ## TODO
+   ## sys.stdout.write ('scons prefix=/usr DESTDIR=/tmp/pkg 
all install')
Exit (0)
elif not env['checksums']:
# When using timestams, config.hh is NEW.  The next
@@ -587,9 +596,6 @@
s = os.system (command)
Exit (s)
 
-
-if os.path.exists (config_cache) and 'config' in COMMAND_LINE_TARGETS:
-   os.unlink (config_cache)
 # WTF?
 # scons: *** Calling Configure from Builders is not supported.
 # env.Command (config_cache, None, configure)


___
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

lilypond Documentation/topdocs/NEWS.tely scm/ou...

2005-04-18 Thread Han-Wen Nienhuys 
CVSROOT:/cvsroot/lilypond
Module name:lilypond
Branch: 
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]>05/04/18 20:47:16

Modified files:
Documentation/topdocs: NEWS.tely 
scm: output-ps.scm 
Removed files:
buildscripts   : clean-fonts.sh 

Log message:
(grob-cause): don't add cwd if path starts
with /

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/topdocs/NEWS.tely.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/output-ps.scm.diff?tr1=1.130&tr2=1.131&r1=text&r2=text

Patches:
Index: lilypond/Documentation/topdocs/NEWS.tely
diff -u lilypond/Documentation/topdocs/NEWS.tely:1.27 
lilypond/Documentation/topdocs/NEWS.tely:1.28
--- lilypond/Documentation/topdocs/NEWS.tely:1.27   Mon Apr 18 12:37:16 2005
+++ lilypond/Documentation/topdocs/NEWS.telyMon Apr 18 20:47:15 2005
@@ -34,7 +34,8 @@
 @itemize @bullet
 
 @item
-Lines, such glissandi or Text-spanner lines can have arrows at the end,
+Lines, such as glissandi or Text-spanner lines, can have arrows at the
+end, e.g.
 
 @lilypond[verbatim,fragment]
 \override Glissando #'arrow = ##t
@@ -44,6 +45,7 @@
 @item
 Chord names may now be rendered in Italian and French.
 
[EMAIL PROTECTED]
 @file{lilypond-book} now makes @file{lilypond} print line numbers
 relative to the input file for every error message.
 
Index: lilypond/scm/output-ps.scm
diff -u lilypond/scm/output-ps.scm:1.130 lilypond/scm/output-ps.scm:1.131
--- lilypond/scm/output-ps.scm:1.130Wed Apr 13 00:15:06 2005
+++ lilypond/scm/output-ps.scm  Mon Apr 18 20:47:15 2005
@@ -204,7 +204,10 @@
   (ly:input-file-line-column music-origin)
   #f
   ))
-(file (if location (string-append (getcwd) "/" (car location))
+(file (if location
+  (if (eq? (string-ref (car location) 0 ) #\/) 
+  location
+  (string-append (getcwd) "/" (car location)))
   #f))
 (x-ext (ly:grob-extent grob grob X)) 
 (y-ext (ly:grob-extent grob grob Y)) 


___
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

lilypond scm/music-functions.scm ./ChangeLog

2005-04-18 Thread Nicolas Sceaux 
CVSROOT:/cvsroot/lilypond
Module name:lilypond
Branch: 
Changes by: Nicolas Sceaux <[EMAIL PROTECTED]>  05/04/18 21:20:11

Modified files:
scm: music-functions.scm 
.  : ChangeLog 

Log message:
(markup-expression->make-markup): fix bug with cons arguments of
markup commands.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/music-functions.scm.diff?tr1=1.144&tr2=1.145&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3467&tr2=1.3468&r1=text&r2=text

Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3467 lilypond/ChangeLog:1.3468
--- lilypond/ChangeLog:1.3467   Mon Apr 18 18:22:35 2005
+++ lilypond/ChangeLog  Mon Apr 18 21:20:10 2005
@@ -1,3 +1,8 @@
+2005-04-18  Nicolas Sceaux  <[EMAIL PROTECTED]>
+
+   * scm/music-functions.scm (markup-expression->make-markup): fix
+   bug with cons arguments of markup commands.
+
 2005-04-18  Jan Nieuwenhuizen  <[EMAIL PROTECTED]>
 
* SCons updates.
Index: lilypond/scm/music-functions.scm
diff -u lilypond/scm/music-functions.scm:1.144 
lilypond/scm/music-functions.scm:1.145
--- lilypond/scm/music-functions.scm:1.144  Tue Apr 12 22:49:25 2005
+++ lilypond/scm/music-functions.scmMon Apr 18 21:20:10 2005
@@ -96,11 +96,11 @@
   (symbol->keyword (string->symbol (substring cmd-markup 0 (- 
(string-length cmd-markup)
  
(string-length "-markup")))
   (define (transform-arg arg)
-(cond ((and (pair? arg) (pair? (car arg))) ;; a markup list
+(cond ((and (pair? arg) (markup? (car arg))) ;; a markup list
   (apply append (map inner-markup->make-markup arg)))
- ((pair? arg) ;; a markup
+ ((and (not (string? arg)) (markup? arg)) ;; a markup
   (inner-markup->make-markup arg))
- (else;; scheme arg
+ (else  ;; scheme arg
   arg)))
   (define (inner-markup->make-markup mrkup)
 (let ((cmd (proc->command-keyword (car mrkup)))


___
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

lilypond stepmake/aclocal.m4 buildscripts/build...

2005-04-18 Thread Jan Nieuwenhuizen 
CVSROOT:/cvsroot/lilypond
Module name:lilypond
Branch: 
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]>   05/04/18 21:31:24

Modified files:
stepmake   : aclocal.m4 
buildscripts   : builder.py 
Documentation/topdocs: SConscript 
.  : SConstruct ChangeLog 

Log message:
SCons updates

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/stepmake/aclocal.m4.diff?tr1=1.137&tr2=1.138&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/buildscripts/builder.py.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/topdocs/SConscript.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/SConstruct.diff?tr1=1.76&tr2=1.77&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3468&tr2=1.3469&r1=text&r2=text

Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3468 lilypond/ChangeLog:1.3469
--- lilypond/ChangeLog:1.3468   Mon Apr 18 21:20:10 2005
+++ lilypond/ChangeLog  Mon Apr 18 21:31:24 2005
@@ -5,6 +5,8 @@
 
 2005-04-18  Jan Nieuwenhuizen  <[EMAIL PROTECTED]>
 
+   * aclocal.m4: Massage package names.
+
* SCons updates.
 
 2005-04-18  Han-Wen Nienhuys  <[EMAIL PROTECTED]>
Index: lilypond/Documentation/topdocs/SConscript
diff -u lilypond/Documentation/topdocs/SConscript:1.5 
lilypond/Documentation/topdocs/SConscript:1.6
--- lilypond/Documentation/topdocs/SConscript:1.5   Fri Jul 16 16:13:21 2004
+++ lilypond/Documentation/topdocs/SConscript   Mon Apr 18 21:31:24 2005
@@ -3,7 +3,7 @@
 Import ('env', 'src_glob', 'install')
 
 tely = src_glob ('*.tely')
-texi = src_glob ('*.texi')
+texi = src_glob ('*.texi') + map (env.TEXI, tely)
 
 txt = map (env.TXT, texi)
 html = map (env.HTML, texi)
Index: lilypond/SConstruct
diff -u lilypond/SConstruct:1.76 lilypond/SConstruct:1.77
--- lilypond/SConstruct:1.76Mon Apr 18 18:36:08 2005
+++ lilypond/SConstruct Mon Apr 18 21:31:24 2005
@@ -884,7 +884,7 @@
lst.append (i)
return lst
 
-if os.path.isdir ('$srcdir/CVS'):
+if os.path.isdir ('%(srcdir)s/CVS' % vars ()):
subdirs = flatten (cvs_dirs ('.'), [])
 else:
# ugh
@@ -905,7 +905,7 @@
   'mf',
   ]
 
-if os.path.isdir ('$srcdir/CVS'):
+if os.path.isdir ('%(srcdir)s/CVS' % vars ()):
src_files = reduce (lambda x, y: x + y, map (cvs_files, subdirs))
 else:
src_files = ['foobar']
Index: lilypond/buildscripts/builder.py
diff -u lilypond/buildscripts/builder.py:1.31 
lilypond/buildscripts/builder.py:1.32
--- lilypond/buildscripts/builder.py:1.31   Mon Apr 18 18:22:35 2005
+++ lilypond/buildscripts/builder.pyMon Apr 18 21:31:24 2005
@@ -243,7 +243,7 @@
 # Specific builders
 
 env['DIFF_PY'] = '$srcdir/stepmake/bin/package-diff.py'
-a = '$PYTHON $DIFF_PY $__verbose --outdir=${TARGET.dir}'
+a = '$PYTHON $DIFF_PY $NO__verbose --outdir=${TARGET.dir}'
 patch = Builder (action = a, suffix = '.diff', src_suffix = '.tar.gz')
 env.Append (BUILDERS = {'PATCH': patch})
 
Index: lilypond/stepmake/aclocal.m4
diff -u lilypond/stepmake/aclocal.m4:1.137 lilypond/stepmake/aclocal.m4:1.138
--- lilypond/stepmake/aclocal.m4:1.137  Mon Apr 18 14:57:41 2005
+++ lilypond/stepmake/aclocal.m4Mon Apr 18 21:31:24 2005
@@ -994,12 +994,36 @@
 ])
 
 
-
 AC_DEFUN(STEPMAKE_TEXMF_DIRS, [
+AC_ARG_ENABLE(tfm-path,
+[  --enable-tfm-path=PATH  set path of tex directories where tfm files 
live,
+esp.: cmr10.tfm.  Default: use kpsewhich],
+[tfm_path=$enableval],
+[tfm_path=auto] )
 
 # ugh
 STEPMAKE_PROGS(KPSEWHICH, kpsewhich, OPTIONAL)
-   
+AC_MSG_CHECKING(for tfm path)
+
+TFM_FONTS="cmr msam"
+
+if test "x$tfm_path" = xauto ; then
+   if test "x$KPSEWHICH" != "xno" ; then
+   for i in $TFM_FONTS; do
+   dir=`$KPSEWHICH tfm ${i}10.tfm`
+   TFM_PATH="$TFM_PATH `dirname $dir`"
+   done
+   else
+   STEPMAKE_WARN(Please specify where cmr10.tfm lives:
+./configure --enable-tfm-path=/usr/local/TeX/lib/tex/fonts)
+   fi
+else
+ TFM_PATH=$tfm_path
+fi
+
+TFM_PATH=`echo $TFM_PATH | tr ':' ' '`
+AC_MSG_RESULT($TFM_PATH)
+AC_SUBST(TFM_PATH)
 ])
 
 
@@ -1101,7 +1125,9 @@
AC_SUBST(GTK2_CFLAGS)
AC_SUBST(GTK2_LIBS)
 else
-   r="lib$1-dev or $1-devel"
+   # UGR
+   # r="lib$1-dev or $1-devel"
+   r="libgtk+2.0-dev or gtk2-devel"
ver="$(pkg-config --modversion $1)"
STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"])
 fi
@@ -1123,7 +1149,9 @@
CPPFLAGS="$save_CPPFLAGS"
LIBS="$save_LIBS"
 else
-   r="lib$1-dev or $1-devel"
+   # UGR
+   #r="lib$1-dev or $1-devel"
+   r="libpango1.0-dev or pango1.0-devel"
ver="$(pkg-config --modversion

lilypond scm/music-functions.scm ./ChangeLog

2005-04-18 Thread Nicolas Sceaux 
CVSROOT:/cvsroot/lilypond
Module name:lilypond
Branch: 
Changes by: Nicolas Sceaux <[EMAIL PROTECTED]>  05/04/18 21:55:17

Modified files:
scm: music-functions.scm 
.  : ChangeLog 

Log message:
(music->make-music): fix music expression property list building

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/music-functions.scm.diff?tr1=1.145&tr2=1.146&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3470&tr2=1.3471&r1=text&r2=text

Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3470 lilypond/ChangeLog:1.3471
--- lilypond/ChangeLog:1.3470   Mon Apr 18 21:43:03 2005
+++ lilypond/ChangeLog  Mon Apr 18 21:55:16 2005
@@ -6,6 +6,7 @@
 
* scm/music-functions.scm (markup-expression->make-markup): fix
bug with cons arguments of markup commands.
+   (music->make-music): fix music expression property list building
 
 2005-04-18  Jan Nieuwenhuizen  <[EMAIL PROTECTED]>
 
Index: lilypond/scm/music-functions.scm
diff -u lilypond/scm/music-functions.scm:1.145 
lilypond/scm/music-functions.scm:1.146
--- lilypond/scm/music-functions.scm:1.145  Mon Apr 18 21:20:10 2005
+++ lilypond/scm/music-functions.scmMon Apr 18 21:55:16 2005
@@ -121,17 +121,16 @@
 (ly:music? obj)
 `(make-music 
   ',(ly:music-property obj 'name)
-  ,@(append (map (lambda (prop)
-   (list
-(car prop)
-(if (and (not (markup? (cdr prop)))
- (list? (cdr prop))
- (pair? (cdr prop))) ;; property is a 
non-empty list
-`(list ,@(map music->make-music (cdr prop)))
-(music->make-music (cdr prop)
- (remove (lambda (prop)
-   (eqv? (car prop) 'origin))
- (ly:music-mutable-properties obj))
+  ,@(apply append (map (lambda (prop)
+  `(',(car prop)
+,(if (and (not (markup? (cdr prop)))
+  (list? (cdr prop))
+  (pair? (cdr prop))) ;; property 
is a non-empty list
+ `(list ,@(map music->make-music (cdr 
prop)))
+ (music->make-music (cdr prop)
+(remove (lambda (prop)
+  (eqv? (car prop) 'origin))
+(ly:music-mutable-properties obj))
(;; moment
 (ly:moment? obj)
 `(ly:make-moment ,(ly:moment-main-numerator obj)


___
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

lilypond stepmake/aclocal.m4 ./ChangeLog

2005-04-18 Thread Jan Nieuwenhuizen 
CVSROOT:/cvsroot/lilypond
Module name:lilypond
Branch: 
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]>   05/04/18 21:43:04

Modified files:
stepmake   : aclocal.m4 
.  : ChangeLog 

Log message:
Remove tfm_path.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/stepmake/aclocal.m4.diff?tr1=1.138&tr2=1.139&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3469&tr2=1.3470&r1=text&r2=text

Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3469 lilypond/ChangeLog:1.3470
--- lilypond/ChangeLog:1.3469   Mon Apr 18 21:31:24 2005
+++ lilypond/ChangeLog  Mon Apr 18 21:43:03 2005
@@ -1,3 +1,7 @@
+2005-04-18  Jan Nieuwenhuizen  <[EMAIL PROTECTED]>
+
+   * stepmake/aclocal.m4: Remove tfm_path.
+
 2005-04-18  Nicolas Sceaux  <[EMAIL PROTECTED]>
 
* scm/music-functions.scm (markup-expression->make-markup): fix
Index: lilypond/stepmake/aclocal.m4
diff -u lilypond/stepmake/aclocal.m4:1.138 lilypond/stepmake/aclocal.m4:1.139
--- lilypond/stepmake/aclocal.m4:1.138  Mon Apr 18 21:31:24 2005
+++ lilypond/stepmake/aclocal.m4Mon Apr 18 21:43:03 2005
@@ -993,40 +993,11 @@
 fi
 ])
 
-
 AC_DEFUN(STEPMAKE_TEXMF_DIRS, [
-AC_ARG_ENABLE(tfm-path,
-[  --enable-tfm-path=PATH  set path of tex directories where tfm files 
live,
-esp.: cmr10.tfm.  Default: use kpsewhich],
-[tfm_path=$enableval],
-[tfm_path=auto] )
-
 # ugh
 STEPMAKE_PROGS(KPSEWHICH, kpsewhich, OPTIONAL)
-AC_MSG_CHECKING(for tfm path)
-
-TFM_FONTS="cmr msam"
-
-if test "x$tfm_path" = xauto ; then
-   if test "x$KPSEWHICH" != "xno" ; then
-   for i in $TFM_FONTS; do
-   dir=`$KPSEWHICH tfm ${i}10.tfm`
-   TFM_PATH="$TFM_PATH `dirname $dir`"
-   done
-   else
-   STEPMAKE_WARN(Please specify where cmr10.tfm lives:
-./configure --enable-tfm-path=/usr/local/TeX/lib/tex/fonts)
-   fi
-else
- TFM_PATH=$tfm_path
-fi
-
-TFM_PATH=`echo $TFM_PATH | tr ':' ' '`
-AC_MSG_RESULT($TFM_PATH)
-AC_SUBST(TFM_PATH)
 ])
 
-
 AC_DEFUN(STEPMAKE_TEXMF, [
 STEPMAKE_PROGS(METAFONT, mf-nowin mf mfw mfont, $1)
 # STEPMAKE_PROGS(INIMETAFONT, inimf inimfont "$METAFONT -ini", $1)


___
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

lilypond ./ChangeLog buildscripts/lilypond-logi...

2005-04-18 Thread Han-Wen Nienhuys 
CVSROOT:/cvsroot/lilypond
Module name:lilypond
Branch: 
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]>05/04/19 00:14:59

Modified files:
.  : ChangeLog 
Removed files:
buildscripts   : lilypond-login.sh lilypond-profile.sh 

Log message:


CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3471&tr2=1.3472&r1=text&r2=text

Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3471 lilypond/ChangeLog:1.3472
--- lilypond/ChangeLog:1.3471   Mon Apr 18 21:55:16 2005
+++ lilypond/ChangeLog  Tue Apr 19 00:14:59 2005
@@ -1,3 +1,12 @@
+2005-04-19  Han-Wen Nienhuys  <[EMAIL PROTECTED]>
+
+   * buildscripts/lilypond-{login,profile}.sh (Module): remove file.
+
+2005-04-18  Han-Wen Nienhuys  <[EMAIL PROTECTED]>
+
+   * scm/output-ps.scm (grob-cause): don't add cwd if path starts
+   with 
+
 2005-04-18  Jan Nieuwenhuizen  <[EMAIL PROTECTED]>
 
* stepmake/aclocal.m4: Remove tfm_path.


___
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs