summaryrefslogtreecommitdiff
path: root/pango/pango-attributes.h
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2021-03-31 20:39:20 +0000
committerMatthias Clasen <mclasen@redhat.com>2021-03-31 20:39:20 +0000
commit1fedc11aa03d95e4e365f01796ecceca8b0acd0e (patch)
treeef449695d79e349dd05de8e6330dc4d291f5816f /pango/pango-attributes.h
parent379f38e0054e72b003f1d81a48b83fef7ffb5312 (diff)
parent3aab7d85577d1aff46d7c7f131622cb73e9fe66a (diff)
downloadpango-1fedc11aa03d95e4e365f01796ecceca8b0acd0e.tar.gz
Merge branch 'fix-deadlocks' into 'master'
Fix deadlocks See merge request GNOME/pango!310
Diffstat (limited to 'pango/pango-attributes.h')
-rw-r--r--pango/pango-attributes.h36
1 files changed, 34 insertions, 2 deletions
diff --git a/pango/pango-attributes.h b/pango/pango-attributes.h
index e20b6413..fdc1e86a 100644
--- a/pango/pango-attributes.h
+++ b/pango/pango-attributes.h
@@ -228,6 +228,22 @@ typedef enum
* @PANGO_UNDERLINE_ERROR_LINE: Like @PANGO_UNDERLINE_ERROR, but
* drawn continuously across multiple runs. This type
* of underlining is available since Pango 1.46.
+ * @PANGO_UNDERLINE_SINGLE_DOTTED: a single, dotted underline. Since Pango 1.50.
+ * @PANGO_UNDERLINE_DOUBLE_DOTTED: a double, dotted underline. Since Pango 1.50.
+ * @PANGO_UNDERLINE_LOW_DOTTED: a single, dotted underline in the same
+ * position as for @PANGO_UNDERLINE_LOW. Since Pango 1.50.
+ * @PANGO_UNDERLINE_SINGLE_LINE_DOTTED: a single, dotted underline, drawn
+ * continuously across multiple runs. Since Pango 1.50.
+ * @PANGO_UNDERLINE_DOUBLE_LINE_DOTTED: a double, dotted underline, drawn
+ * continuously across multiple runs. Since Pango 1.50.
+ * @PANGO_UNDERLINE_SINGLE_DASHED: a single, dashed underline. Since Pango 1.50.
+ * @PANGO_UNDERLINE_DOUBLE_DASHED: a double, dashed underline. Since Pango 1.50.
+ * @PANGO_UNDERLINE_LOW_DASHED: a single, dashed underline in the same
+ * position as for @PANGO_UNDERLINE_LOW. Since Pango 1.50.
+ * @PANGO_UNDERLINE_SINGLE_LINE_DASHED: a single, dashed underline, drawn
+ * continuously across multiple runs. Since Pango 1.50.
+ * @PANGO_UNDERLINE_DOUBLE_LINE_DASHED: a double, dashed underline, drawn
+ * continuously across multiple runs. Since Pango 1.50.
*
* The `PangoUnderline` enumeration is used to specify whether text
* should be underlined, and if so, the type of underlining.
@@ -240,7 +256,19 @@ typedef enum {
PANGO_UNDERLINE_ERROR,
PANGO_UNDERLINE_SINGLE_LINE,
PANGO_UNDERLINE_DOUBLE_LINE,
- PANGO_UNDERLINE_ERROR_LINE
+ PANGO_UNDERLINE_ERROR_LINE,
+
+ PANGO_UNDERLINE_SINGLE_DOTTED,
+ PANGO_UNDERLINE_DOUBLE_DOTTED,
+ PANGO_UNDERLINE_LOW_DOTTED,
+ PANGO_UNDERLINE_SINGLE_LINE_DOTTED,
+ PANGO_UNDERLINE_DOUBLE_LINE_DOTTED,
+
+ PANGO_UNDERLINE_SINGLE_DASHED,
+ PANGO_UNDERLINE_DOUBLE_DASHED,
+ PANGO_UNDERLINE_LOW_DASHED,
+ PANGO_UNDERLINE_SINGLE_LINE_DASHED,
+ PANGO_UNDERLINE_DOUBLE_LINE_DASHED,
} PangoUnderline;
@@ -249,6 +277,8 @@ typedef enum {
* @PANGO_OVERLINE_NONE: no overline should be drawn
* @PANGO_OVERLINE_SINGLE: Draw a single line above the ink
* extents of the text being underlined.
+ * @PANGO_OVERLINE_SINGLE_DOTTED: A single, dotted line. Since Pango 1.50
+ * @PANGO_OVERLINE_SINGLE_DASHED: A single, dashed line. Since Pango 1.50
*
* The `PangoOverline` enumeration is used to specify whether text
* should be overlined, and if so, the type of line.
@@ -257,7 +287,9 @@ typedef enum {
*/
typedef enum {
PANGO_OVERLINE_NONE,
- PANGO_OVERLINE_SINGLE
+ PANGO_OVERLINE_SINGLE,
+ PANGO_OVERLINE_SINGLE_DOTTED,
+ PANGO_OVERLINE_SINGLE_DASHED
} PangoOverline;
/**