Add underline_color and strikethrough_color attribute types. (#147616,

Tue Nov 23 10:23:43 2004  Owen Taylor  <otaylor@redhat.com>

        * pango/pango-attributes.[ch]: Add underline_color
        and strikethrough_color attribute types. (#147616, Morten
        Welinder)

        * pango/pango-markup.c docs/pango_markup.sgml: Add
        corresponding 'underline_color' and
        'strikethrough_color' attributes for <span>.

        * pango/pango-renderer.c (pango_renderer_default_prepare_run):
        Implement underline and strikethrough colors.

        * pango/pango-renderer.c: Fix some bigs with updating
        underlines/strikethrough state.

        * pango/pango-renderer.c (get_total_matrix): Fix a const
        warning.

        * docs/pango-sections.txt: Update

4 files changed, 56 insertions, 1 deletions

diff --git a/docs/pango-sections.txt b/docs/pango-sections.txt
index 939952c2..10600e3c 100644
--- a/docs/pango-sections.txt
+++ b/docs/pango-sections.txt
@@ -303,7 +303,9 @@ pango_attr_font_desc_new
 pango_attr_foreground_new
 pango_attr_background_new
 pango_attr_strikethrough_new
+pango_attr_strikethrough_color_new
 pango_attr_underline_new
+pango_attr_underline_color_new
 PangoUnderline
 PANGO_TYPE_UNDERLINE
 pango_attr_shape_new
@@ -656,6 +658,7 @@ pango_x_font_cache_unload
 PANGO_RENDER_TYPE_WIN32
 pango_win32_get_context
 pango_win32_render
+pango_win32_render_transformed
 pango_win32_render_layout_line
 pango_win32_render_layout
 pango_win32_get_unknown_glyph
diff --git a/docs/pango_markup.sgml b/docs/pango_markup.sgml
index 4a55356e..7bd81ac3 100644
--- a/docs/pango_markup.sgml
+++ b/docs/pango_markup.sgml
@@ -69,7 +69,7 @@ Synonym for font_family
 
 <varlistentry><term>size</term>
 <listitem><para>
-Font size in 1024ths of a point, one of the absolute sizes 
+Font size in 1024ths of a point, or one of the absolute sizes 
 'xx-small', 'x-small', 'small', 'medium', 'large', 'x-large',
 'xx-large', or one of the relative sizes 'smaller' or 'larger'.
 If you want to specify a absolute size, it's usually easier
@@ -127,6 +127,14 @@ One of 'single', 'double', 'low', 'none'
 </para></listitem>
 </varlistentry>
 
+<varlistentry><term>underline_col
+or</term>
+<listitem><para>
+The color of underlines; an RGB color specification such as '#00FF00'
+or a color name such as 'red'
+</para></listitem>
+</varlistentry>
+
 <varlistentry><term>rise</term>
 <listitem><para>
 Vertical displacement, in 10000ths of an em. Can be negative for 
@@ -140,6 +148,13 @@ subscript, positive for superscript.
 </para></listitem>
 </varlistentry>
 
+<varlistentry><term>strikethrough_color</term>
+<listitem><para>
+The color of strikethrough lines; an RGB color specification such as
+'#00FF00' or a color name such as 'red'
+</para></listitem>
+</varlistentry>
+
 <varlistentry><term>fallback</term>
 <listitem><para>
 'true' or 'false' whether to enable fallback. If disabled, then characters
diff --git a/docs/tmpl/text-attributes.sgml b/docs/tmpl/text-attributes.sgml
index 5aee1e0a..d4f5d467 100644
--- a/docs/tmpl/text-attributes.sgml
+++ b/docs/tmpl/text-attributes.sgml
@@ -45,6 +45,8 @@ attribute is listed in parentheses after the description.
 @PANGO_ATTR_SCALE: font size scale factor (#PangoAttrScale)
 @PANGO_ATTR_FALLBACK: whether fallback is enabled (#PangoAttrInt)
 @PANGO_ATTR_LETTER_SPACING: 
+@PANGO_ATTR_UNDERLINE_COLOR: 
+@PANGO_ATTR_STRIKETHROUGH_COLOR: 
 
 <!-- ##### MACRO PANGO_TYPE_ATTR_TYPE ##### -->
 <para>
@@ -301,6 +303,17 @@ impose shape restrictions.
 @Returns: 
 
 
+<!-- ##### FUNCTION pango_attr_strikethrough_color_new ##### -->
+<para>
+
+</para>
+
+@red: 
+@green: 
+@blue: 
+@Returns: 
+
+
 <!-- ##### FUNCTION pango_attr_underline_new ##### -->
 <para>
 
@@ -310,6 +323,17 @@ impose shape restrictions.
 @Returns: 
 
 
+<!-- ##### FUNCTION pango_attr_underline_color_new ##### -->
+<para>
+
+</para>
+
+@red: 
+@green: 
+@blue: 
+@Returns: 
+
+
 <!-- ##### ENUM PangoUnderline ##### -->
 <para>
 the #PangoUnderline enumeration is used to specify
diff --git a/docs/tmpl/win32-fonts.sgml b/docs/tmpl/win32-fonts.sgml
index 5f997876..863b8500 100644
--- a/docs/tmpl/win32-fonts.sgml
+++ b/docs/tmpl/win32-fonts.sgml
@@ -42,6 +42,19 @@ g_quark_from_string()) is used to identify the renderer in pango_find_map().
 @y: 
 
 
+<!-- ##### FUNCTION pango_win32_render_transformed ##### -->
+<para>
+
+</para>
+
+@hdc: 
+@matrix: 
+@font: 
+@glyphs: 
+@x: 
+@y: 
+
+
 <!-- ##### FUNCTION pango_win32_render_layout_line ##### -->
 <para>