From 4cd613b1018f369e303860f5f713b3647d2a1a67 Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Sun, 22 Aug 2004 22:12:33 +0000
Subject: [PATCH] (add_column): remove set_interface()
---
ChangeLog | 4 ++++
Documentation/user/notation.itely | 14 +++++++++++---
input/regression/slur-double.ly | 2 +-
lily/include/new-slur.hh | 1 -
lily/new-slur.cc | 9 ---------
lily/slur.cc | 2 +-
scripts/convert-ly.py | 4 +++-
tex/GNUmakefile | 3 +--
8 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 599a28e882..e05c895d23 100644
--- 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 4804a9b6c4..3dbff1a210 100644
--- 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 8639d0ed16..ad30c29ad3 100644
--- 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 b307af970e..51c837c8c4 100644
--- 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 f617c320f1..5da6a302ee 100644
--- 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 36a8a2caa9..cc4090a8fd 100644
--- 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 10aa9d7c52..5e60e25b90 100644
--- 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 706184ee68..894856efab 100644
--- 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/
--
2.39.5