diff options
| -rw-r--r-- | ChangeLog | 20 | ||||
| -rw-r--r-- | docs/pango-docs.sgml | 2 | ||||
| -rw-r--r-- | docs/pango-sections.txt | 16 | ||||
| -rw-r--r-- | docs/tmpl/atsui-fonts.sgml | 31 | ||||
| -rw-r--r-- | pango/pangoatsui-fontmap.c | 3 | ||||
| -rw-r--r-- | pango/pangocairo-atsuifont.c | 10 |
6 files changed, 82 insertions, 0 deletions
@@ -1,3 +1,23 @@ +2006-01-21 Behdad Esfahbod <behdad@gnome.org> + + Finish ATSUI module work. Bug #322022, Matthias Clasen. + + * docs/tmpl/atsui-fonts.sgml: Added. + + * docs/pango-docs.sgml: Updated to reflect above change. + + * docs/pango-sections.txt: Updated to reflect above change and + also document Standard ATSUI symbols. + + * pango/pangocairo-atsuifont.c + (pango_cairo_atsui_font_get_atsu_font_id): Add docs. + + * pango/pangoatsui-fontmap.c: Register included ATSUI modules. + +2006-01-20 Behdad Esfahbod <behdad@gnome.org> + + * examples/cairosimple.c: Small fixes. + 2006-01-20 Behdad Esfahbod <behdad@gnome.org> * pango/pangocairo-font.c (_pango_cairo_get_hex_box_info): Add a diff --git a/docs/pango-docs.sgml b/docs/pango-docs.sgml index aa026ff3..9623b20c 100644 --- a/docs/pango-docs.sgml +++ b/docs/pango-docs.sgml @@ -17,6 +17,7 @@ <!ENTITY pango-Win32-Fonts-and-Rendering SYSTEM "xml/win32-fonts.xml"> <!ENTITY pango-FreeType-Fonts-and-Rendering SYSTEM "xml/freetype-fonts.xml"> <!ENTITY pango-Xft-Fonts-and-Rendering SYSTEM "xml/xft-fonts.xml"> +<!ENTITY pango-ATSUI-Fonts-and-Rendering SYSTEM "xml/atsui-fonts.xml"> <!ENTITY pangocairo SYSTEM "xml/pangocairo.xml"> <!ENTITY PangoFcFontMap SYSTEM "xml/pangofc-fontmap.xml"> <!ENTITY PangoFcFont SYSTEM "xml/pangofc-font.xml"> @@ -50,6 +51,7 @@ &pango-FreeType-Fonts-and-Rendering; &pango-Xft-Fonts-and-Rendering; &pangocairo; + &pango-ATSUI-Fonts-and-Rendering; &pango-X-Fonts-and-Rendering; </chapter> diff --git a/docs/pango-sections.txt b/docs/pango-sections.txt index c8fe913b..ce994e94 100644 --- a/docs/pango-sections.txt +++ b/docs/pango-sections.txt @@ -808,6 +808,22 @@ pango_cairo_font_map_get_type </SECTION> <SECTION> +<TITLE>ATSUI Fonts</TITLE> +<FILE>atsui-fonts</FILE> +PangoCairoATSUIFont +pango_cairo_atsui_font_get_atsu_font_id +<SUBSECTION Standard> +PangoCairoATSUIFontClass +PANGO_CAIRO_ATSUI_FONT +PANGO_CAIRO_ATSUI_FONT_CLASS +PANGO_CAIRO_ATSUI_FONT_GET_CLASS +PANGO_CAIRO_IS_FONT_CLASS +PANGO_RENDER_TYPE_ATSUI +PANGO_TYPE_CAIRO_ATSUI_FONT +pango_cairo_atsui_font_get_type +</SECTION> + +<SECTION> <FILE>pangofc-fontmap</FILE> <TITLE>PangoFcFontMap</TITLE> PangoFcFontMap diff --git a/docs/tmpl/atsui-fonts.sgml b/docs/tmpl/atsui-fonts.sgml new file mode 100644 index 00000000..6b3297b4 --- /dev/null +++ b/docs/tmpl/atsui-fonts.sgml @@ -0,0 +1,31 @@ +<!-- ##### SECTION Title ##### --> +ATSUI Fonts + +<!-- ##### SECTION Short_Description ##### --> +Font handling and rendering with ATSUI fonts + +<!-- ##### SECTION Long_Description ##### --> +<para> + +</para> + +<!-- ##### SECTION See_Also ##### --> +<para> + +</para> + +<!-- ##### STRUCT PangoCairoATSUIFont ##### --> +<para> + +</para> + + +<!-- ##### FUNCTION pango_cairo_atsui_font_get_atsu_font_id ##### --> +<para> + +</para> + +@cafont: +@Returns: + + diff --git a/pango/pangoatsui-fontmap.c b/pango/pangoatsui-fontmap.c index a547df91..257536e5 100644 --- a/pango/pangoatsui-fontmap.c +++ b/pango/pangoatsui-fontmap.c @@ -179,6 +179,9 @@ pango_atsui_family_class_init (PangoFontFamilyClass *class) class->list_faces = pango_atsui_family_list_faces; class->get_name = pango_atsui_family_get_name; class->is_monospace = pango_atsui_family_is_monospace; + + for (i = 0; _pango_included_atsui_modules[i].list; i++) + pango_module_register (&_pango_included_atsui_modules[i]); } static void diff --git a/pango/pangocairo-atsuifont.c b/pango/pangocairo-atsuifont.c index 81a9bac5..e28a92d1 100644 --- a/pango/pangocairo-atsuifont.c +++ b/pango/pangocairo-atsuifont.c @@ -51,6 +51,16 @@ struct _PangoCairoATSUIFontClass static cairo_font_face_t *pango_cairo_atsui_font_get_font_face (PangoCairoFont *font); +/** + * pango_cairo_atsui_font_get_atsu_font_id: + * @cafont: A #PangoCairoATSUIFont + * + * Returns the ATSUFontID of a font. + * + * Returns: the ATSUFontID associated to @cafont. + * + * Since: 1.12 + */ ATSUFontID pango_cairo_atsui_font_get_atsu_font_id (PangoCairoATSUIFont *cafont) { |