diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/Makefile.am | 15 | ||||
| -rw-r--r-- | docs/pango-docs.sgml | 6 | ||||
| -rw-r--r-- | docs/pango-sections.txt | 59 | ||||
| -rw-r--r-- | docs/pango.types | 10 | ||||
| -rw-r--r-- | docs/tmpl/freetype-fonts.sgml | 4 | ||||
| -rw-r--r-- | docs/tmpl/pango-indic.sgml | 98 | ||||
| -rw-r--r-- | docs/tmpl/xft-fonts.sgml | 4 |
7 files changed, 76 insertions, 120 deletions
diff --git a/docs/Makefile.am b/docs/Makefile.am index 6650dea9..e7948401 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -26,6 +26,7 @@ IGNORE_HFILES= \ modules.h \ pango-intset.h \ pango-utils.h \ + pangofc-private.h \ pangoft2-private.h \ pangowin32-private.h \ pangox-private.h \ @@ -36,9 +37,17 @@ IGNORE_HFILES= \ INCLUDES = \ -DPANGO_ENABLE_BACKEND \ -I$(top_srcdir) \ - $(GLIB_CFLAGS) - -GTKDOC_LIBS = $(top_builddir)/pango/libpango-1.0.la + $(GLIB_CFLAGS) \ + $(XFT_CFLAGS) \ + $(FREETYPE_CFLAGS) \ + $(X_CFLAGS) + +# libpangoxft.la pulls in libpango.la and libpangoft2.la; +# We're assuming here that we'll only regenerate the +# HTML docs on Unix. We don't get introspection on Win32 +# specific types, but that isn't a bug deal. +GTKDOC_LIBS = \ + $(top_builddir)/pango/libpangoxft-1.0.la # Extra options to supply to gtkdoc-mkdb diff --git a/docs/pango-docs.sgml b/docs/pango-docs.sgml index f78a86dd..79cdf112 100644 --- a/docs/pango-docs.sgml +++ b/docs/pango-docs.sgml @@ -9,12 +9,13 @@ <!ENTITY pango-Tab-Stops SYSTEM "xml/tab-stops.xml"> <!ENTITY pango-Layout-Objects SYSTEM "xml/layout.xml"> <!ENTITY pango-Engines SYSTEM "xml/engines.xml"> -<!ENTITY pango-Indic-Engine-Support SYSTEM "xml/pango-indic.xml"> <!ENTITY pango-Modules SYSTEM "xml/modules.xml"> <!ENTITY pango-X-Fonts-and-Rendering SYSTEM "xml/x-fonts.xml"> <!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 PangoFcFontMap SYSTEM "xml/pangofc-fontmap.xml"> +<!ENTITY PangoFcFont SYSTEM "xml/pangofc-font.xml"> <!ENTITY pango-OpenType-Font-Handling SYSTEM "xml/opentype.xml"> <!ENTITY markup-format SYSTEM "pango_markup.sgml"> <!ENTITY pango-querymodules SYSTEM "pango-querymodules.xml"> @@ -47,10 +48,11 @@ <chapter id="lowlevel"> <title>Low Level Functionality</title> + &PangoFcFontMap; + &PangoFcFont; &pango-OpenType-Font-Handling; &pango-Coverage-Maps; &pango-Engines; - &pango-Indic-Engine-Support; &pango-Modules; </chapter> diff --git a/docs/pango-sections.txt b/docs/pango-sections.txt index ec11c070..27c9bb9c 100644 --- a/docs/pango-sections.txt +++ b/docs/pango-sections.txt @@ -463,6 +463,8 @@ PANGO_RENDER_TYPE_NONE script_engine_list script_engine_load script_engine_unload +<SUBSECTION Private> +PANGO_MODULE_ENTRY </SECTION> <SECTION> @@ -478,18 +480,6 @@ pango_module_register </SECTION> <SECTION> -<FILE>pango-indic</FILE> -<TITLE>Indic Engine Support</TITLE> -PANGO_ZERO_WIDTH_NON_JOINER -PANGO_ZERO_WIDTH_JOINER -PangoIndicScript -pango_indic_shift_vowels -pango_indic_compact -pango_indic_convert_vowels -pango_indic_split_out_characters -</SECTION> - -<SECTION> <TITLE>X Fonts and Rendering</TITLE> <FILE>x-fonts</FILE> PANGO_RENDER_TYPE_X @@ -608,6 +598,51 @@ pango_xft_font_get_type </SECTION> <SECTION> +<FILE>pangofc-fontmap</FILE> +<TITLE>PangoFcFontMap</TITLE> +PangoFcFontMap +PangoFcFontMapClass +pango_fc_font_description_from_pattern +pango_fc_font_map_cache_clear +pango_fc_font_map_create_context +pango_fc_font_map_shutdown +<SUBSECTION Standard> +PANGO_FC_FONT_MAP +PANGO_IS_FC_FONT_MAP +PANGO_TYPE_FC_FONT_MAP +PANGO_FC_FONT_MAP_CLASS +PANGO_IS_FC_FONT_MAP_CLASS +PANGO_FC_FONT_MAP_GET_CLASS + +<SUBSECTION Private> +PangoFcFontMapPrivate +pango_fc_font_map_get_type +</SECTION> + +<SECTION> +<FILE>pangofc-font</FILE> +<TITLE>PangoFcFont</TITLE> +PangoFcFont +PangoFcFontClass +PANGO_RENDER_TYPE_FC +pango_fc_font_lock_face +pango_fc_font_unlock_face +pango_fc_font_has_char +pango_fc_font_get_glyph +pango_fc_font_get_unknown_glyph +pango_fc_font_kern_glyphs +<SUBSECTION Standard> +PANGO_FC_FONT +PANGO_IS_FC_FONT +PANGO_TYPE_FC_FONT +PANGO_FC_FONT_CLASS +PANGO_IS_FC_FONT_CLASS +PANGO_FC_FONT_GET_CLASS +<SUBSECTION Private> +pango_fc_font_get_type +</SECTION> + +<SECTION> <TITLE>OpenType Font Handling</TITLE> <FILE>opentype</FILE> PangoOTTag diff --git a/docs/pango.types b/docs/pango.types index 73860fd9..ae3d2947 100644 --- a/docs/pango.types +++ b/docs/pango.types @@ -1,4 +1,8 @@ #include <pango/pango.h> +#include <pango/pangofc-font.h> +#include <pango/pangofc-fontmap.h> +#include <pango/pangoft2.h> +#include <pango/pangoxft.h> pango_font_get_type pango_font_family_get_type @@ -7,5 +11,9 @@ pango_context_get_type pango_font_map_get_type pango_fontset_get_type pango_fontset_simple_get_type -pango_layout_get_type +pango_fc_font_get_type +pango_fc_font_map_get_type +pango_ft2_font_map_get_type +pango_xft_font_get_type + diff --git a/docs/tmpl/freetype-fonts.sgml b/docs/tmpl/freetype-fonts.sgml index 8d175001..81823761 100644 --- a/docs/tmpl/freetype-fonts.sgml +++ b/docs/tmpl/freetype-fonts.sgml @@ -22,8 +22,8 @@ The #PangoFT2FontMap is the #PangoFontMap implementation for FreeType fonts. <!-- ##### MACRO PANGO_RENDER_TYPE_FT2 ##### --> <para> -A string constant identifying the FreeType renderer. The associated quark (see -g_quark_from_string()) is used to identify the renderer in pango_find_map(). +A string constant that was used to identify shape engines that work +with the FreeType backend. See %PANGO_RENDER_TYPE_FC for the replacement. </para> diff --git a/docs/tmpl/pango-indic.sgml b/docs/tmpl/pango-indic.sgml deleted file mode 100644 index 8409296f..00000000 --- a/docs/tmpl/pango-indic.sgml +++ /dev/null @@ -1,98 +0,0 @@ -<!-- ##### SECTION Title ##### --> -Indic Engine Support - -<!-- ##### SECTION Short_Description ##### --> -Indic support for legacy shaper engines - -<!-- ##### SECTION Long_Description ##### --> -<para> -The <function>pango_indic_*</function> functions are used to -implement indic shaping support for certain legacy shaping engines, -in particular the shaping engines for bitmap X fonts. -These are basically internal routines and should not be -used by applications. -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### MACRO PANGO_ZERO_WIDTH_NON_JOINER ##### --> -<para> -The Unicode character 'ZERO WIDTH NON-JOINER', 0x200c. -</para> - - - -<!-- ##### MACRO PANGO_ZERO_WIDTH_JOINER ##### --> -<para> -The Unicode character 'ZERO WIDTH JOINER', 0x200d. -</para> - - - -<!-- ##### STRUCT PangoIndicScript ##### --> -<para> -The <structname>PangoIndicScript</structname> struct contains a few -script-dependent functions which are used by the -<function>pango_indic_*</function> functions. -Renderers must provide a suitable <structname>PangoIndicScript</structname> -struct. -</para> - -@name: the name of the script. -@is_prefixing_vowel: determines whether a vowel is left-joining. -@is_vowel_sign: determines whether the given character is a vowel sign. -@vowel_sign_to_matra: converts a vowel sign to a matra (abbreviated form). -@is_vowel_half: determines whether the given character is part of a two-part -vowel. This is an optional function. -@vowel_split: returns whether the given vowel can be split and the pieces in -which it can be split. This is an optional function. - -<!-- ##### FUNCTION pango_indic_shift_vowels ##### --> -<para> - -</para> - -@script: -@chars: -@end: - - -<!-- ##### FUNCTION pango_indic_compact ##### --> -<para> - -</para> - -@script: -@num: -@chars: -@cluster: - - -<!-- ##### FUNCTION pango_indic_convert_vowels ##### --> -<para> - -</para> - -@script: -@in_middle: -@num: -@chars: -@has_standalone_vowels: - - -<!-- ##### FUNCTION pango_indic_split_out_characters ##### --> -<para> - -</para> - -@script: -@text: -@n_chars: -@wc: -@n_glyph: -@glyphs: - - diff --git a/docs/tmpl/xft-fonts.sgml b/docs/tmpl/xft-fonts.sgml index 954ed04e..ef0b635b 100644 --- a/docs/tmpl/xft-fonts.sgml +++ b/docs/tmpl/xft-fonts.sgml @@ -16,8 +16,8 @@ Functions for shape engines to manipulate Xft fonts <!-- ##### MACRO PANGO_RENDER_TYPE_XFT ##### --> <para> -A string constant identifying the Xft renderer. The associated quark (see -g_quark_from_string()) is used to identify the renderer in pango_find_map(). +A string constant that was used to identify shape engines that work +with the Xft backend. See %PANGO_RENDER_TYPE_FC for the replacement. </para> |