* scm/grob-description.scm (all-grob-descriptions): set

[lilypond.git] / scripts / ly2dvi.py

diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py
index 9009214e7e4773b48ca85f58ffc6bd44456f1b7c..d15fd4452a889c57266d3ba43d0bb036f81c59d5 100644 (file)
--- a/scripts/ly2dvi.py
+++ b/scripts/ly2dvi.py
@@ -422,11 +422,18 @@ def setup_environment ():
 #what a name.
 def set_setting (dict, key, val):
        try:
-               val = string.atof (val)
+               val = string.atoi (val)
        except ValueError:
                #warning (_ ("invalid value: %s") % `val`)
                pass
 
+       if type(val) == type ('hoi'):
+               try:
+                       val = string.atof (val)
+               except ValueError:
+                       #warning (_ ("invalid value: %s") % `val`)
+                       pass
+
        try:
                dict[key].append (val)
        except KeyError:
@@ -638,7 +645,7 @@ def global_latex_preamble (extra):
 '''
        
        if extra['pagenumber'] and extra['pagenumber'][-1] and extra['pagenumber'][-1] != 'no':
-               s = s + '\setcounter{page}{%s}\n' % (extra['pagenumber'][-1])
+               s = s + '\setcounter{page}{%d}\n' % (extra['pagenumber'][-1])
                 s = s + '\\pagestyle{plain}\n'
        else:
                s = s + '\\pagestyle{empty}\n'