Skip to content

Commit

Permalink
Merge branch 'libertinus'
Browse files Browse the repository at this point in the history
  • Loading branch information
alerque committed Sep 21, 2024
2 parents f6a3920 + ae0729b commit b74deaa
Show file tree
Hide file tree
Showing 22 changed files with 933 additions and 933 deletions.
4 changes: 2 additions & 2 deletions Makefile-fonts
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ notobase = $(shell echo $(notdir $1) | sed -e 's/-.*//')
.sources/LateefGR-1.200.zip: | .sources
$(CURL) -fsSL https://software.sil.org/downloads/r/lateef/$(notdir $@) -o $@

.sources/Libertinus-%.tar.xz: | .sources
.sources/Libertinus-%.tar.zst: | .sources
$(CURL) -fsSL https://github.com/alerque/libertinus/releases/download/v$*/$(notdir $@) -o $@

.sources/roboto-unhinted.zip: | .sources
Expand Down Expand Up @@ -138,7 +138,7 @@ notobase = $(shell echo $(notdir $1) | sed -e 's/-.*//')
$(BSDTAR) -x -f $< -C $(dir $@) $(notdir $@) && \
touch $@

.fonts/Libertinus%: .sources/Libertinus-7.020.tar.xz | .fonts
.fonts/Libertinus%: .sources/Libertinus-7.050.tar.zst | .fonts
$(BSDTAR) -x -f $< -C $(dir $@) --strip-components 3 $(basename $(basename $(<F)))/static/OTF/$(notdir $@) && \
touch $@

Expand Down
4 changes: 2 additions & 2 deletions tests/alignment.expected
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Mx 4.5400
Mx 5.0600
T 51 a=5.8700 66 a=4.5700 72 a=5.0000 72 a=5.0000 70 a=4.4700 69 a=5.0600 (Ragged)
Mx 66.4459
T 77 70 2385 w=13.0700 (left)
T 77 70 2435 w=13.0700 (left)
Mx 82.0159
Set font Libertinus Serif;10;400;;normal;;;LTR
Mx 2.6400
Expand Down Expand Up @@ -512,7 +512,7 @@ Mx 2.7100
Mx 5.6000
Mx 4.5400
Mx 5.0600
T 43 a=3.2200 86 a=5.3100 84 a=3.9000 85 a=3.1600 74 a=2.7100 2361 a=5.6000 70 a=4.4700 69 a=5.0600 (Justified)
T 43 a=3.2200 86 a=5.3100 84 a=3.9000 85 a=3.1600 74 a=2.7100 2398 a=5.6000 70 a=4.4700 69 a=5.0600 (Justified)
Mx 62.8736
Set font Libertinus Serif;10;400;;normal;;;LTR
Mx 2.6400
Expand Down
18 changes: 9 additions & 9 deletions tests/bug-1362.expected
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,21 @@ T 74 81 84 86 78 w=25.0100 (ipsum)
Mx 79.6094
T 69 80 77 80 83 w=21.5000 (dolor)
Mx 104.7559
T 69 74 2363 68 86 77 85 w=31.4500 (difficult)
T 69 74 2400 68 86 77 85 w=31.4500 (difficult)
Mx 139.8525
Mx 4.4700
Mx 5.8200
Mx 4.5400
Mx 4.2800
Mx 3.1600
Mx 3.9000
T 70 a=4.4700 2360 a=5.8200 70 a=4.4700 68 a=4.2800 85 a=3.1600 84 a=3.9000 (effects)
T 70 a=4.4700 2397 a=5.8200 70 a=4.4700 68 a=4.2800 85 a=3.1600 84 a=3.9000 (effects)
Mx 169.6690
T 66 2360 66 74 83 84 w=25.2900 (affairs)
T 66 2397 66 74 83 84 w=25.2900 (affairs)
Mx 198.6055
T 80 71 w=8.1400 (of)
Mx 210.3920
T 2361 79 74 85 74 80 79 w=30.0600 (finition)
T 2398 79 74 85 74 80 79 w=30.0600 (finition)
Mx 244.0986
Mx 2.6400
Mx 5.0400
Expand Down Expand Up @@ -197,28 +197,28 @@ T 89 a=4.9000 89 a=4.9000 89 a=4.9000 89 a=4.9000 89 a=4.9000 89 a=4.9000 89 a=4
Mx 378.7012
T 69 74 71 w=10.8700 (dif)
Mx 389.5712
T 2361 w=5.6000 (fi)
T 2398 w=5.6000 (fi)
Mx 395.1712
T 14 w=3.3800 (-)
Mx 20.9764
My 84.7438
T 68 86 77 85 w=15.3900 (cult)
Mx 39.3383
T 69 74 2363 68 86 77 85 w=31.4500 (difficult)
T 69 74 2400 68 86 77 85 w=31.4500 (difficult)
Mx 73.7602
T 66 2360 66 74 83 84 w=25.2900 (affairs)
T 66 2397 66 74 83 84 w=25.2900 (affairs)
Mx 102.0221
Mx 4.4700
Mx 5.8200
Mx 4.5400
Mx 4.2800
Mx 3.1600
Mx 3.9000
T 70 a=4.4700 2360 a=5.8200 70 a=4.4700 68 a=4.2800 85 a=3.1600 84 a=3.9000 (effects)
T 70 a=4.4700 2397 a=5.8200 70 a=4.4700 68 a=4.2800 85 a=3.1600 84 a=3.9000 (effects)
Mx 131.1640
T 80 71 w=8.1400 (of)
Mx 142.2759
T 2361 79 74 85 74 80 79 w=30.0600 (finition)
T 2398 79 74 85 74 80 79 w=30.0600 (finition)
Mx 175.3078
Mx 2.6400
Mx 5.0400
Expand Down
20 changes: 10 additions & 10 deletions tests/bug-1495-inline-math-layout.expected
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ Mx 164.9888
T 80 68 86 86 68 w=24.9365 (massa)
Mx 192.9594
Set font Libertinus Math;10;400;Regular;normal;;;LTR
T 2717 w=3.8100 (nil)
T 2750 w=3.8100 (nil)
Mx 196.7694
My 37.4447
Set font Libertinus Math;8;400;Regular;normal;;;LTR
T 2720 w=1.8320 (nil)
T 2753 w=1.8320 (nil)
Mx 198.6014
T 874 w=4.5280 (nil)
Mx 207.3248
Expand All @@ -75,7 +75,7 @@ T 10 a=3.5600 (nil)
Mx 247.3357
T 30 w=6.4800 (nil)
Mx 257.5811
T 2061 w=6.4800 (nil)
T 2088 w=6.4800 (nil)
Mx 264.0611
T 18 w=4.6500 (nil)
Mx 271.7452
Expand All @@ -100,11 +100,11 @@ Mx 153.4230
T 51 75 68 86 72 79 79 88 86 w=38.3984 (Phasellus)
Mx 194.3961
Set font Libertinus Math;10;400;Regular;normal;;;LTR
T 2717 w=3.8100 (nil)
T 2750 w=3.8100 (nil)
Mx 198.2061
My 49.5701
Set font Libertinus Math;8;400;Regular;normal;;;LTR
T 2720 w=1.8320 (nil)
T 2753 w=1.8320 (nil)
Mx 200.0381
T 866 w=3.9120 (nil)
Mx 207.1579
Expand All @@ -115,26 +115,26 @@ Mx 216.4157
T 68 80 84 w=13.2200 (nil)
Mx 229.6357
Mx 3.0000
T 3653 a=4.2100 (nil)
T 3798 a=4.2100 (nil)
Mx 233.8457
T 866 w=4.8900 (nil)
Mx 238.7357
Mx 2.9900
T 3654 a=4.2100 (nil)
T 3799 a=4.2100 (nil)
Mx 244.9625
T 12 w=6.4800 (nil)
Mx 253.4592
T 2720 w=2.2900 (nil)
T 2753 w=2.2900 (nil)
Mx 257.4159
T 84 74 79 w=12.0300 (nil)
Mx 269.4459
Mx 3.0000
T 3653 a=4.2100 (nil)
T 3798 a=4.2100 (nil)
Mx 273.6559
T 866 w=4.8900 (nil)
Mx 278.5459
Mx 2.9900
T 3654 a=4.2100 (nil)
T 3799 a=4.2100 (nil)
Mx 14.8819
My 64.6701
Set font Gentium Plus;10;400;;normal;;;LTR
Expand Down
4 changes: 2 additions & 2 deletions tests/bug-1495-math-alone.expected
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Begin page
Mx 14.8819
My 25.3664
Set font Libertinus Math;10;400;Regular;normal;;;LTR
T 2735 w=5.4100 (nil)
T 2768 w=5.4100 (nil)
My 37.3664
T 2736 w=5.4000 (nil)
T 2769 w=5.4000 (nil)
End page
Finish
2 changes: 1 addition & 1 deletion tests/bug-61.expected
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ T 52 a=5.8200 70 a=5.3640 68 a=5.1360 80 a=6.0480 79 a=6.5040 69 a=6.0720 (Secon
Mx 83.3420
T 71 83 66 78 70 w=28.5120 (frame)
Mx 115.4640
T 2361 83 84 85 w=19.6560 (first)
T 2398 83 84 85 w=19.6560 (first)
Mx 138.7301
T 81 66 83 66 72 83 66 81 73 w=50.2920 (paragraph)
Mx 44.7039
Expand Down
12 changes: 6 additions & 6 deletions tests/feat-1365-lists-alternate.expected
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Mx 58.0920
Mx 5.4000
Mx 4.9700
Mx 7.4700
T 2362 a=5.4000 80 a=5.0400 88 a=7.4700 (flow)
T 2399 a=5.4000 80 a=5.0400 88 a=7.4700 (flow)
Mx 79.5201
T 88 74 85 73 w=18.7200 (with)
Mx 101.8282
Expand Down Expand Up @@ -139,9 +139,9 @@ Mx 44.4056
Mx 5.4000
Mx 4.9700
Mx 7.4700
T 2362 a=5.4000 80 a=5.0400 88 a=7.4700 (flow)
T 2399 a=5.4000 80 a=5.0400 88 a=7.4700 (flow)
Mx 64.1472
T 66 2385 70 83 w=18.7200 (after)
T 66 2435 70 83 w=18.7200 (after)
Mx 84.7688
T 77 74 84 85 w=12.4100 (list)
Mx 99.0804
Expand Down Expand Up @@ -197,7 +197,7 @@ Mx 56.1706
Mx 5.4000
Mx 4.9700
Mx 7.4700
T 2362 a=5.4000 80 a=5.0400 88 a=7.4700 (flow)
T 2399 a=5.4000 80 a=5.0400 88 a=7.4700 (flow)
Mx 75.6773
Mx 5.0300
Mx 4.4700
Expand Down Expand Up @@ -337,9 +337,9 @@ Mx 56.1706
Mx 5.4000
Mx 4.9700
Mx 7.4700
T 2362 a=5.4000 80 a=5.0400 88 a=7.4700 (flow)
T 2399 a=5.4000 80 a=5.0400 88 a=7.4700 (flow)
Mx 75.6773
T 66 2385 70 83 w=18.7200 (after)
T 66 2435 70 83 w=18.7200 (after)
Mx 96.0639
T 77 74 84 85 w=12.4100 (list)
Mx 110.1406
Expand Down
12 changes: 6 additions & 6 deletions tests/feat-1365-lists-compact.expected
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Mx 58.0920
Mx 5.4000
Mx 4.9700
Mx 7.4700
T 2362 a=5.4000 80 a=5.0400 88 a=7.4700 (flow)
T 2399 a=5.4000 80 a=5.0400 88 a=7.4700 (flow)
Mx 79.5201
T 88 74 85 73 w=18.7200 (with)
Mx 101.8282
Expand Down Expand Up @@ -150,9 +150,9 @@ Mx 44.4056
Mx 5.4000
Mx 4.9700
Mx 7.4700
T 2362 a=5.4000 80 a=5.0400 88 a=7.4700 (flow)
T 2399 a=5.4000 80 a=5.0400 88 a=7.4700 (flow)
Mx 64.1472
T 66 2385 70 83 w=18.7200 (after)
T 66 2435 70 83 w=18.7200 (after)
Mx 84.7688
T 77 74 84 85 w=12.4100 (list)
Mx 99.0804
Expand Down Expand Up @@ -208,7 +208,7 @@ Mx 56.1706
Mx 5.4000
Mx 4.9700
Mx 7.4700
T 2362 a=5.4000 80 a=5.0400 88 a=7.4700 (flow)
T 2399 a=5.4000 80 a=5.0400 88 a=7.4700 (flow)
Mx 75.6773
Mx 5.0300
Mx 4.4700
Expand Down Expand Up @@ -325,9 +325,9 @@ Mx 56.1706
Mx 5.4000
Mx 4.9700
Mx 7.4700
T 2362 a=5.4000 80 a=5.0400 88 a=7.4700 (flow)
T 2399 a=5.4000 80 a=5.0400 88 a=7.4700 (flow)
Mx 75.6773
T 66 2385 70 83 w=18.7200 (after)
T 66 2435 70 83 w=18.7200 (after)
Mx 96.0639
T 77 74 84 85 w=12.4100 (list)
Mx 110.1406
Expand Down
8 changes: 4 additions & 4 deletions tests/feat-1365-lists-footnote.expected
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Mx 64.4073
T 18 w=4.6500 (1)
Mx 45.4489
My 67.6452
T 2222 w=3.5100 (◦)
T 2223 w=3.5100 (◦)
Mx 54.7039
Mx 5.2800
Mx 4.4000
Expand Down Expand Up @@ -44,7 +44,7 @@ Mx 94.4036
T 20 w=4.6500 (3)
Mx 45.4489
My 91.6452
T 2222 w=3.5100 (◦)
T 2223 w=3.5100 (◦)
Mx 54.7039
Mx 5.2800
Mx 4.4000
Expand Down Expand Up @@ -105,7 +105,7 @@ Mx 67.3418
T 39 85 w=7.2090 (Ft)
Mx 43.3744
My 316.9585
T 2222 w=3.1590 (◦)
T 2223 w=3.1590 (◦)
Mx 51.7039
Mx 4.7520
Mx 3.9600
Expand Down Expand Up @@ -133,7 +133,7 @@ Mx 94.3357
T 39 85 w=7.2090 (Ft)
Mx 43.3744
My 338.5585
T 2222 w=3.1590 (◦)
T 2223 w=3.1590 (◦)
Mx 51.7039
Mx 4.7520
Mx 3.9600
Expand Down
Loading

0 comments on commit b74deaa

Please sign in to comment.