diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-1-0 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-1-2 | 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-- | docs/Makefile.am | 43 | ||||
| -rw-r--r-- | docs/tmpl/freetype-fonts.sgml | 20 | ||||
| -rw-r--r-- | docs/tmpl/layout.sgml | 247 | ||||
| -rw-r--r-- | docs/tmpl/modules.sgml | 17 | ||||
| -rw-r--r-- | docs/tmpl/opentype.sgml | 187 | ||||
| -rw-r--r-- | docs/tmpl/pango-indic.sgml | 72 | ||||
| -rw-r--r-- | docs/tmpl/tab-stops.sgml | 7 | ||||
| -rw-r--r-- | docs/tmpl/text-attributes.sgml | 64 | ||||
| -rw-r--r-- | docs/tmpl/x-fonts.sgml | 36 | ||||
| -rw-r--r-- | docs/tmpl/xft-fonts.sgml | 92 | ||||
| -rw-r--r-- | pango/pangox.c | 8 |
18 files changed, 821 insertions, 28 deletions
@@ -1,3 +1,11 @@ +Fri Mar 9 11:57:46 2001 Owen Taylor <otaylor@redhat.com> + + * pango/pangox.c (pango_x_find_subfont): Remove a lot of + instances of "Error parsing ligature info" that somehow + crept in. + + * docs/*: Some makefile tweaks, structure updates. + 2001-03-15 Sven Neumann <sven@gimp.org> * Makefile.am diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index 72511465..3e128a02 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,11 @@ +Fri Mar 9 11:57:46 2001 Owen Taylor <otaylor@redhat.com> + + * pango/pangox.c (pango_x_find_subfont): Remove a lot of + instances of "Error parsing ligature info" that somehow + crept in. + + * docs/*: Some makefile tweaks, structure updates. + 2001-03-15 Sven Neumann <sven@gimp.org> * Makefile.am diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 72511465..3e128a02 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,11 @@ +Fri Mar 9 11:57:46 2001 Owen Taylor <otaylor@redhat.com> + + * pango/pangox.c (pango_x_find_subfont): Remove a lot of + instances of "Error parsing ligature info" that somehow + crept in. + + * docs/*: Some makefile tweaks, structure updates. + 2001-03-15 Sven Neumann <sven@gimp.org> * Makefile.am diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index 72511465..3e128a02 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,11 @@ +Fri Mar 9 11:57:46 2001 Owen Taylor <otaylor@redhat.com> + + * pango/pangox.c (pango_x_find_subfont): Remove a lot of + instances of "Error parsing ligature info" that somehow + crept in. + + * docs/*: Some makefile tweaks, structure updates. + 2001-03-15 Sven Neumann <sven@gimp.org> * Makefile.am diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 72511465..3e128a02 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,11 @@ +Fri Mar 9 11:57:46 2001 Owen Taylor <otaylor@redhat.com> + + * pango/pangox.c (pango_x_find_subfont): Remove a lot of + instances of "Error parsing ligature info" that somehow + crept in. + + * docs/*: Some makefile tweaks, structure updates. + 2001-03-15 Sven Neumann <sven@gimp.org> * Makefile.am diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 72511465..3e128a02 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,11 @@ +Fri Mar 9 11:57:46 2001 Owen Taylor <otaylor@redhat.com> + + * pango/pangox.c (pango_x_find_subfont): Remove a lot of + instances of "Error parsing ligature info" that somehow + crept in. + + * docs/*: Some makefile tweaks, structure updates. + 2001-03-15 Sven Neumann <sven@gimp.org> * Makefile.am diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 72511465..3e128a02 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,11 @@ +Fri Mar 9 11:57:46 2001 Owen Taylor <otaylor@redhat.com> + + * pango/pangox.c (pango_x_find_subfont): Remove a lot of + instances of "Error parsing ligature info" that somehow + crept in. + + * docs/*: Some makefile tweaks, structure updates. + 2001-03-15 Sven Neumann <sven@gimp.org> * Makefile.am diff --git a/docs/Makefile.am b/docs/Makefile.am index d68a5284..8920d3b3 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -79,20 +79,23 @@ EXTRA_DIST = \ $(DOC_MODULE)-sections.txt \ $(DOC_MODULE)-overrides.txt -DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp - -if ENABLE_GTK_DOC -all-local: html-build.stamp +DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ + $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp SCANOBJ_FILES = \ $(DOC_MODULE).args \ $(DOC_MODULE).hierarchy \ - $(DOC_MODULE).signal + $(DOC_MODULE).signals + +if ENABLE_GTK_DOC +all-local: html-build.stamp + +#### scan #### scan-build.stamp: $(HFILE_GLOB) @echo '*** Scanning header files ***' cd $(srcdir) && ( \ - if grep -l '^.+$$' $(DOC_MODULE).types > /dev/null ; then \ + if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null ; then \ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj --module=$(DOC_MODULE) ; \ else \ for i in $(SCANOBJ_FILES) ; do \ @@ -103,33 +106,33 @@ scan-build.stamp: $(HFILE_GLOB) gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) touch scan-build.stamp -check_scan: - $(MAKE) scan-build.stamp +$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp + @true -$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): check_scan +#### templates #### tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt @echo '*** Rebuilding template files ***' cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) touch tmpl-build.stamp -check_templates: - $(MAKE) tmpl-build.stamp +tmpl.stamp: tmpl-build.stamp + @true -tmpl.stamp: check_templates +#### sgml #### -sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) +sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) tmpl/*.sgml @echo '*** Building SGML ***' cd $(srcdir) && \ gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) $(MKDB_OPTIONS) touch sgml-build.stamp -check_sgml: - $(MAKE) sgml-build.stamp +sgml.stamp: sgml-build.stamp + @true -sgml.stamp: check_sgml +#### html #### -html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) +html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) @echo '*** Building HTML ***' test -d $(srcdir)/html || mkdir $(srcdir)/html cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) @@ -139,8 +142,10 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) touch html-build.stamp endif +############## + clean-local: - rm -f *~ *.bak $(SCANOBJ_FILES) *-unused.txt $(DOC_STAMPS) $(srcdir)/sgml.stamp + rm -f *~ *.bak $(SCANOBJ_FILES) *-unused.txt $(DOC_STAMPS) maintainer-clean-local: clean cd $(srcdir) && rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt @@ -183,4 +188,4 @@ dist-hook: dist-check-gtkdoc dist-hook-local cp $(srcdir)/$$i $(distdir)/html ; \ done -.PHONY : check_sgml check_templates check_scan dist-hook-local +.PHONY : dist-hook-local diff --git a/docs/tmpl/freetype-fonts.sgml b/docs/tmpl/freetype-fonts.sgml index e535f153..1847ec0d 100644 --- a/docs/tmpl/freetype-fonts.sgml +++ b/docs/tmpl/freetype-fonts.sgml @@ -138,6 +138,26 @@ FreeType Fonts and Rendering @Returns: +<!-- ##### FUNCTION pango_ft2_get_coverage ##### --> +<para> + +</para> + +@font: +@lang: +@Returns: + + +<!-- ##### FUNCTION pango_ft2_get_face ##### --> +<para> + +</para> + +@font: +@subfont_index: +@Returns: + + <!-- ##### STRUCT PangoFT2FontCache ##### --> <para> diff --git a/docs/tmpl/layout.sgml b/docs/tmpl/layout.sgml index 4cb4c9a9..5628e4bc 100644 --- a/docs/tmpl/layout.sgml +++ b/docs/tmpl/layout.sgml @@ -48,6 +48,12 @@ fields. </para> +<!-- ##### STRUCT PangoLayoutIter ##### --> +<para> + +</para> + + <!-- ##### FUNCTION pango_layout_new ##### --> <para> @@ -57,6 +63,15 @@ fields. @Returns: +<!-- ##### FUNCTION pango_layout_copy ##### --> +<para> + +</para> + +@src: +@Returns: + + <!-- ##### FUNCTION pango_layout_get_context ##### --> <para> @@ -84,6 +99,37 @@ fields. @length: +<!-- ##### FUNCTION pango_layout_get_text ##### --> +<para> + +</para> + +@layout: +@Returns: + + +<!-- ##### FUNCTION pango_layout_set_markup ##### --> +<para> + +</para> + +@layout: +@markup: +@length: + + +<!-- ##### FUNCTION pango_layout_set_markup_with_accel ##### --> +<para> + +</para> + +@layout: +@markup: +@length: +@accel_marker: +@accel_char: + + <!-- ##### FUNCTION pango_layout_set_attributes ##### --> <para> @@ -93,6 +139,15 @@ fields. @attrs: +<!-- ##### FUNCTION pango_layout_get_attributes ##### --> +<para> + +</para> + +@layout: +@Returns: + + <!-- ##### FUNCTION pango_layout_set_font_description ##### --> <para> @@ -120,6 +175,32 @@ fields. @Returns: +<!-- ##### FUNCTION pango_layout_set_wrap ##### --> +<para> + +</para> + +@layout: +@wrap: + + +<!-- ##### FUNCTION pango_layout_get_wrap ##### --> +<para> + +</para> + +@layout: +@Returns: + + +<!-- ##### ENUM PangoWrapMode ##### --> +<para> + +</para> + +@PANGO_WRAP_WORD: +@PANGO_WRAP_CHAR: + <!-- ##### FUNCTION pango_layout_set_indent ##### --> <para> @@ -222,6 +303,13 @@ for partial lines. @PANGO_ALIGN_CENTER: Center the line within the available space @PANGO_ALIGN_RIGHT: Put all available space on the left +<!-- ##### MACRO PANGO_TYPE_ALIGNMENT ##### --> +<para> + +</para> + + + <!-- ##### FUNCTION pango_layout_get_log_attrs ##### --> <para> @@ -347,6 +435,163 @@ for partial lines. @Returns: +<!-- ##### FUNCTION pango_layout_get_iter ##### --> +<para> + +</para> + +@layout: +@Returns: + + +<!-- ##### FUNCTION pango_layout_iter_free ##### --> +<para> + +</para> + +@iter: + + +<!-- ##### FUNCTION pango_layout_iter_next_run ##### --> +<para> + +</para> + +@iter: +@Returns: + + +<!-- ##### FUNCTION pango_layout_iter_next_char ##### --> +<para> + +</para> + +@iter: +@Returns: + + +<!-- ##### FUNCTION pango_layout_iter_next_cluster ##### --> +<para> + +</para> + +@iter: +@Returns: + + +<!-- ##### FUNCTION pango_layout_iter_next_line ##### --> +<para> + +</para> + +@iter: +@Returns: + + +<!-- ##### FUNCTION pango_layout_iter_at_last_line ##### --> +<para> + +</para> + +@iter: +@Returns: + + +<!-- ##### FUNCTION pango_layout_iter_get_index ##### --> +<para> + +</para> + +@iter: +@Returns: + + +<!-- ##### FUNCTION pango_layout_iter_get_baseline ##### --> +<para> + +</para> + +@iter: +@Returns: + + +<!-- ##### FUNCTION pango_layout_iter_get_run ##### --> +<para> + +</para> + +@iter: +@Returns: + + +<!-- ##### FUNCTION pango_layout_iter_get_line ##### --> +<para> + +</para> + +@iter: +@Returns: + + +<!-- ##### FUNCTION pango_layout_iter_get_char_extents ##### --> +<para> + +</para> + +@iter: +@logical_rect: + + +<!-- ##### FUNCTION pango_layout_iter_get_cluster_extents ##### --> +<para> + +</para> + +@iter: +@ink_rect: +@logical_rect: + + +<!-- ##### FUNCTION pango_layout_iter_get_run_extents ##### --> +<para> + +</para> + +@iter: +@ink_rect: +@logical_rect: + + +<!-- ##### FUNCTION pango_layout_iter_get_line_yrange ##### --> +<para> + +</para> + +@iter: +@y0: +@y1: + + +<!-- ##### FUNCTION pango_layout_iter_get_line_extents ##### --> +<para> + +</para> + +@iter: +@ink_rect: +@logical_rect: + + +<!-- ##### FUNCTION pango_layout_iter_get_layout_extents ##### --> +<para> + +</para> + +@iter: +@ink_rect: +@logical_rect: + + <!-- ##### STRUCT PangoLayoutLine ##### --> <para> The #PangoLayoutLine structure represents one of the lines resulting @@ -361,6 +606,7 @@ code specific to each rendering system. </para> @layout: the parent layout for this line. +@start_index: @length: the length of the line in bytes. @runs: a list containing the runs of the line in visual order. @@ -430,7 +676,6 @@ a #PangoLayoutLine. @x_pos: @index: @trailing: -<!-- # Unused Parameters # --> @Returns: diff --git a/docs/tmpl/modules.sgml b/docs/tmpl/modules.sgml index 456de220..8fa14679 100644 --- a/docs/tmpl/modules.sgml +++ b/docs/tmpl/modules.sgml @@ -14,6 +14,15 @@ modules </para> +<!-- ##### STRUCT PangoIncludedModule ##### --> +<para> + +</para> + +@list: +@load: +@unload: + <!-- ##### STRUCT PangoMap ##### --> <para> @@ -59,3 +68,11 @@ modules @Returns: +<!-- ##### FUNCTION pango_module_register ##### --> +<para> + +</para> + +@module: + + diff --git a/docs/tmpl/opentype.sgml b/docs/tmpl/opentype.sgml index 271aafe9..e7aeb733 100644 --- a/docs/tmpl/opentype.sgml +++ b/docs/tmpl/opentype.sgml @@ -14,3 +14,190 @@ OpenType Font Handling </para> +<!-- ##### TYPEDEF PangoOTTag ##### --> +<para> + +</para> + + +<!-- ##### STRUCT PangoOTInfo ##### --> +<para> + +</para> + + +<!-- ##### STRUCT PangoOTRuleset ##### --> +<para> + +</para> + + +<!-- ##### ENUM PangoOTTableType ##### --> +<para> + +</para> + +@PANGO_OT_TABLE_GSUB: +@PANGO_OT_TABLE_GPOS: + +<!-- ##### FUNCTION pango_ot_info_new ##### --> +<para> + +</para> + +@face: +@Returns: + + +<!-- ##### FUNCTION pango_ot_info_find_script ##### --> +<para> + +</para> + +@info: +@table_type: +@script_tag: +@script_index: +@Returns: + + +<!-- ##### FUNCTION pango_ot_info_find_language ##### --> +<para> + +</para> + +@info: +@table_type: +@script_index: +@language_tag: +@language_index: +@required_feature_index: +@Returns: + + +<!-- ##### FUNCTION pango_ot_info_find_feature ##### --> +<para> + +</para> + +@info: +@table_type: +@feature_tag: +@script_index: +@language_index: +@feature_index: +@Returns: + + +<!-- ##### FUNCTION pango_ot_info_list_scripts ##### --> +<para> + +</para> + +@info: +@table_type: +@Returns: + + +<!-- ##### FUNCTION pango_ot_info_list_languages ##### --> +<para> + +</para> + +@info: +@table_type: +@script_index: +@language_tag: +@Returns: + + +<!-- ##### FUNCTION pango_ot_info_list_features ##### --> +<para> + +</para> + +@info: +@table_type: +@tag: +@script_index: +@language_index: +@Returns: + + +<!-- ##### USER_FUNCTION PangoOTGlyphLoader ##### --> +<para> + +</para> + +@face: +@glyphIndex: +@loadFlags: +@data: +@Returns: + + +<!-- ##### USER_FUNCTION PangoOTAlternateFunc ##### --> +<para> + +</para> + +@pos: +@glyphID: +@num_alternates: +@alternates: +@data: +@Returns: + + +<!-- ##### FUNCTION pango_ot_ruleset_new ##### --> +<para> + +</para> + +@info: +@Returns: + + +<!-- ##### FUNCTION pango_ot_ruleset_set_glyph_loader ##### --> +<para> + +</para> + +@ruleset: +@func: +@data: +@notify: + + +<!-- ##### FUNCTION pango_ot_ruleset_set_alternate_func ##### --> +<para> + +</para> + +@ruleset: +@func: +@data: +@notify: + + +<!-- ##### FUNCTION pango_ot_ruleset_add_feature ##### --> +<para> + +</para> + +@ruleset: +@table_type: +@feature_index: +@property_bit: + + +<!-- ##### FUNCTION pango_ot_ruleset_shape ##### --> +<para> + +</para> + +@ruleset: +@glyphs: +@properties: + + diff --git a/docs/tmpl/pango-indic.sgml b/docs/tmpl/pango-indic.sgml index cddc77f9..24c5fae3 100644 --- a/docs/tmpl/pango-indic.sgml +++ b/docs/tmpl/pango-indic.sgml @@ -14,3 +14,75 @@ Indic Engine Support </para> +<!-- ##### MACRO ZERO_WIDTH_NON_JOINER ##### --> +<para> + +</para> + + + +<!-- ##### MACRO ZERO_WIDTH_JOINER ##### --> +<para> + +</para> + + + +<!-- ##### STRUCT PangoIndicScript ##### --> +<para> + +</para> + +@name: +@is_prefixing_vowel: +@is_vowel_sign: +@vowel_sign_to_matra: +@is_vowel_half: +@vowel_split: + +<!-- ##### 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/tab-stops.sgml b/docs/tmpl/tab-stops.sgml index aa13ced2..5f929876 100644 --- a/docs/tmpl/tab-stops.sgml +++ b/docs/tmpl/tab-stops.sgml @@ -27,6 +27,13 @@ Tab Stops @PANGO_TAB_LEFT: +<!-- ##### MACRO PANGO_TYPE_TAB_ALIGN ##### --> +<para> + +</para> + + + <!-- ##### FUNCTION pango_tab_array_new ##### --> <para> diff --git a/docs/tmpl/text-attributes.sgml b/docs/tmpl/text-attributes.sgml index d702e1ec..9a81d21c 100644 --- a/docs/tmpl/text-attributes.sgml +++ b/docs/tmpl/text-attributes.sgml @@ -27,6 +27,7 @@ values are given below. The type of structure used to store the attribute is listed in parentheses after the description. </para> +@PANGO_ATTR_INVALID: @PANGO_ATTR_LANG: language tag (#PangoAttrString) @PANGO_ATTR_FAMILY: font family name list (#PangoAttrString) @PANGO_ATTR_STYLE: font slant style (#PangoAttrInt) @@ -41,6 +42,14 @@ attribute is listed in parentheses after the description. @PANGO_ATTR_STRIKETHROUGH: whether the text is struck-through (#PangoAttrInt) @PANGO_ATTR_RISE: baseline displacement (#PangoAttrInt) @PANGO_ATTR_SHAPE: +@PANGO_ATTR_SCALE: + +<!-- ##### MACRO PANGO_TYPE_ATTR_TYPE ##### --> +<para> + +</para> + + <!-- ##### STRUCT PangoAttrClass ##### --> <para> @@ -53,7 +62,7 @@ provided for #PangoAttribute. @type: the type ID for this attribute @copy: function to duplicate an attribute of this type (see pango_attribute_copy()) @destroy: function to free an attribute of this type (see pango_attribute_destroy()) -@compare: +@equal: <!-- ##### STRUCT PangoAttribute ##### --> <para> @@ -85,9 +94,7 @@ are colors. </para> @attr: the common portion of the attribute -@red: the red value, in the range 0 to 65535 -@green: the green value -@blue: the blue value +@color: <!-- ##### STRUCT PangoAttrInt ##### --> <para> @@ -98,6 +105,14 @@ a integer or enumeration value. @attr: the common portion of the attribute @value: the value of the attribute +<!-- ##### STRUCT PangoAttrFloat ##### --> +<para> + +</para> + +@attr: +@value: + <!-- ##### STRUCT PangoAttrFontDesc ##### --> <para> The #PangoAttrFontDesc structure is used to store an attribute that @@ -116,6 +131,21 @@ sets all aspects of the font description at once. @ink_rect: @logical_rect: +<!-- ##### FUNCTION pango_parse_markup ##### --> +<para> + +</para> + +@markup_text: +@length: +@accel_marker: +@attr_list: +@text: +@accel_char: +@error: +@Returns: + + <!-- ##### FUNCTION pango_attr_type_register ##### --> <para> @@ -134,6 +164,16 @@ sets all aspects of the font description at once. @Returns: +<!-- ##### FUNCTION pango_attribute_equal ##### --> +<para> + +</para> + +@attr1: +@attr2: +@Returns: + + <!-- ##### FUNCTION pango_attribute_destroy ##### --> <para> @@ -264,6 +304,15 @@ sets all aspects of the font description at once. @Returns: +<!-- ##### FUNCTION pango_attr_scale_new ##### --> +<para> + +</para> + +@scale_factor: +@Returns: + + <!-- ##### ENUM PangoUnderline ##### --> <para> the #PangoUnderline enumeration is used to specify @@ -281,6 +330,13 @@ of underlining. accelerators. %PANGO_UNDERLINE_SINGLE should be used for extended portions of text. +<!-- ##### MACRO PANGO_TYPE_UNDERLINE ##### --> +<para> + +</para> + + + <!-- ##### FUNCTION pango_attr_rise_new ##### --> <para> diff --git a/docs/tmpl/x-fonts.sgml b/docs/tmpl/x-fonts.sgml index ecbc147f..619fa9f9 100644 --- a/docs/tmpl/x-fonts.sgml +++ b/docs/tmpl/x-fonts.sgml @@ -129,6 +129,42 @@ glyph index. @Returns: +<!-- ##### FUNCTION pango_x_find_first_subfont ##### --> +<para> + +</para> + +@font: +@charsets: +@n_charsets: +@rfont: +@Returns: + + +<!-- ##### FUNCTION pango_x_apply_ligatures ##### --> +<para> + +</para> + +@font: +@subfont: +@glyphs: +@n_glyphs: +@clusters: +@Returns: + + +<!-- ##### FUNCTION pango_x_fallback_shape ##### --> +<para> + +</para> + +@font: +@glyphs: +@text: +@n_chars: + + <!-- ##### STRUCT PangoXFontCache ##### --> <para> diff --git a/docs/tmpl/xft-fonts.sgml b/docs/tmpl/xft-fonts.sgml index d742714c..1c8d52f9 100644 --- a/docs/tmpl/xft-fonts.sgml +++ b/docs/tmpl/xft-fonts.sgml @@ -14,3 +14,95 @@ Xft Fonts and Rendering </para> +<!-- ##### MACRO PANGO_RENDER_TYPE_XFT ##### --> +<para> + +</para> + + + +<!-- ##### STRUCT PangoXftFont ##### --> +<para> + +</para> + +@parent_instance: +@xft_font: +@mini_font: +@fontmap: +@description: +@ot_info: +@mini_width: +@mini_height: +@mini_pad: +@in_cache: + +<!-- ##### FUNCTION pango_xft_get_context ##### --> +<para> + +</para> + +@display: +@screen: +@Returns: + + +<!-- ##### FUNCTION pango_xft_render ##### --> +<para> + +</para> + +@draw: +@color: +@font: +@glyphs: +@x: +@y: + + +<!-- ##### FUNCTION pango_xft_font_get_font ##### --> +<para> + +</para> + +@font: +@Returns: + + +<!-- ##### FUNCTION pango_xft_font_get_face ##### --> +<para> + +</para> + +@font: +@Returns: + + +<!-- ##### FUNCTION pango_xft_font_get_ot_info ##### --> +<para> + +</para> + +@font: +@Returns: + + +<!-- ##### FUNCTION pango_xft_font_get_display ##### --> +<para> + +</para> + +@font: +@Returns: + + +<!-- ##### FUNCTION pango_xft_font_get_unknown_glyph ##### --> +<para> + +</para> + +@font: +@wc: +@Returns: + + diff --git a/pango/pangox.c b/pango/pangox.c index bbe734c8..ab042efa 100644 --- a/pango/pangox.c +++ b/pango/pangox.c @@ -200,7 +200,7 @@ pango_x_find_subfont (PangoFont *font, if (subfont_index < 1 || subfont_index > xfont->n_subfonts) { - g_warning ("Error parsing ligature info: Invalid subfont %d", subfont_index); + g_warning ("Invalid subfont %d", subfont_index); return NULL; } @@ -217,7 +217,7 @@ pango_x_make_font_struct (PangoFont *font, PangoXSubfontInfo *info) info->font_struct = pango_x_font_cache_load (cache, info->xlfd); if (!info->font_struct) - g_warning ("Error parsing ligature info: Cannot load font for XLFD '%s\n", info->xlfd); + g_warning ("Cannot load font for XLFD '%s\n", info->xlfd); info->is_1byte = (info->font_struct->min_byte1 == 0 && info->font_struct->max_byte1 == 0); info->range_byte1 = info->font_struct->max_byte1 - info->font_struct->min_byte1 + 1; @@ -597,7 +597,7 @@ get_font_metrics_from_subfonts (PangoFont *font, n_avg_widths += 1; } else - g_warning ("Error parsing ligature info: Invalid subfont %d in get_font_metrics_from_subfonts", GPOINTER_TO_UINT (tmp_list->data)); + g_warning ("Invalid subfont %d in get_font_metrics_from_subfonts", GPOINTER_TO_UINT (tmp_list->data)); tmp_list = tmp_list->next; } @@ -1060,7 +1060,7 @@ pango_x_font_subfont_xlfd (PangoFont *font, subfont = pango_x_find_subfont (font, subfont_id); if (!subfont) { - g_warning ("Error parsing ligature info: pango_x_font_subfont_xlfd: Invalid subfont_id specified"); + g_warning ("pango_x_font_subfont_xlfd: Invalid subfont_id specified"); return NULL; } |