From: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Wed, 8 Jun 2005 18:03:34 +0000 (+0000)
Subject: Also set TextDescription::font if a matching FontDirectoryEntry was found.
X-Git-Tag: redact-0.1.2~6
X-Git-Url: http://git.code-monkey.de/?p=redact.git;a=commitdiff_plain;h=18c7ac35df71363a579ac51d0d075a7161b22093

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

diff --git a/ChangeLog b/ChangeLog
index de6f586..bbf3bf2 100644
--- 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 0150a35..b282d04 100644
--- 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