132 lines
4.2 KiB
Diff
132 lines
4.2 KiB
Diff
From: Simon McVittie <smcv@debian.org>
|
|
Date: Wed, 4 May 2022 10:45:17 +0100
|
|
Subject: Revert expected layouts to match 1.50.6
|
|
|
|
Debian still has Harfbuzz 2.7.4, which rounds these positions slightly
|
|
differently. This patch will probably need to be reverted when Harfbuzz
|
|
is upgraded.
|
|
|
|
This partially reverts commit a2ccd36a42e039d3600b04fe37fdc47f267d90c7.
|
|
|
|
Forwarded: not-needed
|
|
---
|
|
tests/layouts/valid-20.layout | 4 ++--
|
|
tests/layouts/vertical.layout | 28 ++++++++++++++--------------
|
|
2 files changed, 16 insertions(+), 16 deletions(-)
|
|
|
|
diff --git a/tests/layouts/valid-20.layout b/tests/layouts/valid-20.layout
|
|
index db692b7..93b8a1b 100644
|
|
--- a/tests/layouts/valid-20.layout
|
|
+++ b/tests/layouts/valid-20.layout
|
|
@@ -140,7 +140,7 @@
|
|
"glyph" : 244,
|
|
"width" : 15360,
|
|
"x-offset" : 14764,
|
|
- "y-offset" : 3845,
|
|
+ "y-offset" : 3844,
|
|
"is-cluster-start" : true,
|
|
"log-cluster" : 0
|
|
},
|
|
@@ -156,7 +156,7 @@
|
|
"glyph" : 273,
|
|
"width" : 15360,
|
|
"x-offset" : 14764,
|
|
- "y-offset" : 3507,
|
|
+ "y-offset" : 3506,
|
|
"is-cluster-start" : true,
|
|
"log-cluster" : 2
|
|
}
|
|
diff --git a/tests/layouts/vertical.layout b/tests/layouts/vertical.layout
|
|
index a7f6506..e8619bf 100644
|
|
--- a/tests/layouts/vertical.layout
|
|
+++ b/tests/layouts/vertical.layout
|
|
@@ -128,7 +128,7 @@
|
|
{
|
|
"glyph" : 1,
|
|
"width" : 32768,
|
|
- "x-offset" : 28836,
|
|
+ "x-offset" : 28835,
|
|
"y-offset" : 9945,
|
|
"is-cluster-start" : true,
|
|
"log-cluster" : 0
|
|
@@ -136,7 +136,7 @@
|
|
{
|
|
"glyph" : 2,
|
|
"width" : 32768,
|
|
- "x-offset" : 28836,
|
|
+ "x-offset" : 28835,
|
|
"y-offset" : 10764,
|
|
"is-cluster-start" : true,
|
|
"log-cluster" : 1
|
|
@@ -144,8 +144,8 @@
|
|
{
|
|
"glyph" : 3,
|
|
"width" : 32768,
|
|
- "x-offset" : 28836,
|
|
- "y-offset" : 10453,
|
|
+ "x-offset" : 28835,
|
|
+ "y-offset" : 10452,
|
|
"is-cluster-start" : true,
|
|
"log-cluster" : 2
|
|
}
|
|
@@ -179,24 +179,24 @@
|
|
{
|
|
"glyph" : 4,
|
|
"width" : 32768,
|
|
- "x-offset" : 28836,
|
|
- "y-offset" : 16384,
|
|
+ "x-offset" : 28835,
|
|
+ "y-offset" : 16383,
|
|
"is-cluster-start" : true,
|
|
"log-cluster" : 0
|
|
},
|
|
{
|
|
"glyph" : 5,
|
|
"width" : 32768,
|
|
- "x-offset" : 28836,
|
|
- "y-offset" : 16384,
|
|
+ "x-offset" : 28835,
|
|
+ "y-offset" : 16383,
|
|
"is-cluster-start" : true,
|
|
"log-cluster" : 3
|
|
},
|
|
{
|
|
"glyph" : 7,
|
|
"width" : 32768,
|
|
- "x-offset" : 28836,
|
|
- "y-offset" : 16384,
|
|
+ "x-offset" : 28835,
|
|
+ "y-offset" : 16383,
|
|
"is-cluster-start" : true,
|
|
"log-cluster" : 6
|
|
}
|
|
@@ -230,7 +230,7 @@
|
|
{
|
|
"glyph" : 1,
|
|
"width" : 32768,
|
|
- "x-offset" : 28836,
|
|
+ "x-offset" : 28835,
|
|
"y-offset" : 9945,
|
|
"is-cluster-start" : true,
|
|
"log-cluster" : 0
|
|
@@ -238,7 +238,7 @@
|
|
{
|
|
"glyph" : 2,
|
|
"width" : 32768,
|
|
- "x-offset" : 28836,
|
|
+ "x-offset" : 28835,
|
|
"y-offset" : 10764,
|
|
"is-cluster-start" : true,
|
|
"log-cluster" : 1
|
|
@@ -246,8 +246,8 @@
|
|
{
|
|
"glyph" : 3,
|
|
"width" : 32768,
|
|
- "x-offset" : 28836,
|
|
- "y-offset" : 10453,
|
|
+ "x-offset" : 28835,
|
|
+ "y-offset" : 10452,
|
|
"is-cluster-start" : true,
|
|
"log-cluster" : 2
|
|
}
|