release: 1.0.17

[lilypond.git] / lily / paper-def.cc

diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index 2c006ad09798684bcc4e78ed34fdfae8e3fe214a..8593add91051b63d930fb3428bbcfa50f54b0495 100644 (file)
--- a/lily/paper-def.cc
+++ b/lily/paper-def.cc
@@ -15,15 +15,13 @@
 #include "lookup.hh"
 #include "ps-lookup.hh"
 #include "tex-lookup.hh"
-#include "dimension.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 ()
 {
@@ -47,8 +45,7 @@ Paper_def::Paper_def (Paper_def const&s)
   lookup_p_assoc_p_ = new Assoc<int, Lookup*>;
   for (Assoc_iter<int, Lookup*> ai(*s.lookup_p_assoc_p_); ai.ok (); ai++)
     {
-      Lookup * l = ps_output_global_b ? new Ps_lookup (*ai.val ())
-       : new Tex_lookup (*ai.val ());
+      Lookup * l = global_lookup_l->lookup_p (*ai.val ());
       l->paper_l_ = this;
       set_lookup (ai.key(), l);
     }
@@ -216,10 +213,10 @@ String
 Paper_def::ps_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 ("/mudelapaper") + i.key () 
       + "{" + i.val ()->str () + "} bind def\n";
-  s +=  *scope_p_->elem ("texsetting")->access_String ();
+  s +=  *scope_p_->elem ("pssetting")->access_String ();
   return s;
 }
 
@@ -227,7 +224,7 @@ 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 ();