diff options
| author | Owen Taylor <otaylor@redhat.com> | 2004-02-19 15:48:42 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2004-02-19 15:48:42 +0000 |
| commit | c8f3ea5f8e99d8370248feb7585ac3b800a1a53f (patch) | |
| tree | 8cfca1db518dd5f763fb83c117ef04d3e33c012d | |
| parent | 4ab16dfd93fb4c61ba7489226ee30a66b05c8922 (diff) | |
| download | pango-c8f3ea5f8e99d8370248feb7585ac3b800a1a53f.tar.gz | |
Use 'xx' as the language for cases where we the language tag mismatches
Thu Feb 19 10:44:17 2004 Owen Taylor <otaylor@redhat.com>
* pango/pango-context.c (compute_derived_language):
Use 'xx' as the language for cases where we
the language tag mismatches the script but we don't
have a good language tag for the script.
(#123581)
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 8 | ||||
| -rw-r--r-- | pango/pango-context.c | 9 |
6 files changed, 48 insertions, 1 deletions
@@ -1,3 +1,11 @@ +Thu Feb 19 10:44:17 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pango-context.c (compute_derived_language): + Use 'xx' as the language for cases where we + the language tag mismatches the script but we don't + have a good language tag for the script. + (#123581) + Tue Feb 17 23:15:13 2004 Laszlo Peter <laca@sun.com> * pango-uninstalled.pc.in: use @PANGO_API_VERSION@ diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index d3e3438a..c8a919ba 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,11 @@ +Thu Feb 19 10:44:17 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pango-context.c (compute_derived_language): + Use 'xx' as the language for cases where we + the language tag mismatches the script but we don't + have a good language tag for the script. + (#123581) + Tue Feb 17 23:15:13 2004 Laszlo Peter <laca@sun.com> * pango-uninstalled.pc.in: use @PANGO_API_VERSION@ diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index d3e3438a..c8a919ba 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,11 @@ +Thu Feb 19 10:44:17 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pango-context.c (compute_derived_language): + Use 'xx' as the language for cases where we + the language tag mismatches the script but we don't + have a good language tag for the script. + (#123581) + Tue Feb 17 23:15:13 2004 Laszlo Peter <laca@sun.com> * pango-uninstalled.pc.in: use @PANGO_API_VERSION@ diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index d3e3438a..c8a919ba 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,11 @@ +Thu Feb 19 10:44:17 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pango-context.c (compute_derived_language): + Use 'xx' as the language for cases where we + the language tag mismatches the script but we don't + have a good language tag for the script. + (#123581) + Tue Feb 17 23:15:13 2004 Laszlo Peter <laca@sun.com> * pango-uninstalled.pc.in: use @PANGO_API_VERSION@ diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index d3e3438a..c8a919ba 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,11 @@ +Thu Feb 19 10:44:17 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pango-context.c (compute_derived_language): + Use 'xx' as the language for cases where we + the language tag mismatches the script but we don't + have a good language tag for the script. + (#123581) + Tue Feb 17 23:15:13 2004 Laszlo Peter <laca@sun.com> * pango-uninstalled.pc.in: use @PANGO_API_VERSION@ diff --git a/pango/pango-context.c b/pango/pango-context.c index 14e32041..ea6d66e4 100644 --- a/pango/pango-context.c +++ b/pango/pango-context.c @@ -872,8 +872,15 @@ compute_derived_language (PangoLanguage *lang, else { derived_lang = pango_script_get_sample_language (script); + /* If we don't find a sample language for the script, we + * use a language tag that shouldn't actually be used + * anywhere. This keeps fontconfig (for the PangoFc* + * backend) from using the language tag to affect the + * sort order. I don't have a reference for 'xx' being + * safe here, though Keith Packard claims it is. + */ if (!derived_lang) - derived_lang = lang; + derived_lang = pango_language_from_string ("xx"); } return derived_lang; |