ass_shaper: use ass_codepoint_is_fullwidth

libass · Aug 6, 2023 · e663b4e · e663b4e
1 parent cca515d
commit e663b4e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/libass/ass_font.h b/libass/ass_font.h
@@ -31,8 +31,6 @@ typedef struct ass_font ASS_Font;
 #include "ass_cache.h"
 #include "ass_outline.h"
 
-#define VERTICAL_LOWER_BOUND 0x02f1
-
 #define ASS_FONT_MAX_FACES 10
 #define DECO_UNDERLINE     1
 #define DECO_STRIKETHROUGH 2

diff --git a/libass/ass_render.c b/libass/ass_render.c
@@ -2177,8 +2177,6 @@ static bool parse_events(RenderContext *state, ASS_Event *event)
         info->bold = state->bold;
         info->italic = state->italic;
         info->flags = state->flags;
-        if (info->font->desc.vertical && code >= VERTICAL_LOWER_BOUND)
-            info->flags |= DECO_ROTATE;
         info->frx = state->frx;
         info->fry = state->fry;
         info->frz = state->frz;

diff --git a/libass/ass_shaper.c b/libass/ass_shaper.c
@@ -231,7 +231,7 @@ get_cached_metrics(struct ass_shaper_metrics_data *metrics,
     bool rotate = false;
     // if @font rendering is enabled and the glyph should be rotated,
     // make cached_h_advance pick up the right advance later
-    if (metrics->vertical && unicode >= VERTICAL_LOWER_BOUND)
+    if (metrics->vertical && ass_codepoint_is_fullwidth(metrics->hash_key.font->faces_cp[metrics->hash_key.face_index], unicode))
         rotate = true;
 
     metrics->hash_key.glyph_index = glyph;
@@ -894,6 +894,10 @@ void ass_shaper_find_runs(ASS_Shaper *shaper, ASS_Renderer *render_priv,
             // get font face and glyph index
             ass_font_get_index(render_priv->fontselect, info->font,
                     info->symbol, &info->face_index, &info->glyph_index);
+
+            if (info->font->desc.vertical &&
+                ass_codepoint_is_fullwidth(info->font->faces_cp[info->face_index], info->symbol))
+                info->flags |= DECO_ROTATE;
         }
         if (i > 0) {
             GlyphInfo *last = glyphs + i - 1;