From 83975503fc85a3116b91c47ab3307c5de73e019a Mon Sep 17 00:00:00 2001
From: Marcoen Hirschberg <marcoen@gmail.com>
Date: Fri, 27 Apr 2007 10:40:41 +0000
Subject: [PATCH] Accept FS #7058 by Alexander Levin: move the euro glyph to
 the right unicode position and fix the fontname of nimbus-19.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13277 a1c6a512-1295-4272-9138-f99709370657
---
 fonts/nimbus-12.bdf | 37 +++++++++++++++++++++++++------------
 fonts/nimbus-14.bdf | 37 +++++++++++++++++++++++++------------
 fonts/nimbus-19.bdf | 23 +++++++++++++++++++++--
 3 files changed, 71 insertions(+), 26 deletions(-)

diff --git a/fonts/nimbus-12.bdf b/fonts/nimbus-12.bdf
index eb9786858c..6ca93ecd55 100644
--- a/fonts/nimbus-12.bdf
+++ b/fonts/nimbus-12.bdf
@@ -11,7 +11,7 @@ FONT_DESCENT 2
 FONT_ASCENT 10
 COPYRIGHT "Public domain font.  Share and enjoy."
 ENDPROPERTIES
-CHARS 370
+CHARS 371
 STARTCHAR uni0000
 ENCODING 0
 SWIDTH 600 0
@@ -1496,18 +1496,15 @@ ENDCHAR
 STARTCHAR currency
 ENCODING 164
 SWIDTH 3240 0
-DWIDTH 9 0
-BBX 7 9 1 0
+DWIDTH 8 0
+BBX 6 6 1 1
 BITMAP
-3C
-62
-60
-F8
-60
-F0
-60
-62
-3C
+84
+78
+48
+48
+78
+84
 ENDCHAR
 STARTCHAR yen
 ENCODING 165
@@ -5702,4 +5699,20 @@ D8
 90
 48
 ENDCHAR
+STARTCHAR Euro
+ENCODING 8364
+SWIDTH 3240 0
+DWIDTH 9 0
+BBX 7 9 1 0
+BITMAP
+3C
+62
+60
+F8
+60
+F0
+60
+62
+3C
+ENDCHAR
 ENDFONT
diff --git a/fonts/nimbus-14.bdf b/fonts/nimbus-14.bdf
index 3ed9383daa..9aa39462fb 100644
--- a/fonts/nimbus-14.bdf
+++ b/fonts/nimbus-14.bdf
@@ -11,7 +11,7 @@ FONT_DESCENT 3
 FONT_ASCENT 11
 COPYRIGHT "Public domain font.  Share and enjoy."
 ENDPROPERTIES
-CHARS 484
+CHARS 485
 STARTCHAR uni0000
 ENCODING 0
 SWIDTH 600 0
@@ -1511,18 +1511,15 @@ ENDCHAR
 STARTCHAR currency
 ENCODING 164
 SWIDTH 3240 0
-DWIDTH 9 0
-BBX 7 9 1 0
+DWIDTH 8 0
+BBX 6 6 1 1
 BITMAP
-3C
-62
-60
-F8
-60
-F0
-60
-62
-3C
+84
+78
+48
+48
+78
+84
 ENDCHAR
 STARTCHAR yen
 ENCODING 165
@@ -7753,4 +7750,20 @@ D8
 90
 48
 ENDCHAR
+STARTCHAR Euro
+ENCODING 8364
+SWIDTH 3240 0
+DWIDTH 9 0
+BBX 7 9 1 0
+BITMAP
+3C
+62
+60
+F8
+60
+F0
+60
+62
+3C
+ENDCHAR
 ENDFONT
diff --git a/fonts/nimbus-19.bdf b/fonts/nimbus-19.bdf
index ffc0936d32..b781422c69 100644
--- a/fonts/nimbus-19.bdf
+++ b/fonts/nimbus-19.bdf
@@ -1,5 +1,5 @@
 STARTFONT 2.1
-FONT Nimbus18
+FONT Nimbus19
 SIZE 19 78 78
 FONTBOUNDINGBOX 14 16 -2 -4
 COMMENT "Generated by fontforge, http://fontforge.sourceforge.net"
@@ -11,7 +11,7 @@ FONT_DESCENT 4
 FONT_ASCENT 15
 COPYRIGHT "Public domain font.  Share and enjoy."
 ENDPROPERTIES
-CHARS 268
+CHARS 269
 STARTCHAR uni0000
 ENCODING 0
 SWIDTH 600 0
@@ -4882,4 +4882,23 @@ EE
 88
 66
 ENDCHAR
+STARTCHAR Euro
+ENCODING 8364
+SWIDTH 1000 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+3F00
+7180
+7080
+7000
+FE00
+7000
+FC00
+7000
+7000
+7080
+7180
+3F00
+ENDCHAR
 ENDFONT