aboutsummaryrefslogtreecommitdiffstats
path: root/libskrift_create_context.c
diff options
context:
space:
mode:
authorMattias Andrée <maandree@kth.se>2021-08-05 20:53:28 +0200
committerMattias Andrée <maandree@kth.se>2021-08-05 20:53:28 +0200
commita5fe9dab3f68668e3bc31326447139b7446edbc7 (patch)
tree5490cf70dacbf27406817bf759cecd61f7402219 /libskrift_create_context.c
parentmake demo flexible + minor fixes (diff)
downloadlibskrift-a5fe9dab3f68668e3bc31326447139b7446edbc7.tar.gz
libskrift-a5fe9dab3f68668e3bc31326447139b7446edbc7.tar.bz2
libskrift-a5fe9dab3f68668e3bc31326447139b7446edbc7.tar.xz
Improvements for character transformations
Signed-off-by: Mattias Andrée <maandree@kth.se>
Diffstat (limited to '')
-rw-r--r--libskrift_create_context.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/libskrift_create_context.c b/libskrift_create_context.c
index db6f8a4..a1d01e0 100644
--- a/libskrift_create_context.c
+++ b/libskrift_create_context.c
@@ -77,8 +77,10 @@ libskrift_create_context(LIBSKRIFT_CONTEXT **ctxp, LIBSKRIFT_FONT **fonts, size_
(*ctxp)->schrift_ctx.font = fonts[0]->font;
(*ctxp)->schrift_ctx.yScale = height;
- (*ctxp)->x_advancement = 1;
- (*ctxp)->y_advancement = 0;
+ (*ctxp)->char_x_advancement = 1;
+ (*ctxp)->char_y_advancement = 0;
+ (*ctxp)->text_x_advancement = 1;
+ (*ctxp)->text_y_advancement = 0;
(*ctxp)->nfonts = nfonts;
for (i = 0; i < nfonts; i++) {
(*ctxp)->fonts[i] = fonts[i];
@@ -126,8 +128,10 @@ libskrift_create_context(LIBSKRIFT_CONTEXT **ctxp, LIBSKRIFT_FONT **fonts, size_
fpclassify((*ctxp)->rendering.text_transformation[5]) != FP_ZERO) {
memcpy((*ctxp)->transformation, (*ctxp)->rendering.char_transformation, sizeof((*ctxp)->transformation));
libskrift_add_transformation((*ctxp)->transformation, (*ctxp)->rendering.text_transformation);
- (*ctxp)->x_advancement = (*ctxp)->rendering.text_transformation[0];
- (*ctxp)->y_advancement = (*ctxp)->rendering.text_transformation[3];
+ (*ctxp)->char_x_advancement = (*ctxp)->rendering.char_transformation[0];
+ (*ctxp)->char_y_advancement = (*ctxp)->rendering.char_transformation[3];
+ (*ctxp)->text_x_advancement = (*ctxp)->rendering.text_transformation[0];
+ (*ctxp)->text_y_advancement = (*ctxp)->rendering.text_transformation[3];
(*ctxp)->schrift_ctx.transformation_hook = transformation_hook;
}