summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog4
-rw-r--r--ChangeLog.pre-1-04
-rw-r--r--ChangeLog.pre-1-104
-rw-r--r--ChangeLog.pre-1-24
-rw-r--r--ChangeLog.pre-1-44
-rw-r--r--ChangeLog.pre-1-64
-rw-r--r--ChangeLog.pre-1-84
-rw-r--r--docs/pango-docs.sgml2
-rw-r--r--docs/pango-sections.txt7
-rw-r--r--docs/tmpl/layout.sgml55
-rw-r--r--docs/tmpl/pango-unused.sgml103
-rw-r--r--docs/tmpl/text-attributes.sgml19
-rw-r--r--docs/tmpl/x-rendering.sgml2
13 files changed, 175 insertions, 41 deletions
diff --git a/ChangeLog b/ChangeLog
index aef1c05d..543ab50a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Apr 24 20:28:31 2000 Owen Taylor <otaylor@redhat.com>
+
+ * docs/**: Updates for recent API changes.
+
Mon Apr 24 18:09:29 2000 Owen Taylor <otaylor@redhat.com>
* pango/pango-layout.c (pango_layout_line_get_empty_extents): Come
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index aef1c05d..543ab50a 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,7 @@
+Mon Apr 24 20:28:31 2000 Owen Taylor <otaylor@redhat.com>
+
+ * docs/**: Updates for recent API changes.
+
Mon Apr 24 18:09:29 2000 Owen Taylor <otaylor@redhat.com>
* pango/pango-layout.c (pango_layout_line_get_empty_extents): Come
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index aef1c05d..543ab50a 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,7 @@
+Mon Apr 24 20:28:31 2000 Owen Taylor <otaylor@redhat.com>
+
+ * docs/**: Updates for recent API changes.
+
Mon Apr 24 18:09:29 2000 Owen Taylor <otaylor@redhat.com>
* pango/pango-layout.c (pango_layout_line_get_empty_extents): Come
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index aef1c05d..543ab50a 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,7 @@
+Mon Apr 24 20:28:31 2000 Owen Taylor <otaylor@redhat.com>
+
+ * docs/**: Updates for recent API changes.
+
Mon Apr 24 18:09:29 2000 Owen Taylor <otaylor@redhat.com>
* pango/pango-layout.c (pango_layout_line_get_empty_extents): Come
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index aef1c05d..543ab50a 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,7 @@
+Mon Apr 24 20:28:31 2000 Owen Taylor <otaylor@redhat.com>
+
+ * docs/**: Updates for recent API changes.
+
Mon Apr 24 18:09:29 2000 Owen Taylor <otaylor@redhat.com>
* pango/pango-layout.c (pango_layout_line_get_empty_extents): Come
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index aef1c05d..543ab50a 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,7 @@
+Mon Apr 24 20:28:31 2000 Owen Taylor <otaylor@redhat.com>
+
+ * docs/**: Updates for recent API changes.
+
Mon Apr 24 18:09:29 2000 Owen Taylor <otaylor@redhat.com>
* pango/pango-layout.c (pango_layout_line_get_empty_extents): Come
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index aef1c05d..543ab50a 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,7 @@
+Mon Apr 24 20:28:31 2000 Owen Taylor <otaylor@redhat.com>
+
+ * docs/**: Updates for recent API changes.
+
Mon Apr 24 18:09:29 2000 Owen Taylor <otaylor@redhat.com>
* pango/pango-layout.c (pango_layout_line_get_empty_extents): Come
diff --git a/docs/pango-docs.sgml b/docs/pango-docs.sgml
index 66fff619..a95ba085 100644
--- a/docs/pango-docs.sgml
+++ b/docs/pango-docs.sgml
@@ -1,4 +1,4 @@
-<!doctype book PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
+<!doctype book PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
<!entity pango-main SYSTEM "sgml/main.sgml">
<!entity pango-glyphs SYSTEM "sgml/glyphs.sgml">
<!entity pango-fonts SYSTEM "sgml/fonts.sgml">
diff --git a/docs/pango-sections.txt b/docs/pango-sections.txt
index d9ade841..d7a1b673 100644
--- a/docs/pango-sections.txt
+++ b/docs/pango-sections.txt
@@ -125,6 +125,7 @@ PangoAttribute
PangoAttrString
PangoAttrColor
PangoAttrInt
+PangoAttrFontDesc
pango_attr_type_register
pango_attribute_copy
pango_attribute_compare
@@ -137,6 +138,7 @@ pango_attr_variant_new
pango_attr_stretch_new
pango_attr_weight_new
pango_attr_size_new
+pango_attr_font_desc_new
pango_attr_foreground_new
pango_attr_background_new
pango_attr_strikethrough_new
@@ -176,6 +178,8 @@ pango_layout_set_width
pango_layout_get_width
pango_layout_set_indent
pango_layout_get_indent
+pango_layout_get_spacing
+pango_layout_set_spacing
pango_layout_set_justify
pango_layout_get_justify
pango_layout_set_alignment
@@ -186,6 +190,8 @@ pango_layout_get_log_attrs
pango_layout_xy_to_index
pango_layout_index_to_pos
+pango_layout_get_cursor_pos
+pango_layout_move_cursor_visually
pango_layout_get_extents
pango_layout_get_line_count
@@ -201,6 +207,7 @@ pango_layout_line_unref
pango_layout_line_get_extents
pango_layout_line_index_to_x
pango_layout_line_x_to_index
+pango_layout_line_get_x_ranges
</SECTION>
<SECTION>
diff --git a/docs/tmpl/layout.sgml b/docs/tmpl/layout.sgml
index 66a8dae3..b0ee815f 100644
--- a/docs/tmpl/layout.sgml
+++ b/docs/tmpl/layout.sgml
@@ -145,6 +145,24 @@ fields.
@Returns:
+<!-- ##### FUNCTION pango_layout_get_spacing ##### -->
+<para>
+
+</para>
+
+@layout:
+@Returns:
+
+
+<!-- ##### FUNCTION pango_layout_set_spacing ##### -->
+<para>
+
+</para>
+
+@layout:
+@spacing:
+
+
<!-- ##### FUNCTION pango_layout_set_justify ##### -->
<para>
@@ -226,6 +244,30 @@ for partial lines.
@pos:
+<!-- ##### FUNCTION pango_layout_get_cursor_pos ##### -->
+<para>
+
+</para>
+
+@layout:
+@index:
+@strong_pos:
+@weak_pos:
+
+
+<!-- ##### FUNCTION pango_layout_move_cursor_visually ##### -->
+<para>
+
+</para>
+
+@layout:
+@old_index:
+@old_trailing:
+@direction:
+@new_index:
+@new_trailing:
+
+
<!-- ##### FUNCTION pango_layout_get_extents ##### -->
<para>
@@ -337,6 +379,19 @@ a #PangoLayoutLine.
@x_pos:
@index:
@trailing:
+<!-- # Unused Parameters # -->
@Returns:
+<!-- ##### FUNCTION pango_layout_line_get_x_ranges ##### -->
+<para>
+
+</para>
+
+@line:
+@start_index:
+@end_index:
+@ranges:
+@n_ranges:
+
+
diff --git a/docs/tmpl/pango-unused.sgml b/docs/tmpl/pango-unused.sgml
index ff507979..a2882e7d 100644
--- a/docs/tmpl/pango-unused.sgml
+++ b/docs/tmpl/pango-unused.sgml
@@ -1,32 +1,22 @@
<!-- ##### FUNCTION pango_layout_line_x_to_cp ##### -->
-<para>
-
-</para>
+=======
-@line:
-@x_pos:
-@char_pos:
-@trailing:
<!-- ##### FUNCTION pango_x_to_cp ##### -->
-<para>
+=======
-</para>
-
-@text:
-@length:
-@analysis:
-@glyphs:
-@x_pos:
-@char_pos:
-@trailing:
+@coverage:
<!-- ##### FUNCTION pango_cfont_init ##### -->
+>>>>>>> 1.8
<para>
</para>
-@font:
+@line:
+@x_pos:
+@char_pos:
+@trailing: <<<<<<< pango-unused.sgml
<!-- ##### STRUCT PangoCFont ##### -->
<para>
@@ -52,27 +42,16 @@ 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
-<row>
-<entry>#PangoCFontClass *klass;</entry>
-<entry>a pointer to the <firstterm>class structure</firstterm>
- for this font.</entry>
-</row>
-</tbody></tgroup></informaltable>
+<<<<<<< pango-unused.sgml
</para>
-@klass:
+@font:
<!-- ##### FUNCTION pango_x_xlfd_get_ranges ##### -->
-<para>
+=======
-</para>
-
-@font:
-@xlfd:
-@ranges:
-@n_ranges:
-@Returns:
<!-- ##### FUNCTION pango_context_set_size ##### -->
<para>
@@ -80,7 +59,14 @@ that may be accessed by derived classes:
</para>
@context:
-@size:
+@size: =======
+@text:
+@length:
+@analysis:
+@glyphs:
+@char_pos:
+@trailing:
+@x_pos: >>>>>>> 1.8
<!-- ##### FUNCTION pango_x_glyph_extents ##### -->
<para>
@@ -120,35 +106,64 @@ indices.
<!-- ##### SECTION ./tmpl/pango-x.sgml:Title ##### -->
X Rendering
+=======
<!-- ##### FUNCTION pango_cfont_ref ##### -->
+>>>>>>> 1.8
<para>
</para>
-@font:
+<<<<<<< pango-unused.sgml
+
+@coverage: =======
+@font: >>>>>>> 1.8
+
+<<<<<<< pango-unused.sgml
<!-- ##### 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_layout_set_first_line_width ##### -->
+>>>>>>> 1.8
<para>
</para>
+<<<<<<< pango-unused.sgml
+
+@string: =======
@layout:
-@width:
+@width: >>>>>>> 1.8
+
+<<<<<<< pango-unused.sgml
<!-- ##### FUNCTION pango_x_extents ##### -->
+>>>>>>> 1.8
<para>
</para>
+<<<<<<< pango-unused.sgml
+
+@font:
+@xlfd:
+@Returns: =======
@font:
@glyphs:
@lbearing:
@@ -157,27 +172,37 @@ X Rendering
@ascent:
@descent:
@logical_ascent:
-@logical_descent:
+@logical_descent: >>>>>>> 1.8
+
+<<<<<<< pango-unused.sgml
<!-- ##### FUNCTION pango_coverage_destroy ##### -->
<para>
+>>>>>>> 1.8
+<<<<<<< pango-unused.sgml
+=======
</para>
+>>>>>>> 1.8
+
+<<<<<<< pango-unused.sgml
-@coverage:
<!-- ##### FUNCTION pango_cp_to_x ##### -->
+>>>>>>> 1.8
<para>
</para>
+<<<<<<< pango-unused.sgml
+
@text:
@length:
@analysis:
@glyphs:
+@x_pos:
@char_pos:
@trailing:
-@x_pos:
<!-- ##### FUNCTION pango_x_list_cfonts ##### -->
<para>
diff --git a/docs/tmpl/text-attributes.sgml b/docs/tmpl/text-attributes.sgml
index 7430f77a..66f025d6 100644
--- a/docs/tmpl/text-attributes.sgml
+++ b/docs/tmpl/text-attributes.sgml
@@ -34,6 +34,7 @@ attribute is listed in parentheses after the description.
@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:
@PANGO_ATTR_FOREGROUND: foreground color (#PangoAttrColor)
@PANGO_ATTR_BACKGROUND: background color (#PangoAttrColor)
@PANGO_ATTR_UNDERLINE: whether the text has an underline (#PangoAttrInt)
@@ -96,6 +97,15 @@ a integer or enumeration value.
@attr: the common portion of the attribute
@value: the value of the attribute
+<!-- ##### STRUCT PangoAttrFontDesc ##### -->
+<para>
+The #PangoAttrFontDesc structure is used to store an attribute that
+sets all aspects of the font description at once.
+</para>
+
+@attr: the common portion of the attribute
+@desc: the font description which is the value of this attribute
+
<!-- ##### FUNCTION pango_attr_type_register ##### -->
<para>
@@ -195,6 +205,15 @@ a integer or enumeration value.
@Returns:
+<!-- ##### FUNCTION pango_attr_font_desc_new ##### -->
+<para>
+
+</para>
+
+@desc:
+@Returns:
+
+
<!-- ##### FUNCTION pango_attr_foreground_new ##### -->
<para>
diff --git a/docs/tmpl/x-rendering.sgml b/docs/tmpl/x-rendering.sgml
index 844e685e..32a83c4d 100644
--- a/docs/tmpl/x-rendering.sgml
+++ b/docs/tmpl/x-rendering.sgml
@@ -65,7 +65,7 @@ the corresponding PangoGetGCFunc. The function used here will
typically retrieve information from the context with pango_context_set_data().
</para>
-@context: the #PangoContext
+@context: the #PangoContext
@gc: the GC to free
View Lorry Controller Status