summaryrefslogtreecommitdiff
path: root/docs/tmpl
diff options
context:
space:
mode:
authorHavoc Pennington <hp@pobox.com>2000-11-01 06:46:29 +0000
committerHavoc Pennington <hp@src.gnome.org>2000-11-01 06:46:29 +0000
commitb00a32cc4f7b8783d673f31502b4ef3555486995 (patch)
tree2a035c680e76bdfa121585577de26a4796e46345 /docs/tmpl
parent717a0b958c4616753798250985558cab328a6837 (diff)
downloadpango-b00a32cc4f7b8783d673f31502b4ef3555486995.tar.gz
Add a new attribute for scaling a font; also required adding
2000-11-01 Havoc Pennington <hp@pobox.com> * pango/pango-attributes.c (pango_attr_scale_new): Add a new attribute for scaling a font; also required adding PangoAttrFloat. (pango_attr_iterator_get_font): Add PANGO_ATTR_SCALE handling. * pango/pango-utils.c (pango_parse_stretch): Take a plain string not a GString (pango_parse_weight): ditto (pango_parse_variant): ditto (pango_parse_style): ditto * pango/pangox-fontmap.c (pango_x_font_map_read_alias_file): pass GString::str instead of the GString itself to pango_parse_* * pango/pangoft2-fontmap.c (pango_ft2_insert_face): ditto * pango/pangowin32-fontmap.c (pango_win32_font_map_read_alias_file): ditto * pango/pango-layout.c (get_tab_pos): adapt to new pango_itemize() signature (pango_layout_check_lines): Raise attr list copy/creation out of the loop over paragraphs. Adapt to pango_itemize() changes. * pango/pango-context.c (pango_itemize): pass in a starting index and a cached iterator (add_engines): Easy optimization, pass in n_chars instead of recomputing it. Also, pass on the start index and cached iterator. * docs/pango-sections.txt: Add new stuff docs/pango_markup.sgml: Docs on markup format * pango/pango-layout.c (pango_layout_get_attributes): New function to retrieve the AttrList from a layout (pango_layout_set_markup): Set layout from markup (pango_layout_set_markup_with_accel): Set layout from markup including accelerator parsing. * pango/pango-attributes.h (pango_parse_markup): New function to convert a tag string to an attribute list * pango/pango-markup.c (pango_parse_markup): implement * docs/Makefile.am, docs/pango-docs.sgml, docs/pango-sections.txt, docs/pango_markup.sgml: oooooh, documentation for the above patch! * docs/tmpl/pango-unused.sgml: Remove from CVS; just causes problems, and was full of checked-in conflict markers.
Diffstat (limited to 'docs/tmpl')
-rw-r--r--docs/tmpl/layout.sgml39
-rw-r--r--docs/tmpl/main.sgml2
-rw-r--r--docs/tmpl/pango-unused.sgml541
-rw-r--r--docs/tmpl/text-attributes.sgml33
4 files changed, 70 insertions, 545 deletions
diff --git a/docs/tmpl/layout.sgml b/docs/tmpl/layout.sgml
index 9ca78964..fca9db60 100644
--- a/docs/tmpl/layout.sgml
+++ b/docs/tmpl/layout.sgml
@@ -84,6 +84,28 @@ fields.
@length:
+<!-- ##### 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 +115,15 @@ fields.
@attrs:
+<!-- ##### FUNCTION pango_layout_get_attributes ##### -->
+<para>
+
+</para>
+
+@layout:
+@Returns:
+
+
<!-- ##### FUNCTION pango_layout_set_font_description ##### -->
<para>
@@ -192,22 +223,22 @@ fields.
@Returns:
-<!-- ##### FUNCTION pango_layout_get_tabs ##### -->
+<!-- ##### FUNCTION pango_layout_set_tabs ##### -->
<para>
</para>
@layout:
-@Returns:
+@tabs:
-<!-- ##### FUNCTION pango_layout_set_tabs ##### -->
+<!-- ##### FUNCTION pango_layout_get_tabs ##### -->
<para>
</para>
@layout:
-@tabs:
+@Returns:
<!-- ##### ENUM PangoAlignment ##### -->
diff --git a/docs/tmpl/main.sgml b/docs/tmpl/main.sgml
index a8f37c15..7e5c4068 100644
--- a/docs/tmpl/main.sgml
+++ b/docs/tmpl/main.sgml
@@ -171,8 +171,10 @@ for text.
@context:
@text:
+@start_index:
@length:
@attrs:
+@cached_iter:
@Returns:
<!-- # Unused Parameters # -->
@lang_info:
diff --git a/docs/tmpl/pango-unused.sgml b/docs/tmpl/pango-unused.sgml
deleted file mode 100644
index 60f815a4..00000000
--- a/docs/tmpl/pango-unused.sgml
+++ /dev/null
@@ -1,541 +0,0 @@
-<!-- ##### MACRO PANGO_LAYOUT_GET_CLASS ##### -->
-<para>
-
-</para>
-
-@obj:
-
-<!-- ##### FUNCTION pango_layout_line_x_to_cp ##### -->
-=======
-
-
-<!-- ##### FUNCTION pango_cfont_init ##### -->
->>>>>>> 1.8
-<para>
-
-</para>
-
-@line:
-@x_pos:
-@char_pos:
-@trailing: <<<<<<< pango-unused.sgml
-
-<!-- ##### STRUCT PangoCFont ##### -->
-<para>
-The #PangoCFont structure is used to represent a single componenent
-of a font n a rendering-system-independent matter. A component of a
-font is an opaque object that makes sense only to the rendering
-system. A glyph (the #PangoGlyph structure) is stored as a #PangoCFont
-and a numeric glyph index.
-</para>
-<para>
-To create an implementation of a #PangoCFont,
-the rendering-system specific code should malloc
-a larger structure that contains a nested
-#PangoCFont, fill in the klass member of
-the nested #PangoCFont with a pointer to
-a appropriate #PangoCFontClass, then call
-pango_cfont_init() on the structure.
-</para>
-<para>
-The #PangoCFont structure contains one member
-that may be accessed by derived classes:
-
-<informaltable pgwide=1 frame="none" role="struct">
-<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*">
-<tbody>
->>>>>>> 1.8
-
-<<<<<<< pango-unused.sgml
-</para>
-
-@font:
-
-<!-- ##### FUNCTION pango_context_unref ##### -->
-<para>
-
-</para>
-
-@context:
-
-<!-- ##### FUNCTION pango_font_get_data ##### -->
-<para>
-
-</para>
-
-@font:
-@key:
-@Returns:
-
-<!-- ##### FUNCTION pango_layout_ref ##### -->
-<para>
-
-</para>
-
-@layout:
-
-<!-- ##### FUNCTION pango_attribute_register_type ##### -->
-<para>
-
-</para>
-
-@name:
-@Returns:
-
-<!-- ##### SECTION ./tmpl/pango-x.sgml:Title ##### -->
-X Rendering
-=======
-
-
-<!-- ##### FUNCTION pango_cfont_ref ##### -->
->>>>>>> 1.8
-<para>
-
-</para>
-
-<<<<<<< pango-unused.sgml
-
-@coverage: =======
-@font: >>>>>>> 1.8
-
-<<<<<<< pango-unused.sgml
-
-<!-- ##### FUNCTION pango_layout_set_first_line_width ##### -->
->>>>>>> 1.8
-<para>
-
-</para>
-
-<<<<<<< pango-unused.sgml
-
-@string: =======
-@layout:
-@width: >>>>>>> 1.8
-
-<<<<<<< pango-unused.sgml
-
-<!-- ##### FUNCTION pango_x_extents ##### -->
->>>>>>> 1.8
-<para>
-
-</para>
-
-<<<<<<< pango-unused.sgml
-
-@font:
-@xlfd:
-@Returns: =======
-@font:
-@glyphs:
-@lbearing:
-@rbearing:
-@width:
-@ascent:
-@descent:
-@logical_ascent:
-@logical_descent: >>>>>>> 1.8
-
-<<<<<<< pango-unused.sgml
-
-<!-- ##### MACRO PANGO_IS_LAYOUT_CLASS ##### -->
-<para>
-
-</para>
-
-@klass:
-
-<!-- ##### FUNCTION pango_context_get_type ##### -->
-<para>
-
-</para>
-
-@Returns:
-
-<!-- ##### FUNCTION pango_coverage_destroy ##### -->
-<para>
->>>>>>> 1.8
-
-<<<<<<< pango-unused.sgml
-=======
-</para>
->>>>>>> 1.8
-
-<<<<<<< pango-unused.sgml
-
-
-<!-- ##### FUNCTION pango_cp_to_x ##### -->
->>>>>>> 1.8
-<para>
-
-</para>
-
-<<<<<<< pango-unused.sgml
-
-@text:
-@length:
-@analysis:
-@glyphs:
-@x_pos:
-@char_pos:
-@trailing:
-
-<!-- ##### FUNCTION pango_font_init ##### -->
-<para>
-
-</para>
-
-@font:
-
-<!-- ##### FUNCTION pango_layout_get_type ##### -->
-<para>
-
-</para>
-
-@Returns:
-
-<!-- ##### FUNCTION pango_x_list_cfonts ##### -->
-<para>
-
-</para>
-
-@font:
-@charsets:
-@n_charsets:
-@xlfds:
-@n_xlfds:
-
-<!-- ##### FUNCTION pango_font_set_data ##### -->
-<para>
-
-</para>
-
-@font:
-@key:
-@data:
-@destroy_func:
-
-<!-- ##### FUNCTION g_glyph_string_set_size ##### -->
-<para>
-
-</para>
-
-@string:
-@new_len:
-
-<!-- ##### FUNCTION pango_x_find_cfont ##### -->
-<para>
-
-</para>
-
-@font:
-@charset:
-@Returns:
-
-<!-- ##### FUNCTION pango_font_map_init ##### -->
-<para>
-
-</para>
-
-@fontmap:
-
-<!-- ##### MACRO PANGO_CONTEXT ##### -->
-<para>
-
-</para>
-
-@object:
-
-<!-- ##### FUNCTION g_glyph_string_free ##### -->
-<para>
-
-</para>
-
-@string:
-
-<!-- ##### FUNCTION pango_layout_cp_to_line_x ##### -->
-<para>
-
-</para>
-
-@layout:
-@char_pos:
-@trailing:
-@line:
-@x_pos:
-
-<!-- ##### SECTION ./tmpl/pango-x.sgml:Short_Description ##### -->
-Functions for rendering and measuring glyphs on
-the X Window system.
-
-
-<!-- ##### FUNCTION pango_context_get_size ##### -->
-<para>
-
-</para>
-
-@context:
-@Returns:
-
-<!-- ##### FUNCTION pango_font_map_ref ##### -->
-<para>
-
-</para>
-
-@fontmap:
-
-<!-- ##### SECTION ./tmpl/pango-x.sgml:Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### STRUCT PangoContextClass ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION pango_font_ref ##### -->
-<para>
-
-</para>
-
-@font:
-
-<!-- ##### FUNCTION pango_x_to_cp ##### -->
-=======
-
-@coverage:
-
-<!-- ##### STRUCT PangoLayoutClass ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO PANGO_IS_LAYOUT ##### -->
-<para>
-
-</para>
-
-@object:
-
-<!-- ##### FUNCTION pango_font_map_unref ##### -->
-<para>
-
-</para>
-
-@fontmap:
-
-<!-- ##### FUNCTION pango_font_unref ##### -->
-<para>
-
-</para>
-
-@font:
-
-<!-- ##### FUNCTION pango_x_xlfd_get_ranges ##### -->
-=======
-
-
-<!-- ##### FUNCTION pango_context_set_size ##### -->
-<para>
-
-</para>
-
-@context:
-@size: =======
-@text:
-@length:
-@analysis:
-@glyphs:
-@char_pos:
-@trailing:
-@x_pos: >>>>>>> 1.8
-
-<!-- ##### FUNCTION pango_x_glyph_extents ##### -->
-<para>
-
-</para>
-
-@font:
-@glyph:
-@lbearing:
-@rbearing:
-@width:
-@ascent:
-@descent:
-@logical_ascent:
-@logical_descent:
-
-<!-- ##### TYPEDEF PangoGlyphIndex ##### -->
-<para>
-The #PangoGlyphIndex type is an integral type used to store glyph
-indices.
-</para>
-
-
-<!-- ##### SECTION ./tmpl/pango-x.sgml:See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO PANGO_LAYOUT ##### -->
-<para>
-
-</para>
-
-@object:
-
-<!-- ##### FUNCTION pango_cfont_unref ##### -->
->>>>>>> 1.8
-<para>
-
-</para>
-
-<<<<<<< pango-unused.sgml
-
-@font:
-@xlfd:
-@ranges:
-@n_ranges:
-@Returns: =======
-@font: >>>>>>> 1.8
-
-<<<<<<< pango-unused.sgml
-
-<!-- ##### FUNCTION pango_context_get_data ##### -->
-<para>
-
-</para>
-
-@context:
-@key:
-@Returns:
-
-<!-- ##### MACRO PANGO_CONTEXT_GET_CLASS ##### -->
-<para>
-
-</para>
-
-@obj:
-
-<!-- ##### MACRO PANGO_IS_CONTEXT_CLASS ##### -->
-<para>
-
-</para>
-
-@klass:
-
-<!-- ##### FUNCTION pango_x_load_xlfd ##### -->
-<para>
-
-</para>
-
-@font:
-@xlfd:
-@Returns:
-
-<!-- ##### MACRO PANGO_TYPE_LAYOUT ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### STRUCT PangoXCFont ##### -->
-<para>
-The PangoXCFont represents a component of a
-composite font for the X window system. It
-has the following publically accessible fields:
-
-<informaltable pgwide=1 frame="none" role="struct">
-<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*">
-<tbody>
-
-<row>
-<entry><structname>Display</structname> *display;</entry>
-<entry>the X Display for which this font component was created.</entry>
-</row>
-
-<row>
-<entry><structname>XFontStruct</structname> *font_struct;</entry>
-<entry>the X font information for the corresponding X font.</entry>
-</row>
-
-</tbody></tgroup></informaltable>
-</para>
-
-@display:
-@font_struct:
-
-<!-- ##### MACRO PANGO_LAYOUT_CLASS ##### -->
-<para>
-
-</para>
-
-@klass:
-
-<!-- ##### FUNCTION pango_layout_unref ##### -->
-<para>
-
-</para>
-
-@layout:
-
-<!-- ##### MACRO PANGO_CONTEXT_CLASS ##### -->
-<para>
-
-</para>
-
-@klass:
-
-<!-- ##### FUNCTION pango_context_set_data ##### -->
-<para>
-
-</para>
-
-@context:
-@key:
-@data:
-@destroy_func:
-
-<!-- ##### MACRO PANGO_TYPE_CONTEXT ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION g_glyph_string_new ##### -->
-<para>
-
-</para>
-
-@Returns:
-
-<!-- ##### FUNCTION pango_context_ref ##### -->
-<para>
-
-</para>
-
-@context:
-
-<!-- ##### STRUCT PangoCFontClass ##### -->
-<para>
-The PangoCFontClass structure contains the virtual
-functions for an implementation of a a PangoCFont.
-
-It contains the following member:
-
-<informaltable pgwide=1 frame="none" role="struct">
-<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*">
-<tbody>
-
-<row>
-<entry>void (*destroy) (#PangoFont *font);</entry>
-<entry>a function to free the font structure and associated resources.</entry>
-</row>
-</tbody></tgroup></informaltable>
-</para>
-
-
diff --git a/docs/tmpl/text-attributes.sgml b/docs/tmpl/text-attributes.sgml
index 0bf3ea3b..0682bad4 100644
--- a/docs/tmpl/text-attributes.sgml
+++ b/docs/tmpl/text-attributes.sgml
@@ -41,6 +41,7 @@ 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:
<!-- ##### STRUCT PangoAttrClass ##### -->
<para>
@@ -98,6 +99,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 +125,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>
@@ -274,6 +298,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