CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/10/10 10:40:59
Modified files:
. : ChangeLog
Documentation/topdocs: NEWS.tely
lily : tie-helper.cc tie.cc
lily/include : tie.hh
ly : declarations-init.ly paper-defaults.ly
scm : define-grobs.scm lily.scm
translation-functions.scm
Log message:
* scm/lily.scm (define-scheme-options): add paper-size option.
* ly/declarations-init.ly (laissezVibrer): get paper size from
-dpaper-size
* scm/translation-functions.scm: use \fontsize for changing the
fontsize.
* scm/define-grobs.scm (all-grob-descriptions): set
between-length-limit to 1.0
* lily/tie-helper.cc: add between_length_limit_ detail property.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.4166&tr2=1.4167&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/topdocs/NEWS.tely.diff?tr1=1.98&tr2=1.99&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/tie-helper.cc.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/tie.cc.diff?tr1=1.163&tr2=1.164&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/tie.hh.diff?tr1=1.59&tr2=1.60&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ly/declarations-init.ly.diff?tr1=1.91&tr2=1.92&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ly/paper-defaults.ly.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-grobs.scm.diff?tr1=1.242&tr2=1.243&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/lily.scm.diff?tr1=1.376&tr2=1.377&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/translation-functions.scm.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.4166 lilypond/ChangeLog:1.4167
--- lilypond/ChangeLog:1.4166 Sun Oct 9 22:30:36 2005
+++ lilypond/ChangeLog Mon Oct 10 10:40:59 2005
@@ -1,5 +1,20 @@
2005-10-10 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * scm/lily.scm (define-scheme-options): add paper-size option.
+
+ * ly/declarations-init.ly (laissezVibrer): get paper size from
+ -dpaper-size
+
+ * scm/translation-functions.scm: use \fontsize for changing the
+ fontsize.
+
+ * scm/define-grobs.scm (all-grob-descriptions): set
+ between-length-limit to 1.0
+
+ * lily/tie-helper.cc: add between_length_limit_ detail property.
+
+ * mf/feta-bolletjes.mf: typos.
+
* lily/note-head.cc (internal_print): don't shadow idx
parameter. This fixes wrong attachment for do shape heads.
Index: lilypond/Documentation/topdocs/NEWS.tely
diff -u lilypond/Documentation/topdocs/NEWS.tely:1.98
lilypond/Documentation/topdocs/NEWS.tely:1.99
--- lilypond/Documentation/topdocs/NEWS.tely:1.98 Fri Oct 7 14:03:14 2005
+++ lilypond/Documentation/topdocs/NEWS.tely Mon Oct 10 10:40:59 2005
@@ -46,6 +46,10 @@
@itemize @bullet
@item
+The default paper size may now be set from the command line using
[EMAIL PROTECTED]
+
[EMAIL PROTECTED]
Beamlets may stick out of the side of beams.
Index: lilypond/lily/include/tie.hh
diff -u lilypond/lily/include/tie.hh:1.59 lilypond/lily/include/tie.hh:1.60
--- lilypond/lily/include/tie.hh:1.59 Mon Sep 12 12:20:26 2005
+++ lilypond/lily/include/tie.hh Mon Oct 10 10:40:59 2005
@@ -25,6 +25,7 @@
Real ratio_;
Real staff_space_;
Real x_gap_;
+ Real between_length_limit_;
Tie_details ();
void init (Grob *);
@@ -76,7 +77,8 @@
Grob *const &s2);
static Interval get_default_attachments (Spanner *me, Grob *common, Real gap,
- int *staff_position, bool
*in_between);
+ int *staff_position, bool
*in_between,
+ Tie_details const &);
};
Index: lilypond/lily/tie-helper.cc
diff -u lilypond/lily/tie-helper.cc:1.5 lilypond/lily/tie-helper.cc:1.6
--- lilypond/lily/tie-helper.cc:1.5 Mon Sep 12 23:33:24 2005
+++ lilypond/lily/tie-helper.cc Mon Oct 10 10:40:59 2005
@@ -85,19 +85,25 @@
}
+
void
Tie_details::init (Grob *me)
{
staff_space_ = Staff_symbol_referencer::staff_space (me);
SCM details = me->get_property ("details");
- SCM limit
- = scm_assq (ly_symbol2scm ("height-limit"), details);
- height_limit_ = robust_scm2double (scm_cdr (limit), 0.75) * staff_space_;
- ratio_ = robust_scm2double (scm_cdr (scm_assq (ly_symbol2scm ("ratio"),
details)),
- .333);
- x_gap_ = robust_scm2double (me->get_property ("x-gap"), 0.2);
+ height_limit_ = robust_scm2double (ly_assoc_get (ly_symbol2scm
("height-limit"), details, SCM_EOL),
+ 0.75) * staff_space_;
+
+ ratio_ = robust_scm2double (ly_assoc_get (ly_symbol2scm ("ratio"), details,
SCM_EOL),
+ .333);
+
+ x_gap_ = robust_scm2double (me->get_property ("x-gap"), 0.2);
+ between_length_limit_
+ = robust_scm2double (ly_assoc_get (ly_symbol2scm ("between-length-limit"),
details, SCM_EOL),
+ 1.0);
+
}
Tie_details::Tie_details ()
Index: lilypond/lily/tie.cc
diff -u lilypond/lily/tie.cc:1.163 lilypond/lily/tie.cc:1.164
--- lilypond/lily/tie.cc:1.163 Thu Sep 15 20:17:45 2005
+++ lilypond/lily/tie.cc Mon Oct 10 10:40:59 2005
@@ -111,7 +111,8 @@
Interval
Tie::get_default_attachments (Spanner *me, Grob *common, Real gap,
int *staff_position,
- bool *in_between
+ bool *in_between,
+ Tie_details const &details
)
{
Real staff_space = Staff_symbol_referencer::staff_space (me);
@@ -128,7 +129,7 @@
}
while (flip (&d) != LEFT);
- if (attachments.length () < 0.6 * staff_space)
+ if (attachments.length () < details.between_length_limit_ * staff_space)
{
/*
Let short ties start over note heads, instead of between.
@@ -206,7 +207,6 @@
conf->dir_ = get_grob_direction (me);
if (!conf->dir_)
conf->dir_ = get_default_dir (me);
-
Real staff_space = details.staff_space_;
bool in_between = true;
@@ -216,8 +216,8 @@
{
if (!skylines)
conf->attachment_x_ = get_default_attachments (me, common, gap,
- &conf->position_,
- &in_between);
+ &conf->position_,
+ &in_between, details);
else
{
Real y = staff_space * 0.5 * conf->position_;
@@ -326,7 +326,8 @@
if (conf->position_ == conf->head_position_
&& in_space
&& Staff_symbol_referencer::staff_radius (me) > abs (conf->position_) / 2
- && dy > 0.3 * staff_space)
+ && dy > 0.3 * staff_space
+ )
{
conf->position_ += 2 * conf->dir_;
}
@@ -500,7 +501,9 @@
ADD_INTERFACE (Tie,
"tie-interface",
- "A tie connecting two noteheads.\n",
+ "A tie connecting two noteheads. \n\n"
+ ,
+
/* properties */
"control-points "
Index: lilypond/ly/declarations-init.ly
diff -u lilypond/ly/declarations-init.ly:1.91
lilypond/ly/declarations-init.ly:1.92
--- lilypond/ly/declarations-init.ly:1.91 Mon Sep 12 12:20:26 2005
+++ lilypond/ly/declarations-init.ly Mon Oct 10 10:40:59 2005
@@ -85,8 +85,7 @@
}
-
-#(set-default-paper-size "a4")
+#(set-default-paper-size (ly:get-option 'paper-size))
partCombineListener = \layout {
Index: lilypond/ly/paper-defaults.ly
diff -u lilypond/ly/paper-defaults.ly:1.15 lilypond/ly/paper-defaults.ly:1.16
--- lilypond/ly/paper-defaults.ly:1.15 Tue Sep 27 10:01:15 2005
+++ lilypond/ly/paper-defaults.ly Mon Oct 10 10:40:59 2005
@@ -66,10 +66,6 @@
%%
raggedlastbottom= ##t
- %% ugh. Should use /etc/papersize and set explicitly for
- %% documentation.
- papersizename = "a4"
-
#(define font-defaults
'((font-encoding . fetaMusic)))
Index: lilypond/scm/define-grobs.scm
diff -u lilypond/scm/define-grobs.scm:1.242 lilypond/scm/define-grobs.scm:1.243
--- lilypond/scm/define-grobs.scm:1.242 Fri Oct 7 10:43:36 2005
+++ lilypond/scm/define-grobs.scm Mon Oct 10 10:40:59 2005
@@ -208,7 +208,6 @@
(NewBassFigure
. (
(print-function . ,Text_interface::print)
- (font-size . -2)
(meta . ((class . Item)
(interfaces . (text-interface
rhythmic-grob-interface
@@ -1498,12 +1497,14 @@
font-interface))))))
(Tie
- . (
- (print-function . ,Tie::print)
- (details . ((ratio . 0.333) (height-limit . 1.0)))
+ . ((print-function . ,Tie::print)
+ (details . ((ratio . 0.333)
+ (height-limit . 1.0)
+ (between-length-limit . 1.0)))
(thickness . 1.0)
(meta . ((class . Spanner)
- (interfaces . (tie-interface))))))
+ (interfaces . (tie-interface))))
+ ))
(TieColumn
. (
Index: lilypond/scm/lily.scm
diff -u lilypond/scm/lily.scm:1.376 lilypond/scm/lily.scm:1.377
--- lilypond/scm/lily.scm:1.376 Sun Oct 9 15:28:35 2005
+++ lilypond/scm/lily.scm Mon Oct 10 10:40:59 2005
@@ -11,6 +11,7 @@
(ly:add-option (car x) (cadr x) (caddr x)))
'((point-and-click #t "use point & click")
+ (paper-size "a4" "the default paper size")
(midi-debug #f "generate human readable MIDI")
(internal-type-checking #f "check every property assignment for
types")
(parse-protect #t "continue when finding errors in inline
Index: lilypond/scm/translation-functions.scm
diff -u lilypond/scm/translation-functions.scm:1.14
lilypond/scm/translation-functions.scm:1.15
--- lilypond/scm/translation-functions.scm:1.14 Sun Oct 9 15:28:35 2005
+++ lilypond/scm/translation-functions.scm Mon Oct 10 10:40:59 2005
@@ -99,7 +99,7 @@
#:pad-x 0.2 alt-markup
)))
- (if (markup? fig-markup)
- fig-markup
+ (if (markup? fig-markup)
+ (markup #:fontsize -2 fig-markup)
empty-markup)))
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
