summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorAlex Larsson <alexl@redhat.com>2001-11-19 00:54:43 +0000
committerAlexander Larsson <alexl@src.gnome.org>2001-11-19 00:54:43 +0000
commit2d283d659416ebf06a6c5397eca41cd91aaee68f (patch)
treeef82d56f27c56be31cbbfaeb98d2c7b732c94bc4 /docs
parenta409a746f1fdec933cd1be897cc6078e6050690f (diff)
downloadpango-2d283d659416ebf06a6c5397eca41cd91aaee68f.tar.gz
Take both dpi_x and dpi_y as arguments. Doesn't currently handle dpi_x
2001-11-18 Alex Larsson <alexl@redhat.com> * pango/pangoft2.[ch] (pango_ft2_get_context): Take both dpi_x and dpi_y as arguments. Doesn't currently handle dpi_x correctly, but at least the API is in.
Diffstat (limited to 'docs')
-rw-r--r--docs/tmpl/fonts.sgml31
-rw-r--r--docs/tmpl/freetype-fonts.sgml151
-rw-r--r--docs/tmpl/layout.sgml1
-rw-r--r--docs/tmpl/main.sgml9
-rw-r--r--docs/tmpl/tab-stops.sgml3
-rw-r--r--docs/tmpl/text-attributes.sgml9
-rw-r--r--docs/tmpl/xft-fonts.sgml16
7 files changed, 25 insertions, 195 deletions
diff --git a/docs/tmpl/fonts.sgml b/docs/tmpl/fonts.sgml
index 8d5f2f0e..b5f84da5 100644
--- a/docs/tmpl/fonts.sgml
+++ b/docs/tmpl/fonts.sgml
@@ -116,10 +116,10 @@ The bits in a #PangoFontMask correspond to fields in a
</para>
@PANGO_FONT_MASK_FAMILY: the font family is specified.
-@PANGO_FONT_MASK_STYLE: the font style is specified.
+@PANGO_FONT_MASK_STYLE: the font style is specified.
@PANGO_FONT_MASK_VARIANT: the font variant is specified.
-@PANGO_FONT_MASK_WEIGHT: the font weight is specified.
-@PANGO_FONT_MASK_STRETCH: the font stretch is specified.
+@PANGO_FONT_MASK_WEIGHT: the font weight is specified.
+@PANGO_FONT_MASK_STRETCH: the font stretch is specified.
@PANGO_FONT_MASK_SIZE: the font size is specified.
<!-- ##### MACRO PANGO_TYPE_FONT_MASK ##### -->
@@ -395,13 +395,13 @@ The GObject type for #PangoFontMask.
@approximate_char_width:
@approximate_digit_width:
-
<!-- ##### MACRO PANGO_TYPE_FONT_METRICS ##### -->
<para>
The GObject type for #PangoFontMetrics.
</para>
+
<!-- ##### FUNCTION pango_font_metrics_ref ##### -->
<para>
@@ -455,7 +455,6 @@ The GObject type for #PangoFontMetrics.
@Returns:
-
<!-- ##### STRUCT PangoFont ##### -->
<para>
The #PangoFont structure is used to represent
@@ -481,12 +480,13 @@ The GObject type for #PangoFont.
</para>
+
<!-- ##### MACRO PANGO_FONT ##### -->
<para>
Casts a #GObject to a #PangoFont.
</para>
-@object: a #GObject.
+@object: a #GObject.
<!-- ##### MACRO PANGO_IS_FONT ##### -->
@@ -548,7 +548,6 @@ Returns %TRUE if @object is a #PangoFont.
@Returns:
-
<!-- ##### STRUCT PangoFontFamily ##### -->
<para>
@@ -576,7 +575,7 @@ Casts a #GObject to a #PangoFontFamily.
Returns %TRUE if @object is a #PangoFontFamily.
</para>
-@object: a #GObject.
+@object: a #GObject.
<!-- ##### FUNCTION pango_font_family_get_name ##### -->
@@ -617,7 +616,7 @@ The GObject type for #PangoFontFace.
Casts a #GObject to a #PangoFontFace.
</para>
-@object: a #GObject.
+@object: a #GObject.
<!-- ##### MACRO PANGO_IS_FONT_FACE ##### -->
@@ -625,7 +624,7 @@ Casts a #GObject to a #PangoFontFace.
Returns %TRUE if @object is a #PangoFontFace.
</para>
-@object: a #GObject.
+@object: a #GObject.
<!-- ##### FUNCTION pango_font_face_get_face_name ##### -->
@@ -663,7 +662,6 @@ The #PangoFont structure contains one member which the implementation fills in:
@parent_instance:
-
<!-- ##### MACRO PANGO_TYPE_FONT_MAP ##### -->
<para>
The GObject type for #PangoFontMap.
@@ -676,7 +674,7 @@ The GObject type for #PangoFontMap.
Casts a #GObject to a #PangoFontMap.
</para>
-@object: a #GObject.
+@object: a #GObject.
<!-- ##### MACRO PANGO_IS_FONT_MAP ##### -->
@@ -684,7 +682,7 @@ Casts a #GObject to a #PangoFontMap.
Returns %TRUE if @object is a #PangoFontMap.
</para>
-@object: a #GObject.
+@object: a #GObject.
<!-- ##### STRUCT PangoFontMapClass ##### -->
@@ -698,14 +696,14 @@ a particular #PangoFontMap implementation.
pango_font_map_load_font()
@list_families: A function to list available font families. See
pango_font_map_list_families().
-
+@load_fontset:
<!-- ##### MACRO PANGO_FONT_MAP_CLASS ##### -->
<para>
Casts a #GObject to a #PangoFontMapClass.
</para>
-@klass: a #GObject.
+@klass: a #GObject.
<!-- ##### MACRO PANGO_IS_FONT_MAP_CLASS ##### -->
@@ -723,12 +721,14 @@ Returns the type of a #PangoFontMap.
@obj: a #PangoFontMap.
+
<!-- ##### FUNCTION pango_font_map_load_font ##### -->
<para>
</para>
@fontmap:
+@context:
@desc:
@Returns:
@@ -743,4 +743,3 @@ Returns the type of a #PangoFontMap.
@n_families:
-
diff --git a/docs/tmpl/freetype-fonts.sgml b/docs/tmpl/freetype-fonts.sgml
index ff855f71..6fdd5da6 100644
--- a/docs/tmpl/freetype-fonts.sgml
+++ b/docs/tmpl/freetype-fonts.sgml
@@ -27,20 +27,11 @@ g_quark_from_string()) is used to identify the renderer in pango_find_map().
</para>
+@dpi_x:
+@dpi_y:
@Returns:
-
-
-<!-- ##### FUNCTION pango_ft2_load_font ##### -->
-<para>
-
-</para>
-
-@fontmap:
-@open_args:
-@face_indices:
-@n_fonts:
-@size:
-@Returns:
+<!-- # Unused Parameters # -->
+@dpi:
<!-- ##### FUNCTION pango_ft2_render ##### -->
@@ -77,48 +68,6 @@ g_quark_from_string()) is used to identify the renderer in pango_find_map().
@y:
-<!-- ##### TYPEDEF PangoFT2Subfont ##### -->
-<para>
-The #PangoFT2SubFont type is an integer ID that identifies one
-particular FreeType font within the fonts referenced in a #PangoFont.
-</para>
-
-
-<!-- ##### MACRO PANGO_FT2_MAKE_GLYPH ##### -->
-<para>
-Makes a glyph index from a #PangoFT2SubFont index and a index
-of a character with the corresponding FreeType font.
-</para>
-
-@subfont: a #PangoFT2Subfont index.
-@index: the index of a character within an FreeType font.
-
-
-<!-- ##### MACRO PANGO_FT2_GLYPH_SUBFONT ##### -->
-<para>
-Extracts the subfont index from a glyph index.
-</para>
-
-@glyph: a #PangoGlyphIndex.
-
-<!-- ##### MACRO PANGO_FT2_GLYPH_INDEX ##### -->
-<para>
-Extracts the character index within the FreeType font from a
-glyph index.
-</para>
-
-@glyph: a #PangoGlyphIndex.
-
-
-<!-- ##### FUNCTION pango_ft2_n_subfonts ##### -->
-<para>
-
-</para>
-
-@font:
-@Returns:
-
-
<!-- ##### FUNCTION pango_ft2_get_unknown_glyph ##### -->
<para>
@@ -139,69 +88,6 @@ glyph index.
@Returns:
-<!-- ##### FUNCTION pango_ft2_get_coverage ##### -->
-<para>
-
-</para>
-
-@font:
-@language:
-@Returns:
-
-
-<!-- ##### FUNCTION pango_ft2_get_face ##### -->
-<para>
-
-</para>
-
-@font:
-@subfont_index:
-@Returns:
-
-
-<!-- ##### STRUCT PangoFT2FontCache ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION pango_ft2_font_cache_new ##### -->
-<para>
-
-</para>
-
-@library:
-@Returns:
-
-
-<!-- ##### FUNCTION pango_ft2_font_cache_free ##### -->
-<para>
-
-</para>
-
-@cache:
-
-
-<!-- ##### FUNCTION pango_ft2_font_cache_load ##### -->
-<para>
-
-</para>
-
-@cache:
-@args:
-@face_index:
-@Returns:
-
-
-<!-- ##### FUNCTION pango_ft2_font_cache_unload ##### -->
-<para>
-
-</para>
-
-@cache:
-@face:
-
-
<!-- ##### FUNCTION pango_ft2_font_map_for_display ##### -->
<para>
@@ -217,32 +103,3 @@ glyph index.
-<!-- ##### FUNCTION pango_ft2_font_map_get_font_cache ##### -->
-<para>
-
-</para>
-
-@font_map:
-@Returns:
-
-
-<!-- ##### FUNCTION pango_ft2_font_subfont_open_args ##### -->
-<para>
-
-</para>
-
-@font:
-@subfont_id:
-@open_args:
-@face_index:
-
-
-<!-- ##### FUNCTION pango_ft2_fontmap_dump ##### -->
-<para>
-
-</para>
-
-@indent:
-@fontmap:
-
-
diff --git a/docs/tmpl/layout.sgml b/docs/tmpl/layout.sgml
index 41bae50c..b1ff736c 100644
--- a/docs/tmpl/layout.sgml
+++ b/docs/tmpl/layout.sgml
@@ -206,7 +206,6 @@ describes how to wrap the lines of a #PangoLayout to the desired width.
@PANGO_WRAP_WORD: wrap lines at word boundaries.
@PANGO_WRAP_CHAR: wrap lines at character boundaries.
-
<!-- ##### MACRO PANGO_TYPE_WRAP_MODE ##### -->
<para>
The GObject type for #PangoWrapMode.
diff --git a/docs/tmpl/main.sgml b/docs/tmpl/main.sgml
index 9db09c07..f6d30ab6 100644
--- a/docs/tmpl/main.sgml
+++ b/docs/tmpl/main.sgml
@@ -206,15 +206,6 @@ The GObject type for #PangoDirection.
@Returns:
-<!-- ##### FUNCTION pango_context_add_font_map ##### -->
-<para>
-
-</para>
-
-@context:
-@font_map:
-
-
<!-- ##### FUNCTION pango_context_get_font_description ##### -->
<para>
diff --git a/docs/tmpl/tab-stops.sgml b/docs/tmpl/tab-stops.sgml
index a6fd1b8b..fb7c29b8 100644
--- a/docs/tmpl/tab-stops.sgml
+++ b/docs/tmpl/tab-stops.sgml
@@ -33,8 +33,7 @@ The GObject type for #PangoTabArray.
A #PangoTabAlign specifies where a tab stop appears relative to the text.
</para>
-@PANGO_TAB_LEFT: the tab stop appears to the left of the text.
-
+@PANGO_TAB_LEFT: the tab stop appears to the left of the text.
<!-- ##### MACRO PANGO_TYPE_TAB_ALIGN ##### -->
<para>
diff --git a/docs/tmpl/text-attributes.sgml b/docs/tmpl/text-attributes.sgml
index 3e1f4855..d05e9f46 100644
--- a/docs/tmpl/text-attributes.sgml
+++ b/docs/tmpl/text-attributes.sgml
@@ -28,21 +28,21 @@ attribute is listed in parentheses after the description.
</para>
@PANGO_ATTR_INVALID:
-@PANGO_ATTR_LANGUAGE: language (#PangoAttrLanguage)
+@PANGO_ATTR_LANGUAGE: language (#PangoAttrLanguage)
@PANGO_ATTR_FAMILY: font family name list (#PangoAttrString)
@PANGO_ATTR_STYLE: font slant style (#PangoAttrInt)
@PANGO_ATTR_WEIGHT: font weight (#PangoAttrInt)
@PANGO_ATTR_VARIANT: font variant (normal or small caps) (#PangoAttrInt)
@PANGO_ATTR_STRETCH: font stretch (#PangoAttrInt)
@PANGO_ATTR_SIZE: font size in 1000th's of a point (#PangoAttrInt)
-@PANGO_ATTR_FONT_DESC: font description (#PangoAttrFontDesc)
+@PANGO_ATTR_FONT_DESC: font description (#PangoAttrFontDesc)
@PANGO_ATTR_FOREGROUND: foreground color (#PangoAttrColor)
@PANGO_ATTR_BACKGROUND: background color (#PangoAttrColor)
@PANGO_ATTR_UNDERLINE: whether the text has an underline (#PangoAttrInt)
@PANGO_ATTR_STRIKETHROUGH: whether the text is struck-through (#PangoAttrInt)
@PANGO_ATTR_RISE: baseline displacement (#PangoAttrInt)
@PANGO_ATTR_SHAPE: shape (#PangoAttrShape)
-@PANGO_ATTR_SCALE: font size scale factor (#PangoAttrScale)
+@PANGO_ATTR_SCALE: font size scale factor (#PangoAttrScale)
<!-- ##### MACRO PANGO_TYPE_ATTR_TYPE ##### -->
<para>
@@ -139,7 +139,7 @@ impose shape restrictions.
</para>
@attr: the common portion of the attribute
-@ink_rect: the ink rectangle to restrict to
+@ink_rect: the ink rectangle to restrict to
@logical_rect: the logical rectangle to restrict to
<!-- ##### FUNCTION pango_parse_markup ##### -->
@@ -488,6 +488,7 @@ Returns a RFC-3066 format string representing the given language tag.
@language: a language tag.
@Returns: a string representing the language tag.
+
<!-- ##### FUNCTION pango_language_matches ##### -->
<para>
diff --git a/docs/tmpl/xft-fonts.sgml b/docs/tmpl/xft-fonts.sgml
index aee519a7..76f40355 100644
--- a/docs/tmpl/xft-fonts.sgml
+++ b/docs/tmpl/xft-fonts.sgml
@@ -22,22 +22,6 @@ g_quark_from_string()) is used to identify the renderer in pango_find_map().
-<!-- ##### 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>