*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 97b062e0b091e2f42ec02f1fa54fe32adc2541c9..dd4fe9bf84b5c97cd9c647760e32acbf6d884b61 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2005-04-22  Bernard Hurley  <bernard@fong-hurley.org.uk>
+
+       * scm/x11-color.scm: new file
+       All x11 color names can be accessed with:
+       #(x11-color 'ColorName),
+       #(x11-color "ColorName") or:
+       #(x11-color "color name")
+       If the x11 color name is not recognised then it defaults
+       to black
+
+       * scm/lily.scm: amended to call scm/x11-color.scm
+
+2005-04-24  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * Documentation/user/invoking.itely (Reporting bugs): comment out
+       reference to online PNG bug repository.
+
 2005-04-21  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * lily/translator-scheme.cc (ly:translator-property): Remove.
@@ -3778,11 +3795,11 @@
 
 2004-12-09  Graham Percival  <gperlist@shaw.ca>
 
-        * Documentation/user/changing-defaults.itely: add info about
-        make-dynamic-script
+       * Documentation/user/changing-defaults.itely: add info about
+       make-dynamic-script
 
-        * Documentation/user/notation.itely: add link in dynamics to
-        section about make-dynamic-script.
+       * Documentation/user/notation.itely: add link in dynamics to
+       section about make-dynamic-script.
 
 2004-12-09  Christian hitz  <chhitz@gmx.net>
 
@@ -4001,7 +4018,7 @@
          foo= \new Staff ..
          << \foo \foo >>
 
-        produce 2 staves.
+       produce 2 staves.
        
 
        * scm/define-music-properties.scm (all-music-properties): add
@@ -4019,7 +4036,7 @@
 
 2004-11-24  Erik Sandberg  <ersa9195@student.uu.se>
 
-        * buildscripts/guile-gnome.sh: Fixed typo.
+       * buildscripts/guile-gnome.sh: Fixed typo.
 
 2004-11-23  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
@@ -4043,7 +4060,7 @@
 
 2004-11-22  Erik Sandberg  <ersa9195@student.uu.se>
 
-        * ly/dynamic-scripts-init.ly: Fixed typo.
+       * ly/dynamic-scripts-init.ly: Fixed typo.
 
 2004-11-22  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
@@ -4683,7 +4700,7 @@
 
 2004-11-04  Heikki Junes <hjunes@cc.hut.fi>
 
-        * Documentation/user/lilypond.tely: changes 2.3.x to 2.5.x.
+       * Documentation/user/lilypond.tely: changes 2.3.x to 2.5.x.
 
 2004-11-04  Jan Nieuwenhuizen  <janneke@gnu.org>
 
@@ -7867,7 +7884,7 @@
        --include-css=.../texinfo.css; command includes css into the html.
 
        * Documentation/texinfo.css: add file.
-       define <hr> as black and thin.            
+       define <hr> as black and thin.
 
 2004-06-20  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 

diff --git a/Documentation/user/advanced-notation.itely b/Documentation/user/advanced-notation.itely
index 524a02e67570374af96591cde59f789884662d82..454d7e6bc0bfad3d55483e306b65b14cedb39ceb 100644 (file)
--- a/Documentation/user/advanced-notation.itely
+++ b/Documentation/user/advanced-notation.itely
@@ -171,6 +171,7 @@ existing music with another @code{transpose}
 @end example
 
 
+
 @seealso
 
 Program reference: @internalsref{TransposedMusic}, and

diff --git a/Documentation/user/invoking.itely b/Documentation/user/invoking.itely
index c4727fdd5d90d1b54624d7719a4305328b1acb28..4c543af2e5ef455f97069e7042fdcae555420aeb 100644 (file)
--- a/Documentation/user/invoking.itely
+++ b/Documentation/user/invoking.itely
@@ -485,12 +485,12 @@ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/lilypond/lily-bugs/bugs/conve
 @end ignore
 @verbatim
 
-There are a few things that the convert-ly cannot handle.  Here's a list of limitations
-that the community has complained about.
+There are a few things that the convert-ly cannot handle.  Here's a
+list of limitations that the community has complained about.
 
-This bug report structure has been chosen because convert-ly has a structure that doesn't
-allow to smoothly implement all needed changes.  Thus this is just a wishlist, placed
-here for reference.
+This bug report structure has been chosen because convert-ly has a
+structure that doesn't allow to smoothly implement all needed changes.
+Thus this is just a wishlist, placed here for reference.
 
 1.6->2.0:
  Doesn't always convert figured bass correctly, specifically things like {< >}. Mats' comment on working around this:
@@ -524,11 +524,15 @@ reproduce the problem.  Make it small, so we can easily debug the
 problem.  Don't forget to tell which version of LilyPond you use!  Send
 the report to @email{bug-lilypond@@gnu.org}.
 
+@ignore
+@c the bug database is not up to date enough. 
+
 When you've found a bug, have a look at our
 @uref{http://@/lilypond@/.org/@/doc/@/v2.5/@/bugs/,bug database} to see if
 it has already been reported.  You could also try to do a few searches
 on the mailing list for the bug.  Sometimes the bug will have already
 been reported and a fix or workaround is already known.
+@end ignore
 
 Here is an example of a good bug report:
 

diff --git a/lily/separation-item.cc b/lily/separation-item.cc
index 0cf923a2d04a56768939dce54b3b30f7a76698c4..381647b94554ea6ddb3e073536b7a8d607dac6a4 100644 (file)
--- a/lily/separation-item.cc
+++ b/lily/separation-item.cc
@@ -49,7 +49,7 @@ Separation_item::conditional_width (Grob *me, Grob *left)
       if (pc != il->get_column ())
        {
          /* this shouldn't happen, but let's continue anyway. */
-         programming_error (_ ("Separation_item:  I've been drinking too much"));
+         programming_error ("Separation_item:  I've been drinking too much");
          continue;             /*UGH UGH*/
        }
 
@@ -93,7 +93,7 @@ Separation_item::width (Grob *me)
       if (pc != il->get_column ())
        {
          /* this shouldn't happen, but let's continue anyway. */
-         programming_error (_ ("Separation_item:  I've been drinking too much"));
+         programming_error ("Separation_item:  I've been drinking too much");
          continue;             /*UGH UGH*/
        }
 

diff --git a/scm/lily.scm b/scm/lily.scm
index 3defc3e3ad112a997974e41be2df5996d3e0f049..acc61e59fd254c13025dcf5e5fb654c42a3d75e1 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -226,6 +226,7 @@ The syntax is the same as `define*-public'."
            
            "paper.scm"
            "backend-library.scm"
+           "x11-color.scm"
            ;; must be after everything has been defined
            "safe-lily.scm"))