summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2019-07-10 03:57:53 +0000
committerMatthias Clasen <mclasen@redhat.com>2019-07-10 03:57:53 +0000
commitfc5dc3e3dcb3c464f9b4f04b2d0b97ccc7796d19 (patch)
treeca9f55f72859a6aab67e4e8b33c412b3f4c4f0f3
parent27817e637d3297c5208678c6aff684065fa49898 (diff)
parent318c83d584bc5c9c66e7786b922cb934a256cea7 (diff)
downloadpango-fc5dc3e3dcb3c464f9b4f04b2d0b97ccc7796d19.tar.gz
Merge branch 'line-separator-font' into 'master'
itemize: Don't change font for line separator See merge request GNOME/pango!71
-rw-r--r--pango/pango-context.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/pango/pango-context.c b/pango/pango-context.c
index b8e78c22..413119f3 100644
--- a/pango/pango-context.c
+++ b/pango/pango-context.c
@@ -1484,11 +1484,15 @@ itemize_state_process_run (ItemizeState *state)
*
* We don't want to change fonts just for variation selectors.
* See bug #781123.
+ *
+ * Finally, don't change fonts for line or paragraph separators.
*/
type = g_unichar_type (wc);
if (G_UNLIKELY (type == G_UNICODE_CONTROL ||
type == G_UNICODE_FORMAT ||
type == G_UNICODE_SURROGATE ||
+ type == G_UNICODE_LINE_SEPARATOR ||
+ type == G_UNICODE_PARAGRAPH_SEPARATOR ||
(type == G_UNICODE_SPACE_SEPARATOR && wc != 0x1680u /* OGHAM SPACE MARK */) ||
(wc >= 0xfe00u && wc <= 0xfe0fu) ||
(wc >= 0xe0100u && wc <= 0xe01efu)))