CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/04/21 18:45:04
Modified files:
scm : auto-beam.scm
lily : translator-scheme.cc grid-line-interface.cc
context-scheme.cc auto-beam-engraver.cc
. : ChangeLog
Log message:
* lily/translator-scheme.cc (ly:translator-property): Remove.
Update callers.
* lily/context-scheme.cc (ly:context-now): Move from translator.
Update callers.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/auto-beam.scm.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/translator-scheme.cc.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/grid-line-interface.cc.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/context-scheme.cc.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/auto-beam-engraver.cc.diff?tr1=1.140&tr2=1.141&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3491&tr2=1.3492&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3491 lilypond/ChangeLog:1.3492
--- lilypond/ChangeLog:1.3491 Thu Apr 21 15:59:43 2005
+++ lilypond/ChangeLog Thu Apr 21 18:45:04 2005
@@ -1,3 +1,11 @@
+2005-04-21 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+
+ * lily/translator-scheme.cc (ly:translator-property): Remove.
+ Update callers.
+
+ * lily/context-scheme.cc (ly:context-now): Move from translator.
+ Update callers.
+
2005-04-21 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* input/regression/grid-lines.ly (skips): refine example.
@@ -7,7 +15,7 @@
* input/regression/grid-lines.ly (Module): new file.
- * lily/grid-point-engraver.cc (Module): new file
+ * lily/grid-point-engraver.cc (Module): new file.
* lily/grid-line.cc (Module): new file.
Index: lilypond/lily/auto-beam-engraver.cc
diff -u lilypond/lily/auto-beam-engraver.cc:1.140
lilypond/lily/auto-beam-engraver.cc:1.141
--- lilypond/lily/auto-beam-engraver.cc:1.140 Thu Apr 21 14:28:31 2005
+++ lilypond/lily/auto-beam-engraver.cc Thu Apr 21 18:45:04 2005
@@ -112,7 +112,7 @@
Auto_beam_engraver::test_moment (Direction dir, Moment test)
{
return scm_call_3 (get_property ("autoBeamCheck"),
- self_scm (),
+ context ()->self_scm (),
scm_from_int (dir),
test.smobbed_copy ())
!= SCM_BOOL_F;
Index: lilypond/lily/context-scheme.cc
diff -u lilypond/lily/context-scheme.cc:1.21
lilypond/lily/context-scheme.cc:1.22
--- lilypond/lily/context-scheme.cc:1.21 Wed Mar 16 19:19:15 2005
+++ lilypond/lily/context-scheme.cc Thu Apr 21 18:45:04 2005
@@ -150,3 +150,11 @@
return SCM_BOOL_F;
}
+LY_DEFINE (ly_context_now, "ly:context-now",
+ 1, 0, 0, (SCM context),
+ "Return now-moment of context CONTEXT")
+{
+ Context *ctx = unsmob_context (context);
+ SCM_ASSERT_TYPE (ctx, context, SCM_ARG1, __FUNCTION__, "Context");
+ return ctx->now_mom ().smobbed_copy ();
+}
Index: lilypond/lily/grid-line-interface.cc
diff -u lilypond/lily/grid-line-interface.cc:1.2
lilypond/lily/grid-line-interface.cc:1.3
--- lilypond/lily/grid-line-interface.cc:1.2 Thu Apr 21 15:59:44 2005
+++ lilypond/lily/grid-line-interface.cc Thu Apr 21 18:45:04 2005
@@ -7,12 +7,13 @@
*/
+#include "grid-line-interface.hh"
+
+#include "grob.hh"
#include "group-interface.hh"
+#include "lookup.hh"
#include "output-def.hh"
#include "stencil.hh"
-#include "lookup.hh"
-#include "grid-line-interface.hh"
-#include "grob.hh"
MAKE_SCHEME_CALLBACK (Grid_line_interface, print, 1);
@@ -81,4 +82,3 @@
ADD_INTERFACE (Grid_point_interface, "grid-point-interface",
"A spanning point for grid lines. ",
"");
-
Index: lilypond/lily/translator-scheme.cc
diff -u lilypond/lily/translator-scheme.cc:1.31
lilypond/lily/translator-scheme.cc:1.32
--- lilypond/lily/translator-scheme.cc:1.31 Thu Apr 21 14:28:31 2005
+++ lilypond/lily/translator-scheme.cc Thu Apr 21 18:45:04 2005
@@ -21,15 +21,6 @@
return ly_symbol2scm (nm);
}
-LY_DEFINE (ly_translator_now, "ly:translator-now",
- 1, 0, 0, (SCM trans),
- "Return now-moment of translater TRANS")
-{
- Translator *tr = unsmob_translator (trans);
- SCM_ASSERT_TYPE (tr, trans, SCM_ARG1, __FUNCTION__, "Translator");
- return tr->now_mom ().smobbed_copy ();
-}
-
LY_DEFINE (ly_translator_description, "ly:translator-description",
1, 0, 0, (SCM me),
"Return an alist of properties of translator @var{me}.")
@@ -39,20 +30,6 @@
return tr->translator_description ();
}
-LY_DEFINE (ly_translator_property, "ly:translator-property",
- 2, 0, 0, (SCM translator, SCM sym),
- "Return the value of a value in translator @var{g} of property
@var{sym}. "
- "It will return @code{' ()} (end-of-list) "
- "if @var{sym} is undefined in @var{g}."
- "\n\n")
-{
- Translator *sc = unsmob_translator (translator);
- SCM_ASSERT_TYPE (sc, translator, SCM_ARG1, __FUNCTION__, "translator");
- SCM_ASSERT_TYPE (scm_is_symbol (sym), sym, SCM_ARG2, __FUNCTION__, "symbol");
-
- return sc->internal_get_property (sym);
-}
-
int
Translator::print_smob (SCM s, SCM port, scm_print_state *)
{
Index: lilypond/scm/auto-beam.scm
diff -u lilypond/scm/auto-beam.scm:1.24 lilypond/scm/auto-beam.scm:1.25
--- lilypond/scm/auto-beam.scm:1.24 Thu Apr 21 14:28:31 2005
+++ lilypond/scm/auto-beam.scm Thu Apr 21 18:45:04 2005
@@ -185,12 +185,12 @@
;; 4. exceptions for specific time signature
;; 5. easy catch-all rule for non-specified measure types
-(define-public (default-auto-beam-check translator dir test)
+(define-public (default-auto-beam-check context dir test)
(define (get name default)
- (let ((value (ly:translator-property translator name)))
+ (let ((value (ly:context-property context name)))
(if (not (null? value)) value default)))
- (if (!= (ly:moment-grace-numerator (ly:translator-now translator)) 0)
+ (if (!= (ly:moment-grace-numerator (ly:context-now context)) 0)
;; No auto beaming for grace notes
#f
(let* ((beat-length (get 'beatLength (ly:make-moment 1 1)))
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
