Update.

Mon Apr 16 14:26:54 2001  Owen Taylor  <otaylor@redhat.com>

        * docs/pango-sections.txt: Update.

        * docs/Makefile.am (EXTRA_DIST): Update to the latest
        version.

11 files changed, 185 insertions, 23 deletions

diff --git a/ChangeLog b/ChangeLog
index 60092266..7ababaa9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Apr 16 14:26:54 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* docs/pango-sections.txt: Update.
+
+	* docs/Makefile.am (EXTRA_DIST): Update to the latest
+	version.
+
 2001-04-14  Hans Breuer  <hans@breuer.org>
 
 	* pango/pangowin32-fontmap.c : instead of simply adding one
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 60092266..7ababaa9 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,10 @@
+Mon Apr 16 14:26:54 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* docs/pango-sections.txt: Update.
+
+	* docs/Makefile.am (EXTRA_DIST): Update to the latest
+	version.
+
 2001-04-14  Hans Breuer  <hans@breuer.org>
 
 	* pango/pangowin32-fontmap.c : instead of simply adding one
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 60092266..7ababaa9 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,10 @@
+Mon Apr 16 14:26:54 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* docs/pango-sections.txt: Update.
+
+	* docs/Makefile.am (EXTRA_DIST): Update to the latest
+	version.
+
 2001-04-14  Hans Breuer  <hans@breuer.org>
 
 	* pango/pangowin32-fontmap.c : instead of simply adding one
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 60092266..7ababaa9 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,10 @@
+Mon Apr 16 14:26:54 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* docs/pango-sections.txt: Update.
+
+	* docs/Makefile.am (EXTRA_DIST): Update to the latest
+	version.
+
 2001-04-14  Hans Breuer  <hans@breuer.org>
 
 	* pango/pangowin32-fontmap.c : instead of simply adding one
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 60092266..7ababaa9 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,10 @@
+Mon Apr 16 14:26:54 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* docs/pango-sections.txt: Update.
+
+	* docs/Makefile.am (EXTRA_DIST): Update to the latest
+	version.
+
 2001-04-14  Hans Breuer  <hans@breuer.org>
 
 	* pango/pangowin32-fontmap.c : instead of simply adding one
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 60092266..7ababaa9 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,10 @@
+Mon Apr 16 14:26:54 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* docs/pango-sections.txt: Update.
+
+	* docs/Makefile.am (EXTRA_DIST): Update to the latest
+	version.
+
 2001-04-14  Hans Breuer  <hans@breuer.org>
 
 	* pango/pangowin32-fontmap.c : instead of simply adding one
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 60092266..7ababaa9 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,10 @@
+Mon Apr 16 14:26:54 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* docs/pango-sections.txt: Update.
+
+	* docs/Makefile.am (EXTRA_DIST): Update to the latest
+	version.
+
 2001-04-14  Hans Breuer  <hans@breuer.org>
 
 	* pango/pangowin32-fontmap.c : instead of simply adding one
diff --git a/docs/Makefile.am b/docs/Makefile.am
index baee93fa..d2d952e1 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -94,14 +94,14 @@ all-local: html-build.stamp
 
 scan-build.stamp: $(HFILE_GLOB)
 	@echo '*** Scanning header files ***'
-	cd $(srcdir) && ( \
-	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) ; \
+	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \
+	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
 	else \
+	    cd $(srcdir) ; \
 	    for i in $(SCANOBJ_FILES) ; do \
                test -f $$i || touch $$i ; \
 	    done \
-	fi )
+	fi
 	cd $(srcdir) && \
 	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
 	touch scan-build.stamp
@@ -181,11 +181,12 @@ dist-hook: dist-check-gtkdoc dist-hook-local
 	mkdir $(distdir)/html
 	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
 	-cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
-	-cp $(srcdir)/sgml/*.bottom $(srcdir)/sgml/*.top $(distdir)/sgml
 	-cp $(srcdir)/html/index.sgml $(distdir)/html
 	-cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
-	for i in $(HTML_IMAGES) ; do          \
+
+	images=$(HTML_IMAGES) ;    	      \
+	for i in $$images ; do		      \
 	  cp $(srcdir)/$$i $(distdir)/html ;  \
-        done
+	done
 
 .PHONY : dist-hook-local
diff --git a/docs/pango-sections.txt b/docs/pango-sections.txt
index b5e049db..4e99aaa0 100644
--- a/docs/pango-sections.txt
+++ b/docs/pango-sections.txt
@@ -185,13 +185,25 @@ pango_attr_foreground_new
 pango_attr_background_new
 pango_attr_strikethrough_new
 pango_attr_underline_new
-pango_attr_shape_new
-pango_attr_scale_new
 PangoUnderline
 PANGO_TYPE_UNDERLINE
+pango_attr_shape_new
+pango_attr_scale_new
+PANGO_SCALE_XX_SMALL
+PANGO_SCALE_X_SMALL
+PANGO_SCALE_SMALL
+PANGO_SCALE_MEDIUM
+PANGO_SCALE_LARGE
+PANGO_SCALE_X_LARGE
+PANGO_SCALE_XX_LARGE
 pango_attr_rise_new
+PangoColor
+PANGO_TYPE_COLOR
+pango_color_free
+pango_color_copy
 <SUBSECTION>
 PangoAttrList
+PANGO_TYPE_ATTR_LIST
 pango_attr_list_new
 pango_attr_list_ref
 pango_attr_list_unref
@@ -209,7 +221,9 @@ pango_attr_iterator_get
 pango_attr_iterator_get_font
 pango_attr_iterator_destroy
 <SUBSECTION Private>
+pango_attr_list_get_type
 pango_attr_type_get_type
+pango_color_get_type
 pango_underline_get_type
 </SECTION>
 
@@ -257,6 +271,7 @@ pango_layout_get_width
 pango_layout_set_wrap
 pango_layout_get_wrap
 PangoWrapMode
+PANGO_TYPE_WRAP_MODE
 pango_layout_set_indent
 pango_layout_get_indent
 pango_layout_get_spacing
@@ -324,6 +339,7 @@ PANGO_IS_LAYOUT
 PANGO_LAYOUT_CLASS
 PANGO_IS_LAYOUT_CLASS
 PANGO_LAYOUT_GET_CLASS
+pango_wrap_mode_get_type
 pango_alignment_get_type
 </SECTION>
 
diff --git a/docs/tmpl/layout.sgml b/docs/tmpl/layout.sgml
index 5628e4bc..61b3a37f 100644
--- a/docs/tmpl/layout.sgml
+++ b/docs/tmpl/layout.sgml
@@ -201,6 +201,13 @@ fields.
 @PANGO_WRAP_WORD: 
 @PANGO_WRAP_CHAR: 
 
+<!-- ##### MACRO PANGO_TYPE_WRAP_MODE ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### FUNCTION pango_layout_set_indent ##### -->
 <para>
 
diff --git a/docs/tmpl/text-attributes.sgml b/docs/tmpl/text-attributes.sgml
index 9a81d21c..22eb7d99 100644
--- a/docs/tmpl/text-attributes.sgml
+++ b/docs/tmpl/text-attributes.sgml
@@ -294,6 +294,30 @@ sets all aspects of the font description at once.
 @Returns: 
 
 
+<!-- ##### ENUM PangoUnderline ##### -->
+<para>
+the #PangoUnderline enumeration is used to specify
+whether text should be underlined, and if so, the type
+of underlining.
+</para>
+
+@PANGO_UNDERLINE_NONE: no underline should be drawn.
+@PANGO_UNDERLINE_SINGLE: a single underline should be drawn.
+@PANGO_UNDERLINE_DOUBLE: a double underline should be drawn.
+@PANGO_UNDERLINE_LOW: a single underline should be drawn at a position
+                      beneath the ink extents of the text being
+                      underlined. This should be used only for underlining
+                      single characters, such as for keyboard
+                      accelerators. %PANGO_UNDERLINE_SINGLE should
+                      be used for extended portions of text.
+
+<!-- ##### MACRO PANGO_TYPE_UNDERLINE ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### FUNCTION pango_attr_shape_new ##### -->
 <para>
 
@@ -313,24 +337,49 @@ sets all aspects of the font description at once.
 @Returns: 
 
 
-<!-- ##### ENUM PangoUnderline ##### -->
+<!-- ##### MACRO PANGO_SCALE_XX_SMALL ##### -->
 <para>
-the #PangoUnderline enumeration is used to specify
-whether text should be underlined, and if so, the type
-of underlining.
+
 </para>
 
-@PANGO_UNDERLINE_NONE: no underline should be drawn.
-@PANGO_UNDERLINE_SINGLE: a single underline should be drawn.
-@PANGO_UNDERLINE_DOUBLE: a double underline should be drawn.
-@PANGO_UNDERLINE_LOW: a single underline should be drawn at a position
-                      beneath the ink extents of the text being
-                      underlined. This should be used only for underlining
-                      single characters, such as for keyboard
-                      accelerators. %PANGO_UNDERLINE_SINGLE should
-                      be used for extended portions of text.
 
-<!-- ##### MACRO PANGO_TYPE_UNDERLINE ##### -->
+
+<!-- ##### MACRO PANGO_SCALE_X_SMALL ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO PANGO_SCALE_SMALL ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO PANGO_SCALE_MEDIUM ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO PANGO_SCALE_LARGE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO PANGO_SCALE_X_LARGE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO PANGO_SCALE_XX_LARGE ##### -->
 <para>
 
 </para>
@@ -346,6 +395,39 @@ of underlining.
 @Returns: 
 
 
+<!-- ##### STRUCT PangoColor ##### -->
+<para>
+
+</para>
+
+@red: 
+@green: 
+@blue: 
+
+<!-- ##### MACRO PANGO_TYPE_COLOR ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION pango_color_free ##### -->
+<para>
+
+</para>
+
+@color: 
+
+
+<!-- ##### FUNCTION pango_color_copy ##### -->
+<para>
+
+</para>
+
+@src: 
+@Returns: 
+
+
 <!-- ##### STRUCT PangoAttrList ##### -->
 <para>
 The #PangoAttrList structure represents a list of attributes
@@ -362,6 +444,13 @@ for more than one paragraph of text.
 </para>
 
 
+<!-- ##### MACRO PANGO_TYPE_ATTR_LIST ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### FUNCTION pango_attr_list_new ##### -->
 <para>