summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2021-06-17 13:04:52 +0000
committerMatthias Clasen <mclasen@redhat.com>2021-06-17 13:04:52 +0000
commitc167cf0da686926116fdaf3ceb81f7ad364a6df8 (patch)
tree891e87ee19c51088790ce14693272e570fbc266d
parent07f646202ee9d54e5884e8e7ae5e0eab621b43bd (diff)
parentf5044cf7d3f196559c055c814537caf84d578e2c (diff)
downloadpango-c167cf0da686926116fdaf3ceb81f7ad364a6df8.tar.gz
Merge branch 'font-features-docs' into 'master'
Link to the CSS font-feature-settings docs for pango_attr_font_features_new Closes #565 See merge request GNOME/pango!342
-rw-r--r--pango/pango-attributes.c6
-rw-r--r--pango/pango-bidi-type.h2
2 files changed, 6 insertions, 2 deletions
diff --git a/pango/pango-attributes.c b/pango/pango-attributes.c
index ffd209d6..8b1d857b 100644
--- a/pango/pango-attributes.c
+++ b/pango/pango-attributes.c
@@ -1122,10 +1122,14 @@ pango_attr_gravity_hint_new (PangoGravityHint hint)
/**
* pango_attr_font_features_new:
- * @features: a string with OpenType font features, in CSS syntax
+ * @features: a string with OpenType font features, with the syntax of the [CSS
+ * font-feature-settings property](https://www.w3.org/TR/css-fonts-4/#font-rend-desc)
*
* Create a new font features tag attribute.
*
+ * You can use this attribute to select OpenType font features like small-caps,
+ * alternative glyphs, ligatures, etc. for fonts that support them.
+ *
* Return value: (transfer full): the newly allocated
* `PangoAttribute`, which should be freed with
* [method@Pango.Attribute.destroy]
diff --git a/pango/pango-bidi-type.h b/pango/pango-bidi-type.h
index ebfaa574..2f1dfd1d 100644
--- a/pango/pango-bidi-type.h
+++ b/pango/pango-bidi-type.h
@@ -54,7 +54,7 @@ G_BEGIN_DECLS
*
* `PangoBidiType` represents the bidirectional character
* type of a Unicode character as specified by the
- * <ulink url="http://www.unicode.org/reports/tr9/">Unicode bidirectional algorithm</ulink>.
+ * [Unicode bidirectional algorithm](http://www.unicode.org/reports/tr9/).
*
* Since: 1.22
* Deprecated: 1.44: Use fribidi for this information