From 8e9b056664214f59326b2b7d1cc5c9af1d74522e Mon Sep 17 00:00:00 2001 From: Omikhleia Date: Wed, 15 Sep 2021 02:36:12 +0200 Subject: [PATCH] fix(languages): Add test 704 for French punctuations, fix expected 621 and 702 results --- tests/bug-621.expected | 550 ++++++++++++++++++++++++++--------------- tests/bug-702.expected | 64 +++-- tests/bug-704.expected | 272 ++++++++++++++++++++ tests/bug-704.sil | 26 ++ 4 files changed, 686 insertions(+), 226 deletions(-) create mode 100644 tests/bug-704.expected create mode 100644 tests/bug-704.sil diff --git a/tests/bug-621.expected b/tests/bug-621.expected index 1d84d886c..2cf83eb94 100644 --- a/tests/bug-621.expected +++ b/tests/bug-621.expected @@ -4,306 +4,458 @@ Mx 49.7638 My 53.4470 Set font Gentium Plus;15;400;;normal;;LTR T 47 68 w=14.0259 (La) -Mx 67.2704 +Mx 67.2333 T 83 72 76 81 72 w=34.1455 (peine) -Mx 104.8966 +Mx 104.8224 T 71 72 w=14.7290 (de) -Mx 123.1063 +Mx 122.9950 T 80 82 85 87 w=30.6958 (mort) -Mx 157.2827 +Mx 157.1345 T 72 86 87 w=17.8857 (est) -Mx 178.6492 +Mx 178.4638 T 81 112 70 72 86 86 68 76 85 72 w=64.0942 (nécessaire) -Mx 242.7434 +Mx 242.5581 T 15 w=3.4351 (,) -Mx 249.6592 +Mx 249.4367 T 71 76 86 72 81 87 w=38.0273 (disent) -Mx 291.1672 +Mx 290.9077 T 79 72 86 w=16.7871 (les) -Mx 311.4350 +Mx 311.1384 T 83 68 85 87 76 86 68 81 86 w=56.7480 (partisans) -Mx 371.6638 +Mx 371.3301 T 71 72 w=14.7290 (de) -Mx 389.8734 +Mx 389.5027 T 79 183 68 81 87 76 84 88 72 w=54.4922 (l’antique) -Mx 447.8463 +Mx 447.4385 T 72 87 w=12.0923 (et) -Mx 463.4193 +Mx 462.9744 T 69 68 85 69 68 85 72 w=47.8125 (barbare) -Mx 514.7125 +Mx 514.2306 T 85 82 88 87 76 81 72 w=45.8643 (routine) Mx 562.0768 T 30 w=3.4351 (;) Mx 29.7638 My 71.4470 -T 86 68 81 86 w=26.7480 (sans) -Mx 61.8199 -T 72 79 79 72 w=21.9873 (elle) -Mx 89.1153 -T 76 79 w=8.1299 (il) -Mx 102.5532 -T 81 183 72 86 87 w=29.5972 (n’est) -Mx 137.4585 -T 83 82 76 81 87 w=32.9956 (point) -Mx 175.7622 -T 71 72 w=14.7290 (de) -Mx 195.7992 -T 73 85 72 76 81 w=29.8755 (frein) -Mx 230.9828 -T 68 86 86 72 93 w=31.7651 (assez) -Mx 268.0560 -T 83 88 76 86 86 68 81 87 w=51.8701 (puissant) -Mx 325.2342 -T 83 82 88 85 w=29.3774 (pour) -Mx 359.9197 -T 79 72 w=10.9937 (le) -Mx 376.2214 -T 70 85 76 80 72 w=35.5371 (crime) -Mx 411.7586 +T 86 68 81 w=20.9546 (san) +Mx 50.7184 +T 86 w=5.7935 (s) +Mx 59.9972 +T 72 79 79 w=15.0586 (ell) +Mx 75.0558 +T 72 w=6.9287 (e) +Mx 85.4698 +T 76 w=4.0649 (i) +Mx 89.5348 +T 79 w=4.0649 (l) +Mx 97.0851 +T 81 183 72 86 w=24.4336 (n’es) +Mx 121.5187 +T 87 w=5.1636 (t) +Mx 130.1676 +T 83 82 76 81 w=27.8320 (poin) +Mx 157.9996 +T 87 w=5.1636 (t) +Mx 166.6485 +T 71 w=7.8003 (d) +Mx 174.4488 +T 72 w=6.9287 (e) +Mx 184.8629 +T 73 85 72 76 w=21.5991 (frei) +Mx 206.4620 +T 81 w=8.2764 (n) +Mx 218.2237 +T 68 86 86 72 w=25.4004 (asse) +Mx 243.6241 +T 93 w=6.3647 (z) +Mx 253.4742 +T 83 88 76 86 86 68 81 w=46.7065 (puissan) +Mx 300.1808 +T 87 w=5.1636 (t) +Mx 308.8297 +T 83 82 88 w=23.4375 (pou) +Mx 332.2672 +T 85 w=5.9399 (r) +Mx 341.6925 +T 79 w=4.0649 (l) +Mx 345.7574 +T 72 w=6.9287 (e) +Mx 356.1715 +T 70 85 76 80 w=28.6084 (crim) +Mx 384.7799 +T 72 w=6.9287 (e) +Mx 391.7086 T 17 w=3.4351 (.) -Mx 420.5017 -T 52 88 76 w=21.0132 (Qui) -Mx 446.8229 -T 89 82 88 86 w=28.6816 (vous) -Mx 480.8127 -T 79 183 68 w=14.3848 (l’a) -Mx 500.5055 -T 71 76 87 w=17.0288 (dit) -Mx 519.0343 +Mx 398.6290 +T 52 88 w=16.9482 (Qu) +Mx 415.5772 +T 76 w=4.0649 (i) +Mx 423.1275 +T 89 82 88 w=22.8882 (vou) +Mx 446.0157 +T 86 w=5.7935 (s) +Mx 455.2945 +T 79 183 w=7.5000 (l’) +Mx 462.7945 +T 68 w=6.8848 (a) +Mx 473.1646 +T 71 76 w=11.8652 (di) +Mx 485.0299 +T 87 w=5.1636 (t) +Mx 492.1754 T 34 w=6.4966 (?) -Mx 530.8390 -T 36 89 72 93 w=29.6191 (Avez) -Mx 560.4581 -T 16 w=5.0537 (-) +Mx 502.1573 +T 36 89 w=16.3257 (Av) +Mx 518.4830 +T 72 w=6.9287 (e) +Mx 525.4117 +T 93 16 89 82 w=26.3599 (z-vo) +Mx 551.7716 +T 88 w=7.9468 (u) +Mx 559.7184 +T 86 w=5.7935 (s) Mx 29.7638 My 89.4470 -T 89 82 88 86 w=28.6816 (vous) -Mx 61.9205 -T 70 68 79 70 88 79 112 w=43.0005 (calculé) -Mx 108.3960 -T 87 82 88 86 w=26.4478 (tous) -Mx 138.3188 -T 79 72 86 w=16.7871 (les) -Mx 158.5810 -T 85 72 86 86 82 85 87 86 w=48.8965 (ressorts) -Mx 210.9526 -T 83 68 85 w=20.7715 (par) -Mx 235.1991 -T 79 72 86 84 88 72 79 86 w=49.2480 (lesquels) -Mx 287.9222 -T 79 72 86 w=16.7871 (les) -Mx 308.1844 -T 79 82 76 86 w=21.4673 (lois) -Mx 333.1267 -T 83 112 81 68 79 72 86 w=46.8237 (pénales) -Mx 383.4255 -T 83 72 88 89 72 81 87 w=50.5884 (peuvent) -Mx 437.4890 -T 68 74 76 85 w=24.2065 (agir) -Mx 465.1706 -T 86 88 85 w=19.6802 (sur) -Mx 488.3258 -T 79 68 w=10.9497 (la) -Mx 502.7506 -T 86 72 81 86 76 69 76 79 76 87 112 w=62.7612 (sensibilité) +T 70 68 79 70 88 79 w=36.0718 (calcul) +Mx 65.8356 +T 112 w=6.9287 (é) +Mx 76.7682 +T 87 82 w=12.7075 (to) +Mx 89.4758 +T 88 w=7.9468 (u) +Mx 97.4225 +T 86 w=5.7935 (s) +Mx 107.2200 +T 79 w=4.0649 (l) +Mx 111.2849 +T 72 w=6.9287 (e) +Mx 118.2136 +T 86 w=5.7935 (s) +Mx 128.0111 +T 85 72 86 86 82 85 w=37.9395 (ressor) +Mx 165.9505 +T 87 w=5.1636 (t) +Mx 171.1141 +T 86 w=5.7935 (s) +Mx 180.9115 +T 83 w=7.9468 (p) +Mx 188.8583 +T 68 w=6.8848 (a) +Mx 195.7431 +T 85 w=5.9399 (r) +Mx 205.6870 +T 79 72 86 84 88 72 w=39.3896 (lesque) +Mx 245.0766 +T 79 w=4.0649 (l) +Mx 249.1416 +T 86 w=5.7935 (s) +Mx 258.9390 +T 79 w=4.0649 (l) +Mx 263.0039 +T 72 w=6.9287 (e) +Mx 269.9327 +T 86 w=5.7935 (s) +Mx 279.7301 +T 79 82 w=11.6089 (lo) +Mx 291.3390 +T 76 w=4.0649 (i) +Mx 295.4039 +T 86 w=5.7935 (s) +Mx 305.2013 +T 83 112 81 68 79 w=34.1016 (pénal) +Mx 339.3029 +T 72 w=6.9287 (e) +Mx 346.2316 +T 86 w=5.7935 (s) +Mx 356.0290 +T 83 72 88 89 72 w=37.1484 (peuve) +Mx 393.1775 +T 81 w=8.2764 (n) +Mx 401.4539 +T 87 w=5.1636 (t) +Mx 410.6214 +T 68 74 w=14.2017 (ag) +Mx 424.8231 +T 76 w=4.0649 (i) +Mx 428.8880 +T 85 w=5.9399 (r) +Mx 438.8319 +T 86 w=5.7935 (s) +Mx 444.6254 +T 88 w=7.9468 (u) +Mx 452.5722 +T 85 w=5.9399 (r) +Mx 462.5161 +T 79 w=4.0649 (l) +Mx 466.5810 +T 68 w=6.8848 (a) +Mx 477.4698 +T 86 72 81 86 76 69 76 79 76 87 w=55.8325 (sensibilit) +Mx 533.3023 +T 112 w=6.9287 (é) +Mx 544.2350 +T 75 88 w=16.2231 (hu) +Mx 560.4581 +T 16 w=5.0537 (-) Mx 29.7638 My 107.4470 -T 75 88 80 68 76 81 72 w=54.4263 (humaine) -Mx 85.6900 +T 80 68 76 w=22.9980 (mai) +Mx 52.7618 +T 81 w=8.2764 (n) +Mx 61.0382 +T 72 w=6.9287 (e) +Mx 69.9488 T 34 w=6.4966 (?) -Mx 95.5307 -T 43 112 79 68 86 w=33.4790 (Hélas) -Mx 130.5097 +Mx 81.0611 +T 43 112 w=16.7358 (Hé) +Mx 97.7969 +T 79 w=4.0649 (l) +Mx 101.8618 +T 68 w=6.8848 (a) +Mx 108.7466 +T 86 w=5.7935 (s) +Mx 116.5220 T 4 w=4.0796 (!) -Mx 137.9333 -T 68 89 68 81 87 w=34.6069 (avant) -Mx 175.8843 +Mx 125.2172 +T 68 w=6.8848 (a) +Mx 132.1020 +T 89 w=7.3975 (v) +Mx 139.4995 +T 68 81 w=15.1611 (an) +Mx 154.6606 +T 87 w=5.1636 (t) +Mx 164.4398 T 79 68 w=10.9497 (la) -Mx 190.1780 -T 80 82 85 87 w=30.6958 (mort) -Mx 220.8738 -T 15 w=3.4351 (,) -Mx 227.6529 -T 70 82 80 69 76 72 81 w=53.0347 (combien) -Mx 284.0316 +Mx 180.0052 +T 80 w=12.0483 (m) +Mx 192.0535 +T 82 w=7.5439 (o) +Mx 199.5974 +T 85 87 15 w=14.5386 (rt,) +Mx 218.7517 +T 70 82 80 w=26.1475 (com) +Mx 244.8991 +T 69 w=7.6172 (b) +Mx 252.5163 +T 76 72 w=10.9937 (ie) +Mx 263.5100 +T 81 w=8.2764 (n) +Mx 276.4020 T 71 72 w=14.7290 (de) -Mx 302.1046 -T 71 82 88 79 72 88 85 86 w=53.9648 (douleurs) -Mx 359.4135 -T 83 75 92 86 76 84 88 72 86 w=61.8750 (physiques) -Mx 424.6325 +Mx 295.7466 +T 71 82 88 79 w=27.3560 (doul) +Mx 323.1026 +T 72 w=6.9287 (e) +Mx 330.0313 +T 88 85 86 w=19.6802 (urs) +Mx 354.3271 +T 83 75 92 86 76 w=33.4790 (physi) +Mx 387.8061 +T 84 w=7.7271 (q) +Mx 395.5331 +T 88 72 w=14.8755 (ue) +Mx 410.4086 +T 86 w=5.7935 (s) +Mx 420.8177 T 72 87 w=12.0923 (et) -Mx 440.0689 -T 80 82 85 68 79 72 86 w=49.2041 (morales) -Mx 492.6170 -T 79 183 75 82 80 80 72 w=54.3457 (l’homme) +Mx 437.5257 +T 80 82 85 w=25.5322 (mor) +Mx 463.0579 +T 68 w=6.8848 (a) +Mx 469.9426 +T 79 72 86 w=16.7871 (les) +Mx 491.3454 +T 79 183 75 w=15.7764 (l’h) +Mx 507.1218 +T 82 w=7.5439 (o) +Mx 514.6657 +T 80 80 w=24.0967 (mm) +Mx 538.7624 +T 72 w=6.9287 (e) Mx 550.3067 T 81 72 w=15.2051 (ne) Mx 29.7638 My 125.4470 -T 83 72 88 87 w=27.9858 (peut) +T 83 w=7.9468 (p) +Mx 37.7106 +T 72 88 w=14.8755 (eu) +Mx 52.5860 +T 87 w=5.1636 (t) Mx 57.7496 -T 16 w=5.0537 (-) -Mx 62.8033 -T 76 79 w=8.1299 (il) -Mx 74.9649 +T 16 76 79 w=13.1836 (-il) +Mx 74.9648 T 83 68 86 w=20.6250 (pas) -Mx 99.6216 -T 72 81 71 88 85 72 85 w=49.7607 (endurer) -Mx 150.8823 +Mx 99.6214 +T 72 81 71 w=23.0054 (end) +Mx 122.6268 +T 88 w=7.9468 (u) +Mx 130.5736 +T 85 72 85 w=18.8086 (rer) +Mx 151.3641 T 4 w=4.0796 (!) Mx 49.7638 My 143.4470 T 57 82 76 70 76 w=31.9775 (Voici) -Mx 85.7503 +Mx 85.7506 T 88 81 72 w=23.1519 (une) -Mx 112.9112 +Mx 112.9117 T 169 w=7.2803 («) -Mx 124.2005 -T 70 76 87 68 87 76 82 81 w=47.7173 (citation) -Mx 175.9268 +Mx 123.3767 +T 70 76 87 68 87 76 82 w=39.4409 (citatio) +Mx 162.8176 +T 81 w=8.2764 (n) +Mx 174.2787 T 170 w=7.2803 (») -Mx 187.2160 -T 72 81 87 85 72 w=33.2373 (entre) -Mx 224.4623 -T 74 88 76 79 79 72 80 72 87 86 w=64.3213 (guillemets) -Mx 288.7836 -T 17 w=3.4351 (.) +Mx 185.5683 +T 72 81 87 w=20.3687 (ent) +Mx 205.9369 +T 85 w=5.9399 (r) +Mx 211.8769 +T 72 w=6.9287 (e) +Mx 222.8149 +T 74 88 76 79 79 72 80 72 w=53.3643 (guilleme) +Mx 276.1791 +T 87 w=5.1636 (t) +Mx 281.3427 +T 86 17 w=9.2285 (s.) Mx 49.7638 My 161.4470 T 47 68 w=14.0259 (La) -Mx 67.2704 +Mx 67.2333 T 83 72 76 81 72 w=34.1455 (peine) -Mx 104.8966 +Mx 104.8224 T 71 72 w=14.7290 (de) -Mx 123.1063 +Mx 122.9950 T 80 82 85 87 w=30.6958 (mort) -Mx 157.2827 +Mx 157.1345 T 72 86 87 w=17.8857 (est) -Mx 178.6492 +Mx 178.4638 T 81 112 70 72 86 86 68 76 85 72 w=64.0942 (nécessaire) -Mx 242.7434 +Mx 242.5581 T 15 w=3.4351 (,) -Mx 249.6592 +Mx 249.4367 T 71 76 86 72 81 87 w=38.0273 (disent) -Mx 291.1672 +Mx 290.9077 T 79 72 86 w=16.7871 (les) -Mx 311.4350 +Mx 311.1384 T 83 68 85 87 76 86 68 81 86 w=56.7480 (partisans) -Mx 371.6638 +Mx 371.3301 T 71 72 w=14.7290 (de) -Mx 389.8734 +Mx 389.5027 T 79 183 68 81 87 76 84 88 72 w=54.4922 (l’antique) -Mx 447.8463 +Mx 447.4385 T 72 87 w=12.0923 (et) -Mx 463.4193 +Mx 462.9744 T 69 68 85 69 68 85 72 w=47.8125 (barbare) -Mx 514.7125 +Mx 514.2306 T 85 82 88 87 76 81 72 w=45.8643 (routine) Mx 562.0768 T 30 w=3.4351 (;) Mx 29.7638 My 179.4470 T 86 68 81 86 w=26.7480 (sans) -Mx 61.8199 +Mx 59.9972 T 72 79 79 72 w=21.9873 (elle) -Mx 89.1153 +Mx 85.4698 T 76 79 w=8.1299 (il) -Mx 102.5532 +Mx 97.0851 T 81 183 72 86 87 w=29.5972 (n’est) -Mx 137.4585 +Mx 130.1676 T 83 82 76 81 87 w=32.9956 (point) -Mx 175.7622 +Mx 166.6485 T 71 72 w=14.7290 (de) -Mx 195.7992 +Mx 184.8629 T 73 85 72 76 81 w=29.8755 (frein) -Mx 230.9828 +Mx 218.2237 T 68 86 86 72 93 w=31.7651 (assez) -Mx 268.0560 +Mx 253.4742 T 83 88 76 86 86 68 81 87 w=51.8701 (puissant) -Mx 325.2342 +Mx 308.8297 T 83 82 88 85 w=29.3774 (pour) -Mx 359.9197 +Mx 341.6925 T 79 72 w=10.9937 (le) -Mx 376.2214 +Mx 356.1715 T 70 85 76 80 72 w=35.5371 (crime) -Mx 411.7586 +Mx 391.7086 T 17 w=3.4351 (.) -Mx 420.5017 +Mx 398.6290 T 52 88 76 w=21.0132 (Qui) -Mx 446.8229 +Mx 423.1275 T 89 82 88 86 w=28.6816 (vous) -Mx 480.8127 +Mx 455.2945 T 79 183 68 w=14.3848 (l’a) -Mx 500.5055 +Mx 473.1646 T 71 76 87 w=17.0288 (dit) -Mx 519.0343 +Mx 492.1754 T 34 w=6.4966 (?) -Mx 530.8390 +Mx 502.1573 T 36 89 72 93 w=29.6191 (Avez) -Mx 560.4581 +Mx 531.7765 T 16 w=5.0537 (-) +Mx 536.8302 +T 89 82 88 86 w=28.6816 (vous) Mx 29.7638 My 197.4470 -T 89 82 88 86 w=28.6816 (vous) -Mx 61.9205 T 70 68 79 70 88 79 112 w=43.0005 (calculé) -Mx 108.3960 +Mx 76.7682 T 87 82 88 86 w=26.4478 (tous) -Mx 138.3188 +Mx 107.2200 T 79 72 86 w=16.7871 (les) -Mx 158.5810 +Mx 128.0111 T 85 72 86 86 82 85 87 86 w=48.8965 (ressorts) -Mx 210.9526 +Mx 180.9115 T 83 68 85 w=20.7715 (par) -Mx 235.1991 +Mx 205.6870 T 79 72 86 84 88 72 79 86 w=49.2480 (lesquels) -Mx 287.9222 +Mx 258.9390 T 79 72 86 w=16.7871 (les) -Mx 308.1844 +Mx 279.7301 T 79 82 76 86 w=21.4673 (lois) -Mx 333.1267 +Mx 305.2013 T 83 112 81 68 79 72 86 w=46.8237 (pénales) -Mx 383.4255 +Mx 356.0290 T 83 72 88 89 72 81 87 w=50.5884 (peuvent) -Mx 437.4890 +Mx 410.6214 T 68 74 76 85 w=24.2065 (agir) -Mx 465.1706 +Mx 438.8319 T 86 88 85 w=19.6802 (sur) -Mx 488.3258 +Mx 462.5161 T 79 68 w=10.9497 (la) -Mx 502.7506 +Mx 477.4698 T 86 72 81 86 76 69 76 79 76 87 112 w=62.7612 (sensibilité) +Mx 544.2350 +T 75 88 w=16.2231 (hu) +Mx 560.4581 +T 16 w=5.0537 (-) Mx 29.7638 My 215.4470 -T 75 88 80 68 76 81 72 w=54.4263 (humaine) -Mx 85.6900 +T 80 68 76 81 72 w=38.2031 (maine) +Mx 69.9488 T 34 w=6.4966 (?) -Mx 95.5307 +Mx 81.0611 T 43 112 79 68 86 w=33.4790 (Hélas) -Mx 130.5097 +Mx 116.5220 T 4 w=4.0796 (!) -Mx 137.9333 +Mx 125.2172 T 68 89 68 81 87 w=34.6069 (avant) -Mx 175.8843 +Mx 164.4398 T 79 68 w=10.9497 (la) -Mx 190.1780 +Mx 180.0052 T 80 82 85 87 w=30.6958 (mort) -Mx 220.8738 +Mx 210.7010 T 15 w=3.4351 (,) -Mx 227.6529 +Mx 218.7517 T 70 82 80 69 76 72 81 w=53.0347 (combien) -Mx 284.0316 +Mx 276.4020 T 71 72 w=14.7290 (de) -Mx 302.1046 +Mx 295.7466 T 71 82 88 79 72 88 85 86 w=53.9648 (douleurs) -Mx 359.4135 +Mx 354.3271 T 83 75 92 86 76 84 88 72 86 w=61.8750 (physiques) -Mx 424.6325 +Mx 420.8177 T 72 87 w=12.0923 (et) -Mx 440.0689 +Mx 437.5257 T 80 82 85 68 79 72 86 w=49.2041 (morales) -Mx 492.6170 +Mx 491.3454 T 79 183 75 82 80 80 72 w=54.3457 (l’homme) Mx 550.3067 T 81 72 w=15.2051 (ne) @@ -314,37 +466,37 @@ Mx 57.7496 T 16 w=5.0537 (-) Mx 62.8033 T 76 79 w=8.1299 (il) -Mx 74.9649 +Mx 74.9648 T 83 68 86 w=20.6250 (pas) -Mx 99.6216 +Mx 99.6214 T 72 81 71 88 85 72 85 w=49.7607 (endurer) -Mx 150.8823 +Mx 151.3641 T 4 w=4.0796 (!) Mx 49.7638 My 251.4470 T 57 82 76 70 76 w=31.9775 (Voici) -Mx 85.7516 +Mx 85.7506 T 88 81 72 w=23.1519 (une) -Mx 112.9138 +Mx 112.9117 T 169 w=7.2803 («) -Mx 120.1941 +Mx 123.3767 T 70 76 87 68 87 76 82 81 w=47.7173 (citation) -Mx 167.9114 +Mx 174.2787 T 170 w=7.2803 (») -Mx 179.2020 +Mx 185.5683 T 72 81 87 85 72 w=33.2373 (entre) -Mx 216.4496 +Mx 222.8149 T 74 88 76 79 79 72 80 72 87 86 w=64.3213 (guillemets) -Mx 280.7709 +Mx 287.1361 T 17 w=3.4351 (.) Mx 49.7638 My 269.4470 T 43 112 79 68 86 w=33.4790 (Hélas) -Mx 84.7428 +Mx 85.2247 T 4 w=4.0796 (!) -Mx 88.8224 +Mx 89.3043 T 4 w=4.0796 (!) -Mx 92.9020 +Mx 93.3839 T 4 w=4.0796 (!) Mx 295.2916 My 780.6177 diff --git a/tests/bug-702.expected b/tests/bug-702.expected index c01d3b0f6..c8c3c75ad 100644 --- a/tests/bug-702.expected +++ b/tests/bug-702.expected @@ -37,33 +37,33 @@ T 16 w=3.3691 (-) Mx 14.8819 My 40.7889 T 85 76 79 79 72 88 91 w=27.0361 (rilleux) -Mx 44.4591 +Mx 44.3050 T 81 72 w=10.1367 (ne) -Mx 57.1370 +Mx 56.8288 T 71 82 76 87 w=16.3818 (doit) -Mx 76.0599 +Mx 75.5976 T 83 68 86 w=13.7500 (pas) -Mx 90.8099 +Mx 91.7346 Mx 4.6191 Mx 3.4424 Mx 3.9600 Mx 4.6191 T 72 a=4.6191 2195 x=0.3809 87 a=3.4424 85 a=3.9600 72 a=4.6191 (être) -Mx 109.9917 +Mx 110.7623 T 83 85 82 81 82 81 70 112 w=39.3408 (prononcé) -Mx 149.3325 +Mx 150.1031 T 12 w=3.1689 ()) -Mx 152.5015 +Mx 153.2720 T 15 w=2.2900 (,) -Mx 157.3326 +Mx 157.9491 T 89 76 89 68 76 87 w=23.3154 (vivait) -Mx 183.1892 +Mx 183.6515 T 37 72 85 81 68 71 72 87 87 72 w=45.5078 (Bernadette) -Mx 228.6970 +Mx 229.1593 T 15 w=2.2900 (,) -Mx 233.5282 +Mx 233.8364 T 84 88 76 w=13.1592 (qui) -Mx 249.2285 +Mx 249.3826 T 81 82 88 86 w=19.7070 (nous) Mx 271.4766 T 71 76 w=7.9102 (di) @@ -74,23 +74,33 @@ My 52.7889 T 86 68 76 87 w=14.6045 (sait) Mx 32.1394 T 169 w=4.8535 («) -Mx 39.6459 -T 53 76 72 81 w=18.4570 (Rien) -Mx 60.7559 -T 71 183 76 80 83 82 85 87 68 81 87 w=49.5117 (d’important) -Mx 111.2676 +Mx 39.1101 +T 53 76 72 w=12.9395 (Rie) +Mx 52.0496 +T 81 w=5.5176 (n) +Mx 60.2202 +T 71 183 76 80 83 82 85 87 68 81 w=46.0693 (d’importan) +Mx 106.2895 +T 87 w=3.4424 (t) +Mx 111.0532 T 4 w=2.7197 (!) -Mx 116.6403 +Mx 115.8901 T 170 w=4.8535 (») -Mx 124.1468 -T 36 86 w=9.8145 (As) -Mx 133.9613 -T 16 w=3.3691 (-) -Mx 137.3304 -T 87 88 w=8.7402 (tu) -Mx 148.7236 -T 72 81 87 72 81 71 88 w=34.2139 (entendu) -Mx 183.9375 +Mx 123.3967 +T 36 w=5.9521 (A) +Mx 129.3488 +T 86 16 w=7.2314 (s-) +Mx 136.5803 +T 87 w=3.4424 (t) +Mx 140.0226 +T 88 w=5.2979 (u) +Mx 147.9735 +T 72 81 87 72 81 w=23.7158 (enten) +Mx 171.6893 +T 71 w=5.2002 (d) +Mx 176.8895 +T 88 w=5.2979 (u) +Mx 183.5087 T 34 w=4.3311 (?) Mx 146.4727 My 392.0445 diff --git a/tests/bug-704.expected b/tests/bug-704.expected new file mode 100644 index 000000000..03e729794 --- /dev/null +++ b/tests/bug-704.expected @@ -0,0 +1,272 @@ +Set paper size 432 648 +Begin page +Mx 41.6000 +My 39.6266 +Set font Gentium Plus;10;400;;normal;;LTR +T 56 81 w=12.0557 (Un) +Mx 54.9770 +T 4 w=2.7197 (!) +Mx 60.3669 +T 39 72 88 w=15.8447 (Deu) +Mx 76.2117 +T 91 w=5.0293 (x) +Mx 82.5622 +T 34 w=4.3311 (?) +Mx 89.5636 +T 55 85 82 w=14.4971 (Tro) +Mx 104.0606 +T 76 w=2.7100 (i) +Mx 106.7706 +T 86 w=3.8623 (s) +Mx 111.9542 +T 4 34 w=7.0508 (!?) +Mx 121.6752 +T 52 88 68 w=15.8887 (Qua) +Mx 137.5639 +T 87 w=3.4424 (t) +Mx 141.0063 +T 85 w=3.9600 (r) +Mx 144.9662 +T 72 w=4.6191 (e) +Mx 150.9067 +T 4 4 4 w=8.1592 (!!!) +Mx 41.6000 +My 51.6266 +T 38 76 81 84 w=18.7402 (Cinq) +Mx 63.0114 +T 29 w=2.2900 (:) +Mx 67.9726 +T 169 w=4.8535 («) +Mx 74.9488 +T 54 w=4.7607 (S) +Mx 79.7095 +T 76 w=2.7100 (i) +Mx 82.4195 +T 91 w=5.0293 (x) +Mx 90.1199 +T 190 w=3.0469 (‹) +Mx 95.2894 +T 54 w=4.7607 (S) +Mx 100.0502 +T 72 83 87 w=13.3594 (ept) +Mx 115.5322 +T 191 67 w=6.2354 (›`) +Mx 121.7675 +T 43 88 w=11.8359 (Hu) +Mx 133.6035 +T 76 w=2.7100 (i) +Mx 136.3134 +T 87 w=3.4424 (t) +Mx 141.8785 +T 170 w=4.8535 (») +Mx 148.0533 +T 4 w=2.7197 (!) +Mx 41.6000 +My 63.6266 +T 62 w=3.0762 ([) +Mx 44.6762 +T 49 72 88 73 w=19.5166 (Neuf) +Mx 64.1928 +T 64 w=3.0762 (]) +Mx 69.9385 +T 29 w=2.2900 (:) +Mx 74.8980 +T 11 39 76 w=11.8066 ((Di) +Mx 86.7047 +T 91 w=5.0293 (x) +Mx 91.7340 +T 12 w=3.1689 ()) +Mx 96.2242 +T 4 w=2.7197 (!) +Mx 101.6134 +Set font Gentium Plus;10;400;Italic;normal;;LTR +T 50 81 93 72 w=18.1104 (Onze) +Mx 121.0451 +Set font Gentium Plus;10;400;;normal;;LTR +T 4 w=2.7197 (!) +Mx 126.4343 +Set font Gentium Plus;10;400;Italic;normal;;LTR +T 169 w=4.3066 («) +Mx 132.8631 +T 39 82 88 93 w=18.4570 (Douz) +Mx 151.3201 +T 72 w=3.9307 (e) +Mx 157.3730 +T 170 w=4.3066 (») +Mx 163.0009 +Set font Gentium Plus;10;400;;normal;;LTR +T 4 w=2.7197 (!) +Mx 41.6000 +My 75.6266 +T 55 85 72 76 93 72 w=25.6592 (Treize) +Mx 68.5805 +T 30 w=2.2900 (;) +Mx 73.5448 +T 52 88 68 87 82 85 93 w=32.5635 (Quatorz) +Mx 106.1082 +T 72 w=4.6191 (e) +Mx 113.4016 +T 171 w=6.6895 (…) +Mx 120.0911 +T 4 w=2.7197 (!) +Mx 41.6000 +My 87.6266 +T 52 88 76 81 93 72 w=28.3887 (Quinze) +Mx 72.6609 +T 11 w=3.1689 (() +Mx 75.8298 +T 34 w=4.3311 (?) +Mx 80.1609 +T 12 w=3.1689 ()) +Mx 83.3298 +T 15 w=2.2900 (,) +Mx 86.9412 +T 34 w=4.3311 (?) +Mx 91.2722 +T 4 w=2.7197 (!) +Mx 93.9919 +T 15 w=2.2900 (,) +Mx 98.9542 +T 62 w=3.0762 ([) +Mx 102.0304 +T 4 w=2.7197 (!) +Mx 104.7501 +T 64 w=3.0762 (]) +Mx 107.8263 +T 15 w=2.2900 (,) +Mx 112.7885 +T 171 w=6.6895 (…) +Mx 119.4780 +T 34 w=4.3311 (?) +Mx 126.4813 +T 72 87 w=8.0615 (et) +Mx 134.5428 +T 70 w=4.3701 (c) +Mx 138.9129 +T 17 w=2.2900 (.) +Mx 41.6000 +My 99.6266 +T 56 81 w=12.0557 (Un) +Mx 54.9770 +T 4 w=2.7197 (!) +Mx 60.3669 +T 39 72 88 91 w=20.8740 (Deux) +Mx 82.5622 +T 34 w=4.3311 (?) +Mx 89.5636 +T 55 85 82 76 86 w=21.0693 (Trois) +Mx 111.9542 +T 4 w=2.7197 (!) +Mx 114.6739 +T 34 w=4.3311 (?) +Mx 121.6752 +T 52 88 68 87 85 72 w=27.9102 (Quatre) +Mx 150.9067 +T 4 w=2.7197 (!) +Mx 153.6264 +T 4 w=2.7197 (!) +Mx 156.3461 +T 4 w=2.7197 (!) +Mx 41.6000 +My 111.6266 +T 38 76 81 84 w=18.7402 (Cinq) +Mx 63.0114 +T 29 w=2.2900 (:) +Mx 67.9726 +T 169 w=4.8535 («) +Mx 74.9488 +T 54 76 91 w=12.5000 (Six) +Mx 90.1199 +T 190 w=3.0469 (‹) +Mx 95.2894 +T 54 72 83 87 w=18.1201 (Sept) +Mx 115.5322 +T 191 w=3.0469 (›) +Mx 118.5791 +T 67 w=3.1885 (`) +Mx 121.7675 +T 43 88 76 87 w=17.9883 (Huit) +Mx 141.8785 +T 170 w=4.8535 (») +Mx 148.0533 +T 4 w=2.7197 (!) +Mx 41.6000 +My 123.6266 +T 62 w=3.0762 ([) +Mx 44.6762 +T 49 72 88 73 w=19.5166 (Neuf) +Mx 64.1928 +T 64 w=3.0762 (]) +Mx 69.9385 +T 29 w=2.2900 (:) +Mx 74.8980 +T 11 w=3.1689 (() +Mx 78.0670 +T 39 76 91 w=13.6670 (Dix) +Mx 91.7340 +T 12 w=3.1689 ()) +Mx 96.2242 +T 4 w=2.7197 (!) +Mx 101.6134 +Set font Gentium Plus;10;400;Italic;normal;;LTR +T 50 81 93 72 w=18.1104 (Onze) +Mx 121.0451 +Set font Gentium Plus;10;400;;normal;;LTR +T 4 w=2.7197 (!) +Mx 126.4343 +Set font Gentium Plus;10;400;Italic;normal;;LTR +T 169 w=4.3066 («) +Mx 132.8631 +T 39 82 88 93 w=18.4570 (Douz) +Mx 151.3201 +T 72 w=3.9307 (e) +Mx 157.3730 +T 170 w=4.3066 (») +Mx 163.0009 +Set font Gentium Plus;10;400;;normal;;LTR +T 4 w=2.7197 (!) +Mx 41.6000 +My 135.6266 +T 55 85 72 76 93 72 w=25.6592 (Treize) +Mx 68.5805 +T 30 w=2.2900 (;) +Mx 73.5450 +T 52 88 68 87 82 85 93 72 w=37.1826 (Quatorze) +Mx 110.7277 +T 171 w=6.6895 (…) +Mx 117.4171 +T 4 w=2.7197 (!) +Mx 41.6000 +My 147.6266 +T 52 88 76 81 93 72 w=28.3887 (Quinze) +Mx 72.6609 +T 11 w=3.1689 (() +Mx 75.8298 +T 34 w=4.3311 (?) +Mx 80.1609 +T 12 w=3.1689 ()) +Mx 83.3298 +T 15 w=2.2900 (,) +Mx 86.9412 +T 34 w=4.3311 (?) +Mx 91.2722 +T 4 w=2.7197 (!) +Mx 93.9919 +T 15 w=2.2900 (,) +Mx 98.9542 +T 62 w=3.0762 ([) +Mx 102.0304 +T 4 64 w=5.7959 (!]) +Mx 107.8263 +T 15 w=2.2900 (,) +Mx 112.7885 +T 171 w=6.6895 (…) +Mx 119.4780 +T 34 w=4.3311 (?) +Mx 126.4813 +T 72 87 70 17 w=14.7217 (etc.) +Mx 213.6538 +My 602.2391 +T 20 w=4.6924 (1) +End page +Finish diff --git a/tests/bug-704.sil b/tests/bug-704.sil new file mode 100644 index 000000000..b1a688acf --- /dev/null +++ b/tests/bug-704.sil @@ -0,0 +1,26 @@ +\begin[papersize=6in x 9in]{document} + +\language[main=fr] + +Un ! Deux ? Trois !? Quatre !!! + +Cinq : « Six ‹ Sept ›`Huit » ! + +[Neuf] : (Dix) ! \em{Onze} ! \em{« Douze »} ! + +Treize ; Quatorze … ! + +Quinze (?), ?!, [!], …? etc. + + +Un! Deux? Trois!? Quatre!!! + +Cinq: «Six ‹Sept›`Huit»! + +[Neuf]: (Dix)! \em{Onze}! \em{« Douze »}! + +Treize; Quatorze…! + +Quinze ( ?), ? !, [ !], … ? etc. + +\end{document}