Merge branch 'translation' into staging

[lilypond.git] / lily / unpure-pure-container.cc

diff --git a/lily/unpure-pure-container.cc b/lily/unpure-pure-container.cc
index 09480acde4ba3b7a278a5a08e68a8f2a5c553a9f..b8d1e2d4a5a84d5458c30af1b1a4fcd64754946d 100644 (file)
--- a/lily/unpure-pure-container.cc
+++ b/lily/unpure-pure-container.cc
@@ -32,6 +32,17 @@ is_unpure_pure_container (SCM s)
   return (SCM_NIMP (s) && SCM_CELL_TYPE (s) == unpure_pure_container_tag);
 }
 
+bool
+is_unchanging_unpure_pure_container (SCM s)
+// A container that has the same callback for both 'pure' and 'unpure' lookups
+// and which ignores the 'start' and 'end' columnns.
+// Such a callback will give the same answer for tentative or final layouts.
+{
+  LY_ASSERT_TYPE (is_unpure_pure_container, s, 1);
+  SCM pure_part = SCM_SMOB_OBJECT_2 (s);
+  return (SCM_UNBNDP (pure_part));
+}
+
 SCM
 unpure_pure_container_unpure_part (SCM smob)
 {
@@ -98,18 +109,20 @@ print_unpure_pure_container (SCM s, SCM port, scm_print_state *)
 {
   scm_puts ("#<unpure-pure-container ", port);
   scm_display (unpure_pure_container_unpure_part (s), port);
-  scm_puts (" ", port);
-  scm_display (unpure_pure_container_pure_part (s), port);
+  if (!SCM_UNBNDP (SCM_SMOB_OBJECT_2 (s)))
+    {
+      scm_puts (" ", port);
+      scm_display (unpure_pure_container_pure_part (s), port);
+    }
   scm_puts (" >", port);
   return 1;
 }
 
 SCM
-pure_mark (SCM pure)
+pure_mark (SCM smob)
 {
-  scm_gc_mark (unpure_pure_container_unpure_part (pure));
-  scm_gc_mark (unpure_pure_container_pure_part (pure));
-  return pure;
+  scm_gc_mark (SCM_SMOB_OBJECT (smob));
+  return SCM_SMOB_OBJECT_2 (smob);
 }
 
 // Function signature has two fixed arguments so that dropping two
@@ -135,7 +148,7 @@ void init_unpure_pure_container ()
   unpure_pure_call_tag = scm_make_smob_type ("unpure-pure-call", 0);
   scm_set_smob_mark (unpure_pure_call_tag, scm_markcdr);
   scm_set_smob_apply (unpure_pure_call_tag,
-                      (SCM (*)()) apply_unpure_pure, 2, 0, 1);
+                      (scm_t_subr) apply_unpure_pure, 2, 0, 1);
 };
 
 ADD_SCM_INIT_FUNC (unpure_pure_container, init_unpure_pure_container);