Also set TextDescription::font if a matching FontDirectoryEntry was found.

diff --git a/ChangeLog b/ChangeLog
index de6f586f7ee92e88f35cf90f1ef6654cd0993f65..bbf3bf2a428303529a494cdeef42ed67ab7b0387 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
 --
-$Id: ChangeLog 45 2005-06-08 18:02:12Z tilman $
+$Id: ChangeLog 46 2005-06-08 18:03:34Z tilman $
 ++
 
 2005-06-08 Tilman Sauerbeck (tilman at code-monkey de)
@@ -9,6 +9,8 @@ $Id: ChangeLog 45 2005-06-08 18:02:12Z tilman $
         * lib/redact/redact.rb, TODO: Added support for the --image_dir
           and --font_dir command line switches
         * lib/redact/{redact,app}.rb: Fixed fontdir handling
+        * lib/redact/part.rb: Also set TextDescription::font if a
+          matching FontDirectoryEntry was found
 
 2005-05-29 Tilman Sauerbeck (tilman at code-monkey de)
         * Rakefile: Use FileUtils.mkdir_p to create the destination

diff --git a/lib/redact/part.rb b/lib/redact/part.rb
index 0150a354cc185da8851d24e5ebfddb293498b691..b282d04b04faf315109bf1809d8576007664547c 100644 (file)
--- a/lib/redact/part.rb
+++ b/lib/redact/part.rb
@@ -1,5 +1,5 @@
 #--
-# $Id: part.rb 45 2005-06-08 18:02:12Z tilman $
+# $Id: part.rb 46 2005-06-08 18:03:34Z tilman $
 #
 # Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
 #
@@ -532,6 +532,8 @@ module Redact
                                if found.nil?
                                        EDJE.font_dir << FontDirectoryEntry.new(f2)
                                        @font = EDJE.font_dir.last.filename
+                               else
+                                       @font = found.filename
                                end
                        else
                                @font = f