summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2007-10-27 10:25:48 +0000
committerMurray Cumming <murrayc@src.gnome.org>2007-10-27 10:25:48 +0000
commit6b36f3fc585a7c5c7d6ad40e29600edd3c656748 (patch)
tree3cacbb366bf0ee6d32567cf1cf12b7074ea98820
parentc497d2e30fee760c11be95747fae3a571b63340d (diff)
downloadpango-6b36f3fc585a7c5c7d6ad40e29600edd3c656748.tar.gz
Adds a link to pango_font_description_from_string() so that the font_desc
2007-10-26 Murray Cumming <murrayc@murrayc.com> * docs/pango_markup.sgml: Adds a link to pango_font_description_from_string() so that the font_desc attribute is not so mysterious. Bug #490661. svn path=/branches/pango-1-18/; revision=2484
-rw-r--r--ChangeLog6
-rw-r--r--docs/pango_markup.sgml11
2 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 14c94b4a..d1b015f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-26 Murray Cumming <murrayc@murrayc.com>
+
+ * docs/pango_markup.sgml: Adds a link to
+ pango_font_description_from_string() so that the font_desc
+ attribute is not so mysterious. Bug #490661.
+
2007-10-24 Behdad Esfahbod <behdad@gnome.org>
Bug 486951 – ChangeLog.pre-1-18
diff --git a/docs/pango_markup.sgml b/docs/pango_markup.sgml
index 5fc3ef48..ba96a9db 100644
--- a/docs/pango_markup.sgml
+++ b/docs/pango_markup.sgml
@@ -48,11 +48,12 @@ tags. &lt;span&gt; has the following attributes:
<varlistentry><term>font_desc</term>
<listitem><para>
-A font description string, such as "Sans Italic 12"; note that any other
-span attributes will override this description. So if you have "Sans
-Italic" and also a style="normal" attribute, you will get Sans normal,
-not italic.
-</para></listitem>
+A font description string, such as "Sans Italic 12". See
+<link linkend="pango-font-description-from-string">pango_font_description_from_string()</link>
+for a description of the format of the string representation . Note that any
+other span attributes will override this description. So if you have
+"Sans Italic" and also a style="normal" attribute, you will get Sans normal,
+not italic.</para></listitem>
</varlistentry>
<varlistentry><term>font_family</term>