diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2008-08-20 03:07:18 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2008-08-20 03:07:18 +0000 |
| commit | 938ae8d796f402c5538f6a911d1b698e53a134bf (patch) | |
| tree | cbab149f5d59bfdf4277541f8b1a753b183a080f | |
| parent | d0145c201c9aa40bbf8adb5fbdd680d76d6b9973 (diff) | |
| download | pango-938ae8d796f402c5538f6a911d1b698e53a134bf.tar.gz | |
Fix cyclic header ordering and move pango_language_* to pango-language.h
2008-08-18 Behdad Esfahbod <behdad@gnome.org>
* pango/pango-language.h:
* pango/pango-script.h:
Fix cyclic header ordering and move pango_language_* to
pango-language.h
svn path=/trunk/; revision=2692
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | pango/pango-language.h | 6 | ||||
| -rw-r--r-- | pango/pango-script.h | 6 |
3 files changed, 14 insertions, 5 deletions
@@ -1,5 +1,12 @@ 2008-08-18 Behdad Esfahbod <behdad@gnome.org> + * pango/pango-language.h: + * pango/pango-script.h: + Fix cyclic header ordering and move pango_language_* to + pango-language.h + +2008-08-18 Behdad Esfahbod <behdad@gnome.org> + Bug 470895 – Improve OpenType language tag list * pango/pango-ot-tag.c: Update to OpenType 1.5 draft, intersected with diff --git a/pango/pango-language.h b/pango/pango-language.h index bbfe268b..b807c4c0 100644 --- a/pango/pango-language.h +++ b/pango/pango-language.h @@ -27,7 +27,6 @@ G_BEGIN_DECLS -/* Dummy typedef - internally it's a 'const char *' */ typedef struct _PangoLanguage PangoLanguage; #define PANGO_TYPE_LANGUAGE (pango_language_get_type ()) @@ -44,6 +43,11 @@ PangoLanguage *pango_language_get_default (void) G_GNUC_CONST; gboolean pango_language_matches (PangoLanguage *language, const char *range_list) G_GNUC_PURE; +#include <pango/pango-script.h> + +gboolean pango_language_includes_script (PangoLanguage *language, + PangoScript script) G_GNUC_PURE; + G_END_DECLS #endif /* __PANGO_LANGUAGE_H__ */ diff --git a/pango/pango-script.h b/pango/pango-script.h index 16e99b8c..32ef7372 100644 --- a/pango/pango-script.h +++ b/pango/pango-script.h @@ -24,8 +24,6 @@ #include <glib.h> -#include <pango/pango-language.h> - G_BEGIN_DECLS /** @@ -137,9 +135,9 @@ void pango_script_iter_get_range (PangoScriptIter *iter, gboolean pango_script_iter_next (PangoScriptIter *iter); void pango_script_iter_free (PangoScriptIter *iter); +#include <pango/pango-language.h> + PangoLanguage *pango_script_get_sample_language (PangoScript script) G_GNUC_PURE; -gboolean pango_language_includes_script (PangoLanguage *language, - PangoScript script) G_GNUC_PURE; G_END_DECLS |