summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/pango-docs.sgml5
-rw-r--r--docs/pango-sections.txt36
-rw-r--r--pango/fonts.c2
-rw-r--r--pango/pango-attributes.c2
-rw-r--r--pango/pango-context.c11
-rw-r--r--pango/shape.c2
6 files changed, 41 insertions, 17 deletions
diff --git a/docs/pango-docs.sgml b/docs/pango-docs.sgml
index 7c597542..1b132d43 100644
--- a/docs/pango-docs.sgml
+++ b/docs/pango-docs.sgml
@@ -19,6 +19,7 @@
<title>Basic Pango Interfaces</title>
<xi:include href="xml/main.xml"/>
<xi:include href="xml/fonts.xml"/>
+ <xi:include href="xml/glyphs.xml"/>
<xi:include href="xml/text-attributes.xml"/>
<xi:include href="xml/markup.xml"/>
<xi:include href="xml/layout.xml"/>
@@ -38,13 +39,13 @@
<chapter id="lowlevel">
<title>Low Level Functionality</title>
- <xi:include href="xml/glyphs.xml"/>
+ <xi:include href="xml/context.xml"/>
<xi:include href="xml/tab-stops.xml"/>
+ <xi:include href="xml/coverage-maps.xml"/>
<xi:include href="xml/pango-renderer.xml"/>
<xi:include href="xml/pangofc-fontmap.xml"/>
<xi:include href="xml/pangofc-font.xml"/>
<xi:include href="xml/pangofc-decoder.xml"/>
- <xi:include href="xml/coverage-maps.xml"/>
<xi:include href="xml/utils.xml"/>
<xi:include href="xml/pango-version.xml"/>
</chapter>
diff --git a/docs/pango-sections.txt b/docs/pango-sections.txt
index 9bf20619..e20c917a 100644
--- a/docs/pango-sections.txt
+++ b/docs/pango-sections.txt
@@ -2,12 +2,12 @@
<TITLE>Text Processing</TITLE>
<FILE>main</FILE>
<SUBSECTION>
-PangoContext
PangoItem
PangoAnalysis
PANGO_ANALYSIS_FLAG_CENTERED_BASELINE
PANGO_ANALYSIS_FLAG_IS_ELLIPSIS
PANGO_TYPE_DIRECTION
+
<SUBSECTION>
pango_itemize
pango_itemize_with_base_dir
@@ -17,7 +17,29 @@ pango_item_new
pango_item_split
pango_item_apply_attrs
pango_reorder_items
+
<SUBSECTION>
+pango_break
+pango_get_log_attrs
+pango_find_paragraph_boundary
+pango_default_break
+PangoLogAttr
+
+<SUBSECTION>
+pango_shape
+pango_shape_full
+
+<SUBSECTION Standard>
+PANGO_TYPE_ITEM
+
+<SUBSECTION Private>
+pango_item_get_type
+</SECTION>
+
+<SECTION>
+<TITLE>Contexts</TITLE>
+<FILE>context</FILE>
+PangoContext
pango_context_new
pango_context_changed
pango_context_get_serial
@@ -40,6 +62,7 @@ pango_context_load_font
pango_context_load_fontset
pango_context_get_metrics
pango_context_list_families
+
<SUBSECTION Standard>
PANGO_TYPE_CONTEXT
PangoContextClass
@@ -48,20 +71,9 @@ PANGO_CONTEXT_CLASS
PANGO_IS_CONTEXT
PANGO_IS_CONTEXT_CLASS
PANGO_CONTEXT_GET_CLASS
-PANGO_TYPE_ITEM
-<SUBSECTION>
-pango_break
-pango_get_log_attrs
-pango_find_paragraph_boundary
-pango_default_break
-PangoLogAttr
-<SUBSECTION>
-pango_shape
-pango_shape_full
<SUBSECTION Private>
pango_context_get_type
-pango_item_get_type
</SECTION>
<SECTION>
diff --git a/pango/fonts.c b/pango/fonts.c
index 209b6042..fafd6a2d 100644
--- a/pango/fonts.c
+++ b/pango/fonts.c
@@ -29,7 +29,7 @@
* implementation of fonts. The #PangoFont structure
* represents an abstract rendering-system-independent font.
* Pango provides routines to list available fonts, and
- * to load a font of a given description.
+ * to load a font matching a given description.
*/
#include "config.h"
diff --git a/pango/pango-attributes.c b/pango/pango-attributes.c
index 85e5a240..54b13795 100644
--- a/pango/pango-attributes.c
+++ b/pango/pango-attributes.c
@@ -22,7 +22,7 @@
/**
* SECTION:text-attributes
* @short_description:Font and other attributes for annotating text
- * @title:Text Attributes
+ * @title:Attributes
*
* Attributed text is used in a number of places in Pango. It
* is used as the input to the itemization process and also when
diff --git a/pango/pango-context.c b/pango/pango-context.c
index 8dd097ee..6a5dcfdd 100644
--- a/pango/pango-context.c
+++ b/pango/pango-context.c
@@ -46,6 +46,17 @@
#include "pango-emoji-private.h"
/**
+ * SECTION:context
+ * @title:Contexts
+ * @short_description: Global context object
+ *
+ * The #PangoContext structure stores global information
+ * influencing Pango's operation, such as the fontmap used
+ * to look up fonts, and default values such as the default
+ * language, default gravity, or default font.
+ */
+
+/**
* PangoContext:
*
* The #PangoContext structure stores global information
diff --git a/pango/shape.c b/pango/shape.c
index 6f535262..1d056f6c 100644
--- a/pango/shape.c
+++ b/pango/shape.c
@@ -22,7 +22,7 @@
/**
* SECTION:glyphs
* @short_description:Structures for storing information about glyphs
- * @title:Glyph Storage
+ * @title:Glyphs
*
* pango_shape() produces a string of glyphs which
* can be measured or drawn to the screen. The following