diff options
| author | Dan Allen <dan.j.allen@gmail.com> | 2022-05-15 14:29:26 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-15 14:29:26 -0600 |
| commit | 8294aa6a671893740bbe487760f4c9727bb0d2bf (patch) | |
| tree | 98b589866b75f2eb6445d1f281a324ce87b35065 | |
| parent | 229e6428a7e244a368fe8b1ae8a946999f821695 (diff) | |
resolves #2173 apply top line height padding to first line of text when text runs to top of next page (PR #2170)
18 files changed, 864 insertions, 826 deletions
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index 88a80dba..e9163df7 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -11,6 +11,10 @@ Enhancements:: * allow hyphenation to be turned on and configured using the `base-hyphens` key in the theme (#2161) +Bug Fixes:: + +* apply top line height padding to first line of text when text runs to top of next page (#2173) + == 2.0.0.beta.2 (2022-05-14) - @mojavelinux Enhancements:: diff --git a/examples/chronicles-example.pdf b/examples/chronicles-example.pdf index ba96a0f6..c1e7e4e6 100644 --- a/examples/chronicles-example.pdf +++ b/examples/chronicles-example.pdf @@ -9033,10 +9033,10 @@ q 52.24 805.89 m 543.04 805.89 l 545.24914 805.89 547.04 804.09914 547.04 801.89 c -547.04 331.63027 l -547.04 329.42114 545.24914 327.63027 543.04 327.63027 c -52.24 327.63027 l -50.03086 327.63027 48.24 329.42114 48.24 331.63027 c +547.04 329.26527 l +547.04 327.05614 545.24914 325.26527 543.04 325.26527 c +52.24 325.26527 l +50.03086 325.26527 48.24 327.05614 48.24 329.26527 c 48.24 801.89 l 48.24 804.09914 50.03086 805.89 52.24 805.89 c h @@ -9047,10 +9047,10 @@ f 52.24 805.89 m 543.04 805.89 l 545.24914 805.89 547.04 804.09914 547.04 801.89 c -547.04 331.63027 l -547.04 329.42114 545.24914 327.63027 543.04 327.63027 c -52.24 327.63027 l -50.03086 327.63027 48.24 329.42114 48.24 331.63027 c +547.04 329.26527 l +547.04 327.05614 545.24914 325.26527 543.04 325.26527 c +52.24 325.26527 l +50.03086 325.26527 48.24 327.05614 48.24 329.26527 c 48.24 801.89 l 48.24 804.09914 50.03086 805.89 52.24 805.89 c h @@ -9071,7 +9071,7 @@ Q 0.53333 0.53333 0.53333 SCN BT -59.24 797.77031 Td +59.24 795.40531 Td /F5.0 9.4415 Tf <ca2a2f> Tj ET @@ -9082,7 +9082,7 @@ ET 0.33333 0.33333 0.33333 SCN BT -59.24 784.72908 Td +59.24 782.36408 Td /F5.0 9.4415 Tf <4053657373696f6e53636f706564> Tj ET @@ -9093,7 +9093,7 @@ ET 0.0 0.53333 0.0 SCN BT -59.24 771.68784 Td +59.24 769.32284 Td /F7.0 9.4415 Tf <7075626c6963> Tj ET @@ -9104,7 +9104,7 @@ ET 0.2 0.2 0.2 SCN BT -87.5645 771.68784 Td +87.5645 769.32284 Td /F5.0 9.4415 Tf <20> Tj ET @@ -9115,7 +9115,7 @@ ET 0.0 0.53333 0.0 SCN BT -92.28525 771.68784 Td +92.28525 769.32284 Td /F7.0 9.4415 Tf <636c617373> Tj ET @@ -9126,7 +9126,7 @@ ET 0.2 0.2 0.2 SCN BT -115.889 771.68784 Td +115.889 769.32284 Td /F5.0 9.4415 Tf <20> Tj ET @@ -9137,7 +9137,7 @@ ET 0.73333 0.0 0.4 SCN BT -120.60975 771.68784 Td +120.60975 769.32284 Td /F7.0 9.4415 Tf <4772656574696e675265636569766572> Tj ET @@ -9148,7 +9148,7 @@ ET 0.2 0.2 0.2 SCN BT -196.14175 771.68784 Td +196.14175 769.32284 Td /F5.0 9.4415 Tf <20> Tj ET @@ -9159,7 +9159,7 @@ ET 0.0 0.53333 0.0 SCN BT -200.8625 771.68784 Td +200.8625 769.32284 Td /F7.0 9.4415 Tf <696d706c656d656e7473> Tj ET @@ -9170,7 +9170,7 @@ ET 0.2 0.2 0.2 SCN BT -248.07 771.68784 Td +248.07 769.32284 Td /F5.0 9.4415 Tf <20> Tj ET @@ -9181,7 +9181,7 @@ ET 0.73333 0.0 0.4 SCN BT -252.79075 771.68784 Td +252.79075 769.32284 Td /F7.0 9.4415 Tf <4576656e745265636569766572> Tj ET @@ -9192,7 +9192,7 @@ ET 0.2 0.2 0.2 SCN BT -314.1605 771.68784 Td +314.1605 769.32284 Td /F5.0 9.4415 Tf <2c> Tj ET @@ -9203,7 +9203,7 @@ ET 0.2 0.2 0.2 SCN BT -318.88125 771.68784 Td +318.88125 769.32284 Td /F5.0 9.4415 Tf <20> Tj ET @@ -9214,7 +9214,7 @@ ET 0.73333 0.0 0.4 SCN BT -323.602 771.68784 Td +323.602 769.32284 Td /F7.0 9.4415 Tf <53657269616c697a61626c65> Tj ET @@ -9225,7 +9225,7 @@ ET 0.2 0.2 0.2 SCN BT -380.251 771.68784 Td +380.251 769.32284 Td /F5.0 9.4415 Tf <20> Tj ET @@ -9236,7 +9236,7 @@ ET 0.2 0.2 0.2 SCN BT -384.97175 771.68784 Td +384.97175 769.32284 Td /F5.0 9.4415 Tf <7b> Tj ET @@ -9247,7 +9247,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 745.60537 Td +59.24 743.24037 Td /F5.0 9.4415 Tf <ca202020> Tj ET @@ -9258,7 +9258,7 @@ ET 0.0 0.53333 0.0 SCN BT -78.123 745.60537 Td +78.123 743.24037 Td /F7.0 9.4415 Tf <70726976617465> Tj ET @@ -9269,7 +9269,7 @@ ET 0.2 0.2 0.2 SCN BT -111.16825 745.60537 Td +111.16825 743.24037 Td /F5.0 9.4415 Tf <20> Tj ET @@ -9280,7 +9280,7 @@ ET 0.73333 0.0 0.4 SCN BT -115.889 745.60537 Td +115.889 743.24037 Td /F7.0 9.4415 Tf <4c697374> Tj ET @@ -9291,7 +9291,7 @@ ET 0.2 0.2 0.2 SCN BT -134.772 745.60537 Td +134.772 743.24037 Td /F5.0 9.4415 Tf <3c> Tj ET @@ -9302,7 +9302,7 @@ ET 0.73333 0.0 0.4 SCN BT -139.49275 745.60537 Td +139.49275 743.24037 Td /F7.0 9.4415 Tf <537472696e67> Tj ET @@ -9313,7 +9313,7 @@ ET 0.2 0.2 0.2 SCN BT -167.81725 745.60537 Td +167.81725 743.24037 Td /F5.0 9.4415 Tf <3e> Tj ET @@ -9324,7 +9324,7 @@ ET 0.2 0.2 0.2 SCN BT -172.538 745.60537 Td +172.538 743.24037 Td /F5.0 9.4415 Tf <20> Tj ET @@ -9335,7 +9335,7 @@ ET 0.2 0.2 0.2 SCN BT -177.25875 745.60537 Td +177.25875 743.24037 Td /F5.0 9.4415 Tf <6772656574696e6773> Tj ET @@ -9346,7 +9346,7 @@ ET 0.2 0.2 0.2 SCN BT -219.7455 745.60537 Td +219.7455 743.24037 Td /F5.0 9.4415 Tf <3b> Tj ET @@ -9357,7 +9357,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 719.5229 Td +59.24 717.1579 Td /F5.0 9.4415 Tf <ca202020> Tj ET @@ -9368,7 +9368,7 @@ ET 0.33333 0.33333 0.33333 SCN BT -78.123 719.5229 Td +78.123 717.1579 Td /F5.0 9.4415 Tf <40506f7374436f6e737472756374> Tj ET @@ -9379,7 +9379,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 706.48166 Td +59.24 704.11666 Td /F5.0 9.4415 Tf <ca202020> Tj ET @@ -9390,7 +9390,7 @@ ET 0.53333 0.53333 0.53333 SCN BT -78.123 706.48166 Td +78.123 704.11666 Td /F7.0 9.4415 Tf <766f6964> Tj ET @@ -9401,7 +9401,7 @@ ET 0.2 0.2 0.2 SCN BT -97.006 706.48166 Td +97.006 704.11666 Td /F5.0 9.4415 Tf <20> Tj ET @@ -9412,7 +9412,7 @@ ET 0.0 0.4 0.73333 SCN BT -101.72675 706.48166 Td +101.72675 704.11666 Td /F7.0 9.4415 Tf <696e6974> Tj ET @@ -9423,7 +9423,7 @@ ET 0.2 0.2 0.2 SCN BT -120.60975 706.48166 Td +120.60975 704.11666 Td /F5.0 9.4415 Tf <2829> Tj ET @@ -9434,7 +9434,7 @@ ET 0.2 0.2 0.2 SCN BT -130.05125 706.48166 Td +130.05125 704.11666 Td /F5.0 9.4415 Tf <20> Tj ET @@ -9445,7 +9445,7 @@ ET 0.2 0.2 0.2 SCN BT -134.772 706.48166 Td +134.772 704.11666 Td /F5.0 9.4415 Tf <7b> Tj ET @@ -9456,7 +9456,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 693.44043 Td +59.24 691.07543 Td /F5.0 9.4415 Tf <ca20202020202020> Tj ET @@ -9467,7 +9467,7 @@ ET 0.0 0.53333 0.0 SCN BT -97.006 693.44043 Td +97.006 691.07543 Td /F7.0 9.4415 Tf <74686973> Tj ET @@ -9478,7 +9478,7 @@ ET 0.2 0.2 0.2 SCN BT -115.889 693.44043 Td +115.889 691.07543 Td /F5.0 9.4415 Tf <2e> Tj ET @@ -9489,7 +9489,7 @@ ET 0.2 0.4 0.6 SCN BT -120.60975 693.44043 Td +120.60975 691.07543 Td /F5.0 9.4415 Tf <6772656574696e6773> Tj ET @@ -9500,7 +9500,7 @@ ET 0.2 0.2 0.2 SCN BT -163.0965 693.44043 Td +163.0965 691.07543 Td /F5.0 9.4415 Tf <20> Tj ET @@ -9511,7 +9511,7 @@ ET 0.2 0.2 0.2 SCN BT -167.81725 693.44043 Td +167.81725 691.07543 Td /F5.0 9.4415 Tf <3d> Tj ET @@ -9522,7 +9522,7 @@ ET 0.2 0.2 0.2 SCN BT -172.538 693.44043 Td +172.538 691.07543 Td /F5.0 9.4415 Tf <20> Tj ET @@ -9533,7 +9533,7 @@ ET 0.0 0.53333 0.0 SCN BT -177.25875 693.44043 Td +177.25875 691.07543 Td /F7.0 9.4415 Tf <6e6577> Tj ET @@ -9544,7 +9544,7 @@ ET 0.2 0.2 0.2 SCN BT -191.421 693.44043 Td +191.421 691.07543 Td /F5.0 9.4415 Tf <20> Tj ET @@ -9555,7 +9555,7 @@ ET 0.73333 0.0 0.4 SCN BT -196.14175 693.44043 Td +196.14175 691.07543 Td /F7.0 9.4415 Tf <41727261794c697374> Tj ET @@ -9566,7 +9566,7 @@ ET 0.2 0.2 0.2 SCN BT -238.6285 693.44043 Td +238.6285 691.07543 Td /F5.0 9.4415 Tf <3c> Tj ET @@ -9577,7 +9577,7 @@ ET 0.73333 0.0 0.4 SCN BT -243.34925 693.44043 Td +243.34925 691.07543 Td /F7.0 9.4415 Tf <537472696e67> Tj ET @@ -9588,7 +9588,7 @@ ET 0.2 0.2 0.2 SCN BT -271.67375 693.44043 Td +271.67375 691.07543 Td /F5.0 9.4415 Tf <3e28293b> Tj ET @@ -9599,7 +9599,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 680.3992 Td +59.24 678.0342 Td /F5.0 9.4415 Tf <ca202020> Tj ET @@ -9610,7 +9610,7 @@ ET 0.2 0.2 0.2 SCN BT -78.123 680.3992 Td +78.123 678.0342 Td /F5.0 9.4415 Tf <7d> Tj ET @@ -9621,7 +9621,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 654.31672 Td +59.24 651.95172 Td /F5.0 9.4415 Tf <ca202020> Tj ET @@ -9632,7 +9632,7 @@ ET 0.53333 0.53333 0.53333 SCN BT -78.123 654.31672 Td +78.123 651.95172 Td /F7.0 9.4415 Tf <766f6964> Tj ET @@ -9643,7 +9643,7 @@ ET 0.2 0.2 0.2 SCN BT -97.006 654.31672 Td +97.006 651.95172 Td /F5.0 9.4415 Tf <20> Tj ET @@ -9654,7 +9654,7 @@ ET 0.0 0.4 0.73333 SCN BT -101.72675 654.31672 Td +101.72675 651.95172 Td /F7.0 9.4415 Tf <72656365697665> Tj ET @@ -9665,7 +9665,7 @@ ET 0.2 0.2 0.2 SCN BT -134.772 654.31672 Td +134.772 651.95172 Td /F5.0 9.4415 Tf <28> Tj ET @@ -9676,7 +9676,7 @@ ET 0.33333 0.33333 0.33333 SCN BT -139.49275 654.31672 Td +139.49275 651.95172 Td /F5.0 9.4415 Tf <404f62736572766573> Tj ET @@ -9687,7 +9687,7 @@ ET 0.2 0.2 0.2 SCN BT -181.9795 654.31672 Td +181.9795 651.95172 Td /F5.0 9.4415 Tf <20> Tj ET @@ -9698,7 +9698,7 @@ ET 0.73333 0.0 0.4 SCN BT -186.70025 654.31672 Td +186.70025 651.95172 Td /F7.0 9.4415 Tf <537472696e67> Tj ET @@ -9709,7 +9709,7 @@ ET 0.2 0.2 0.2 SCN BT -215.02475 654.31672 Td +215.02475 651.95172 Td /F5.0 9.4415 Tf <20> Tj ET @@ -9720,7 +9720,7 @@ ET 0.2 0.2 0.2 SCN BT -219.7455 654.31672 Td +219.7455 651.95172 Td /F5.0 9.4415 Tf <6772656574> Tj ET @@ -9731,7 +9731,7 @@ ET 0.2 0.2 0.2 SCN BT -243.34925 654.31672 Td +243.34925 651.95172 Td /F5.0 9.4415 Tf <29> Tj ET @@ -9742,7 +9742,7 @@ ET 0.2 0.2 0.2 SCN BT -248.07 654.31672 Td +248.07 651.95172 Td /F5.0 9.4415 Tf <20> Tj ET @@ -9753,7 +9753,7 @@ ET 0.2 0.2 0.2 SCN BT -252.79075 654.31672 Td +252.79075 651.95172 Td /F5.0 9.4415 Tf <7b> Tj ET @@ -9764,7 +9764,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 641.27549 Td +59.24 638.91049 Td /F5.0 9.4415 Tf <ca20202020202020> Tj ET @@ -9775,7 +9775,7 @@ ET 0.0 0.53333 0.0 SCN BT -97.006 641.27549 Td +97.006 638.91049 Td /F7.0 9.4415 Tf <74686973> Tj ET @@ -9786,7 +9786,7 @@ ET 0.2 0.2 0.2 SCN BT -115.889 641.27549 Td +115.889 638.91049 Td /F5.0 9.4415 Tf <2e> Tj ET @@ -9797,7 +9797,7 @@ ET 0.2 0.4 0.6 SCN BT -120.60975 641.27549 Td +120.60975 638.91049 Td /F5.0 9.4415 Tf <6772656574696e6773> Tj ET @@ -9808,7 +9808,7 @@ ET 0.2 0.2 0.2 SCN BT -163.0965 641.27549 Td +163.0965 638.91049 Td /F5.0 9.4415 Tf <2e> Tj ET @@ -9819,7 +9819,7 @@ ET 0.2 0.4 0.6 SCN BT -167.81725 641.27549 Td +167.81725 638.91049 Td /F5.0 9.4415 Tf <616464> Tj ET @@ -9830,7 +9830,7 @@ ET 0.2 0.2 0.2 SCN BT -181.9795 641.27549 Td +181.9795 638.91049 Td /F5.0 9.4415 Tf <28> Tj ET @@ -9841,7 +9841,7 @@ ET 0.2 0.2 0.2 SCN BT -186.70025 641.27549 Td +186.70025 638.91049 Td /F5.0 9.4415 Tf <6772656574> Tj ET @@ -9852,7 +9852,7 @@ ET 0.2 0.2 0.2 SCN BT -210.304 641.27549 Td +210.304 638.91049 Td /F5.0 9.4415 Tf <293b> Tj ET @@ -9863,7 +9863,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 628.23426 Td +59.24 625.86926 Td /F5.0 9.4415 Tf <ca202020> Tj ET @@ -9874,7 +9874,7 @@ ET 0.2 0.2 0.2 SCN BT -78.123 628.23426 Td +78.123 625.86926 Td /F5.0 9.4415 Tf <7d> Tj ET @@ -9885,7 +9885,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 602.15178 Td +59.24 599.78678 Td /F5.0 9.4415 Tf <ca202020> Tj ET @@ -9896,7 +9896,7 @@ ET 0.33333 0.33333 0.33333 SCN BT -78.123 602.15178 Td +78.123 599.78678 Td /F5.0 9.4415 Tf <40474554> Tj ET @@ -9907,7 +9907,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 589.11055 Td +59.24 586.74555 Td /F5.0 9.4415 Tf <ca202020> Tj ET @@ -9918,7 +9918,7 @@ ET 0.33333 0.33333 0.33333 SCN BT -78.123 589.11055 Td +78.123 586.74555 Td /F5.0 9.4415 Tf <4050726f6475636573> Tj ET @@ -9929,7 +9929,7 @@ ET 0.2 0.2 0.2 SCN BT -120.60975 589.11055 Td +120.60975 586.74555 Td /F5.0 9.4415 Tf <28> Tj ET @@ -9940,7 +9940,7 @@ ET 0.86667 0.13333 0.0 SCN BT -125.3305 589.11055 Td +125.3305 586.74555 Td /F5.0 9.4415 Tf <226170706c69636174696f6e2f6a736f6e22> Tj ET @@ -9951,7 +9951,7 @@ ET 0.2 0.2 0.2 SCN BT -210.304 589.11055 Td +210.304 586.74555 Td /F5.0 9.4415 Tf <29> Tj ET @@ -9962,7 +9962,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 576.06932 Td +59.24 573.70432 Td /F5.0 9.4415 Tf <ca202020> Tj ET @@ -9973,7 +9973,7 @@ ET 0.0 0.53333 0.0 SCN BT -78.123 576.06932 Td +78.123 573.70432 Td /F7.0 9.4415 Tf <7075626c6963> Tj ET @@ -9984,7 +9984,7 @@ ET 0.2 0.2 0.2 SCN BT -106.4475 576.06932 Td +106.4475 573.70432 Td /F5.0 9.4415 Tf <20> Tj ET @@ -9995,7 +9995,7 @@ ET 0.73333 0.0 0.4 SCN BT -111.16825 576.06932 Td +111.16825 573.70432 Td /F7.0 9.4415 Tf <4c697374> Tj ET @@ -10006,7 +10006,7 @@ ET 0.2 0.2 0.2 SCN BT -130.05125 576.06932 Td +130.05125 573.70432 Td /F5.0 9.4415 Tf <3c> Tj ET @@ -10017,7 +10017,7 @@ ET 0.73333 0.0 0.4 SCN BT -134.772 576.06932 Td +134.772 573.70432 Td /F7.0 9.4415 Tf <537472696e67> Tj ET @@ -10028,7 +10028,7 @@ ET 0.2 0.2 0.2 SCN BT -163.0965 576.06932 Td +163.0965 573.70432 Td /F5.0 9.4415 Tf <3e> Tj ET @@ -10039,7 +10039,7 @@ ET 0.2 0.2 0.2 SCN BT -167.81725 576.06932 Td +167.81725 573.70432 Td /F5.0 9.4415 Tf <20> Tj ET @@ -10050,7 +10050,7 @@ ET 0.0 0.4 0.73333 SCN BT -172.538 576.06932 Td +172.538 573.70432 Td /F7.0 9.4415 Tf <6c697374416c6c> Tj ET @@ -10061,7 +10061,7 @@ ET 0.2 0.2 0.2 SCN BT -205.58325 576.06932 Td +205.58325 573.70432 Td /F5.0 9.4415 Tf <28> Tj ET @@ -10072,7 +10072,7 @@ ET 0.33333 0.33333 0.33333 SCN BT -210.304 576.06932 Td +210.304 573.70432 Td /F5.0 9.4415 Tf <405175657279506172616d> Tj ET @@ -10083,7 +10083,7 @@ ET 0.2 0.2 0.2 SCN BT -262.23225 576.06932 Td +262.23225 573.70432 Td /F5.0 9.4415 Tf <28> Tj ET @@ -10094,7 +10094,7 @@ ET 0.86667 0.13333 0.0 SCN BT -266.953 576.06932 Td +266.953 573.70432 Td /F5.0 9.4415 Tf <22737461727422> Tj ET @@ -10105,7 +10105,7 @@ ET 0.2 0.2 0.2 SCN BT -299.99825 576.06932 Td +299.99825 573.70432 Td /F5.0 9.4415 Tf <29> Tj ET @@ -10116,7 +10116,7 @@ ET 0.2 0.2 0.2 SCN BT -304.719 576.06932 Td +304.719 573.70432 Td /F5.0 9.4415 Tf <20> Tj ET @@ -10127,7 +10127,7 @@ ET 0.73333 0.0 0.4 SCN BT -309.43975 576.06932 Td +309.43975 573.70432 Td /F7.0 9.4415 Tf <496e7465676572> Tj ET @@ -10138,7 +10138,7 @@ ET 0.2 0.2 0.2 SCN BT -342.485 576.06932 Td +342.485 573.70432 Td /F5.0 9.4415 Tf <20> Tj ET @@ -10149,7 +10149,7 @@ ET 0.2 0.2 0.2 SCN BT -347.20575 576.06932 Td +347.20575 573.70432 Td /F5.0 9.4415 Tf <7374617274> Tj ET @@ -10160,7 +10160,7 @@ ET 0.2 0.2 0.2 SCN BT -370.8095 576.06932 Td +370.8095 573.70432 Td /F5.0 9.4415 Tf <2c> Tj ET @@ -10171,7 +10171,7 @@ ET 0.2 0.2 0.2 SCN BT -375.53025 576.06932 Td +375.53025 573.70432 Td /F5.0 9.4415 Tf <20> Tj ET @@ -10182,7 +10182,7 @@ ET 0.33333 0.33333 0.33333 SCN BT -380.251 576.06932 Td +380.251 573.70432 Td /F5.0 9.4415 Tf <405175657279506172616d> Tj ET @@ -10193,7 +10193,7 @@ ET 0.2 0.2 0.2 SCN BT -432.17925 576.06932 Td +432.17925 573.70432 Td /F5.0 9.4415 Tf <28> Tj ET @@ -10204,7 +10204,7 @@ ET 0.86667 0.13333 0.0 SCN BT -436.9 576.06932 Td +436.9 573.70432 Td /F5.0 9.4415 Tf <226d617822> Tj ET @@ -10215,7 +10215,7 @@ ET 0.2 0.2 0.2 SCN BT -460.50375 576.06932 Td +460.50375 573.70432 Td /F5.0 9.4415 Tf <29> Tj ET @@ -10226,7 +10226,7 @@ ET 0.2 0.2 0.2 SCN BT -465.2245 576.06932 Td +465.2245 573.70432 Td /F5.0 9.4415 Tf <20> Tj ET @@ -10237,7 +10237,7 @@ ET 0.73333 0.0 0.4 SCN BT -469.94525 576.06932 Td +469.94525 573.70432 Td /F7.0 9.4415 Tf <496e7465676572> Tj ET @@ -10248,7 +10248,7 @@ ET 0.2 0.2 0.2 SCN BT -502.9905 576.06932 Td +502.9905 573.70432 Td /F5.0 9.4415 Tf <20> Tj ET @@ -10259,7 +10259,7 @@ ET 0.2 0.2 0.2 SCN BT -507.71125 576.06932 Td +507.71125 573.70432 Td /F5.0 9.4415 Tf <6d6178> Tj ET @@ -10270,7 +10270,7 @@ ET 0.2 0.2 0.2 SCN BT -521.8735 576.06932 Td +521.8735 573.70432 Td /F5.0 9.4415 Tf <29> Tj ET @@ -10281,7 +10281,7 @@ ET 0.2 0.2 0.2 SCN BT -526.59425 576.06932 Td +526.59425 573.70432 Td /F5.0 9.4415 Tf <20> Tj ET @@ -10292,7 +10292,7 @@ ET 0.2 0.2 0.2 SCN BT -531.315 576.06932 Td +531.315 573.70432 Td /F5.0 9.4415 Tf <7b> Tj ET @@ -10303,7 +10303,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 563.02808 Td +59.24 560.66308 Td /F5.0 9.4415 Tf <ca20202020202020> Tj ET @@ -10314,7 +10314,7 @@ ET 0.53333 0.53333 0.53333 SCN BT -97.006 563.02808 Td +97.006 560.66308 Td /F7.0 9.4415 Tf <696e74> Tj ET @@ -10325,7 +10325,7 @@ ET 0.2 0.2 0.2 SCN BT -111.16825 563.02808 Td +111.16825 560.66308 Td /F5.0 9.4415 Tf <20> Tj ET @@ -10336,7 +10336,7 @@ ET 0.2 0.2 0.2 SCN BT -115.889 563.02808 Td +115.889 560.66308 Td /F5.0 9.4415 Tf <6e756d4772656574696e6773> Tj ET @@ -10347,7 +10347,7 @@ ET 0.2 0.2 0.2 SCN BT -172.538 563.02808 Td +172.538 560.66308 Td /F5.0 9.4415 Tf <20> Tj ET @@ -10358,7 +10358,7 @@ ET 0.2 0.2 0.2 SCN BT -177.25875 563.02808 Td +177.25875 560.66308 Td /F5.0 9.4415 Tf <3d> Tj ET @@ -10369,7 +10369,7 @@ ET 0.2 0.2 0.2 SCN BT -181.9795 563.02808 Td +181.9795 560.66308 Td /F5.0 9.4415 Tf <20> Tj ET @@ -10380,7 +10380,7 @@ ET 0.0 0.53333 0.0 SCN BT -186.70025 563.02808 Td +186.70025 560.66308 Td /F7.0 9.4415 Tf <74686973> Tj ET @@ -10391,7 +10391,7 @@ ET 0.2 0.2 0.2 SCN BT -205.58325 563.02808 Td +205.58325 560.66308 Td /F5.0 9.4415 Tf <2e> Tj ET @@ -10402,7 +10402,7 @@ ET 0.2 0.4 0.6 SCN BT -210.304 563.02808 Td +210.304 560.66308 Td /F5.0 9.4415 Tf <6772656574696e6773> Tj ET @@ -10413,7 +10413,7 @@ ET 0.2 0.2 0.2 SCN BT -252.79075 563.02808 Td +252.79075 560.66308 Td /F5.0 9.4415 Tf <2e> Tj ET @@ -10424,7 +10424,7 @@ ET 0.2 0.4 0.6 SCN BT -257.5115 563.02808 Td +257.5115 560.66308 Td /F5.0 9.4415 Tf <73697a65> Tj ET @@ -10435,7 +10435,7 @@ ET 0.2 0.2 0.2 SCN BT -276.3945 563.02808 Td +276.3945 560.66308 Td /F5.0 9.4415 Tf <28293b> Tj ET @@ -10446,7 +10446,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 536.94561 Td +59.24 534.58061 Td /F5.0 9.4415 Tf <ca20202020202020> Tj ET @@ -10457,7 +10457,7 @@ ET 0.0 0.53333 0.0 SCN BT -97.006 536.94561 Td +97.006 534.58061 Td /F7.0 9.4415 Tf <6966> Tj ET @@ -10468,7 +10468,7 @@ ET 0.2 0.2 0.2 SCN BT -106.4475 536.94561 Td +106.4475 534.58061 Td /F5.0 9.4415 Tf <20> Tj ET @@ -10479,7 +10479,7 @@ ET 0.2 0.2 0.2 SCN BT -111.16825 536.94561 Td +111.16825 534.58061 Td /F5.0 9.4415 Tf <28> Tj ET @@ -10490,7 +10490,7 @@ ET 0.2 0.2 0.2 SCN BT -115.889 536.94561 Td +115.889 534.58061 Td /F5.0 9.4415 Tf <6e756d4772656574696e6773> Tj ET @@ -10501,7 +10501,7 @@ ET 0.2 0.2 0.2 SCN BT -172.538 536.94561 Td +172.538 534.58061 Td /F5.0 9.4415 Tf <20> Tj ET @@ -10512,7 +10512,7 @@ ET 0.2 0.2 0.2 SCN BT -177.25875 536.94561 Td +177.25875 534.58061 Td /F5.0 9.4415 Tf <3d3d> Tj ET @@ -10523,7 +10523,7 @@ ET 0.2 0.2 0.2 SCN BT -186.70025 536.94561 Td +186.70025 534.58061 Td /F5.0 9.4415 Tf <20> Tj ET @@ -10534,7 +10534,7 @@ ET 0.0 0.0 0.86667 SCN BT -191.421 536.94561 Td +191.421 534.58061 Td /F7.0 9.4415 Tf <30> Tj ET @@ -10545,7 +10545,7 @@ ET 0.2 0.2 0.2 SCN BT -196.14175 536.94561 Td +196.14175 534.58061 Td /F5.0 9.4415 Tf <20> Tj ET @@ -10556,7 +10556,7 @@ ET 0.2 0.2 0.2 SCN BT -200.8625 536.94561 Td +200.8625 534.58061 Td /F5.0 9.4415 Tf <7c7c> Tj ET @@ -10567,7 +10567,7 @@ ET 0.2 0.2 0.2 SCN BT -210.304 536.94561 Td +210.304 534.58061 Td /F5.0 9.4415 Tf <20> Tj ET @@ -10578,7 +10578,7 @@ ET 0.2 0.2 0.2 SCN BT -215.02475 536.94561 Td +215.02475 534.58061 Td /F5.0 9.4415 Tf <6d6178> Tj ET @@ -10589,7 +10589,7 @@ ET 0.2 0.2 0.2 SCN BT -229.187 536.94561 Td +229.187 534.58061 Td /F5.0 9.4415 Tf <20> Tj ET @@ -10600,7 +10600,7 @@ ET 0.2 0.2 0.2 SCN BT -233.90775 536.94561 Td +233.90775 534.58061 Td /F5.0 9.4415 Tf <3d3d> Tj ET @@ -10611,7 +10611,7 @@ ET 0.2 0.2 0.2 SCN BT -243.34925 536.94561 Td +243.34925 534.58061 Td /F5.0 9.4415 Tf <20> Tj ET @@ -10622,7 +10622,7 @@ ET 0.0 0.0 0.86667 SCN BT -248.07 536.94561 Td +248.07 534.58061 Td /F7.0 9.4415 Tf <30> Tj ET @@ -10633,7 +10633,7 @@ ET 0.2 0.2 0.2 SCN BT -252.79075 536.94561 Td +252.79075 534.58061 Td /F5.0 9.4415 Tf <29> Tj ET @@ -10644,7 +10644,7 @@ ET 0.2 0.2 0.2 SCN BT -257.5115 536.94561 Td +257.5115 534.58061 Td /F5.0 9.4415 Tf <20> Tj ET @@ -10655,7 +10655,7 @@ ET 0.2 0.2 0.2 SCN BT -262.23225 536.94561 Td +262.23225 534.58061 Td /F5.0 9.4415 Tf <7b> Tj ET @@ -10666,7 +10666,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 523.90438 Td +59.24 521.53938 Td /F5.0 9.4415 Tf <ca2020202020202020202020> Tj ET @@ -10677,7 +10677,7 @@ ET 0.0 0.53333 0.0 SCN BT -115.889 523.90438 Td +115.889 521.53938 Td /F7.0 9.4415 Tf <72657475726e> Tj ET @@ -10688,7 +10688,7 @@ ET 0.2 0.2 0.2 SCN BT -144.2135 523.90438 Td +144.2135 521.53938 Td /F5.0 9.4415 Tf <20> Tj ET @@ -10699,7 +10699,7 @@ ET 0.73333 0.0 0.4 SCN BT -148.93425 523.90438 Td +148.93425 521.53938 Td /F7.0 9.4415 Tf <436f6c6c656374696f6e73> Tj ET @@ -10710,7 +10710,7 @@ ET 0.2 0.2 0.2 SCN BT -200.8625 523.90438 Td +200.8625 521.53938 Td /F5.0 9.4415 Tf <2e3c> Tj ET @@ -10721,7 +10721,7 @@ ET 0.73333 0.0 0.4 SCN BT -210.304 523.90438 Td +210.304 521.53938 Td /F7.0 9.4415 Tf <537472696e67> Tj ET @@ -10732,7 +10732,7 @@ ET 0.2 0.2 0.2 SCN BT -238.6285 523.90438 Td +238.6285 521.53938 Td /F5.0 9.4415 Tf <3e> Tj ET @@ -10743,7 +10743,7 @@ ET 0.2 0.2 0.2 SCN BT -243.34925 523.90438 Td +243.34925 521.53938 Td /F5.0 9.4415 Tf <656d7074794c697374> Tj ET @@ -10754,7 +10754,7 @@ ET 0.2 0.2 0.2 SCN BT -285.836 523.90438 Td +285.836 521.53938 Td /F5.0 9.4415 Tf <28293b> Tj ET @@ -10765,7 +10765,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 510.86314 Td +59.24 508.49814 Td /F5.0 9.4415 Tf <ca20202020202020> Tj ET @@ -10776,7 +10776,7 @@ ET 0.2 0.2 0.2 SCN BT -97.006 510.86314 Td +97.006 508.49814 Td /F5.0 9.4415 Tf <7d> Tj ET @@ -10787,7 +10787,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 484.78067 Td +59.24 482.41567 Td /F5.0 9.4415 Tf <ca20202020202020> Tj ET @@ -10798,7 +10798,7 @@ ET 0.0 0.53333 0.0 SCN BT -97.006 484.78067 Td +97.006 482.41567 Td /F7.0 9.4415 Tf <6966> Tj ET @@ -10809,7 +10809,7 @@ ET 0.2 0.2 0.2 SCN BT -106.4475 484.78067 Td +106.4475 482.41567 Td /F5.0 9.4415 Tf <20> Tj ET @@ -10820,7 +10820,7 @@ ET 0.2 0.2 0.2 SCN BT -111.16825 484.78067 Td +111.16825 482.41567 Td /F5.0 9.4415 Tf <28> Tj ET @@ -10831,7 +10831,7 @@ ET 0.2 0.2 0.2 SCN BT -115.889 484.78067 Td +115.889 482.41567 Td /F5.0 9.4415 Tf <7374617274> Tj ET @@ -10842,7 +10842,7 @@ ET 0.2 0.2 0.2 SCN BT -139.49275 484.78067 Td +139.49275 482.41567 Td /F5.0 9.4415 Tf <20> Tj ET @@ -10853,7 +10853,7 @@ ET 0.2 0.2 0.2 SCN BT -144.2135 484.78067 Td +144.2135 482.41567 Td /F5.0 9.4415 Tf <3d3d> Tj ET @@ -10864,7 +10864,7 @@ ET 0.2 0.2 0.2 SCN BT -153.655 484.78067 Td +153.655 482.41567 Td /F5.0 9.4415 Tf <20> Tj ET @@ -10875,7 +10875,7 @@ ET 0.0 0.53333 0.0 SCN BT -158.37575 484.78067 Td +158.37575 482.41567 Td /F7.0 9.4415 Tf <6e756c6c> Tj ET @@ -10886,7 +10886,7 @@ ET 0.2 0.2 0.2 SCN BT -177.25875 484.78067 Td +177.25875 482.41567 Td /F5.0 9.4415 Tf <29> Tj ET @@ -10897,7 +10897,7 @@ ET 0.2 0.2 0.2 SCN BT -181.9795 484.78067 Td +181.9795 482.41567 Td /F5.0 9.4415 Tf <20> Tj ET @@ -10908,7 +10908,7 @@ ET 0.2 0.2 0.2 SCN BT -186.70025 484.78067 Td +186.70025 482.41567 Td /F5.0 9.4415 Tf <7b> Tj ET @@ -10919,7 +10919,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 471.73944 Td +59.24 469.37444 Td /F5.0 9.4415 Tf <ca2020202020202020202020> Tj ET @@ -10930,7 +10930,7 @@ ET 0.2 0.2 0.2 SCN BT -115.889 471.73944 Td +115.889 469.37444 Td /F5.0 9.4415 Tf <7374617274> Tj ET @@ -10941,7 +10941,7 @@ ET 0.2 0.2 0.2 SCN BT -139.49275 471.73944 Td +139.49275 469.37444 Td /F5.0 9.4415 Tf <20> Tj ET @@ -10952,7 +10952,7 @@ ET 0.2 0.2 0.2 SCN BT -144.2135 471.73944 Td +144.2135 469.37444 Td /F5.0 9.4415 Tf <3d> Tj ET @@ -10963,7 +10963,7 @@ ET 0.2 0.2 0.2 SCN BT -148.93425 471.73944 Td +148.93425 469.37444 Td /F5.0 9.4415 Tf <20> Tj ET @@ -10974,7 +10974,7 @@ ET 0.0 0.0 0.86667 SCN BT -153.655 471.73944 Td +153.655 469.37444 Td /F7.0 9.4415 Tf <30> Tj ET @@ -10985,7 +10985,7 @@ ET 0.2 0.2 0.2 SCN BT -158.37575 471.73944 Td +158.37575 469.37444 Td /F5.0 9.4415 Tf <3b> Tj ET @@ -10996,7 +10996,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 458.6982 Td +59.24 456.3332 Td /F5.0 9.4415 Tf <ca20202020202020> Tj ET @@ -11007,7 +11007,7 @@ ET 0.2 0.2 0.2 SCN BT -97.006 458.6982 Td +97.006 456.3332 Td /F5.0 9.4415 Tf <7d> Tj ET @@ -11018,7 +11018,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 432.61573 Td +59.24 430.25073 Td /F5.0 9.4415 Tf <ca20202020202020> Tj ET @@ -11029,7 +11029,7 @@ ET 0.0 0.53333 0.0 SCN BT -97.006 432.61573 Td +97.006 430.25073 Td /F7.0 9.4415 Tf <6966> Tj ET @@ -11040,7 +11040,7 @@ ET 0.2 0.2 0.2 SCN BT -106.4475 432.61573 Td +106.4475 430.25073 Td /F5.0 9.4415 Tf <20> Tj ET @@ -11051,7 +11051,7 @@ ET 0.2 0.2 0.2 SCN BT -111.16825 432.61573 Td +111.16825 430.25073 Td /F5.0 9.4415 Tf <28> Tj ET @@ -11062,7 +11062,7 @@ ET 0.2 0.2 0.2 SCN BT -115.889 432.61573 Td +115.889 430.25073 Td /F5.0 9.4415 Tf <6d6178> Tj ET @@ -11073,7 +11073,7 @@ ET 0.2 0.2 0.2 SCN BT -130.05125 432.61573 Td +130.05125 430.25073 Td /F5.0 9.4415 Tf <20> Tj ET @@ -11084,7 +11084,7 @@ ET 0.2 0.2 0.2 SCN BT -134.772 432.61573 Td +134.772 430.25073 Td /F5.0 9.4415 Tf <3d3d> Tj ET @@ -11095,7 +11095,7 @@ ET 0.2 0.2 0.2 SCN BT -144.2135 432.61573 Td +144.2135 430.25073 Td /F5.0 9.4415 Tf <20> Tj ET @@ -11106,7 +11106,7 @@ ET 0.0 0.53333 0.0 SCN BT -148.93425 432.61573 Td +148.93425 430.25073 Td /F7.0 9.4415 Tf <6e756c6c> Tj ET @@ -11117,7 +11117,7 @@ ET 0.2 0.2 0.2 SCN BT -167.81725 432.61573 Td +167.81725 430.25073 Td /F5.0 9.4415 Tf <29> Tj ET @@ -11128,7 +11128,7 @@ ET 0.2 0.2 0.2 SCN BT -172.538 432.61573 Td +172.538 430.25073 Td /F5.0 9.4415 Tf <20> Tj ET @@ -11139,7 +11139,7 @@ ET 0.2 0.2 0.2 SCN BT -177.25875 432.61573 Td +177.25875 430.25073 Td /F5.0 9.4415 Tf <7b> Tj ET @@ -11150,7 +11150,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 419.5745 Td +59.24 417.2095 Td /F5.0 9.4415 Tf <ca2020202020202020202020> Tj ET @@ -11161,7 +11161,7 @@ ET 0.2 0.2 0.2 SCN BT -115.889 419.5745 Td +115.889 417.2095 Td /F5.0 9.4415 Tf <6d6178> Tj ET @@ -11172,7 +11172,7 @@ ET 0.2 0.2 0.2 SCN BT -130.05125 419.5745 Td +130.05125 417.2095 Td /F5.0 9.4415 Tf <20> Tj ET @@ -11183,7 +11183,7 @@ ET 0.2 0.2 0.2 SCN BT -134.772 419.5745 Td +134.772 417.2095 Td /F5.0 9.4415 Tf <3d> Tj ET @@ -11194,7 +11194,7 @@ ET 0.2 0.2 0.2 SCN BT -139.49275 419.5745 Td +139.49275 417.2095 Td /F5.0 9.4415 Tf <20> Tj ET @@ -11205,7 +11205,7 @@ ET 0.2 0.2 0.2 SCN BT -144.2135 419.5745 Td +144.2135 417.2095 Td /F5.0 9.4415 Tf <6e756d4772656574696e6773> Tj ET @@ -11216,7 +11216,7 @@ ET 0.2 0.2 0.2 SCN BT -200.8625 419.5745 Td +200.8625 417.2095 Td /F5.0 9.4415 Tf <3b> Tj ET @@ -11227,7 +11227,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 406.53326 Td +59.24 404.16826 Td /F5.0 9.4415 Tf <ca20202020202020> Tj ET @@ -11238,7 +11238,7 @@ ET 0.2 0.2 0.2 SCN BT -97.006 406.53326 Td +97.006 404.16826 Td /F5.0 9.4415 Tf <7d> Tj ET @@ -11249,7 +11249,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 380.45079 Td +59.24 378.08579 Td /F5.0 9.4415 Tf <ca20202020202020> Tj ET @@ -11260,7 +11260,7 @@ ET 0.0 0.53333 0.0 SCN BT -97.006 380.45079 Td +97.006 378.08579 Td /F7.0 9.4415 Tf <72657475726e> Tj ET @@ -11271,7 +11271,7 @@ ET 0.2 0.2 0.2 SCN BT -125.3305 380.45079 Td +125.3305 378.08579 Td /F5.0 9.4415 Tf <20> Tj ET @@ -11282,7 +11282,7 @@ ET 0.0 0.53333 0.0 SCN BT -130.05125 380.45079 Td +130.05125 378.08579 Td /F7.0 9.4415 Tf <74686973> Tj ET @@ -11293,7 +11293,7 @@ ET 0.2 0.2 0.2 SCN BT -148.93425 380.45079 Td +148.93425 378.08579 Td /F5.0 9.4415 Tf <2e> Tj ET @@ -11304,7 +11304,7 @@ ET 0.2 0.4 0.6 SCN BT -153.655 380.45079 Td +153.655 378.08579 Td /F5.0 9.4415 Tf <6772656574696e6773> Tj ET @@ -11315,7 +11315,7 @@ ET 0.2 0.2 0.2 SCN BT -196.14175 380.45079 Td +196.14175 378.08579 Td /F5.0 9.4415 Tf <2e> Tj ET @@ -11326,7 +11326,7 @@ ET 0.2 0.4 0.6 SCN BT -200.8625 380.45079 Td +200.8625 378.08579 Td /F5.0 9.4415 Tf <7375624c697374> Tj ET @@ -11337,7 +11337,7 @@ ET 0.2 0.2 0.2 SCN BT -233.90775 380.45079 Td +233.90775 378.08579 Td /F5.0 9.4415 Tf <28> Tj ET @@ -11348,7 +11348,7 @@ ET 0.2 0.2 0.2 SCN BT -238.6285 380.45079 Td +238.6285 378.08579 Td /F5.0 9.4415 Tf <7374617274> Tj ET @@ -11359,7 +11359,7 @@ ET 0.2 0.2 0.2 SCN BT -262.23225 380.45079 Td +262.23225 378.08579 Td /F5.0 9.4415 Tf <2c> Tj ET @@ -11370,7 +11370,7 @@ ET 0.2 0.2 0.2 SCN BT -266.953 380.45079 Td +266.953 378.08579 Td /F5.0 9.4415 Tf <20> Tj ET @@ -11381,7 +11381,7 @@ ET 0.73333 0.0 0.4 SCN BT -271.67375 380.45079 Td +271.67375 378.08579 Td /F7.0 9.4415 Tf <4d617468> Tj ET @@ -11392,7 +11392,7 @@ ET 0.2 0.2 0.2 SCN BT -290.55675 380.45079 Td +290.55675 378.08579 Td /F5.0 9.4415 Tf <2e> Tj ET @@ -11403,7 +11403,7 @@ ET 0.2 0.4 0.6 SCN BT -295.2775 380.45079 Td +295.2775 378.08579 Td /F5.0 9.4415 Tf <6d696e> Tj ET @@ -11414,7 +11414,7 @@ ET 0.2 0.2 0.2 SCN BT -309.43975 380.45079 Td +309.43975 378.08579 Td /F5.0 9.4415 Tf <28> Tj ET @@ -11425,7 +11425,7 @@ ET 0.2 0.2 0.2 SCN BT -314.1605 380.45079 Td +314.1605 378.08579 Td /F5.0 9.4415 Tf <6d6178> Tj ET @@ -11436,7 +11436,7 @@ ET 0.2 0.2 0.2 SCN BT -328.32275 380.45079 Td +328.32275 378.08579 Td /F5.0 9.4415 Tf <20> Tj ET @@ -11447,7 +11447,7 @@ ET 0.2 0.2 0.2 SCN BT -333.0435 380.45079 Td +333.0435 378.08579 Td /F5.0 9.4415 Tf <2b> Tj ET @@ -11458,7 +11458,7 @@ ET 0.2 0.2 0.2 SCN BT -337.76425 380.45079 Td +337.76425 378.08579 Td /F5.0 9.4415 Tf <20> Tj ET @@ -11469,7 +11469,7 @@ ET 0.2 0.2 0.2 SCN BT -342.485 380.45079 Td +342.485 378.08579 Td /F5.0 9.4415 Tf <7374617274> Tj ET @@ -11480,7 +11480,7 @@ ET 0.2 0.2 0.2 SCN BT -366.08875 380.45079 Td +366.08875 378.08579 Td /F5.0 9.4415 Tf <2c> Tj ET @@ -11491,7 +11491,7 @@ ET 0.2 0.2 0.2 SCN BT -370.8095 380.45079 Td +370.8095 378.08579 Td /F5.0 9.4415 Tf <20> Tj ET @@ -11502,7 +11502,7 @@ ET 0.2 0.2 0.2 SCN BT -375.53025 380.45079 Td +375.53025 378.08579 Td /F5.0 9.4415 Tf <6e756d4772656574696e6773> Tj ET @@ -11513,7 +11513,7 @@ ET 0.2 0.2 0.2 SCN BT -432.17925 380.45079 Td +432.17925 378.08579 Td /F5.0 9.4415 Tf <29293b> Tj ET @@ -11524,7 +11524,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 367.40955 Td +59.24 365.04455 Td /F5.0 9.4415 Tf <ca202020> Tj ET @@ -11535,7 +11535,7 @@ ET 0.2 0.2 0.2 SCN BT -78.123 367.40955 Td +78.123 365.04455 Td /F5.0 9.4415 Tf <7d> Tj ET @@ -11546,7 +11546,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 341.32708 Td +59.24 338.96208 Td /F5.0 9.4415 Tf <7d> Tj ET @@ -11559,7 +11559,7 @@ ET 0.00749 Tw BT -48.24 303.66627 Td +48.24 301.30127 Td /F1.0 10.5 Tf [<57> 60.05859 <6520616c72656164792073686f77656420796f7520616e20584d4c206578616d706c6520696e20>] TJ ET @@ -11574,7 +11574,7 @@ ET 0.00749 Tw BT -270.1013 303.66627 Td +270.1013 301.30127 Td /F1.0 10.5 Tf <436861707465722032> Tj ET @@ -11589,7 +11589,7 @@ ET 0.00749 Tw BT -318.38779 303.66627 Td +318.38779 301.30127 Td /F1.0 10.5 Tf [<2c2061206c616e6775616765207765206f6674656e2072> 20.01953 <616e742061626f7574206f766572206265657273206174>] TJ ET @@ -11602,7 +11602,7 @@ ET 0.2 0.2 0.2 SCN BT -48.24 287.88627 Td +48.24 285.52127 Td ET 0.0 0.0 0.0 SCN @@ -11611,7 +11611,7 @@ ET 0.25882 0.5451 0.79216 SCN BT -48.24 287.88627 Td +48.24 285.52127 Td /F1.0 10.5 Tf [<426965722043656e7472> 20.01953 <616c>] TJ ET @@ -11622,7 +11622,7 @@ ET 0.2 0.2 0.2 SCN BT -108.14229 287.88627 Td +108.14229 285.52127 Td /F1.0 10.5 Tf <2e> Tj ET @@ -11633,7 +11633,7 @@ ET 0.2 0.2 0.2 SCN BT -48.24 260.10627 Td +48.24 257.74127 Td /F1.0 10.5 Tf [<49d56c6c207472> 20.01953 <61646520796f752061206c6974746c65207461626c6520666f7220736f6d65206f662074686174206261726b2e>] TJ ET @@ -11641,63 +11641,63 @@ ET 0.0 0.0 0.0 SCN 0.0 0.0 0.0 scn 1.0 1.0 1.0 scn -48.24 222.51027 124.7 21.78 re +48.24 220.14527 124.7 21.78 re f 0.0 0.0 0.0 scn 1.0 1.0 1.0 scn -172.94 222.51027 124.7 21.78 re +172.94 220.14527 124.7 21.78 re f 0.0 0.0 0.0 scn 1.0 1.0 1.0 scn -297.64 222.51027 124.7 21.78 re +297.64 220.14527 124.7 21.78 re f 0.0 0.0 0.0 scn 1.0 1.0 1.0 scn -422.34 222.51027 124.7 21.78 re +422.34 220.14527 124.7 21.78 re f 0.0 0.0 0.0 scn 1.0 1.0 1.0 scn -48.24 153.39027 124.7 69.12 re +48.24 151.02527 124.7 69.12 re f 0.0 0.0 0.0 scn 1.0 1.0 1.0 scn -172.94 153.39027 124.7 69.12 re +172.94 151.02527 124.7 69.12 re f 0.0 0.0 0.0 scn 1.0 1.0 1.0 scn -297.64 153.39027 124.7 69.12 re +297.64 151.02527 124.7 69.12 re f 0.0 0.0 0.0 scn 1.0 1.0 1.0 scn -422.34 153.39027 124.7 69.12 re +422.34 151.02527 124.7 69.12 re f 0.0 0.0 0.0 scn 1.0 1.0 1.0 scn -48.24 131.61027 498.8 21.78 re +48.24 129.24527 498.8 21.78 re f 0.0 0.0 0.0 scn 1.0 1.0 1.0 scn -172.94 131.61027 124.7 21.78 re +172.94 129.24527 124.7 21.78 re f 0.0 0.0 0.0 scn 1.0 1.0 1.0 scn -297.64 131.61027 124.7 21.78 re +297.64 129.24527 124.7 21.78 re f 0.0 0.0 0.0 scn 1.0 1.0 1.0 scn -422.34 131.61027 124.7 21.78 re +422.34 129.24527 124.7 21.78 re f 0.0 0.0 0.0 scn 0.5 w 0.86667 0.86667 0.86667 SCN -48.24 244.29027 m -172.94 244.29027 l +48.24 241.92527 m +172.94 241.92527 l S [] 0 d 1.25 w 0.86667 0.86667 0.86667 SCN -48.24 222.51027 m -172.94 222.51027 l +48.24 220.14527 m +172.94 220.14527 l S [] 0 d 1 w @@ -11705,7 +11705,7 @@ S 0.2 0.2 0.2 scn BT -51.24 229.32627 Td +51.24 226.96127 Td /F4.0 10.5 Tf <436f6c756d6e2031> Tj ET @@ -11713,14 +11713,14 @@ ET 0.0 0.0 0.0 scn 0.5 w 0.86667 0.86667 0.86667 SCN -172.94 244.29027 m -297.64 244.29027 l +172.94 241.92527 m +297.64 241.92527 l S [] 0 d 1.25 w 0.86667 0.86667 0.86667 SCN -172.94 222.51027 m -297.64 222.51027 l +172.94 220.14527 m +297.64 220.14527 l S [] 0 d 1 w @@ -11728,7 +11728,7 @@ S 0.2 0.2 0.2 scn BT -175.94 229.32627 Td +175.94 226.96127 Td /F4.0 10.5 Tf <436f6c756d6e2032> Tj ET @@ -11736,14 +11736,14 @@ ET 0.0 0.0 0.0 scn 0.5 w 0.86667 0.86667 0.86667 SCN -297.64 244.29027 m -422.34 244.29027 l +297.64 241.92527 m +422.34 241.92527 l S [] 0 d 1.25 w 0.86667 0.86667 0.86667 SCN -297.64 222.51027 m -422.34 222.51027 l +297.64 220.14527 m +422.34 220.14527 l S [] 0 d 1 w @@ -11751,7 +11751,7 @@ S 0.2 0.2 0.2 scn BT -300.64 229.32627 Td +300.64 226.96127 Td /F4.0 10.5 Tf <436f6c756d6e2033> Tj ET @@ -11759,14 +11759,14 @@ ET 0.0 0.0 0.0 scn 0.5 w 0.86667 0.86667 0.86667 SCN -422.34 244.29027 m -547.04 244.29027 l +422.34 241.92527 m +547.04 241.92527 l S [] 0 d 1.25 w 0.86667 0.86667 0.86667 SCN -422.34 222.51027 m -547.04 222.51027 l +422.34 220.14527 m +547.04 220.14527 l S [] 0 d 1 w @@ -11774,7 +11774,7 @@ S 0.2 0.2 0.2 scn BT -425.34 229.32627 Td +425.34 226.96127 Td /F4.0 10.5 Tf <436f6c756d6e2034> Tj ET @@ -11782,14 +11782,14 @@ ET 0.0 0.0 0.0 scn 1.25 w 0.86667 0.86667 0.86667 SCN -48.24 222.51027 m -172.94 222.51027 l +48.24 220.14527 m +172.94 220.14527 l S [] 0 d 0.5 w 0.86667 0.86667 0.86667 SCN -48.24 153.39027 m -172.94 153.39027 l +48.24 151.02527 m +172.94 151.02527 l S [] 0 d 1 w @@ -11797,7 +11797,7 @@ S 0.69412 0.12941 0.27451 scn BT -63.84 208.78527 Td +63.84 206.42027 Td /F5.0 10.5 Tf <50726566697820> Tj ET @@ -11806,7 +11806,7 @@ ET 0.69412 0.12941 0.27451 SCN BT -100.59 208.78527 Td +100.59 206.42027 Td /F5.0 10.5 Tf <7c> Tj ET @@ -11815,7 +11815,7 @@ ET 0.69412 0.12941 0.27451 scn BT -105.84 208.78527 Td +105.84 206.42027 Td /F5.0 10.5 Tf <207769746820> Tj ET @@ -11824,7 +11824,7 @@ ET 0.69412 0.12941 0.27451 SCN BT -137.34 208.78527 Td +137.34 206.42027 Td /F5.0 10.5 Tf <5e> Tj ET @@ -11833,28 +11833,28 @@ ET 0.69412 0.12941 0.27451 scn BT -142.59 208.78527 Td +142.59 206.42027 Td /F5.0 10.5 Tf <20746f> Tj ET BT -74.34 195.84027 Td +74.34 193.47527 Td /F5.0 10.5 Tf <63656e74657220636f6e74656e74> Tj ET BT -61.215 182.89527 Td +61.215 180.53027 Td /F5.0 10.5 Tf <686f72697a6f6e74616c6c792077697468696e> Tj ET BT -87.465 169.95027 Td +87.465 167.58527 Td /F5.0 10.5 Tf <7468652063656c6c2e> Tj ET @@ -11862,14 +11862,14 @@ ET 0.0 0.0 0.0 scn 1.25 w 0.86667 0.86667 0.86667 SCN -172.94 222.51027 m -297.64 222.51027 l +172.94 220.14527 m +297.64 220.14527 l S [] 0 d 0.5 w 0.86667 0.86667 0.86667 SCN -172.94 153.39027 m -297.64 153.39027 l +172.94 151.02527 m +297.64 151.02527 l S [] 0 d 1 w @@ -11889,7 +11889,7 @@ S 0.2 0.2 0.2 scn BT -175.94 190.76627 Td +175.94 188.40127 Td /F1.0 10.5 Tf <50726566697820> Tj ET @@ -11898,7 +11898,7 @@ ET 0.69412 0.12941 0.27451 SCN BT -208.8575 190.76627 Td +208.8575 188.40127 Td /F5.0 10.5 Tf <7c> Tj ET @@ -11907,7 +11907,7 @@ ET 0.2 0.2 0.2 scn BT -214.1075 190.76627 Td +214.1075 188.40127 Td /F1.0 10.5 Tf <2077697468206120> Tj ET @@ -11916,7 +11916,7 @@ ET 0.69412 0.12941 0.27451 SCN BT -250.91 190.76627 Td +250.91 188.40127 Td /F5.0 10.5 Tf <2e> Tj ET @@ -11925,7 +11925,7 @@ ET 0.2 0.2 0.2 scn BT -256.16 190.76627 Td +256.16 188.40127 Td /F1.0 10.5 Tf <20616e6420> Tj ET @@ -11934,7 +11934,7 @@ ET 0.69412 0.12941 0.27451 SCN BT -280.709 190.76627 Td +280.709 188.40127 Td /F5.0 10.5 Tf <3e> Tj ET @@ -11943,19 +11943,19 @@ ET 0.2 0.2 0.2 scn BT -285.959 190.76627 Td +285.959 188.40127 Td ET BT -175.94 174.98627 Td +175.94 172.62127 Td /F1.0 10.5 Tf <746f20616c69676e20636f6e74656e7420746f20746865> Tj ET BT -175.94 159.20627 Td +175.94 156.84127 Td /F1.0 10.5 Tf <626f74746f6d206f66207468652063656c6c2e> Tj ET @@ -11963,14 +11963,14 @@ ET 0.0 0.0 0.0 scn 1.25 w 0.86667 0.86667 0.86667 SCN -297.64 222.51027 m -422.34 222.51027 l +297.64 220.14527 m +422.34 220.14527 l S [] 0 d 0.5 w 0.86667 0.86667 0.86667 SCN -297.64 153.39027 m -422.34 153.39027 l +297.64 151.02527 m +422.34 151.02527 l S [] 0 d 1 w @@ -11994,7 +11994,7 @@ S 0.2 0.2 0.2 scn BT -302.8555 199.15627 Td +302.8555 196.79127 Td /F1.0 10.5 Tf <50726566697820> Tj ET @@ -12003,7 +12003,7 @@ ET 0.69412 0.12941 0.27451 SCN BT -335.773 199.15627 Td +335.773 196.79127 Td /F5.0 10.5 Tf <7c> Tj ET @@ -12012,7 +12012,7 @@ ET 0.2 0.2 0.2 scn BT -341.023 199.15627 Td +341.023 196.79127 Td /F1.0 10.5 Tf <2077697468206120> Tj ET @@ -12021,7 +12021,7 @@ ET 0.69412 0.12941 0.27451 SCN BT -377.8255 199.15627 Td +377.8255 196.79127 Td /F5.0 10.5 Tf <5e> Tj ET @@ -12030,7 +12030,7 @@ ET 0.2 0.2 0.2 scn BT -383.0755 199.15627 Td +383.0755 196.79127 Td /F1.0 10.5 Tf <2c20> Tj ET @@ -12039,7 +12039,7 @@ ET 0.69412 0.12941 0.27451 SCN BT -388.42 199.15627 Td +388.42 196.79127 Td /F5.0 10.5 Tf <2e> Tj ET @@ -12048,7 +12048,7 @@ ET 0.2 0.2 0.2 scn BT -393.67 199.15627 Td +393.67 196.79127 Td /F1.0 10.5 Tf <2c20616e64> Tj ET @@ -12057,7 +12057,7 @@ ET 0.69412 0.12941 0.27451 SCN BT -301.06525 183.37627 Td +301.06525 181.01127 Td /F5.0 10.5 Tf <5e> Tj ET @@ -12066,14 +12066,14 @@ ET 0.2 0.2 0.2 scn BT -306.31525 183.37627 Td +306.31525 181.01127 Td /F1.0 10.5 Tf <20746f20706c61636520636f6e74656e7420696e20746865> Tj ET BT -315.99625 167.59627 Td +315.99625 165.23127 Td /F1.0 10.5 Tf <6d6964646c65206f66207468652063656c6c2e> Tj ET @@ -12081,14 +12081,14 @@ ET 0.0 0.0 0.0 scn 1.25 w 0.86667 0.86667 0.86667 SCN -422.34 222.51027 m -547.04 222.51027 l +422.34 220.14527 m +547.04 220.14527 l S [] 0 d 0.5 w 0.86667 0.86667 0.86667 SCN -422.34 153.39027 m -547.04 153.39027 l +422.34 151.02527 m +547.04 151.02527 l S [] 0 d 1 w @@ -12096,7 +12096,7 @@ S 0.2 0.2 0.2 scn BT -433.32 207.54627 Td +433.32 205.18127 Td /F1.0 10.5 Tf <50726566697820> Tj ET @@ -12105,7 +12105,7 @@ ET 0.69412 0.12941 0.27451 SCN BT -466.2375 207.54627 Td +466.2375 205.18127 Td /F5.0 10.5 Tf <7c> Tj ET @@ -12114,7 +12114,7 @@ ET 0.2 0.2 0.2 scn BT -471.4875 207.54627 Td +471.4875 205.18127 Td /F1.0 10.5 Tf <207769746820> Tj ET @@ -12123,7 +12123,7 @@ ET 0.69412 0.12941 0.27451 SCN BT -499.6695 207.54627 Td +499.6695 205.18127 Td /F5.0 10.5 Tf <3e> Tj ET @@ -12132,28 +12132,28 @@ ET 0.2 0.2 0.2 scn BT -504.9195 207.54627 Td +504.9195 205.18127 Td /F1.0 10.5 Tf <20746f20616c69676e> Tj ET BT -449.0805 191.76627 Td +449.0805 189.40127 Td /F1.0 10.5 Tf <636f6e74656e7420746f20746865207269676874> Tj ET BT -429.5295 175.98627 Td +429.5295 173.62127 Td /F1.0 10.5 Tf <686f72697a6f6e74616c6c792077697468696e20746865> Tj ET BT -525.1215 160.20627 Td +525.1215 157.84127 Td /F1.0 10.5 Tf <63656c6c2e> Tj ET @@ -12161,14 +12161,14 @@ ET 0.0 0.0 0.0 scn 0.5 w 0.86667 0.86667 0.86667 SCN -48.24 153.39027 m -547.04 153.39027 l +48.24 151.02527 m +547.04 151.02527 l S [] 0 d 0.5 w 0.86667 0.86667 0.86667 SCN -48.24 131.61027 m -547.04 131.61027 l +48.24 129.24527 m +547.04 129.24527 l S [] 0 d 1 w @@ -12176,7 +12176,7 @@ S 0.2 0.2 0.2 scn BT -86.97975 138.42627 Td +86.97975 136.06127 Td /F2.0 10.5 Tf <5468697320636f6e74656e74207370616e7320616c6c20666f757220636f6c756d6e732028> Tj ET @@ -12185,7 +12185,7 @@ ET 0.69412 0.12941 0.27451 SCN BT -266.63475 138.42627 Td +266.63475 136.06127 Td /F5.0 10.5 Tf <342b> Tj ET @@ -12194,7 +12194,7 @@ ET 0.2 0.2 0.2 scn BT -277.13475 138.42627 Td +277.13475 136.06127 Td /F2.0 10.5 Tf <2920616e642069732063656e746572656420686f72697a6f6e74616c6c792028> Tj ET @@ -12203,7 +12203,7 @@ ET 0.69412 0.12941 0.27451 SCN BT -426.22425 138.42627 Td +426.22425 136.06127 Td /F5.0 10.5 Tf <5e> Tj ET @@ -12212,7 +12212,7 @@ ET 0.2 0.2 0.2 scn BT -431.47425 138.42627 Td +431.47425 136.06127 Td /F2.0 10.5 Tf <292077697468696e207468652063656c6c2e> Tj ET @@ -12222,7 +12222,7 @@ ET 0.2 0.2 0.2 SCN BT -48.24 107.64627 Td +48.24 105.28127 Td /F1.0 10.5 Tf [<57> 49.80469 <6169742e20576861743f20576865726520697320746869732073746f727920676f696e673f>] TJ ET @@ -12231,14 +12231,14 @@ ET 0.0 0.0 0.0 scn BT -48.24 79.86627 Td +48.24 77.50127 Td ET 0.69412 0.12941 0.27451 scn 0.69412 0.12941 0.27451 SCN BT -48.24 79.86627 Td +48.24 77.50127 Td /F7.0 10.5 Tf <3c7370616e3e> Tj ET @@ -12247,14 +12247,14 @@ ET 0.0 0.0 0.0 scn BT -63.24 61.08627 Td +63.24 58.72127 Td ET 0.2 0.2 0.2 scn 0.2 0.2 0.2 SCN BT -63.24 61.08627 Td +63.24 58.72127 Td /F1.0 10.5 Tf [<616e2068746d6c207461672074686174206d616b> 20.01953 <6573206d65206372> 20.01953 <617a79>] TJ ET @@ -12362,7 +12362,7 @@ endobj << /Border [0 0 0] /Dest (ravages) /Subtype /Link -/Rect [270.1013 300.60027 318.38779 314.88027] +/Rect [270.1013 298.23527 318.38779 312.51527] /Type /Annot >> endobj @@ -12370,7 +12370,7 @@ endobj << /Border [0 0 0] /Dest (bier-central) /Subtype /Link -/Rect [48.24 284.82027 108.14229 299.10027] +/Rect [48.24 282.45527 108.14229 296.73527] /Type /Annot >> endobj diff --git a/lib/asciidoctor/pdf/converter.rb b/lib/asciidoctor/pdf/converter.rb index c0fa5d47..6b2709a0 100644 --- a/lib/asciidoctor/pdf/converter.rb +++ b/lib/asciidoctor/pdf/converter.rb @@ -3086,7 +3086,7 @@ module Asciidoctor end end - # private + # @private def ink_paragraph_in_float_box node, float_box, prose_opts, role_keys, block_next, insert_margin_bottom @float_box = para_font_descender = para_font_size = end_cursor = nil if role_keys @@ -3105,7 +3105,7 @@ module Asciidoctor start_page_number = float_box[:page] start_cursor = cursor block_bottom = (float_box_bottom = float_box[:bottom]) + float_box[:gap][1] - # use :at to incorporate padding top from line metrics + # use :at to incorporate padding top from line metrics since text_box method does not apply it # use :final_gap to incorporate padding bottom from line metrics # use :draw_text_callback to track end cursor (requires applying :final_gap to result manually) prose_opts.update \ @@ -4287,7 +4287,7 @@ module Asciidoctor opts = { leading: line_metrics.leading, final_gap: line_metrics.final_gap }.merge opts string = string.gsub CjkLineBreakRx, ZeroWidthSpace if @cjk_line_breaks return text_box string, opts if opts[:height] - move_down line_metrics.padding_top + opts[:initial_gap] = line_metrics.padding_top if (hanging_indent = (opts.delete :hanging_indent) || 0) > 0 indent hanging_indent do text string, (opts.merge indent_paragraphs: -hanging_indent) @@ -4303,8 +4303,7 @@ module Asciidoctor # QUESTION: combine with typeset_text? def typeset_formatted_text fragments, line_metrics, opts = {} - move_down line_metrics.padding_top - opts = { leading: line_metrics.leading, final_gap: line_metrics.final_gap }.merge opts + opts = { leading: line_metrics.leading, initial_gap: line_metrics.padding_top, final_gap: line_metrics.final_gap }.merge opts if (hanging_indent = (opts.delete :hanging_indent) || 0) > 0 indent hanging_indent do formatted_text fragments, (opts.merge indent_paragraphs: -hanging_indent) diff --git a/lib/asciidoctor/pdf/ext/prawn/extensions.rb b/lib/asciidoctor/pdf/ext/prawn/extensions.rb index c0ec7b67..07e8059d 100644 --- a/lib/asciidoctor/pdf/ext/prawn/extensions.rb +++ b/lib/asciidoctor/pdf/ext/prawn/extensions.rb @@ -429,11 +429,15 @@ module Asciidoctor # NOTE: override built-in fill_formatted_text_box to insert leading before second line when :first_line is true def fill_formatted_text_box text, options + if (initial_gap = options[:initial_gap]) && (first_text = text[0]) && first_text[:from_page] != page_number + self.y -= initial_gap + end merge_text_box_positioning_options options box = ::Prawn::Text::Formatted::Box.new text, options remaining_text = box.render @no_text_printed = box.nothing_printed? @all_text_printed = box.everything_printed? + remaining_text[0][:from_page] = page_number unless remaining_text.empty? if @final_gap || (options[:first_line] && !(@no_text_printed || @all_text_printed)) self.y -= box.height + box.line_gap + box.leading @@ -454,7 +458,7 @@ module Asciidoctor # remaining lines (which is the default behavior in Prawn). def text_with_formatted_first_line string, first_line_options, options if (first_line_font_color = first_line_options.delete :color) - other_lines_font_color, options[:color] = options[:color], first_line_font_color + remaining_lines_font_color, options[:color] = options[:color], first_line_font_color end fragments = parse_text string, options # NOTE: the low-level APIs we're using don't recognize the :styles option, so we must resolve @@ -473,14 +477,13 @@ module Asciidoctor first_line_options = (options.merge first_line_options).merge single_line: true, first_line: true box = ::Prawn::Text::Formatted::Box.new fragments, first_line_options if text_indent - remaining_fragments = indent text_indent do - box.render dry_run: true - end + remaining_fragments = indent(text_indent) { box.render dry_run: true } else remaining_fragments = box.render dry_run: true end + remaining_fragments.empty? ? (remaining_fragments = nil) : (remaining_fragments[0][:from_page] = page_number) if first_line_text_transform - # NOTE: applying text transform here could alter the wrapping, so we need to isolate first line and shrink to fit + # NOTE: applying text transform here could alter the wrapping, so isolate first line and shrink it to fit first_line_text = (box.instance_variable_get :@printed_lines)[0] unless first_line_text == fragments[0][:text] original_fragments, fragments = fragments, [] @@ -496,18 +499,16 @@ module Asciidoctor end fragments.each {|fragment| fragment[:text] = transform_text fragment[:text], first_line_text_transform } first_line_options[:overflow] = :shrink_to_fit - @final_gap = first_line_options[:force_justify] = true unless remaining_fragments.empty? + @final_gap = first_line_options[:force_justify] = true if remaining_fragments end if text_indent - indent text_indent do - fill_formatted_text_box fragments, first_line_options - end + indent(text_indent) { fill_formatted_text_box fragments, first_line_options } else fill_formatted_text_box fragments, first_line_options end - unless remaining_fragments.empty? + if remaining_fragments + options[:color] = remaining_lines_font_color if first_line_font_color @final_gap = final_gap if first_line_text_transform - options[:color] = other_lines_font_color if first_line_font_color remaining_fragments = fill_formatted_text_box remaining_fragments, options draw_remaining_formatted_text_on_new_pages remaining_fragments, options end diff --git a/spec/arrange_block_spec.rb b/spec/arrange_block_spec.rb index 1777870a..ea797672 100644 --- a/spec/arrange_block_spec.rb +++ b/spec/arrange_block_spec.rb @@ -214,7 +214,7 @@ describe 'Asciidoctor::PDF::Converter#arrange_block' do p1_gs = (pdf.extract_graphic_states pages[0][:raw_content])[0] (expect p1_gs).to have_background color: 'FFFFCC', top_left: [50.0, 742.0], bottom_right: [562.0, 50.0] p2_gs = (pdf.extract_graphic_states pages[1][:raw_content])[0] - (expect p2_gs).to have_background color: 'FFFFCC', top_left: [50.0, 742.0], bottom_right: [562.0, 437.17] + (expect p2_gs).to have_background color: 'FFFFCC', top_left: [50.0, 742.0], bottom_right: [562.0, 436.42] end it 'should split block with nested block taller than page across pages, starting from page top' do @@ -460,7 +460,7 @@ describe 'Asciidoctor::PDF::Converter#arrange_block' do p1_gs = (pdf.extract_graphic_states pages[0][:raw_content])[0] (expect p1_gs).to have_background color: 'FFFFCC', top_left: [50.0, 714.22], bottom_right: [562.0, 50.0] p2_gs = (pdf.extract_graphic_states pages[1][:raw_content])[0] - (expect p2_gs).to have_background color: 'FFFFCC', top_left: [50.0, 742.0], bottom_right: [562.0, 409.39] + (expect p2_gs).to have_background color: 'FFFFCC', top_left: [50.0, 742.0], bottom_right: [562.0, 408.64] end it 'should restart dry run on new page if first page is empty' do @@ -731,7 +731,7 @@ describe 'Asciidoctor::PDF::Converter#arrange_block' do p2_gs = (pdf.extract_graphic_states pages[1][:raw_content])[0] (expect p2_gs).to have_background color: 'EEEEEE', top_left: [50.0, 742.0], bottom_right: [562.0, 50.0] p3_gs = (pdf.extract_graphic_states pages[2][:raw_content])[0] - (expect p3_gs).to have_background color: 'EEEEEE', top_left: [50.0, 742.0], bottom_right: [562.0, 687.19] + (expect p3_gs).to have_background color: 'EEEEEE', top_left: [50.0, 742.0], bottom_right: [562.0, 686.44] end it 'should preserve indentation across pages in scratch document' do @@ -830,7 +830,7 @@ describe 'Asciidoctor::PDF::Converter#arrange_block' do p1_gs = (pdf.extract_graphic_states pages[0][:raw_content])[0] (expect p1_gs).to have_background color: 'FFFFCC', top_left: [50.0, 742.0], bottom_right: [562.0, 50.0] p2_gs = (pdf.extract_graphic_states pages[1][:raw_content])[0] - (expect p2_gs).to have_background color: 'FFFFCC', top_left: [50.0, 742.0], bottom_right: [562.0, 437.17] + (expect p2_gs).to have_background color: 'FFFFCC', top_left: [50.0, 742.0], bottom_right: [562.0, 436.42] end it 'should split block with nested block taller than page across pages, starting from page top' do @@ -1146,7 +1146,7 @@ describe 'Asciidoctor::PDF::Converter#arrange_block' do p2_gs = (pdf.extract_graphic_states pages[1][:raw_content])[0] (expect p2_gs).to have_background color: 'EEEEEE', top_left: [50.0, 742.0], bottom_right: [562.0, 50.0] p3_gs = (pdf.extract_graphic_states pages[2][:raw_content])[0] - (expect p3_gs).to have_background color: 'EEEEEE', top_left: [50.0, 742.0], bottom_right: [562.0, 548.29] + (expect p3_gs).to have_background color: 'EEEEEE', top_left: [50.0, 742.0], bottom_right: [562.0, 547.54] end it 'should split block shorter than page across pages, starting from current position if it does not fit on current page' do @@ -1168,7 +1168,7 @@ describe 'Asciidoctor::PDF::Converter#arrange_block' do p1_gs = (pdf.extract_graphic_states pages[0][:raw_content])[0] (expect p1_gs).to have_background color: 'FFFFCC', top_left: [50.0, 325.3], bottom_right: [562.0, 50.0] p2_gs = (pdf.extract_graphic_states pages[1][:raw_content])[0] - (expect p2_gs).to have_background color: 'FFFFCC', top_left: [50.0, 742.0], bottom_right: [562.0, 576.07] + (expect p2_gs).to have_background color: 'FFFFCC', top_left: [50.0, 742.0], bottom_right: [562.0, 575.32] end it 'should split block taller than page across pages, starting from current position' do @@ -1394,7 +1394,7 @@ describe 'Asciidoctor::PDF::Converter#arrange_block' do p1_gs = (pdf.extract_graphic_states pages[0][:raw_content])[0] (expect p1_gs).to have_background color: 'FFFFCC', top_left: [50.0, 742.0], bottom_right: [562.0, 50.0] p2_gs = (pdf.extract_graphic_states pages[1][:raw_content])[0] - (expect p2_gs).to have_background color: 'FFFFCC', top_left: [50.0, 742.0], bottom_right: [562.0, 437.17] + (expect p2_gs).to have_background color: 'FFFFCC', top_left: [50.0, 742.0], bottom_right: [562.0, 436.42] p3_gs = (pdf.extract_graphic_states pages[2][:raw_content])[0] (expect p3_gs).to have_background color: 'FFFFCC', top_left: [50.0, 742.0], bottom_right: [562.0, 313.3] end diff --git a/spec/image_float_spec.rb b/spec/image_float_spec.rb index 24f24ad4..eed762b6 100644 --- a/spec/image_float_spec.rb +++ b/spec/image_float_spec.rb @@ -127,13 +127,15 @@ describe 'Asciidoctor::PDF::Converter - Image Float' do end it 'should fit multiple paragraphs within float box' do + ref_input = lorem_ipsum '2-sentences-2-paragraphs' + input = <<~EOS image::rect.png[pdfwidth=3in,float=left] - #{lorem_ipsum '2-sentences-2-paragraphs'} + #{ref_input} EOS - pdf = to_pdf input, pdf_theme: (pdf_theme.merge section_indent: [228, 0]), analyze: true + pdf = to_pdf ref_input, pdf_theme: (pdf_theme.merge section_indent: [228, 0]), analyze: true fragments = pdf.text expected_text_top = fragments[0][:y] p2_start_idx = fragments.index {|it| it[:string].start_with? 'Magna' } @@ -676,8 +678,7 @@ describe 'Asciidoctor::PDF::Converter - Image Float' do p2_fragments.each do |fragment| (expect fragment[:x]).to eql page_margin end - # FIXME: off by line_metrics.padding_top, which doesn't get applied at page transition - (expect p2_fragments[0][:y] - 0.75).to eql (pdf.find_text page_number: 3)[0][:y] + (expect p2_fragments[0][:y]).to eql (pdf.find_text page_number: 3)[0][:y] end end @@ -707,8 +708,7 @@ describe 'Asciidoctor::PDF::Converter - Image Float' do p2_fragments.each do |fragment| (expect fragment[:x]).to eql page_margin end - # FIXME: off by line_metrics.padding_top, which doesn't get applied at page transition - (expect p2_fragments[0][:y] - 0.75).to eql (pdf.find_text page_number: 3)[0][:y] + (expect p2_fragments[0][:y]).to eql (pdf.find_text page_number: 3)[0][:y] end end diff --git a/spec/paragraph_spec.rb b/spec/paragraph_spec.rb index b10ce9ef..804907f2 100644 --- a/spec/paragraph_spec.rb +++ b/spec/paragraph_spec.rb @@ -17,6 +17,39 @@ describe 'Asciidoctor::PDF::Converter - Paragraph' do (expect text).to include 'man, Sitting' end + it 'should allow paragraph to flow over page boundary with correct top placement' do + pdf_theme = { + role_outline_border_width: 0.5, + role_outline_border_color: '0000EE', + } + with_content_spacer 50, 675 do |spacer_path| + input = <<~EOS + [.outline]#top# + + image::#{spacer_path}[] + + #{(lorem_ipsum '2-sentences-1-paragraph').sub 'non', '[.outline]#non#'} + #{(['fillmefillme'] * 380).join ' '} [.outline]#fin# + EOS + + pdf = to_pdf input, pdf_theme: pdf_theme, analyze: true + (expect pdf.pages).to have_size 3 + (expect (pdf.find_unique_text 'top')[:page_number]).to eql 1 + (expect (pdf.find_unique_text 'non')[:page_number]).to eql 2 + (expect (pdf.find_unique_text 'fin')[:page_number]).to eql 3 + outlines = (to_pdf input, pdf_theme: pdf_theme, analyze: :rect).rectangles.reject {|it| it[:width] == 50.0 } + (expect outlines).to have_size 3 + reference_outline, subject1_outline, subject2_outline = outlines + expected_top = pdf.pages[0][:size][1] - 36 - 0.75 + initial_top = reference_outline.yield_self {|it| it[:point][1] + it[:height] } + (expect initial_top).to eql expected_top + top_after_first_page_break = subject1_outline.yield_self {|it| it[:point][1] + it[:height] } + (expect top_after_first_page_break).to eql initial_top + top_after_second_page_break = subject2_outline.yield_self {|it| it[:point][1] + it[:height] } + (expect top_after_second_page_break).to eql initial_top + end + end + it 'should indent first line of paragraph if prose_text_indent key is set in theme' do pdf = to_pdf (lorem_ipsum '2-paragraphs'), pdf_theme: { prose_text_indent: 18 }, analyze: true diff --git a/spec/reference/admonition-page-split.pdf b/spec/reference/admonition-page-split.pdf index a2b20b9b..a6c0394e 100644 --- a/spec/reference/admonition-page-split.pdf +++ b/spec/reference/admonition-page-split.pdf @@ -2,10 +2,10 @@ % 1 0 obj << /Title (Untitled) -/Creator (Asciidoctor PDF 2.0.0.dev, based on Prawn 2.4.0) -/Producer (Asciidoctor PDF 2.0.0.dev, based on Prawn 2.4.0) -/ModDate (D:20220310040839-07'00') -/CreationDate (D:20220310040839-07'00') +/Creator (Asciidoctor PDF 2.0.0.beta.1, based on Prawn 2.4.0) +/Producer (Asciidoctor PDF 2.0.0.beta.1, based on Prawn 2.4.0) +/ModDate (D:20220514045258-06'00') +/CreationDate (D:20220514045258-06'00') >> endobj 2 0 obj @@ -450,10 +450,10 @@ q 48.24 805.89 m 547.04 805.89 l 547.04 805.89 547.04 805.89 547.04 805.89 c -547.04 425.72 l -547.04 425.72 547.04 425.72 547.04 425.72 c -48.24 425.72 l -48.24 425.72 48.24 425.72 48.24 425.72 c +547.04 424.97 l +547.04 424.97 547.04 424.97 547.04 424.97 c +48.24 424.97 l +48.24 424.97 48.24 424.97 48.24 424.97 c 48.24 805.89 l 48.24 805.89 48.24 805.89 48.24 805.89 c h @@ -464,10 +464,10 @@ f 48.24 805.89 m 547.04 805.89 l 547.04 805.89 547.04 805.89 547.04 805.89 c -547.04 425.72 l -547.04 425.72 547.04 425.72 547.04 425.72 c -48.24 425.72 l -48.24 425.72 48.24 425.72 48.24 425.72 c +547.04 424.97 l +547.04 424.97 547.04 424.97 547.04 424.97 c +48.24 424.97 l +48.24 424.97 48.24 424.97 48.24 424.97 c 48.24 805.89 l 48.24 805.89 48.24 805.89 48.24 805.89 c h @@ -487,7 +487,7 @@ q /DeviceRGB CS 0.93333 0.93333 0.93333 SCN 102.25929 805.89 m -102.25929 425.72 l +102.25929 424.97 l S Q /DeviceRGB cs @@ -496,7 +496,7 @@ Q 0.2 0.2 0.2 SCN BT -114.25929 794.676 Td +114.25929 793.926 Td /F1.0 10.5 Tf <61646d6f6e6974696f6e> Tj ET @@ -507,7 +507,7 @@ ET 0.2 0.2 0.2 SCN BT -114.25929 766.896 Td +114.25929 766.146 Td /F1.0 10.5 Tf <61646d6f6e6974696f6e> Tj ET @@ -518,7 +518,7 @@ ET 0.2 0.2 0.2 SCN BT -114.25929 739.116 Td +114.25929 738.366 Td /F1.0 10.5 Tf <61646d6f6e6974696f6e> Tj ET @@ -529,7 +529,7 @@ ET 0.2 0.2 0.2 SCN BT -114.25929 711.336 Td +114.25929 710.586 Td /F1.0 10.5 Tf <61646d6f6e6974696f6e> Tj ET @@ -540,7 +540,7 @@ ET 0.2 0.2 0.2 SCN BT -114.25929 683.556 Td +114.25929 682.806 Td /F1.0 10.5 Tf <61646d6f6e6974696f6e> Tj ET @@ -551,7 +551,7 @@ ET 0.2 0.2 0.2 SCN BT -114.25929 655.776 Td +114.25929 655.026 Td /F1.0 10.5 Tf <61646d6f6e6974696f6e> Tj ET @@ -562,7 +562,7 @@ ET 0.2 0.2 0.2 SCN BT -114.25929 627.996 Td +114.25929 627.246 Td /F1.0 10.5 Tf <61646d6f6e6974696f6e> Tj ET @@ -573,7 +573,7 @@ ET 0.2 0.2 0.2 SCN BT -114.25929 600.216 Td +114.25929 599.466 Td /F1.0 10.5 Tf <61646d6f6e6974696f6e> Tj ET @@ -584,7 +584,7 @@ ET 0.2 0.2 0.2 SCN BT -114.25929 572.436 Td +114.25929 571.686 Td /F1.0 10.5 Tf <61646d6f6e6974696f6e> Tj ET @@ -595,7 +595,7 @@ ET 0.2 0.2 0.2 SCN BT -114.25929 544.656 Td +114.25929 543.906 Td /F1.0 10.5 Tf <61646d6f6e6974696f6e> Tj ET @@ -606,7 +606,7 @@ ET 0.2 0.2 0.2 SCN BT -114.25929 516.876 Td +114.25929 516.126 Td /F1.0 10.5 Tf <61646d6f6e6974696f6e> Tj ET @@ -617,7 +617,7 @@ ET 0.2 0.2 0.2 SCN BT -114.25929 489.096 Td +114.25929 488.346 Td /F1.0 10.5 Tf <61646d6f6e6974696f6e> Tj ET @@ -628,7 +628,7 @@ ET 0.2 0.2 0.2 SCN BT -114.25929 461.316 Td +114.25929 460.566 Td /F1.0 10.5 Tf <61646d6f6e6974696f6e> Tj ET @@ -639,7 +639,7 @@ ET 0.2 0.2 0.2 SCN BT -114.25929 433.536 Td +114.25929 432.786 Td /F1.0 10.5 Tf <61646d6f6e6974696f6e> Tj ET @@ -650,7 +650,7 @@ ET 0.2 0.2 0.2 SCN BT -48.24 401.756 Td +48.24 401.006 Td /F1.0 10.5 Tf <6166746572> Tj ET @@ -821,35 +821,35 @@ xref 0 26 0000000000 65535 f 0000000015 00000 n -0000000248 00000 n -0000000450 00000 n -0000000514 00000 n -0000000565 00000 n -0000000837 00000 n -0000005395 00000 n -0000005704 00000 n -0000005868 00000 n -0000008710 00000 n -0000009007 00000 n -0000009177 00000 n -0000009251 00000 n -0000009376 00000 n -0000009436 00000 n -0000009479 00000 n -0000009528 00000 n -0000009581 00000 n -0000014548 00000 n -0000014760 00000 n -0000016114 00000 n -0000017028 00000 n -0000021050 00000 n -0000021267 00000 n -0000022621 00000 n +0000000254 00000 n +0000000456 00000 n +0000000520 00000 n +0000000571 00000 n +0000000843 00000 n +0000005401 00000 n +0000005710 00000 n +0000005874 00000 n +0000008716 00000 n +0000009013 00000 n +0000009183 00000 n +0000009257 00000 n +0000009382 00000 n +0000009442 00000 n +0000009485 00000 n +0000009534 00000 n +0000009587 00000 n +0000014554 00000 n +0000014766 00000 n +0000016120 00000 n +0000017034 00000 n +0000021056 00000 n +0000021273 00000 n +0000022627 00000 n trailer << /Size 26 /Root 2 0 R /Info 1 0 R >> startxref -23535 +23541 %%EOF diff --git a/spec/reference/arrange-block-at-top-does-not-fit.pdf b/spec/reference/arrange-block-at-top-does-not-fit.pdf Binary files differindex 22b6adbb..5563beae 100644 --- a/spec/reference/arrange-block-at-top-does-not-fit.pdf +++ b/spec/reference/arrange-block-at-top-does-not-fit.pdf diff --git a/spec/reference/arrange-block-at-top-fits.pdf b/spec/reference/arrange-block-at-top-fits.pdf Binary files differindex b9965691..483c3b8b 100644 --- a/spec/reference/arrange-block-at-top-fits.pdf +++ b/spec/reference/arrange-block-at-top-fits.pdf diff --git a/spec/reference/arrange-block-below-top-does-not-fit-prepress.pdf b/spec/reference/arrange-block-below-top-does-not-fit-prepress.pdf Binary files differindex 9f03322c..53ed4775 100644 --- a/spec/reference/arrange-block-below-top-does-not-fit-prepress.pdf +++ b/spec/reference/arrange-block-below-top-does-not-fit-prepress.pdf diff --git a/spec/reference/arrange-block-below-top-does-not-fit.pdf b/spec/reference/arrange-block-below-top-does-not-fit.pdf Binary files differindex f86e1a2d..64009725 100644 --- a/spec/reference/arrange-block-below-top-does-not-fit.pdf +++ b/spec/reference/arrange-block-below-top-does-not-fit.pdf diff --git a/spec/reference/arrange-block-below-top-fits.pdf b/spec/reference/arrange-block-below-top-fits.pdf Binary files differindex 62a75d16..1672a594 100644 --- a/spec/reference/arrange-block-below-top-fits.pdf +++ b/spec/reference/arrange-block-below-top-fits.pdf diff --git a/spec/reference/example-page-split.pdf b/spec/reference/example-page-split.pdf Binary files differindex 246934d6..23e5b773 100644 --- a/spec/reference/example-page-split.pdf +++ b/spec/reference/example-page-split.pdf diff --git a/spec/reference/listing-page-split-border-ends.pdf b/spec/reference/listing-page-split-border-ends.pdf index 69eeb0d8..5e1664a4 100644 --- a/spec/reference/listing-page-split-border-ends.pdf +++ b/spec/reference/listing-page-split-border-ends.pdf @@ -2,28 +2,28 @@ % 1 0 obj << /Title (Untitled) -/Creator (Asciidoctor PDF 2.0.0.dev, based on Prawn 2.2.2) -/Producer (Asciidoctor PDF 2.0.0.dev, based on Prawn 2.2.2) -/ModDate (D:20200518073722+00'00') -/CreationDate (D:20200518073722+00'00') +/Creator (Asciidoctor PDF 2.0.0.beta.2, based on Prawn 2.4.0) +/Producer (Asciidoctor PDF 2.0.0.beta.2, based on Prawn 2.4.0) +/ModDate (D:20220515022155-06'00') +/CreationDate (D:20220515022155-06'00') >> endobj 2 0 obj << /Type /Catalog /Pages 3 0 R -/Names 9 0 R -/Outlines 14 0 R -/PageLabels 16 0 R +/Outlines 11 0 R +/PageLabels 13 0 R /PageMode /UseOutlines /OpenAction [7 0 R /FitH 841.89] /ViewerPreferences << /DisplayDocTitle true >> +/Names 15 0 R >> endobj 3 0 obj << /Type /Pages /Count 2 -/Kids [7 0 R 12 0 R] +/Kids [7 0 R 9 0 R] >> endobj 4 0 obj @@ -48,13 +48,13 @@ endobj >> endobj 6 0 obj -<< /Length 6607 +<< /Length 6615 >> stream q q /DeviceRGB cs -0.9608 0.9608 0.9608 scn +0.96078 0.96078 0.96078 scn 48.24 805.89 m 547.04 805.89 l 547.04 805.89 547.04 805.89 547.04 805.89 c @@ -68,7 +68,7 @@ h f q /DeviceRGB CS -0.6667 0.0 0.0 SCN +0.66667 0.0 0.0 SCN 1 w 48.24 805.89 m 547.04 805.89 l @@ -76,7 +76,7 @@ S Q q /DeviceRGB CS -0.6667 0.0 0.0 SCN +0.66667 0.0 0.0 SCN 1 w 48.24 48.24 m 547.04 48.24 l @@ -85,7 +85,7 @@ Q Q q /DeviceRGB CS -0.9608 0.9608 0.9608 SCN +0.96078 0.96078 0.96078 SCN 1.2 w [4.8 4.8] 0.0 d 48.24 48.24 m @@ -658,45 +658,33 @@ endobj /ArtBox [0 0 595.28 841.89] /Contents 6 0 R /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI] -/Font << /F2.0 13 0 R +/Font << /F2.0 10 0 R >> >> >> endobj 8 0 obj -[7 0 R /XYZ 0 841.89 null] -endobj -9 0 obj -<< /Type /Names -/Dests 10 0 R ->> -endobj -10 0 obj -<< /Names [(__anchor-top) 8 0 R] ->> -endobj -11 0 obj -<< /Length 1782 +<< /Length 1790 >> stream q q /DeviceRGB cs -0.9608 0.9608 0.9608 scn +0.96078 0.96078 0.96078 scn 48.24 805.89 m 547.04 805.89 l 547.04 805.89 547.04 805.89 547.04 805.89 c -547.04 649.855 l -547.04 649.855 547.04 649.855 547.04 649.855 c -48.24 649.855 l -48.24 649.855 48.24 649.855 48.24 649.855 c +547.04 647.49 l +547.04 647.49 547.04 647.49 547.04 647.49 c +48.24 647.49 l +48.24 647.49 48.24 647.49 48.24 647.49 c 48.24 805.89 l 48.24 805.89 48.24 805.89 48.24 805.89 c h f q /DeviceRGB CS -0.6667 0.0 0.0 SCN +0.66667 0.0 0.0 SCN 1 w 48.24 805.89 m 547.04 805.89 l @@ -704,16 +692,16 @@ S Q q /DeviceRGB CS -0.6667 0.0 0.0 SCN +0.66667 0.0 0.0 SCN 1 w -48.24 649.855 m -547.04 649.855 l +48.24 647.49 m +547.04 647.49 l S Q Q q /DeviceRGB CS -0.9608 0.9608 0.9608 SCN +0.96078 0.96078 0.96078 SCN 1.2 w [4.8 4.8] 0.0 d 48.24 805.89 m @@ -726,7 +714,7 @@ Q 0.2 0.2 0.2 SCN BT -59.24 796.43 Td +59.24 794.065 Td /F2.0 11 Tf <6c697374696e67> Tj ET @@ -737,7 +725,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 781.69 Td +59.24 779.325 Td /F2.0 11 Tf <6c697374696e67> Tj ET @@ -748,7 +736,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 766.95 Td +59.24 764.585 Td /F2.0 11 Tf <6c697374696e67> Tj ET @@ -759,7 +747,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 752.21 Td +59.24 749.845 Td /F2.0 11 Tf <6c697374696e67> Tj ET @@ -770,7 +758,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 737.47 Td +59.24 735.105 Td /F2.0 11 Tf <6c697374696e67> Tj ET @@ -781,7 +769,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 722.73 Td +59.24 720.365 Td /F2.0 11 Tf <6c697374696e67> Tj ET @@ -792,7 +780,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 707.99 Td +59.24 705.625 Td /F2.0 11 Tf <6c697374696e67> Tj ET @@ -803,7 +791,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 693.25 Td +59.24 690.885 Td /F2.0 11 Tf <6c697374696e67> Tj ET @@ -814,7 +802,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 678.51 Td +59.24 676.145 Td /F2.0 11 Tf <6c697374696e67> Tj ET @@ -825,7 +813,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 663.77 Td +59.24 661.405 Td /F2.0 11 Tf <6c697374696e67> Tj ET @@ -836,7 +824,7 @@ Q endstream endobj -12 0 obj +9 0 obj << /Type /Page /Parent 3 0 R /MediaBox [0 0 595.28 841.89] @@ -844,14 +832,14 @@ endobj /BleedBox [0 0 595.28 841.89] /TrimBox [0 0 595.28 841.89] /ArtBox [0 0 595.28 841.89] -/Contents 11 0 R +/Contents 8 0 R /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI] -/Font << /F2.0 13 0 R +/Font << /F2.0 10 0 R >> >> >> endobj -13 0 obj +10 0 obj << /Type /Font /BaseFont /0bf04b+mplus1mn-regular /Subtype /TrueType @@ -862,36 +850,53 @@ endobj /ToUnicode 19 0 R >> endobj -14 0 obj +11 0 obj << /Type /Outlines /Count 1 -/First 15 0 R -/Last 15 0 R +/First 12 0 R +/Last 12 0 R >> endobj -15 0 obj +12 0 obj << /Title <feff0055006e007400690074006c00650064> -/Parent 14 0 R +/Parent 11 0 R /Count 0 /Dest [7 0 R /XYZ 0 841.89 null] >> endobj -16 0 obj +13 0 obj << /Nums [0 << /P (1) >> 1 << /P (2) >>] >> endobj +14 0 obj +[7 0 R /XYZ 0 841.89 null] +endobj +15 0 obj +<< /Type /Names +/Dests 16 0 R +>> +endobj +16 0 obj +<< /Names [(__anchor-top) 14 0 R] +>> +endobj 17 0 obj -<< /Length1 3484 -/Length 2193 +<< /Length1 3520 +/Length 2195 /Filter [/FlateDecode] >> stream -xV}lS?ʼnAH8ay$8 B|8iHp` _HBnFݲvҦj_H`4$Z`hLmԲ#ٹ/&:y9l -IA#i*D<Mt:^
3:^M~$4!+CnS eM-3\m|U1
6\t ]%bq5v=O3~?I'|#C~ darxbE*Bv -.Ƈ ɤUO&Sh ZtCt0DҘs詈4:.p@'>z_LfZ4mwnWGA<,킿yBl.:llr!$\f{byg& I;bTܿ hÿJI,7DRH1!'P>3Qu1St*LY%JEh˅ U3t!iNC$j.1*4bBLN̙2D4Hd -JS)%NenΤ ?mBQCo&z C}>_Љ=fUM 9n~y\"oDMm-SEˊI TdJHmU\b{D*{mU
ǭG7C=#,) Q|ȩq_EU'?q%%15_V|70 ^qnmFmo "M6כp> = }|8r 8$KY12(a^-B;_`A2 {XIľ^V+X:Vqʞ[UDga`G<ؼoB+0o2"8f~3rƞ*Aޗ18{ǐ#9gc2# ;/~EEK=x<7% P{f￠we%O߮+ 6pw9
ZD !
V68}(<Vf
5
@Ή6r< }_#um͡IQ_`HZ Z=j u ]DA [ V<ǃb!DR{C+k"0:=5;k +xW[lxf]Y^<&8@W| جfx/R%)iaCVj+)
)zjDJ*KKT
l3;6/U>s9sFKSTA';z~yD, l4 Um FcƥD்W;O$PBT]:Ɔܿ/'H̚9ћJm-Է[o@Khr 1 9cm$՟BDVW.[<s"yry5eG<t/^Y;~~?i]Л+>hqM#Q?ITgݻAs } +1Ln8~e@1kszoe v8uИ\yq(GD@9DL A<Fm
b#v"B7D+bcrJS?"?
%.3!qT/801y +]e#i
h +X;LaS)[TS^G \GoѷLzeU Oز)3e?6eֳߘr03e Jͦ\I%ٔQ)ױHSnZ*F-e
iS|*ڣ;yҹk72y(8ͧÃAL@M,/E#ٌ6'TUx /;!t< _̪B*^QJ+[Z.ɗɒ0̞8 l!.T s^Uy!NGdR锦xNͧS#`|$#Z/T737db<*h²SZgƜ]x:KSш"7WaUN|4YZZL6ѱicTcCCz+?2 #@`[^q,hx8^4l(E +u HɅM! +4) +@aM') +eZ8G̜3#˖.1V̂!OԚ5":
^D5҇W jXCqYcмDQ)X} K['i#f]2-gԖ6 TXfK1X
^nTR| +B8dՌjD>:mHIHbe YQG`cDXĪFȝƟТDjYeqQ3 ^'ІW`iŧ`b>IObMޏ endstream endobj 18 0 obj @@ -901,7 +906,7 @@ endobj /FontBBox [0 -270 1000 1025] /Flags 4 /StemV 0 -/ItalicAngle 0.0 +/ItalicAngle 0 /Ascent 860 /Descent -140 /CapHeight 860 @@ -909,46 +914,45 @@ endobj >> endobj 19 0 obj -<< /Length 1286 +<< /Length 1278 /Filter [/FlateDecode] >> stream -xenFὮBtHs&@nu{stԒ + }i /y_!ut ~]snVyg쾝+| <.÷}v)[eO/_q9_ɯ}ഏOmt_LLv͵ LJ1 w9 )e6=n PҪtN*eP)DT.ʕrU)BYTVʪQ6 [ky
^#k5x5F^ky
^#k5x5F^kZy-^+kxZV^kZy-^+kxZV^:y ^'uxu:N^:y ^'uxu:N^zy=^/x z^^zy=^/x z^ހ7y o
xo7
Aހ7y o
xo7
Aވ7Fy#(oĻnuW.I$$*I$ITH$$QI"IDD%$JI$$*I$ITH$$III$$%I$I|Mx o7M&Iބ7ɛ&y$oMx o7M.xyUo ުMMol x; -JÂ31x; -JJ특xxx+!Êw Bxbx+ށr; 2kΜJYeY7+|x oS7+[ƛețךyޢoV浖 -㭌"RW*4XqC^J[(^1»y]k}YM-x Vz[YEVY_}/7*Y%eӫq+:.7JE/3Y(Y*AW RVJS:(u@cD]a*f)9J)o, #\Z>MU\jPS
{HSMj{fkyGm[z*Esa>&ӫj%u; 2^W[®v[2쯲u[P:V̡Յ> MBi2 .Ħԇ!dk`=o qWޕwdJF(L164U)x0E~Z? +xenFὮBtHs&@nu{stԒ + }ik/y_!}t ~]snVyg쾝+| <.÷}v)[eO/_q9_ɯ}ഏOmt_LLv͵ LJ1 w9 )e6=n?[i(JKiU:JSz2QeL*EJ̔Ye,*+eU(NU-уk5x5F^ky
^#k5x5F^ky
^#kxZV^kZy-^+kxZV^kZy-^+uxu:N^:y ^'uxu:N^:y ^'x z^^zy=^/x z^^zy=^/o
xo7
Aހ7y o
xo7
Aހ7y oxo7jo$JI$$*I$ITH$$QI"IDD%$JI$$*I$ITD$$III$$u>M&Iބ7ɛ&y$oMx o7M&Iބ7ɛ&yUoa[5joSor4ۂs +JJ특xxx+!Êw Bxbx+ށr; 2kΜJYeY7+|x oS7+[ƛețךyޢoV浖 -㭌"RW*4XqC^J[(^1»y]k}YM-x e#e_y+h܊7k:/Z5dUluz5n[eB&Si|y(%q& %+S%*ABijPU6\h,(+L,4G5<cD [˧*t [
jjaijIxʪwgFwضR>sh>:OVRP*#i|e0U,*oU/*[U,Nmlx:& \}M)L2\%CHF7էʻBL)jƻJ1:%H߯:=S۳zrmkO媳7 endstream endobj 20 0 obj -[364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 500 364 500 364 364 500 364 500 364 364 364 364 500 500 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364] +[500 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 500 364 500 364 364 500 364 500 364 364 364 364 500 500 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364 364] endobj xref 0 21 0000000000 65535 f 0000000015 00000 n -0000000248 00000 n -0000000449 00000 n -0000000513 00000 n -0000000564 00000 n -0000000836 00000 n -0000007495 00000 n -0000007792 00000 n -0000007834 00000 n -0000007882 00000 n -0000007934 00000 n -0000009769 00000 n -0000010068 00000 n -0000010240 00000 n -0000010314 00000 n -0000010439 00000 n -0000010499 00000 n -0000012782 00000 n -0000012995 00000 n -0000014357 00000 n +0000000254 00000 n +0000000456 00000 n +0000000519 00000 n +0000000570 00000 n +0000000842 00000 n +0000007509 00000 n +0000007806 00000 n +0000009648 00000 n +0000009945 00000 n +0000010117 00000 n +0000010191 00000 n +0000010316 00000 n +0000010376 00000 n +0000010419 00000 n +0000010468 00000 n +0000010521 00000 n +0000012806 00000 n +0000013017 00000 n +0000014371 00000 n trailer << /Size 21 /Root 2 0 R /Info 1 0 R >> startxref -15271 +15285 %%EOF diff --git a/spec/reference/listing-page-split.pdf b/spec/reference/listing-page-split.pdf index 486aaf59..b780330b 100644 --- a/spec/reference/listing-page-split.pdf +++ b/spec/reference/listing-page-split.pdf @@ -2,28 +2,28 @@ % 1 0 obj << /Title (Untitled) -/Creator (Asciidoctor PDF 1.5.0.rc.1.dev, based on Prawn 2.2.2) -/Producer (Asciidoctor PDF 1.5.0.rc.1.dev, based on Prawn 2.2.2) -/ModDate (D:20200101032703-07'00') -/CreationDate (D:20200101032703-07'00') +/Creator (Asciidoctor PDF 2.0.0.beta.2, based on Prawn 2.4.0) +/Producer (Asciidoctor PDF 2.0.0.beta.2, based on Prawn 2.4.0) +/ModDate (D:20220515022127-06'00') +/CreationDate (D:20220515022127-06'00') >> endobj 2 0 obj << /Type /Catalog /Pages 3 0 R -/Names 9 0 R -/Outlines 14 0 R -/PageLabels 16 0 R +/Outlines 11 0 R +/PageLabels 13 0 R /PageMode /UseOutlines /OpenAction [7 0 R /FitH 841.89] /ViewerPreferences << /DisplayDocTitle true >> +/Names 15 0 R >> endobj 3 0 obj << /Type /Pages /Count 2 -/Kids [7 0 R 12 0 R] +/Kids [7 0 R 9 0 R] >> endobj 4 0 obj @@ -48,22 +48,22 @@ endobj >> endobj 6 0 obj -<< /Length 6788 +<< /Length 6810 >> stream q q /DeviceRGB cs -0.9608 0.9608 0.9608 scn +0.96078 0.96078 0.96078 scn 52.24 805.89 m 543.04 805.89 l -545.2491 805.89 547.04 804.0991 547.04 801.89 c +545.24914 805.89 547.04 804.09914 547.04 801.89 c 547.04 52.24 l -547.04 50.0309 545.2491 48.24 543.04 48.24 c +547.04 50.03086 545.24914 48.24 543.04 48.24 c 52.24 48.24 l -50.0309 48.24 48.24 50.0309 48.24 52.24 c +50.03086 48.24 48.24 50.03086 48.24 52.24 c 48.24 801.89 l -48.24 804.0991 50.0309 805.89 52.24 805.89 c +48.24 804.09914 50.03086 805.89 52.24 805.89 c h f /DeviceRGB CS @@ -71,20 +71,20 @@ f 0.75 w 52.24 805.89 m 543.04 805.89 l -545.2491 805.89 547.04 804.0991 547.04 801.89 c +545.24914 805.89 547.04 804.09914 547.04 801.89 c 547.04 52.24 l -547.04 50.0309 545.2491 48.24 543.04 48.24 c +547.04 50.03086 545.24914 48.24 543.04 48.24 c 52.24 48.24 l -50.0309 48.24 48.24 50.0309 48.24 52.24 c +50.03086 48.24 48.24 50.03086 48.24 52.24 c 48.24 801.89 l -48.24 804.0991 50.0309 805.89 52.24 805.89 c +48.24 804.09914 50.03086 805.89 52.24 805.89 c h S Q q -0.8999999999999999 w /DeviceRGB CS -0.9608 0.9608 0.9608 SCN +0.96078 0.96078 0.96078 SCN +0.8999999999999999 w [3.6 3.6] 0.0 d 52.99 48.24 m 542.29 48.24 l @@ -656,40 +656,28 @@ endobj /ArtBox [0 0 595.28 841.89] /Contents 6 0 R /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI] -/Font << /F2.0 13 0 R +/Font << /F2.0 10 0 R >> >> >> endobj 8 0 obj -[7 0 R /XYZ 0 841.89 null] -endobj -9 0 obj -<< /Type /Names -/Dests 10 0 R ->> -endobj -10 0 obj -<< /Names [(__anchor-top) 8 0 R] ->> -endobj -11 0 obj -<< /Length 2843 +<< /Length 2858 >> stream q q /DeviceRGB cs -0.9608 0.9608 0.9608 scn +0.96078 0.96078 0.96078 scn 52.24 805.89 m 543.04 805.89 l -545.2491 805.89 547.04 804.0991 547.04 801.89 c -547.04 653.855 l -547.04 651.6459 545.2491 649.855 543.04 649.855 c -52.24 649.855 l -50.0309 649.855 48.24 651.6459 48.24 653.855 c +545.24914 805.89 547.04 804.09914 547.04 801.89 c +547.04 651.49 l +547.04 649.28086 545.24914 647.49 543.04 647.49 c +52.24 647.49 l +50.03086 647.49 48.24 649.28086 48.24 651.49 c 48.24 801.89 l -48.24 804.0991 50.0309 805.89 52.24 805.89 c +48.24 804.09914 50.03086 805.89 52.24 805.89 c h f /DeviceRGB CS @@ -697,20 +685,20 @@ f 0.75 w 52.24 805.89 m 543.04 805.89 l -545.2491 805.89 547.04 804.0991 547.04 801.89 c -547.04 653.855 l -547.04 651.6459 545.2491 649.855 543.04 649.855 c -52.24 649.855 l -50.0309 649.855 48.24 651.6459 48.24 653.855 c +545.24914 805.89 547.04 804.09914 547.04 801.89 c +547.04 651.49 l +547.04 649.28086 545.24914 647.49 543.04 647.49 c +52.24 647.49 l +50.03086 647.49 48.24 649.28086 48.24 651.49 c 48.24 801.89 l -48.24 804.0991 50.0309 805.89 52.24 805.89 c +48.24 804.09914 50.03086 805.89 52.24 805.89 c h S Q q -0.8999999999999999 w /DeviceRGB CS -0.9608 0.9608 0.9608 SCN +0.96078 0.96078 0.96078 SCN +0.8999999999999999 w [3.6 3.6] 0.0 d 52.99 805.89 m 542.29 805.89 l @@ -722,7 +710,7 @@ Q 0.2 0.2 0.2 SCN BT -59.24 796.43 Td +59.24 794.065 Td /F2.0 11 Tf <6c697374696e67> Tj ET @@ -733,7 +721,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 781.69 Td +59.24 779.325 Td /F2.0 11 Tf <6c697374696e67> Tj ET @@ -744,7 +732,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 766.95 Td +59.24 764.585 Td /F2.0 11 Tf <6c697374696e67> Tj ET @@ -755,7 +743,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 752.21 Td +59.24 749.845 Td /F2.0 11 Tf <6c697374696e67> Tj ET @@ -766,7 +754,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 737.47 Td +59.24 735.105 Td /F2.0 11 Tf <6c697374696e67> Tj ET @@ -777,7 +765,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 722.73 Td +59.24 720.365 Td /F2.0 11 Tf <6c697374696e67> Tj ET @@ -788,7 +776,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 707.99 Td +59.24 705.625 Td /F2.0 11 Tf <6c697374696e67> Tj ET @@ -799,7 +787,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 693.25 Td +59.24 690.885 Td /F2.0 11 Tf <6c697374696e67> Tj ET @@ -810,7 +798,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 678.51 Td +59.24 676.145 Td /F2.0 11 Tf <6c697374696e67> Tj ET @@ -821,7 +809,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 663.77 Td +59.24 661.405 Td /F2.0 11 Tf <6c697374696e67> Tj ET @@ -829,29 +817,29 @@ ET 0.0 0.0 0.0 SCN 0.0 0.0 0.0 scn q -0.9608 0.9608 0.9608 scn -52.24 637.855 m -543.04 637.855 l -545.2491 637.855 547.04 636.0641 547.04 633.855 c -547.04 590.375 l -547.04 588.1659 545.2491 586.375 543.04 586.375 c -52.24 586.375 l -50.0309 586.375 48.24 588.1659 48.24 590.375 c -48.24 633.855 l -48.24 636.0641 50.0309 637.855 52.24 637.855 c +0.96078 0.96078 0.96078 scn +52.24 635.49 m +543.04 635.49 l +545.24914 635.49 547.04 633.69914 547.04 631.49 c +547.04 588.01 l +547.04 585.80086 545.24914 584.01 543.04 584.01 c +52.24 584.01 l +50.03086 584.01 48.24 585.80086 48.24 588.01 c +48.24 631.49 l +48.24 633.69914 50.03086 635.49 52.24 635.49 c h f 0.8 0.8 0.8 SCN 0.75 w -52.24 637.855 m -543.04 637.855 l -545.2491 637.855 547.04 636.0641 547.04 633.855 c -547.04 590.375 l -547.04 588.1659 545.2491 586.375 543.04 586.375 c -52.24 586.375 l -50.0309 586.375 48.24 588.1659 48.24 590.375 c -48.24 633.855 l -48.24 636.0641 50.0309 637.855 52.24 637.855 c +52.24 635.49 m +543.04 635.49 l +545.24914 635.49 547.04 633.69914 547.04 631.49 c +547.04 588.01 l +547.04 585.80086 545.24914 584.01 543.04 584.01 c +52.24 584.01 l +50.03086 584.01 48.24 585.80086 48.24 588.01 c +48.24 631.49 l +48.24 633.69914 50.03086 635.49 52.24 635.49 c h S Q @@ -859,7 +847,7 @@ Q 0.2 0.2 0.2 SCN BT -59.24 615.03 Td +59.24 612.665 Td /F2.0 11 Tf <6d6f7265206c697374696e67> Tj ET @@ -870,7 +858,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 600.29 Td +59.24 597.925 Td /F2.0 11 Tf <6d6f7265206c697374696e67> Tj ET @@ -881,7 +869,7 @@ Q endstream endobj -12 0 obj +9 0 obj << /Type /Page /Parent 3 0 R /MediaBox [0 0 595.28 841.89] @@ -889,14 +877,14 @@ endobj /BleedBox [0 0 595.28 841.89] /TrimBox [0 0 595.28 841.89] /ArtBox [0 0 595.28 841.89] -/Contents 11 0 R +/Contents 8 0 R /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI] -/Font << /F2.0 13 0 R +/Font << /F2.0 10 0 R >> >> >> endobj -13 0 obj +10 0 obj << /Type /Font /BaseFont /6edddb+mplus1mn-regular /Subtype /TrueType @@ -907,43 +895,50 @@ endobj /ToUnicode 19 0 R >> endobj -14 0 obj +11 0 obj << /Type /Outlines /Count 1 -/First 15 0 R -/Last 15 0 R +/First 12 0 R +/Last 12 0 R >> endobj -15 0 obj +12 0 obj << /Title <feff0055006e007400690074006c00650064> -/Parent 14 0 R +/Parent 11 0 R /Count 0 /Dest [7 0 R /XYZ 0 841.89 null] >> endobj -16 0 obj +13 0 obj << /Nums [0 << /P (1) >> 1 << /P (2) >>] >> endobj +14 0 obj +[7 0 R /XYZ 0 841.89 null] +endobj +15 0 obj +<< /Type /Names +/Dests 16 0 R +>> +endobj +16 0 obj +<< /Names [(__anchor-top) 14 0 R] +>> +endobj 17 0 obj -<< /Length1 3796 -/Length 2434 +<< /Length1 3820 +/Length 2431 /Filter [/FlateDecode] >> stream -xV{l?!6Nx|/v4I ; -b;/0(mnԔJTU6uZ>誡ڭmneL jHv&{9{s_6 -.Gnt|I0fc} - >+7,\n#wT+VW3n -PAFWHMc749ܱi!^NvngKW}5[w?#rUlind{ܹJu^rmzKuigQ6?fk(<-="ELb3`%`k֊- [% lNl l# g\Z|u Xp/H A5[=/!7i<s dP&7POB8P _L_o|LqR@nrIqx<&?_"7?/{t /ngא)VqK[]pMi8A
i -_ _ ,7Lid>}5LCe(clL2$cX<aXft0P%Ig3p_m4p,cg= S4crVd86 $QQ9ł338L 9o .Z>z =^o/3b.WMi\n( @l mg2MA,XoOI99VY[J!,310Uޏ -φcVE /$G3La !e|eV,v V6,3'b×߮F5=wvօ7 *|G* qM}\oG /' -1[/M/J?G#5e)"$Aꐞ% -DU:sKDzL; 42[> RH< 8N?qG"N=?yOb Q D -[ X[CUzvUocVz XV5֯ -@ +xWkp>w-v$#;J8KZ8؎,'(Z IL^-mhg0 (ML)C)mdx t }NK4vZLZt|wsνwwebD:66mHz+aTGOj\Z:AT$xj%*Ij<./lu4BBĬYO`U7}["* |& oNENgn A< I/G^:Cdmf^F~oԬ;7U3sGuV\./b~Ϻ-ofWD$Q8ob CcW ?`B$èρ} R +K *CjfRyB,6pN]I+Yhc]͓STцсƨb1ƅ膙5ޜ?7}$ +tVj-+'X>:uZ? ':7ֆоa;ol}F]K@_;=z;]!u;C;~v +b#snDw7Ų
BC W౻.F^(W k $ Gr{]%ܗўK3L:-+j:X\<8g/uvFE _ W ߂U u{'qʥw)-"o%.z^wwn eeD>ӶgkIO\uJ!2pm˟jDmum.[筭m.냖 #=Ŧ{o -ݛ9_f|vXuiAV6;)dzbس}wC|w>llڨ3~. +H6&jXʯ}.w>} 4vηjǶ>(|)=I+U:m-( +(lqGe|[v} ME\DHL_9u5G;"KĭM>x?G\VY]U^Kjr4z9Z8Kw/YwNM]E4r>m)6^#Tݽui}-6 6vk71;6gGkomZgtXϾݷNOFy-;vm
ڻ7un5OS}Vߧ.)M
`O,` w.}^wU$`\axLYB;M&S +Ct* endstream endobj 18 0 obj @@ -953,7 +948,7 @@ endobj /FontBBox [0 -270 1000 1025] /Flags 4 /StemV 0 -/ItalicAngle 0.0 +/ItalicAngle 0 /Ascent 860 /Descent -140 /CapHeight 860 @@ -961,13 +956,12 @@ endobj >> endobj 19 0 obj -<< /Length 1286 +<< /Length 1278 /Filter [/FlateDecode] >> stream -xenFὮBtHs&@nu{stԒ + }i /y_!ut ~]snVyg쾝+| <.÷}v)[eO/_q9_ɯ}ഏOmt_LLv͵ LJ1 w9 )e6=n PҪtN*eP)DT.ʕrU)BYTVʪQ6 [ky
^#k5x5F^ky
^#k5x5F^kZy-^+kxZV^kZy-^+kxZV^:y ^'uxu:N^:y ^'uxu:N^zy=^/x z^^zy=^/x z^ހ7y o
xo7
Aހ7y o
xo7
Aވ7Fy#(oĻnuW.I$$*I$ITH$$QI"IDD%$JI$$*I$ITH$$III$$%I$I|Mx o7M&Iބ7ɛ&y$oMx o7M.xyUo ުMMol x; -JÂ31x; -JJ특xxx+!Êw Bxbx+ށr; 2kΜJYeY7+|x oS7+[ƛețךyޢoV浖 -㭌"RW*4XqC^J[(^1»y]k}YM-x Vz[YEVY_}/7*Y%eӫq+:.7JE/3Y(Y*AW RVJS:(u@cD]a*f)9J)o, #\Z>MU\jPS
{HSMj{fkyGm[z*Esa>&ӫj%u; 2^W[®v[2쯲u[P:V̡Յ> MBi2 .Ħԇ!dk`=o qWޕwdJF(L164U)x0E~Z? +xenFὮBtHs&@nu{stԒ + }ik/y_!}t ~]snVyg쾝+| <.÷}v)[eO/_q9_ɯ}ഏOmt_LLv͵ LJ1 w9 )e6=n?[i(JKiU:JSz2QeL*EJ̔Ye,*+eU(NU-уk5x5F^ky
^#k5x5F^ky
^#kxZV^kZy-^+kxZV^kZy-^+uxu:N^:y ^'uxu:N^:y ^'x z^^zy=^/x z^^zy=^/o
xo7
Aހ7y o
xo7
Aހ7y oxo7jo$JI$$*I$ITH$$QI"IDD%$JI$$*I$ITD$$III$$u>M&Iބ7ɛ&y$oMx o7M&Iބ7ɛ&yUoa[5joSor4ۂs +JJ특xxx+!Êw Bxbx+ށr; 2kΜJYeY7+|x oS7+[ƛețךyޢoV浖 -㭌"RW*4XqC^J[(^1»y]k}YM-x e#e_y+h܊7k:/Z5dUluz5n[eB&Si|y(%q& %+S%*ABijPU6\h,(+L,4G5<cD [˧*t [
jjaijIxʪwgFwضR>sh>:OVRP*#i|e0U,*oU/*[U,Nmlx:& \}M)L2\%CHF7էʻBL)jƻJ1:%H߯:=S۳zrmkO媳7 endstream endobj 20 0 obj @@ -977,30 +971,30 @@ xref 0 21 0000000000 65535 f 0000000015 00000 n -0000000258 00000 n -0000000459 00000 n -0000000523 00000 n -0000000574 00000 n -0000000846 00000 n -0000007686 00000 n -0000007983 00000 n -0000008025 00000 n -0000008073 00000 n -0000008125 00000 n -0000011021 00000 n -0000011320 00000 n -0000011492 00000 n -0000011566 00000 n -0000011691 00000 n -0000011751 00000 n -0000014275 00000 n -0000014488 00000 n -0000015850 00000 n +0000000254 00000 n +0000000456 00000 n +0000000519 00000 n +0000000570 00000 n +0000000842 00000 n +0000007704 00000 n +0000008001 00000 n +0000010911 00000 n +0000011208 00000 n +0000011380 00000 n +0000011454 00000 n +0000011579 00000 n +0000011639 00000 n +0000011682 00000 n +0000011731 00000 n +0000011784 00000 n +0000014305 00000 n +0000014516 00000 n +0000015870 00000 n trailer << /Size 21 /Root 2 0 R /Info 1 0 R >> startxref -16764 +16784 %%EOF diff --git a/spec/reference/open-unbreakable-option-break.pdf b/spec/reference/open-unbreakable-option-break.pdf index 4d51ff68..c179acc6 100644 --- a/spec/reference/open-unbreakable-option-break.pdf +++ b/spec/reference/open-unbreakable-option-break.pdf @@ -2,10 +2,10 @@ % 1 0 obj << /Title (Untitled) -/Creator (Asciidoctor PDF 2.0.0.dev, based on Prawn 2.4.0) -/Producer (Asciidoctor PDF 2.0.0.dev, based on Prawn 2.4.0) -/ModDate (D:20220119024146-07'00') -/CreationDate (D:20220119024146-07'00') +/Creator (Asciidoctor PDF 2.0.0.beta.1, based on Prawn 2.4.0) +/Producer (Asciidoctor PDF 2.0.0.beta.1, based on Prawn 2.4.0) +/ModDate (D:20220514045532-06'00') +/CreationDate (D:20220514045532-06'00') >> endobj 2 0 obj @@ -1243,7 +1243,7 @@ endobj >> endobj 24 0 obj -<< /Length 495 +<< /Length 503 >> stream q @@ -1253,7 +1253,7 @@ q 0.2 0.2 0.2 SCN BT -48.24 797.346 Td +48.24 796.77457 Td ET 0.0 0.0 0.0 SCN @@ -1262,7 +1262,7 @@ ET 0.2 0.2 0.2 SCN BT -48.24 797.346 Td +48.24 796.77457 Td /F1.0 8 Tf <5b> Tj ET @@ -1273,7 +1273,7 @@ ET 0.25882 0.5451 0.79216 SCN BT -51.112 797.346 Td +51.112 796.77457 Td /F1.0 8 Tf <33> Tj ET @@ -1284,7 +1284,7 @@ ET 0.2 0.2 0.2 SCN BT -55.584 797.346 Td +55.584 796.77457 Td /F1.0 8 Tf <5d20646f6c6c61722062696c6c73> Tj ET @@ -1312,13 +1312,13 @@ endobj >> endobj 26 0 obj -[25 0 R /XYZ 48.24 805.89 null] +[25 0 R /XYZ 48.24 805.31857 null] endobj 27 0 obj << /Border [0 0 0] /Dest (_footnoteref_3) /Subtype /Link -/Rect [51.112 795.01 55.584 805.89] +/Rect [51.112 794.43857 55.584 805.31857] /Type /Annot >> endobj @@ -1447,49 +1447,49 @@ xref 0 40 0000000000 65535 f 0000000015 00000 n -0000000248 00000 n -0000000450 00000 n -0000000521 00000 n -0000000572 00000 n -0000000844 00000 n -0000008807 00000 n -0000009140 00000 n -0000009304 00000 n -0000009354 00000 n -0000009403 00000 n -0000009599 00000 n -0000009736 00000 n -0000009908 00000 n -0000009957 00000 n -0000010090 00000 n -0000015694 00000 n -0000016023 00000 n -0000016075 00000 n -0000016212 00000 n -0000016262 00000 n -0000016391 00000 n -0000016441 00000 n -0000016570 00000 n -0000017117 00000 n -0000017432 00000 n -0000017480 00000 n -0000017605 00000 n -0000017679 00000 n -0000017804 00000 n -0000017879 00000 n -0000017922 00000 n -0000025716 00000 n -0000025928 00000 n -0000027282 00000 n -0000028196 00000 n -0000031447 00000 n -0000031658 00000 n -0000033012 00000 n +0000000254 00000 n +0000000456 00000 n +0000000527 00000 n +0000000578 00000 n +0000000850 00000 n +0000008813 00000 n +0000009146 00000 n +0000009310 00000 n +0000009360 00000 n +0000009409 00000 n +0000009605 00000 n +0000009742 00000 n +0000009914 00000 n +0000009963 00000 n +0000010096 00000 n +0000015700 00000 n +0000016029 00000 n +0000016081 00000 n +0000016218 00000 n +0000016268 00000 n +0000016397 00000 n +0000016447 00000 n +0000016576 00000 n +0000017131 00000 n +0000017446 00000 n +0000017497 00000 n +0000017628 00000 n +0000017702 00000 n +0000017827 00000 n +0000017902 00000 n +0000017945 00000 n +0000025739 00000 n +0000025951 00000 n +0000027305 00000 n +0000028219 00000 n +0000031470 00000 n +0000031681 00000 n +0000033035 00000 n trailer << /Size 40 /Root 2 0 R /Info 1 0 R >> startxref -33926 +33949 %%EOF diff --git a/spec/reference/verse-page-split.pdf b/spec/reference/verse-page-split.pdf index 809539e7..f6ba0801 100644 --- a/spec/reference/verse-page-split.pdf +++ b/spec/reference/verse-page-split.pdf @@ -2,28 +2,28 @@ % 1 0 obj << /Title (Untitled) -/Creator (Asciidoctor PDF 1.5.0.rc.1.dev, based on Prawn 2.2.2) -/Producer (Asciidoctor PDF 1.5.0.rc.1.dev, based on Prawn 2.2.2) -/ModDate (D:20200104235841-07'00') -/CreationDate (D:20200104235841-07'00') +/Creator (Asciidoctor PDF 2.0.0.beta.1, based on Prawn 2.4.0) +/Producer (Asciidoctor PDF 2.0.0.beta.1, based on Prawn 2.4.0) +/ModDate (D:20220514045638-06'00') +/CreationDate (D:20220514045638-06'00') >> endobj 2 0 obj << /Type /Catalog /Pages 3 0 R -/Names 9 0 R -/Outlines 14 0 R -/PageLabels 16 0 R +/Outlines 11 0 R +/PageLabels 13 0 R /PageMode /UseOutlines /OpenAction [7 0 R /FitH 841.89] /ViewerPreferences << /DisplayDocTitle true >> +/Names 15 0 R >> endobj 3 0 obj << /Type /Pages /Count 2 -/Kids [7 0 R 12 0 R] +/Kids [7 0 R 9 0 R] >> endobj 4 0 obj @@ -48,13 +48,13 @@ endobj >> endobj 6 0 obj -<< /Length 5550 +<< /Length 5589 >> stream q q /DeviceRGB cs -0.9333 0.9333 0.9333 scn +0.93333 0.93333 0.93333 scn 48.24 805.89 m 547.04 805.89 l 547.04 805.89 547.04 805.89 547.04 805.89 c @@ -82,9 +82,9 @@ h S Q q -0.6 w /DeviceRGB CS -0.9333 0.9333 0.9333 SCN +0.93333 0.93333 0.93333 SCN +0.6 w [2.4 2.4] 0.0 d 48.74 48.24 m 546.54 48.24 l @@ -96,7 +96,7 @@ Q 0.2 0.2 0.2 SCN BT -58.24 785.0774 Td +58.24 785.07743 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -107,7 +107,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 765.5403 Td +58.24 765.54029 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -118,7 +118,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 746.0031 Td +58.24 746.00314 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -140,7 +140,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 706.9289 Td +58.24 706.92886 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -151,7 +151,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 687.3917 Td +58.24 687.39171 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -162,7 +162,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 667.8546 Td +58.24 667.85457 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -173,7 +173,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 648.3174 Td +58.24 648.31743 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -184,7 +184,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 628.7803 Td +58.24 628.78029 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -195,7 +195,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 609.2431 Td +58.24 609.24314 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -217,7 +217,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 570.1689 Td +58.24 570.16886 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -228,7 +228,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 550.6317 Td +58.24 550.63171 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -239,7 +239,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 531.0946 Td +58.24 531.09457 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -250,7 +250,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 511.5574 Td +58.24 511.55743 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -261,7 +261,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 492.0203 Td +58.24 492.02029 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -272,7 +272,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 472.4831 Td +58.24 472.48314 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -294,7 +294,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 433.4089 Td +58.24 433.40886 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -305,7 +305,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 413.8717 Td +58.24 413.87171 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -316,7 +316,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 394.3346 Td +58.24 394.33457 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -327,7 +327,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 374.7974 Td +58.24 374.79743 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -338,7 +338,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 355.2603 Td +58.24 355.26029 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -349,7 +349,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 335.7231 Td +58.24 335.72314 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -371,7 +371,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 296.6489 Td +58.24 296.64886 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -382,7 +382,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 277.1117 Td +58.24 277.11171 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -393,7 +393,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 257.5746 Td +58.24 257.57457 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -404,7 +404,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 238.0374 Td +58.24 238.03743 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -415,7 +415,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 218.5003 Td +58.24 218.50029 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -426,7 +426,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 198.9631 Td +58.24 198.96314 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -448,7 +448,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 159.8889 Td +58.24 159.88886 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -459,7 +459,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 140.3517 Td +58.24 140.35171 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -470,7 +470,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 120.8146 Td +58.24 120.81457 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -481,7 +481,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 101.2774 Td +58.24 101.27743 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -492,7 +492,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 81.7403 Td +58.24 81.74029 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -503,7 +503,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 62.2031 Td +58.24 62.20314 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -524,38 +524,26 @@ endobj /ArtBox [0 0 595.28 841.89] /Contents 6 0 R /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI] -/Font << /F1.0 13 0 R +/Font << /F1.0 10 0 R >> >> >> endobj 8 0 obj -[7 0 R /XYZ 0 841.89 null] -endobj -9 0 obj -<< /Type /Names -/Dests 10 0 R ->> -endobj -10 0 obj -<< /Names [(__anchor-top) 8 0 R] ->> -endobj -11 0 obj -<< /Length 2277 +<< /Length 2309 >> stream q q /DeviceRGB cs -0.9333 0.9333 0.9333 scn +0.93333 0.93333 0.93333 scn 48.24 805.89 m 547.04 805.89 l 547.04 805.89 547.04 805.89 547.04 805.89 c -547.04 560.3729 l -547.04 560.3729 547.04 560.3729 547.04 560.3729 c -48.24 560.3729 l -48.24 560.3729 48.24 560.3729 48.24 560.3729 c +547.04 559.44429 l +547.04 559.44429 547.04 559.44429 547.04 559.44429 c +48.24 559.44429 l +48.24 559.44429 48.24 559.44429 48.24 559.44429 c 48.24 805.89 l 48.24 805.89 48.24 805.89 48.24 805.89 c h @@ -566,19 +554,19 @@ f 48.24 805.89 m 547.04 805.89 l 547.04 805.89 547.04 805.89 547.04 805.89 c -547.04 560.3729 l -547.04 560.3729 547.04 560.3729 547.04 560.3729 c -48.24 560.3729 l -48.24 560.3729 48.24 560.3729 48.24 560.3729 c +547.04 559.44429 l +547.04 559.44429 547.04 559.44429 547.04 559.44429 c +48.24 559.44429 l +48.24 559.44429 48.24 559.44429 48.24 559.44429 c 48.24 805.89 l 48.24 805.89 48.24 805.89 48.24 805.89 c h S Q q -0.6 w /DeviceRGB CS -0.9333 0.9333 0.9333 SCN +0.93333 0.93333 0.93333 SCN +0.6 w [2.4 2.4] 0.0 d 48.74 805.89 m 546.54 805.89 l @@ -590,7 +578,7 @@ Q 0.2 0.2 0.2 SCN BT -58.24 792.006 Td +58.24 791.07743 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -601,7 +589,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 772.4689 Td +58.24 771.54029 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -612,7 +600,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 752.9317 Td +58.24 752.00314 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -623,7 +611,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 733.3946 Td +58.24 732.466 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -634,7 +622,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 713.8574 Td +58.24 712.92886 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -645,7 +633,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 694.3203 Td +58.24 693.39171 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -656,7 +644,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 674.7831 Td +58.24 673.85457 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -667,7 +655,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 655.246 Td +58.24 654.31743 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -678,7 +666,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 635.7089 Td +58.24 634.78029 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -689,7 +677,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 616.1717 Td +58.24 615.24314 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -700,7 +688,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 596.6346 Td +58.24 595.706 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -711,7 +699,7 @@ ET 0.2 0.2 0.2 SCN BT -58.24 577.0974 Td +58.24 576.16886 Td /F1.0 13 Tf <4c65742069742062652e> Tj ET @@ -722,7 +710,7 @@ Q endstream endobj -12 0 obj +9 0 obj << /Type /Page /Parent 3 0 R /MediaBox [0 0 595.28 841.89] @@ -730,14 +718,14 @@ endobj /BleedBox [0 0 595.28 841.89] /TrimBox [0 0 595.28 841.89] /ArtBox [0 0 595.28 841.89] -/Contents 11 0 R +/Contents 8 0 R /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI] -/Font << /F1.0 13 0 R +/Font << /F1.0 10 0 R >> >> >> endobj -13 0 obj +10 0 obj << /Type /Font /BaseFont /b4e9da+NotoSerif /Subtype /TrueType @@ -748,50 +736,66 @@ endobj /ToUnicode 19 0 R >> endobj -14 0 obj +11 0 obj << /Type /Outlines /Count 1 -/First 15 0 R -/Last 15 0 R +/First 12 0 R +/Last 12 0 R >> endobj -15 0 obj +12 0 obj << /Title <feff0055006e007400690074006c00650064> -/Parent 14 0 R +/Parent 11 0 R /Count 0 /Dest [7 0 R /XYZ 0 841.89 null] >> endobj -16 0 obj +13 0 obj << /Nums [0 << /P (1) >> 1 << /P (2) >>] >> endobj +14 0 obj +[7 0 R /XYZ 0 841.89 null] +endobj +15 0 obj +<< /Type /Names +/Dests 16 0 R +>> +endobj +16 0 obj +<< /Names [(__anchor-top) 14 0 R] +>> +endobj 17 0 obj -<< /Length1 7156 -/Length 4268 +<< /Length1 7184 +/Length 4248 /Filter [/FlateDecode] >> stream -xY}P[ו?>Io
W</@Llc,@`0_BXrz )pBYvxq&:mL7yxgR&;3f?=v:m2֠=A:M{~=s{@ -4_Ouz @3yK
ǀ\ Z~ȯ H rSW t+[Y]h].'P༆3N
PW4\Kp -H로kLįsD4 psn2rUÍ|`E ;i}!
χ*C'CG UB+BMO5*r4r gpmسubS -뉎X]I6$i%dNA f!00{K]C| -z -`V;"SXJ -IZAX KŘGID&V <B#T0!M !q4fhtp2dlQd -Y:k4D( ^v~%J"E [>hq>CO ƚ`-'<1dAJCt0q&V;|L )oawN!
-w/wN%%8}N8 J0 , 0MJͲP46"#_bXXʦ:v1Ù]#lT*~nm½ش}RIѐ]_ -)bdž$ӆΈ! eu1"&蓩P$L? .g$ESH=L(<_"J4Kcq%U*Աϳrݝ,IC`U{Xu{z<uXHw k n qy0 w f~cJI0!|M&Y,"O -7ͦ G9*#o3mͳ*,t=G a[P="/DZrEYG`tKc -ZNBHgbG& iDw7?D?ȯ }[3Ώd3!*AuqarDBZZy??NѕsraÌfS0N Q]>H<%#SXb>[wl$q-<q 櫟~ >D'[M?,nsM _ Bg1&I 3fKoJ6 RȫXKBd@HǖW͐3bʐE")^$"io%8Pb, )F -VnM0E#, 4:ȱex[ٌȼ 덎
SI<7&iI /(A1\o|}"y&eUs?$ 긜[~yR|4gϞ~VgLğ{FD\2]W/%rRu\"(KW/ūu.^x틙z.ӁL;b-TAʽ7drt*$Yȼxr"]r^ I rxoh,l _,nKXYa1:8* xz{o{# P+jW1ȖFwcc{M^Jo]\| .Z|Xxn?yj~S[ۻUsUYKqpV{}|бW^5
oaôu~#tdV\$y2Y{ZH.#$d[ -|>~jfDH@eYMd GNP[ktIA6w-p}@Ѿ#=]nqPin۹c{6ZUn.1s z^s -S MKt V%;]P+W:Rk9k<OIT}IfOD Z5PcxӍM2sBfnLf&9=_P0Q 7YT~bݘADlb-/ ~Q7# S/܂PP|Y_-Wa4{Z)垕U]MOHvչ1̧y(dZ*KK~_2'a~;G MB(4[}h 2p -hHlGp;j1r7qD0!8ET WrJ<Y'hTs -qmjw9̕Fr#0FW MW~''؉9ݕ&Ԫ%r,VG -S<)ћniVaJ;G| w lո>KS5Z$?*`nl X95FM he>|N/k.R אyuv/<ߚ(v3mb a^j@"˹WOVd fc#"9CGiM`e;SuZV;Wؽgr'e x;)gb`ΈI; <[xrJ _|R%# uxuм n`gG|W(6 -Foy0'zu8 ̸_Y̴QtY!0~ac<],p:9#GT"wyB
jtrsp7p<3l$uM.zʠ_lk1Pwp sKfR. zoÏ[E{gk*XG xCĄo3Y}]7e/ӿ +XYx ΓnX\MۖJd8/fH;~=㮉檎7={;LF^ Z8~; \G]xN7V
ivi(܆+XaxTk]Rh}cG2~
#Eݧzfj4
e ޣX!ljY}~/'qnf.d ȌSN%P +x9kl[y߹7%S,ҡ%R$Y$,Y/2i6)d,4IQZ' mY 7i4iAW,W^A%Â?:72X3F %;h7 W} + +: xBVF +ꝒOM~EIi`@B`P$V(jI;JN'iJڗ%A[C=uJTC GO8|ÚM )FlF
;BԩNNtI]rAC="XEϓ-ylYEsа0;^DrptqK&i| [R0WJE*9O|\Jp*fody{KE[gh3pOnT0ЅM]uBfn\)=_T;10E;LO1dkOY3|īu. K]&s/'306`"0 S~n(s,Nat6OnSa gY/a5
JN27+dPJ>7tymqY^#Tn´J6p. 㔜~d
Іzǒ-W;9mc"^>&Թ\O3rUM1v)RV4߷sXɧX>i{27曩ϛ|fxm&gTj I5M$cMz]3sk{wNg̜ykʚTuzL
H.6:=SY[wQ/1ANPRPʨ^WOΚhdGCl.zV Kû4I,,+ɒO +S>eQ: +[,LCX2Ŵ2J7Ǘўؽ96M>wT*ݾc$W + +ʈ aFsyU; j8 8MX4C& M9 X0Nd_8 # +1;R<tEJ$w*R'gY3ZPD>lgfT18+8)Hy gL+,}Pƣd 1dТgh.dnta*n + +NpJ cc(,&oa%ىDKJ +7G`FR52Kbżd\?}_rx &aEx+,3 ܭ3x<Ch x! ¯WiA{Kۄ}D \૭&@!o`{Df%d V 79-`>߆8BJо}y܆+=XP# +}sC%v~Skϵ Ψ}9 /|-q"l',dNdƵ52ٌy+K'I%&}n5eIy&D}75w>v:s<5 +GVa
E +kRR<p9z&XaxG QM +B +A*\,|] +@s3]l" +;hw,iotJ;c%鈜'u QLȡ@`,KQe:DCޓɉd$ۭ;Ǜ1IE4@S@P$JW*CNFBQ:* T# p +T*f;u5NĦm!9eCm{ZUXFbat;6:H,Ȅ M3ѠLݽt0.GYzz/#ۭƂd*h(JM{ݵ뮧zG{=PHhMGhwwp +̦ +˴\)N }A8ȫȢ sY7f |*,#A=gY_Sѫ_fϵܼn)trȁCBz+;Gp @\w)w R \Y9Lٖѫlv { 3>&x Heu'*s[U$י໎IR|gxG1?i\Ejjy,l'>=u˻ki3܇էnM U?$cV8sYoSxe12ߟGMf}<2wbٷ%=
@!- endstream endobj 18 0 obj @@ -801,7 +805,7 @@ endobj /FontBBox [-212 -250 1246 1047] /Flags 6 /StemV 0 -/ItalicAngle 0.0 +/ItalicAngle 0 /Ascent 1068 /Descent -292 /CapHeight 1462 @@ -809,13 +813,12 @@ endobj >> endobj 19 0 obj -<< /Length 1286 +<< /Length 1278 /Filter [/FlateDecode] >> stream -xenFὮBtHs&@nu{stԒ + }i /y_!ut ~]snVyg쾝+| <.÷}v)[eO/_q9_ɯ}ഏOmt_LLv͵ LJ1 w9 )e6=n PҪtN*eP)DT.ʕrU)BYTVʪQ6 [ky
^#k5x5F^ky
^#k5x5F^kZy-^+kxZV^kZy-^+kxZV^:y ^'uxu:N^:y ^'uxu:N^zy=^/x z^^zy=^/x z^ހ7y o
xo7
Aހ7y o
xo7
Aވ7Fy#(oĻnuW.I$$*I$ITH$$QI"IDD%$JI$$*I$ITH$$III$$%I$I|Mx o7M&Iބ7ɛ&y$oMx o7M.xyUo ުMMol x; -JÂ31x; -JJ특xxx+!Êw Bxbx+ށr; 2kΜJYeY7+|x oS7+[ƛețךyޢoV浖 -㭌"RW*4XqC^J[(^1»y]k}YM-x Vz[YEVY_}/7*Y%eӫq+:.7JE/3Y(Y*AW RVJS:(u@cD]a*f)9J)o, #\Z>MU\jPS
{HSMj{fkyGm[z*Esa>&ӫj%u; 2^W[®v[2쯲u[P:V̡Յ> MBi2 .Ħԇ!dk`=o qWޕwdJF(L164U)x0E~Z? +xenFὮBtHs&@nu{stԒ + }ik/y_!}t ~]snVyg쾝+| <.÷}v)[eO/_q9_ɯ}ഏOmt_LLv͵ LJ1 w9 )e6=n?[i(JKiU:JSz2QeL*EJ̔Ye,*+eU(NU-уk5x5F^ky
^#k5x5F^ky
^#kxZV^kZy-^+kxZV^kZy-^+uxu:N^:y ^'uxu:N^:y ^'x z^^zy=^/x z^^zy=^/o
xo7
Aހ7y o
xo7
Aހ7y oxo7jo$JI$$*I$ITH$$QI"IDD%$JI$$*I$ITD$$III$$u>M&Iބ7ɛ&y$oMx o7M&Iބ7ɛ&yUoa[5joSor4ۂs +JJ특xxx+!Êw Bxbx+ށr; 2kΜJYeY7+|x oS7+[ƛețךyޢoV浖 -㭌"RW*4XqC^J[(^1»y]k}YM-x e#e_y+h܊7k:/Z5dUluz5n[eB&Si|y(%q& %+S%*ABijPU6\h,(+L,4G5<cD [˧*t [
jjaijIxʪwgFwضR>sh>:OVRP*#i|e0U,*oU/*[U,Nmlx:& \}M)L2\%CHF7էʻBL)jƻJ1:%H߯:=S۳zrmkO媳7 endstream endobj 20 0 obj @@ -825,30 +828,30 @@ xref 0 21 0000000000 65535 f 0000000015 00000 n -0000000258 00000 n -0000000459 00000 n -0000000523 00000 n -0000000574 00000 n -0000000846 00000 n -0000006448 00000 n -0000006745 00000 n -0000006787 00000 n -0000006835 00000 n -0000006887 00000 n -0000009217 00000 n -0000009516 00000 n -0000009681 00000 n -0000009755 00000 n -0000009880 00000 n -0000009940 00000 n -0000014298 00000 n -0000014512 00000 n -0000015874 00000 n +0000000254 00000 n +0000000456 00000 n +0000000519 00000 n +0000000570 00000 n +0000000842 00000 n +0000006483 00000 n +0000006780 00000 n +0000009141 00000 n +0000009438 00000 n +0000009603 00000 n +0000009677 00000 n +0000009802 00000 n +0000009862 00000 n +0000009905 00000 n +0000009954 00000 n +0000010007 00000 n +0000014345 00000 n +0000014557 00000 n +0000015911 00000 n trailer << /Size 21 /Root 2 0 R /Info 1 0 R >> startxref -16788 +16825 %%EOF |