CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/08/11 12:47:26
Modified files:
stepmake/stepmake: topdocs-targets.make
lily : text-interface.cc side-position-interface.cc
script-interface.cc lily-guile.cc
dynamic-engraver.cc
Documentation/topdocs: NEWS.tely GNUmakefile
. : ChangeLog
Log message:
* lily/lily-guile.cc (parse_symbol_list): Rewrite. Grok multiple
whitespace as symbol separator.
* lily/side-position-interface.cc: Add slur-padding.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/stepmake/stepmake/topdocs-targets.make.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/text-interface.cc.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/side-position-interface.cc.diff?tr1=1.97&tr2=1.98&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/script-interface.cc.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/lily-guile.cc.diff?tr1=1.216&tr2=1.217&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/dynamic-engraver.cc.diff?tr1=1.180&tr2=1.181&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/topdocs/NEWS.tely.diff?tr1=1.61&tr2=1.62&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/topdocs/GNUmakefile.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3990&tr2=1.3991&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3990 lilypond/ChangeLog:1.3991
--- lilypond/ChangeLog:1.3990 Thu Aug 11 11:43:36 2005
+++ lilypond/ChangeLog Thu Aug 11 12:47:26 2005
@@ -1,6 +1,13 @@
2005-08-11 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
- * input/regression/slur-script.ly: Fixed.
+ * lily/lily-guile.cc (parse_symbol_list): Rewrite. Grok multiple
+ whitespace as symbol separator.
+
+ * lily/side-position-interface.cc: Add slur-padding.
+
+ * input/regression/slur-script.ly: Fixed. Backportme? This is
+ quite a large fix, and it never worked in a stable release; so not
+ really a regression.
* lily/phrasing-slur-engraver.cc (class Phrasing_slur_engraver):
Update cut and paste code from Slur_engraver.
Index: lilypond/Documentation/topdocs/GNUmakefile
diff -u lilypond/Documentation/topdocs/GNUmakefile:1.10
lilypond/Documentation/topdocs/GNUmakefile:1.11
--- lilypond/Documentation/topdocs/GNUmakefile:1.10 Wed May 18 14:55:37 2005
+++ lilypond/Documentation/topdocs/GNUmakefile Thu Aug 11 12:47:26 2005
@@ -3,8 +3,8 @@
STEPMAKE_TEMPLATES=documentation tex texinfo topdocs
LOCALSTEPMAKE_TEMPLATES=lilypond ly
-HTML_FILES=$(addprefix $(outdir)/, $(TEXI_FILES:.texi=.html)
$(TELY_FILES:.tely=.html))
-
+HTML_FILES=$(TEXI_FILES:%.texi=$(outdir)/%.html)
$(TELY_FILES:%.tely=$(outdir)/%.html)
+PDF_FILES=$(outdir)/NEWS.pdf
include $(depth)/make/stepmake.make
ifneq ($(out),www)
Index: lilypond/Documentation/topdocs/NEWS.tely
diff -u lilypond/Documentation/topdocs/NEWS.tely:1.61
lilypond/Documentation/topdocs/NEWS.tely:1.62
--- lilypond/Documentation/topdocs/NEWS.tely:1.61 Fri Aug 5 20:16:55 2005
+++ lilypond/Documentation/topdocs/NEWS.tely Thu Aug 11 12:47:26 2005
@@ -30,8 +30,24 @@
@end ifnottex
@unnumbered New features in 2.7 since 2.6
[EMAIL PROTECTED]
+This document is also available in
@uref{source/Documentation/topdocs/out-www/NEWS.pdf,PDF}.
[EMAIL PROTECTED] ifhtml
+
@itemize @bullet
+
[EMAIL PROTECTED]
+Text scripts such as fingering instructions and dynamics avoid
+collissions with Slurs
+
[EMAIL PROTECTED],relative=1]
+{
+ b_1( b <b d f>_1_3_5)
+ c-2_\markup { \italic {"cresc."}}( f c)
+ c-3( c\f c)
+}
[EMAIL PROTECTED] lilypond
@item
Tuplets can be made to reach the next non-tuplet note by setting the
Index: lilypond/lily/dynamic-engraver.cc
diff -u lilypond/lily/dynamic-engraver.cc:1.180
lilypond/lily/dynamic-engraver.cc:1.181
--- lilypond/lily/dynamic-engraver.cc:1.180 Thu Aug 11 11:43:36 2005
+++ lilypond/lily/dynamic-engraver.cc Thu Aug 11 12:47:26 2005
@@ -441,10 +441,9 @@
Side_position_interface::add_support (line_spanner_, info.grob ());
}
-
-ADD_ACKNOWLEDGER (Dynamic_engraver,script);
-ADD_ACKNOWLEDGER (Dynamic_engraver,note_column);
-ADD_ACKNOWLEDGER (Dynamic_engraver,slur);
+ADD_ACKNOWLEDGER (Dynamic_engraver, script);
+ADD_ACKNOWLEDGER (Dynamic_engraver, note_column);
+ADD_ACKNOWLEDGER (Dynamic_engraver, slur);
ADD_TRANSLATOR (Dynamic_engraver,
/* descr */
Index: lilypond/lily/lily-guile.cc
diff -u lilypond/lily/lily-guile.cc:1.216 lilypond/lily/lily-guile.cc:1.217
--- lilypond/lily/lily-guile.cc:1.216 Sun Jul 24 19:31:02 2005
+++ lilypond/lily/lily-guile.cc Thu Aug 11 12:47:26 2005
@@ -25,6 +25,7 @@
#include "misc.hh"
#include "offset.hh"
#include "pitch.hh"
+#include "string-convert.hh"
#include "source-file.hh"
#include "version.hh"
#include "warn.hh"
@@ -352,46 +353,31 @@
if (scm_is_pair (alist))
{
SCM trykey = scm_caar (alist);
- if (scm_is_pair (trykey) && to_boolean (scm_equal_p (key, scm_cdr
(trykey))))
+ if (scm_is_pair (trykey)
+ && to_boolean (scm_equal_p (key, scm_cdr (trykey))))
return scm_car (alist);
- else
- return ly_assoc_cdr (key, scm_cdr (alist));
+ return ly_assoc_cdr (key, scm_cdr (alist));
}
return SCM_BOOL_F;
}
-/* LST has the form "sym1 sym2 sym3\nsym4\nsym5"
- i.e. \n and ' ' can be used interchangeably as separators. */
SCM
-parse_symbol_list (char const *lst)
+ly_string_array_to_scm (Array<String> a)
{
- char *s = strdup (lst);
- char *orig = s;
- SCM create_list = SCM_EOL;
-
- char *e = s + strlen (s) - 1;
- while (e >= s && isspace (*e))
- *e-- = 0;
-
- for (char *p = s; *p; p++)
- if (*p == '\n')
- *p = ' ';
-
- if (!s[0])
- s = 0;
+ SCM s = SCM_EOL;
+ for (int i = a.size () - 1; i >= 0; i--)
+ s = scm_cons (ly_symbol2scm (a[i].to_str0 ()), s);
+ return s;
+}
- while (s)
- {
- char *next = strchr (s, ' ');
- if (next)
- *next++ = 0;
-
- create_list = scm_cons (ly_symbol2scm (s), create_list);
- s = next;
- }
-
- free (orig);
- return create_list;
+/* LST is whitespace separated list of symbols. */
+SCM
+parse_symbol_list (char const *lst)
+{
+ String s = lst;
+ s.substitute ('\n', ' ');
+ s.substitute ('\t', ' ');
+ return ly_string_array_to_scm (String_convert::split (s, ' '));
}
SCM
Index: lilypond/lily/script-interface.cc
diff -u lilypond/lily/script-interface.cc:1.16
lilypond/lily/script-interface.cc:1.17
--- lilypond/lily/script-interface.cc:1.16 Tue Apr 12 22:49:27 2005
+++ lilypond/lily/script-interface.cc Thu Aug 11 12:47:26 2005
@@ -6,9 +6,10 @@
(c) 1999--2005 Han-Wen Nienhuys <[EMAIL PROTECTED]>
*/
+#include "script-interface.hh"
+
#include "directional-element-interface.hh"
#include "warn.hh"
-#include "script-interface.hh"
#include "font-interface.hh"
#include "side-position-interface.hh"
#include "output-def.hh"
Index: lilypond/lily/side-position-interface.cc
diff -u lilypond/lily/side-position-interface.cc:1.97
lilypond/lily/side-position-interface.cc:1.98
--- lilypond/lily/side-position-interface.cc:1.97 Sun Jul 24 19:31:02 2005
+++ lilypond/lily/side-position-interface.cc Thu Aug 11 12:47:26 2005
@@ -261,5 +261,12 @@
"victim object relative to the support (left or right, up or
down?)\n\n "
"The routine also takes the size the staff into account if "
"@code{staff-padding} is set. If undefined, the staff symbol is
ignored.",
- "staff-padding side-support-elements direction-source "
- "direction side-relative-direction minimum-space padding");
+ "direction "
+ "direction-source "
+ "minimum-space "
+ "padding "
+ "side-relative-direction "
+ "side-support-elements "
+ "slur-padding "
+ "staff-padding "
+ );
Index: lilypond/lily/text-interface.cc
diff -u lilypond/lily/text-interface.cc:1.4 lilypond/lily/text-interface.cc:1.5
--- lilypond/lily/text-interface.cc:1.4 Wed Aug 3 18:23:47 2005
+++ lilypond/lily/text-interface.cc Thu Aug 11 12:47:26 2005
@@ -92,5 +92,5 @@
ADD_INTERFACE (Text_interface, "text-interface",
"A scheme markup text, see @usermanref{Text markup}.",
- "text baseline-skip word-space");
+ "baseline-skip direction text word-space");
Index: lilypond/stepmake/stepmake/topdocs-targets.make
diff -u lilypond/stepmake/stepmake/topdocs-targets.make:1.6
lilypond/stepmake/stepmake/topdocs-targets.make:1.7
--- lilypond/stepmake/stepmake/topdocs-targets.make:1.6 Sat Jan 31 20:48:27 2004
+++ lilypond/stepmake/stepmake/topdocs-targets.make Thu Aug 11 12:47:26 2005
@@ -5,5 +5,5 @@
$(foreach i, $(TO_TOP_FILES), \
cp $(i) $(builddir) && ) true
-local-WWW: $(HTML_FILES) copy-to-top
+local-WWW: $(HTML_FILES) $(PDF_FILES) copy-to-top
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
