(tex-encoded-fontswitch): use

round for rounding (inexact->exact yields rationals)

diff --git a/ChangeLog b/ChangeLog
index d7173ad4280ae8ae120fcfeba2f90b5f7beeb5d1..2989567aefaab59beeb2e396b86012aceb1cb3df 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-01-10  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * scm/output-tex.scm (tex-encoded-fontswitch): use
+       round for rounding (inexact->exact yields rationals)
+
        * lily/*.cc: remove superfluous start_translation_timestep() calls.
 
        * lily/translator-group.cc (get_simple_trans_list): 

diff --git a/lily/include/gregorian-ligature-engraver.hh b/lily/include/gregorian-ligature-engraver.hh
index ec571f6f6477105d4259c4a7e07936ebe15b06ee..dfca3561a16a874c8cf41cf8159a65bcef085bcc 100644 (file)
--- a/lily/include/gregorian-ligature-engraver.hh
+++ b/lily/include/gregorian-ligature-engraver.hh
@@ -23,7 +23,7 @@ protected:
   virtual void build_ligature (Spanner *ligature, Array<Grob_info> primitives);
   virtual void transform_heads (Spanner *ligature,
                                Array<Grob_info> primitives); /* abstract method */
-  virtual void start_translation_timestep ();
+  virtual void stop_translation_timestep ();
 };
 
 #endif // GREGORIAN_LIGATURE_ENGRAVER_HH

diff --git a/lily/include/ligature-engraver.hh b/lily/include/ligature-engraver.hh
index 5c246ce4f6d0f6b61ef66057b586172d0cc1c329..7cd682ee072dd96d0cfdea0b6b4cf221ad592f9c 100644 (file)
--- a/lily/include/ligature-engraver.hh
+++ b/lily/include/ligature-engraver.hh
@@ -15,7 +15,6 @@ class Ligature_engraver : public Engraver
 {
 protected:
   virtual void stop_translation_timestep ();
-  virtual void start_translation_timestep ();
   virtual void finalize ();
 
   virtual void acknowledge_grob (Grob_info);

diff --git a/lily/metronome-engraver.cc b/lily/metronome-engraver.cc
index 80fe67837bca915bf9b83e59ed868f7585567215..2aba83882d53662048dd0e29eee7486f877b4be8 100644 (file)
--- a/lily/metronome-engraver.cc
+++ b/lily/metronome-engraver.cc
@@ -31,7 +31,6 @@ protected:
   virtual void acknowledge_grob (Grob_info);
   void create_items (Music*);
   virtual bool try_music (Music *req);
-  virtual void start_translation_timestep ();
   virtual void process_music ();
   
 private:

diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc
index 132ea54ca2f09e6794e9c676b66be41cba6bd155..e21c39841602dbe5a10763a22a7ae14a452feb98 100644 (file)
--- a/lily/slur-engraver.cc
+++ b/lily/slur-engraver.cc
@@ -29,7 +29,6 @@ protected:
   virtual bool try_music (Music*);
   virtual void acknowledge_grob (Grob_info);
   virtual void stop_translation_timestep ();
-  virtual void start_translation_timestep ();
   virtual void finalize ();
   virtual void process_music ();
 

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index 5cdc157f0dbf9daab9f0b789c2d5dcca45de762f..3d849d36d918cfdd9bd2112c24371f6421422fbe 100644 (file)
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -29,7 +29,6 @@ public:
 protected:
   virtual bool try_music (Music* m);
   virtual void stop_translation_timestep ();
-  virtual void start_translation_timestep ();
   virtual void process_acknowledged_grobs ();
   virtual void acknowledge_grob (Grob_info);
 };
@@ -137,7 +136,9 @@ Text_engraver::stop_translation_timestep ()
 }
 
 
-Text_engraver::Text_engraver(){}
+Text_engraver::Text_engraver ()
+{
+}
 
 ENTER_DESCRIPTION(Text_engraver,
 /* descr */       "Create text-scripts",

diff --git a/scm/output-tex.scm b/scm/output-tex.scm
index c4395f1923fd45e05b7024ad362479089d0563c5..fb1fe1bb5cca24f4e3236f78f219acf3e2ae33be 100644 (file)
--- a/scm/output-tex.scm
+++ b/scm/output-tex.scm
@@ -28,6 +28,7 @@
 (define (tex-encoded-fontswitch name-mag)
   (let* ((iname-mag (car name-mag))
         (ename-mag (cdr name-mag)))
+
     (cons iname-mag
          (cons ename-mag
                (string-append  "magfont"
@@ -35,7 +36,7 @@
                           (hashq (car ename-mag) 1000000))
                          "m"
                          (string-encode-integer
-                          (inexact->exact (* 1000 (cdr ename-mag)))))))))
+                          (inexact->exact (round (* 1000 (cdr ename-mag))))))))))
 
 (define (define-fonts internal-external-name-mag-pairs)
   (set! font-name-alist (map tex-encoded-fontswitch
@@ -113,7 +114,7 @@
    "\\font\\" command "="
    (car name-mag)
    " scaled "
-   (ly:number->string (inexact->exact (* 1000  (cdr name-mag))))
+   (ly:number->string (inexact->exact (round (* 1000  (cdr name-mag)))))
    "\n"))
 
 (define (ez-ball c l b)