summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2004-06-21 19:02:01 +0000
committerOwen Taylor <otaylor@src.gnome.org>2004-06-21 19:02:01 +0000
commitc8decd09fdc98d818aacfe8c723b8df78c94093c (patch)
tree280aa29cd94fb43dd5917bee35962a433fc826dc
parent2d51ae6ee29fef51d901cdcff2b0cb40bb7bb9e3 (diff)
downloadpango-c8decd09fdc98d818aacfe8c723b8df78c94093c.tar.gz
use x-large instead of 100 in the markup example. (#142355, Doug Quale).
Mon Jun 21 14:42:02 2004 Owen Taylor <otaylor@redhat.com> * docs/pango_markup.sgml: use x-large instead of 100 in the markup example. (#142355, Doug Quale). Fix the 'size' documentation to say 1024ths rather than 1000ths. Document using font_desc='12.5' instead.
-rw-r--r--ChangeLog7
-rw-r--r--ChangeLog.pre-1-107
-rw-r--r--ChangeLog.pre-1-67
-rw-r--r--ChangeLog.pre-1-87
-rw-r--r--docs/pango_markup.sgml9
5 files changed, 35 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c6256274..60621e98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jun 21 14:42:02 2004 Owen Taylor <otaylor@redhat.com>
+
+ * docs/pango_markup.sgml: use x-large instead of 100
+ in the markup example. (#142355, Doug Quale).
+ Fix the 'size' documentation to say 1024ths rather
+ than 1000ths. Document using font_desc='12.5' instead.
+
Mon Jun 21 14:31:40 2004 Owen Taylor <otaylor@redhat.com>
* pango/pangoft2.[ch] (pango_ft2_font_get_face):
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index c6256274..60621e98 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,10 @@
+Mon Jun 21 14:42:02 2004 Owen Taylor <otaylor@redhat.com>
+
+ * docs/pango_markup.sgml: use x-large instead of 100
+ in the markup example. (#142355, Doug Quale).
+ Fix the 'size' documentation to say 1024ths rather
+ than 1000ths. Document using font_desc='12.5' instead.
+
Mon Jun 21 14:31:40 2004 Owen Taylor <otaylor@redhat.com>
* pango/pangoft2.[ch] (pango_ft2_font_get_face):
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index c6256274..60621e98 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,10 @@
+Mon Jun 21 14:42:02 2004 Owen Taylor <otaylor@redhat.com>
+
+ * docs/pango_markup.sgml: use x-large instead of 100
+ in the markup example. (#142355, Doug Quale).
+ Fix the 'size' documentation to say 1024ths rather
+ than 1000ths. Document using font_desc='12.5' instead.
+
Mon Jun 21 14:31:40 2004 Owen Taylor <otaylor@redhat.com>
* pango/pangoft2.[ch] (pango_ft2_font_get_face):
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index c6256274..60621e98 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,10 @@
+Mon Jun 21 14:42:02 2004 Owen Taylor <otaylor@redhat.com>
+
+ * docs/pango_markup.sgml: use x-large instead of 100
+ in the markup example. (#142355, Doug Quale).
+ Fix the 'size' documentation to say 1024ths rather
+ than 1000ths. Document using font_desc='12.5' instead.
+
Mon Jun 21 14:31:40 2004 Owen Taylor <otaylor@redhat.com>
* pango/pangoft2.[ch] (pango_ft2_font_get_face):
diff --git a/docs/pango_markup.sgml b/docs/pango_markup.sgml
index 56f2ddae..4a55356e 100644
--- a/docs/pango_markup.sgml
+++ b/docs/pango_markup.sgml
@@ -35,7 +35,7 @@ You can parse a marked-up string into the string text plus a
<para>
A simple example of a marked-up string might be:
-<literal>"&lt;span foreground="blue" size="100"&gt;Blue text&lt;/span&gt; is &lt;i&gt;cool&lt;/i&gt;!"</literal>
+<literal>"&lt;span foreground="blue" size="x-large"&gt;Blue text&lt;/span&gt; is &lt;i&gt;cool&lt;/i&gt;!"</literal>
</para>
<para>
@@ -69,9 +69,14 @@ Synonym for font_family
<varlistentry><term>size</term>
<listitem><para>
-Font size in 1000ths of a point, one of the absolute sizes
+Font size in 1024ths of a point, 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
+to take advantage of the ability to specify a partial
+font description using 'font_desc'; you can use
+<literal>font_desc='12.5'</literal> rather than
+<literal>size='12800'</literal>.
</para></listitem>
</varlistentry>