diff options
author | Matthias Clasen <mclasen@redhat.com> | 2021-08-08 14:44:57 +0000 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2021-08-08 14:44:57 +0000 |
commit | 4d4d9e02892f6ed8496af5e2c6067d650eff3fd5 (patch) | |
tree | 8baccfcbf663d7431c6cab69f42f4fd3712b3f8d /docs/pango_markup.md | |
parent | 1f262e416a2d33265539e423ab5de28895379adf (diff) | |
parent | 59d38cde20425696543d262c5329b14056915614 (diff) | |
download | pango-4d4d9e02892f6ed8496af5e2c6067d650eff3fd5.tar.gz |
Merge branch 'markup-sizes' into 'main'
markup: Allow specifying size in pt or px
Closes #67 and #23
See merge request GNOME/pango!391
Diffstat (limited to 'docs/pango_markup.md')
-rw-r--r-- | docs/pango_markup.md | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/docs/pango_markup.md b/docs/pango_markup.md index 8291dc3c..c82de9d5 100644 --- a/docs/pango_markup.md +++ b/docs/pango_markup.md @@ -77,11 +77,15 @@ face font_size size -: 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 to take advantage of the ability to specify a partial font - description using 'font'; you can use font='12.5' rather than size='12800'. +: Font size in 1024ths of a point, or in points (e.g. '12.5pt'), or one of the + absolute sizes 'xx-small', 'x-small', 'small', 'medium', 'large', 'x-large', + 'xx-large', or a percentage (e.g. '200%'), 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'; you can use + font='12.5' rather than size='12800' or size='12.5pt'. + Support for specifying font sizes in points or as percentages was added in + Pango 1.50. font_style style @@ -144,8 +148,9 @@ overline_color name such as 'red'. Overline support was added in Pango 1.46/ rise -: Vertical displacement, in Pango units. Can be negative for subscript, positive - for superscript. +: Vertical displacement, in Pango units or in points (e.g. '5pt'). Can be + negative for subscript, positive for superscript. + Support for specifying rise in points was added in Pango 1.50. strikethrough : 'true' or 'false' whether to strike through the text. |