* input/mutopia/E.Satie/petite-ouverture-a-danser.ly:

* input/mutopia/R.Schumann/romanze-op28-2.ly:
* input/mutopia/F.Schubert/standchen.ly: Remove obsolete
#'Slur.attachment setting.

* elisp/lilypond-mode.el (LilyPond-command-alist): Use -ftex,
friendlier for point and click.

diff --git a/ChangeLog b/ChangeLog
index fa9f7b118029a951db5de3880bf3f8c6be3fcd41..25a71f7af43734fcee3ece0e2d0075dd0005cf5a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-09-19  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * input/mutopia/E.Satie/petite-ouverture-a-danser.ly: 
+       * input/mutopia/R.Schumann/romanze-op28-2.ly:
+       * input/mutopia/F.Schubert/standchen.ly: Remove obsolete
+       #'Slur.attachment setting.
+
+       * elisp/lilypond-mode.el (LilyPond-command-alist): Use -ftex,
+       friendlier for point and click.
+

 2004-09-19  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
        * ly/init.ly: reverse collected scores.
 2004-09-19  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
        * ly/init.ly: reverse collected scores.

diff --git a/elisp/lilypond-mode.el b/elisp/lilypond-mode.el
index 1c272c171c22a7aa6528615e115d448f5d04f407..c6c174bde6f1f60caae35e012f02ac80a0945433 100644 (file)
--- a/elisp/lilypond-mode.el
+++ b/elisp/lilypond-mode.el
@@ -19,7 +19,7 @@
 (require 'easymenu)
 (require 'compile)
 
 (require 'easymenu)
 (require 'compile)
 

-(defconst LilyPond-version "1.9.9"
+(defconst LilyPond-version "2.3.17"

   "`LilyPond-mode' version number.")
 
 (defconst LilyPond-help-address "bug-lilypond@gnu.org"
   "`LilyPond-mode' version number.")
 
 (defconst LilyPond-help-address "bug-lilypond@gnu.org"


@@ -411,7 +411,7 @@ in LilyPond-include-path."
   ;; Should expand this to include possible keyboard shortcuts which
   ;; could then be mapped to define-key and menu.
   `(
   ;; Should expand this to include possible keyboard shortcuts which
   ;; could then be mapped to define-key and menu.
   `(

-    ("LilyPond" . ("lilypond %s" "%s" "%l" "ViewPS"))
+    ("LilyPond" . ("lilypond -ftex %s" "%s" "%l" "View"))

     ("TeX" . ("tex '\\nonstopmode\\input %t'" "%t" "%d" "View"))
 
     ("2Dvi" . ("lilypond -f tex %s" "%s" "%d" "LaTeX"))
     ("TeX" . ("tex '\\nonstopmode\\input %t'" "%t" "%d" "View"))
 
     ("2Dvi" . ("lilypond -f tex %s" "%s" "%d" "LaTeX"))

diff --git a/input/mutopia/F.Schubert/standchen.ly b/input/mutopia/F.Schubert/standchen.ly
index 4da834f27b0de8cd5c1df5591da1402da9ca53e2..0bf0cfc0198b5f216f1ef8ac47d5aed32b21bc09 100644 (file)
--- a/input/mutopia/F.Schubert/standchen.ly
+++ b/input/mutopia/F.Schubert/standchen.ly
@@ -193,14 +193,12 @@ trebleVerseOne = \relative c{
        r8\pp <es as c> <as c es> <es as c> <as c es> <es as c> |
        %20
        r8 <es g bes> <g bes es> <es g bes> <g bes es> <es g bes> |
        r8\pp <es as c> <as c es> <es as c> <as c es> <es as c> |
        %20
        r8 <es g bes> <g bes es> <es g bes> <g bes es> <es g bes> |

-       \override Slur   #'attachment = #'(stem . stem)

        \grace {
   \override Stem   #'stroke-style = #"grace"
     as'32[( bes ] 
   \revert Stem #'stroke-style }
 
        \times 2/3 {  as8[)( g as] } c4.->  as8) |
        \grace {
   \override Stem   #'stroke-style = #"grace"
     as'32[( bes ] 
   \revert Stem #'stroke-style }
 
        \times 2/3 {  as8[)( g as] } c4.->  as8) |

-       \revert Slur #'attachment

        g2. |
        r8 <f, g> <g b> <f g> <g b> <f g> |
        r8 <e g> <g c> <e g> <g c> <e g> |
        g2. |
        r8 <f, g> <g b> <f g> <g b> <f g> |
        r8 <e g> <g c> <e g> <g c> <e g> |

diff --git a/input/mutopia/R.Schumann/romanze-op28-2.ly b/input/mutopia/R.Schumann/romanze-op28-2.ly
index bb9890e72c75cd4196f6635bee6bfad1bb52802f..82707c02ff9be4263a4c708495f6ae7048696d5d 100644 (file)
--- a/input/mutopia/R.Schumann/romanze-op28-2.ly
+++ b/input/mutopia/R.Schumann/romanze-op28-2.ly
@@ -38,7 +38,6 @@ global =  { \key fis \major \time 6/8
 righta =  \transpose c cis' {
  % \stemUp \slurUp \tieUp
  \stemUp
 righta =  \transpose c cis' {
  % \stemUp \slurUp \tieUp
  \stemUp

- \override Slur   #'attachment = #'(stem . stem)

  \repeat volta 2 {
   \override TextScript   #'extra-offset = #'(-8.0 . 2.5)
   \m  a,16[^\p( \u c^\markup {
  \repeat volta 2 {
   \override TextScript   #'extra-offset = #'(-8.0 . 2.5)
   \m  a,16[^\p( \u c^\markup {

diff --git a/scm/lily.scm b/scm/lily.scm
index 84da44a6a723682da02c727d15d3601ea73aa1cc..40d8a93b1521d6913d540baa5fe0109e4175756f 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -64,8 +64,10 @@
 (define ifdef "First run this through cpp.")
 (define ifndef "First run this through cpp.")
 
 (define ifdef "First run this through cpp.")
 (define ifndef "First run this through cpp.")
 

-;; gettext wrapper
-(define-public _ ly:gettext)
+;; gettext wrapper for guile < 1.7.2
+(if (defined? 'gettext)
+    (define-public _ gettext)
+    (define-public _ ly:gettext))

 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;