(add_column): remove set_interface()

diff --git a/ChangeLog b/ChangeLog
index 599a28e882dad795b78636b47e085baaa52969e3..e05c895d23fc9465dca1831f0fff06f90e9d8f46 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-23  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * lily/new-slur.cc (add_column): remove set_interface()
+
 2004-08-22  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
        * input/regression/slur-double.ly: new file. 

diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index 4804a9b6c4a6f304f9409326b73fe24456dd3c3e..3dbff1a2103c536e874873570210951845b0d0d3 100644 (file)
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -1959,6 +1959,17 @@ parentheses, the direction is also set. For example,
 @lilypond[relative=2,verbatim,fragment]
    c4_( c)   c^( c)
 @end lilypond
+
+Some composers write two slurs when they want legato chords. This can
+be achieved in LilyPond, by setting @code{doubleSlurs},
+
+@lilypond[verbatim,raggedright]
+\relative {
+    \set doubleSlurs = ##t
+    <c e>4 ( <d f> <c e> <d f> )
+}
+@end lilypond  
+
  
 @refcommands
 
@@ -1979,9 +1990,6 @@ parentheses, the direction is also set. For example,
 Program reference: @seeinternals{Slur}, and @internalsref{SlurEvent}.
 
 
-
-@cindex Adjusting slurs
-
 @node Phrasing slurs
 @subsection Phrasing slurs
 

diff --git a/input/regression/slur-double.ly b/input/regression/slur-double.ly
index 8639d0ed16129e0427623d322b298755cb05577a..ad30c29ad38bcc88cea12cc09ec7cf1f393e1ac7 100644 (file)
--- a/input/regression/slur-double.ly
+++ b/input/regression/slur-double.ly
@@ -6,7 +6,7 @@
 \version "2.3.12"
 
 \paper { raggedright = ##t }
-{
+\relative {
     \set doubleSlurs = ##t
     <c e>4 ( <d f> <c e> <d f> )
 }

diff --git a/lily/include/new-slur.hh b/lily/include/new-slur.hh
index b307af970e89f568b8f96f62c7c4fb48f8e1cd00..51c837c8c43092955a98e7c3eeda1899a24b371b 100644 (file)
--- a/lily/include/new-slur.hh
+++ b/lily/include/new-slur.hh
@@ -24,7 +24,6 @@ public:
   DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM));
   DECLARE_SCHEME_CALLBACK (height, (SCM,SCM));
 
-  static void set_interface (Grob *);
   static bool has_interface (Grob *);
   static Bezier get_curve (Grob*me);
 };

diff --git a/lily/new-slur.cc b/lily/new-slur.cc
index f617c320f1788ecbbc244cfa7efe4dbf85ec7ee0..5da6a302ee19bbcdce8f6e5c6cc4405cf826c569 100644 (file)
--- a/lily/new-slur.cc
+++ b/lily/new-slur.cc
@@ -111,15 +111,6 @@ New_slur::get_curve (Grob*me)
   return b;
 }
 
-
-void
-New_slur::set_interface (Grob*me)
-{
-  /* Copy to mutable list. */
-  me->set_property ("attachment",
-                   ly_deep_copy (me->get_property ("attachment")));
-}
-
 void
 New_slur::add_column (Grob*me, Grob*n)
 {

diff --git a/lily/slur.cc b/lily/slur.cc
index 36a8a2caa9598dacbea2e8952b98c540e1d3c30b..cc4090a8fd303614ef22de3ef0875df177678ef2 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -43,7 +43,7 @@ Old_slur::set_interface (Grob*me)
 {
   /* Copy to mutable list. */
   me->set_property ("attachment",
-                        ly_deep_copy (me->get_property ("attachment")));
+                   ly_deep_copy (me->get_property ("attachment")));
 }
 
 void

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 10aa9d7c523359db2af181f6d05cdb57f95b19ef..5e60e25b904aaa6d4f1ba40e99979fc5c69b5f9b 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -2172,7 +2172,9 @@ def conv (str):
        return str
 
 conversions.append (((2, 3, 12), conv,
-                    '''\\newpage -> \\pageBreak'''))
+                    '''\\newpage -> \\pageBreak, junk \\script{up,down,both},
+soloADue -> printPartCombineTexts, #notes-to-clusters -> \\makeClusters
+'''))
 
 
 def conv_mode_experiment (str):

diff --git a/tex/GNUmakefile b/tex/GNUmakefile
index 706184ee68b2e4ce92897b696831fdb79504ddf7..894856efabe7d846f36d7d1aadaca72daa06321c 100644 (file)
--- a/tex/GNUmakefile
+++ b/tex/GNUmakefile
@@ -1,8 +1,7 @@
 depth = ..
 
 TEX_FILES = $(wildcard *.tex)  
-
-EXTRA_DIST_FILES = $(TEX_FILES) latin1.enc
+EXTRA_DIST_FILES = $(TEX_FILES)
 STEPMAKE_TEMPLATES=install
 
 INSTALLATION_DIR=$(local_lilypond_datadir)/tex/