source file of the GNU LilyPond music typesetter
- (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "output-def.hh"
#include "file-path.hh"
#include "global-context.hh"
#include "interval.hh"
-#include "ly-module.hh"
#include "main.hh"
#include "output-def.hh"
#include "scm-hash.hh"
#include "ly-smobs.icc"
+#include "program-option.hh"
+
+#include "string-convert.hh"
+
Output_def::Output_def ()
{
scope_ = SCM_EOL;
parent_ = 0;
- smobify_self ();
+ smobify_self ();
+
scope_ = ly_make_anonymous_module (false);
}
input_origin_ = s.input_origin_;
scope_ = ly_make_anonymous_module (false);
- if (ly_c_module_p (s.scope_))
+ if (ly_is_module (s.scope_))
ly_module_copy (scope_, s.scope_);
}
/* find the translator for NAME. NAME must be a symbol. */
SCM
find_context_def (Output_def const *m, SCM name)
-{
+{
Context_def *cd = unsmob_context_def (m->lookup_variable (name));
return cd ? cd->self_scm () : SCM_EOL;
}
{
Output_def * def = unsmob_output_def (s);
scm_puts ("#< ", p);
- scm_puts (classname (def), p);
+ scm_puts (def->class_name (), p);
(void)def;
scm_puts (">", p);
Output_def::lookup_variable (SCM sym) const
{
SCM var = ly_module_lookup (scope_, sym);
- if (SCM_VARIABLEP (var) && SCM_VARIABLE_REF(var) != SCM_UNDEFINED)
+ if (SCM_VARIABLEP (var) && SCM_VARIABLE_REF (var) != SCM_UNDEFINED)
return SCM_VARIABLE_REF (var);
if (parent_)
return parent_->lookup_variable (sym);
- return SCM_EOL;
+ return SCM_UNDEFINED;
}
SCM
-Output_def::c_variable (String s) const
+Output_def::c_variable (string s) const
{
- return lookup_variable (ly_symbol2scm (s.to_str0 ()));
+ return lookup_variable (ly_symbol2scm (s.c_str ()));
}
void
Interval
line_dimensions_int (Output_def *def, int n)
{
- Real lw = def->get_dimension (ly_symbol2scm ("linewidth"));
+ Real lw = def->get_dimension (ly_symbol2scm ("line-width"));
Real ind = n ? 0.0 : def->get_dimension (ly_symbol2scm ("indent"));
return Interval (ind, lw);
}