summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2007-10-27 10:21:21 +0000
committerMurray Cumming <murrayc@src.gnome.org>2007-10-27 10:21:21 +0000
commite92d37731695d77df3e5aa3033b435af8a4f1a27 (patch)
tree2d1ca83d04fa506d774515a04deb1a2b42e3b2b5
parent07944bc701e1fd4af8a327769d6c942df43c4622 (diff)
downloadpango-e92d37731695d77df3e5aa3033b435af8a4f1a27.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=/trunk/; revision=2483
-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 bccd604d..c54945ae 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-26 Behdad Esfahbod <behdad@gnome.org>
* tools/Makefile.am:
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>