#include "paper-def.hh"
#include "debug.hh"
#include "lookup.hh"
-#include "dimension.hh"
+#include "ps-lookup.hh"
+#include "tex-lookup.hh"
#include "assoc-iter.hh"
#include "score-engraver.hh"
#include "p-score.hh"
#include "identifier.hh"
#include "main.hh"
#include "scope.hh"
-#include "assoc.hh"
-#include "assoc-iter.hh"
+#include "dictionary-iter.hh"
Paper_def::Paper_def ()
{
lookup_p_assoc_p_ = new Assoc<int, Lookup*>;
for (Assoc_iter<int, Lookup*> ai(*s.lookup_p_assoc_p_); ai.ok (); ai++)
{
- Lookup * l=new Lookup (*ai.val ());
+ Lookup * l = global_lookup_l->lookup_p (*ai.val ());
l->paper_l_ = this;
set_lookup (ai.key(), l);
}
-
-
}
Real
IMPLEMENT_IS_TYPE_B1 (Paper_def, Music_output_def);
String
-Paper_def::TeX_output_settings_str () const
+Paper_def::ps_output_settings_str () const
+{
+ String s ("\n ");
+ for (Dictionary_iter<Identifier*> i (*scope_p_); i.ok (); i++)
+ s += String ("/mudelapaper") + i.key ()
+ + "{" + i.val ()->str () + "} bind def\n";
+ s += *scope_p_->elem ("pssetting")->access_String ();
+ return s;
+}
+
+String
+Paper_def::tex_output_settings_str () const
{
String s ("\n ");
- for (Assoc_iter<String,Identifier*> i (*scope_p_); i.ok (); i++)
+ for (Dictionary_iter<Identifier*> i (*scope_p_); i.ok (); i++)
s += String ("\\def\\mudelapaper") + i.key ()
+ "{" + i.val ()->str () + "}\n";
s += *scope_p_->elem ("texsetting")->access_String ();