Implement storage and manipulation of grob properties.
*/
-#include <string.h>
+#include <cstring>
#include <math.h>
#include "main.hh"
#include "group-interface.hh"
#include "misc.hh"
#include "paper-score.hh"
-#include "paper-def.hh"
-#include "grob.hh"
+#include "output-def.hh"
#include "spanner.hh"
#include "item.hh"
#include "misc.hh"
/*
This special add_thing routine is slightly more efficient than
- set_prop (name,cons (thing, get_prop (name)))
+ set_prop (name, cons (thing, get_prop (name)))
since it can reuse the handle returned by scm_assq ().
*/
if (handle != SCM_BOOL_F)
{
- scm_set_cdr_x (handle, scm_cons (thing, ly_cdr (handle)));
+ scm_set_cdr_x (handle, scm_cons (thing, scm_cdr (handle)));
}
else
{
mutable prop list.
*/
handle = scm_sloppy_assq (sym, immutable_property_alist_);
- SCM tail = (handle != SCM_BOOL_F) ? ly_cdr (handle) : SCM_EOL;
+ SCM tail = (handle != SCM_BOOL_F) ? scm_cdr (handle) : SCM_EOL;
SCM val = scm_cons (thing, tail);
mutable_property_alist_ = scm_cons (scm_cons (sym, val),
Grob::internal_set_property (SCM s, SCM v)
{
/* Perhaps we simply do the assq_set, but what the heck. */
- if (!live ())
+ if (!is_live ())
return;
- if (internal_type_checking_global_b)
+ if (do_internal_type_checking_global)
{
if (!type_check_assignment (s, v, ly_symbol2scm ("backend-type?")))
abort ();
{
SCM s = scm_sloppy_assq (sym, mutable_property_alist_);
if (s != SCM_BOOL_F)
- return ly_cdr (s);
+ return scm_cdr (s);
s = scm_sloppy_assq (sym, immutable_property_alist_);
- if (internal_type_checking_global_b && is_pair (s))
+ if (do_internal_type_checking_global && scm_is_pair (s))
{
- if (!type_check_assignment (sym, ly_cdr (s),
+ if (!type_check_assignment (sym, scm_cdr (s),
ly_symbol2scm ("backend-type?")))
abort ();
check_interfaces_for_property (this, sym);
}
- return (s == SCM_BOOL_F) ? SCM_EOL : ly_cdr (s);
+ return (s == SCM_BOOL_F) ? SCM_EOL : scm_cdr (s);
}
void
bool
-Grob::live () const
+Grob::is_live () const
{
return immutable_property_alist_ != SCM_EOL;
}