diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-11-06 23:43:07 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-11-07 09:56:50 -0500 |
| commit | ee4e7886a6fbd00e777019a38adb8d2ace1980e4 (patch) | |
| tree | 984c10797012a1382cd9062bc94615a107c5c08d | |
| parent | 6815efd7ac1013c11ca16e6ac94e560cb680ecfe (diff) | |
| download | pango-ee4e7886a6fbd00e777019a38adb8d2ace1980e4.tar.gz | |
itemize: Handle PANGO_FONT_SCALE_SMALL_CAPS
This is not used by anything yet.
| -rw-r--r-- | pango/itemize.c | 56 |
1 files changed, 39 insertions, 17 deletions
diff --git a/pango/itemize.c b/pango/itemize.c index bd339633..66bf0e8d 100644 --- a/pango/itemize.c +++ b/pango/itemize.c @@ -1024,6 +1024,8 @@ itemize_state_finish (ItemizeState *state) /* }}} */ /* {{{ Post-processing */ + /* {{{ Handling font scale */ + typedef struct { PangoAttribute *attr; double scale; @@ -1048,43 +1050,61 @@ collect_font_scale (PangoContext *context, if (attr->start_index == item->offset) { ScaleItem *entry; - hb_font_t *hb_font; int y_scale; hb_position_t y_size; + hb_position_t cap_height; + hb_position_t x_height; entry = g_new (ScaleItem, 1); entry->attr = attr; *stack = g_list_prepend (*stack, entry); - if (prev) - { - hb_font = pango_font_get_hb_font (prev->analysis.font); - hb_font_get_scale (hb_font, NULL, &y_scale); - } - else - hb_font = NULL; - switch (((PangoAttrInt *)attr)->value) { case PANGO_FONT_SCALE_NONE: break; case PANGO_FONT_SCALE_SUPERSCRIPT: - if (hb_font && - hb_ot_metrics_get_position (hb_font, + if (prev && + hb_ot_metrics_get_position (pango_font_get_hb_font (prev->analysis.font), HB_OT_METRICS_TAG_SUPERSCRIPT_EM_Y_SIZE, &y_size)) - entry->scale = y_size / (double) y_scale; + { + hb_font_get_scale (pango_font_get_hb_font (prev->analysis.font), NULL, &y_scale); + entry->scale = y_size / (double) y_scale; + } else - entry->scale = 1 / 1.2; + { + entry->scale = 1 / 1.2; + } break; case PANGO_FONT_SCALE_SUBSCRIPT: - if (hb_font && - hb_ot_metrics_get_position (hb_font, + if (prev && + hb_ot_metrics_get_position (pango_font_get_hb_font (prev->analysis.font), HB_OT_METRICS_TAG_SUBSCRIPT_EM_Y_SIZE, &y_size)) - entry->scale = y_size / (double) y_scale; + { + hb_font_get_scale (pango_font_get_hb_font (prev->analysis.font), NULL, &y_scale); + entry->scale = y_size / (double) y_scale; + } else - entry->scale = 1 / 1.2; + { + entry->scale = 1 / 1.2; + } + break; + case PANGO_FONT_SCALE_SMALL_CAPS: + if (hb_ot_metrics_get_position (pango_font_get_hb_font (item->analysis.font), + HB_OT_METRICS_TAG_CAP_HEIGHT, + &cap_height) && + hb_ot_metrics_get_position (pango_font_get_hb_font (item->analysis.font), + HB_OT_METRICS_TAG_X_HEIGHT, + &x_height)) + { + entry->scale = x_height / (double) cap_height; + } + else + { + entry->scale = 0.8; + } break; default: g_assert_not_reached (); @@ -1167,6 +1187,8 @@ apply_font_scale (PangoContext *context, } } +/* }}} */ + static GList * post_process_items (PangoContext *context, GList *items) |