You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
59 lines
2.0 KiB
59 lines
2.0 KiB
6 years ago
|
From 082f2faf5007812bac6a1f783c7dcc6f49d761fe Mon Sep 17 00:00:00 2001
|
||
|
|
From: Werner Lemberg <wl@gnu.org>
|
||
|
|
Date: Wed, 24 May 2017 07:40:46 +0200
|
||
|
|
Subject: [PATCH] [bdf, pcf] Support ISO646.1991-IRV character encoding (aka
|
||
|
|
ASCII).
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Problem reported by Marek Kašík <mkasik@redhat.com>, cf.
|
||
|
|
|
||
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1451795
|
||
|
|
|
||
|
|
* src/bdf/bdfdrivr.c (BDF_Face_Init), src/pcf/pcfdrivr.c
|
||
|
|
(PCF_Face_Init): Implement it.
|
||
|
|
---
|
||
|
|
ChangeLog | 11 +++++++++++
|
||
|
|
src/bdf/bdfdrivr.c | 6 +++++-
|
||
|
|
src/pcf/pcfdrivr.c | 6 +++++-
|
||
|
|
3 files changed, 21 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/bdf/bdfdrivr.c b/src/bdf/bdfdrivr.c
|
||
|
|
index a2242be0..c0a5a5c5 100644
|
||
|
|
--- a/src/bdf/bdfdrivr.c
|
||
|
|
+++ b/src/bdf/bdfdrivr.c
|
||
|
|
@@ -545,7 +545,11 @@ THE SOFTWARE.
|
||
|
|
if ( !ft_strcmp( s, "10646" ) ||
|
||
|
|
( !ft_strcmp( s, "8859" ) &&
|
||
|
|
!ft_strcmp( face->charset_encoding, "1" ) ) )
|
||
|
|
- unicode_charmap = 1;
|
||
|
|
+ unicode_charmap = 1;
|
||
|
|
+ /* another name for ASCII */
|
||
|
|
+ else if ( !ft_strcmp( s, "646.1991" ) &&
|
||
|
|
+ !ft_strcmp( face->charset_encoding, "IRV" ) )
|
||
|
|
+ unicode_charmap = 1;
|
||
|
|
}
|
||
|
|
|
||
|
|
{
|
||
|
|
diff --git a/src/pcf/pcfdrivr.c b/src/pcf/pcfdrivr.c
|
||
|
|
index 9f4d36d1..50530941 100644
|
||
|
|
--- a/src/pcf/pcfdrivr.c
|
||
|
|
+++ b/src/pcf/pcfdrivr.c
|
||
|
|
@@ -387,7 +387,11 @@ THE SOFTWARE.
|
||
|
|
if ( !ft_strcmp( s, "10646" ) ||
|
||
|
|
( !ft_strcmp( s, "8859" ) &&
|
||
|
|
!ft_strcmp( face->charset_encoding, "1" ) ) )
|
||
|
|
- unicode_charmap = 1;
|
||
|
|
+ unicode_charmap = 1;
|
||
|
|
+ /* another name for ASCII */
|
||
|
|
+ else if ( !ft_strcmp( s, "646.1991" ) &&
|
||
|
|
+ !ft_strcmp( face->charset_encoding, "IRV" ) )
|
||
|
|
+ unicode_charmap = 1;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
2.13.0
|
||
|
|
|