diff --git a/pitfall/pitfall/text.rkt b/pitfall/pitfall/text.rkt index ce63e7d6..52647bb7 100644 --- a/pitfall/pitfall/text.rkt +++ b/pitfall/pitfall/text.rkt @@ -115,7 +115,7 @@ https://github.com/mbutterick/pdfkit/blob/master/lib/mixins/text.coffee (send this _fragment text (· this x) (· this y) options) (define lineGap (or (· options lineGap) (· this _lineGap) 0)) ;; 180325 suppress the size tracking: we'll do our own line measurement - #;(if (not wrapper) + (if (not wrapper) (increment-field! x this (send this widthOfString text)) (increment-field! y (+ (send this currentLineHeight #t) lineGap))) (void)) diff --git a/pitfall/ptest/test4crkt.pdf b/pitfall/ptest/test4crkt.pdf new file mode 100644 index 00000000..7f8afb77 Binary files /dev/null and b/pitfall/ptest/test4crkt.pdf differ diff --git a/pitfall/ptest/test4rkt.pdf b/pitfall/ptest/test4rkt.pdf new file mode 100644 index 00000000..27eea6a7 --- /dev/null +++ b/pitfall/ptest/test4rkt.pdf @@ -0,0 +1,330 @@ +%PDF-1.3 +%ÿÿÿÿ +5 0 obj +<< +/Resources 4 0 R +/Contents 3 0 R +/MediaBox [0 0 612 792] +/Type /Page +/Parent 1 0 R +>> +endobj +4 0 obj +<< +/Font << +/F9 14 0 R +/F8 12 0 R +/F10 15 0 R +/F1 13 0 R +/F11 16 0 R +/F12 17 0 R +/F3 7 0 R +/F13 18 0 R +/F2 6 0 R +/F14 19 0 R +/F5 9 0 R +/F4 8 0 R +/F7 11 0 R +/F6 10 0 R +>> +/ProcSet [/PDF /Text /ImageB /ImageC /ImageI] +>> +endobj +3 0 obj +<< +/Length 1412 +>> +stream +1 0 0 -1 0 792 cm +q +1 0 0 -1 0 792 cm +BT +1 0 0 1 72 713.71 Tm +/F2 10 Tf +[<48656c6c6f> 0] TJ +ET +Q +1 0 0 1 -30 30 cm +q +1 0 0 -1 0 792 cm +BT +1 0 0 1 102 713.081 Tm +/F3 11 Tf +[<48656c6c6f> 0] TJ +ET +Q +1 0 0 1 -30 30 cm +q +1 0 0 -1 0 792 cm +BT +1 0 0 1 135 712.452 Tm +/F4 12 Tf +[<48656c6c6f> 0] TJ +ET +Q +1 0 0 1 -30 30 cm +q +1 0 0 -1 0 792 cm +BT +1 0 0 1 171 711.194 Tm +/F5 14 Tf +[<48656c6c6f> 0] TJ +ET +Q +1 0 0 1 -30 30 cm +q +1 0 0 -1 0 792 cm +BT +1 0 0 1 213 708.512 Tm +/F6 16 Tf +[<48656c6c6f> 0] TJ +ET +Q +1 0 0 1 -30 30 cm +q +1 0 0 -1 0 792 cm +BT +1 0 0 1 252.12 707.076 Tm +/F7 18 Tf +[<48656c6c6f> 0] TJ +ET +Q +1 0 0 1 -30 30 cm +q +1 0 0 -1 0 792 cm +BT +1 0 0 1 296.13 705.64 Tm +/F8 20 Tf +[<48656c6c6f> 0] TJ +ET +Q +1 0 0 1 -30 30 cm +q +1 0 0 -1 0 792 cm +BT +1 0 0 1 341.69 704.204 Tm +/F1 22 Tf +[<48656c6c6f> 0] TJ +ET +Q +1 0 0 1 -30 30 cm +q +1 0 0 -1 0 792 cm +BT +1 0 0 1 391.806 720 Tm +/F9 24 Tf +[<48656c6c6f> 0] TJ +ET +Q +1 0 0 1 -30 30 cm +q +1 0 0 -1 0 792 cm +BT +1 0 0 1 391.806 702.242 Tm +/F10 26 Tf +[<48656c6c6f> 0] TJ +ET +Q +1 0 0 1 -30 30 cm +q +1 0 0 -1 0 792 cm +BT +1 0 0 1 451.034 700.876 Tm +/F11 28 Tf +[<48656c6c6f> 0] TJ +ET +Q +1 0 0 1 -30 30 cm +q +1 0 0 -1 0 792 cm +BT +1 0 0 1 514.818 699.51 Tm +/F12 30 Tf +[<48656c6c6f> 0] TJ +ET +Q +1 0 0 1 -30 30 cm +q +1 0 0 -1 0 792 cm +BT +1 0 0 1 581.478 698.144 Tm +/F13 32 Tf +[<48656c6c6f> 0] TJ +ET +Q +1 0 0 1 -30 30 cm +q +1 0 0 -1 0 792 cm +BT +1 0 0 1 652.582 720 Tm +/F14 34 Tf +[<48656c6c6f> 0] TJ +ET +Q + +endstream +endobj +20 0 obj +<< +/CreationDate (D:19700101000000Z) +/Producer (PITKIT) +/Creator (PITKIT) +>> +endobj +7 0 obj +<< +/Subtype /Type1 +/Encoding /WinAnsiEncoding +/BaseFont /Courier-BoldOblique +/Type /Font +>> +endobj +8 0 obj +<< +/Subtype /Type1 +/Encoding /WinAnsiEncoding +/BaseFont /Courier-Oblique +/Type /Font +>> +endobj +17 0 obj +<< +/Subtype /Type1 +/Encoding /WinAnsiEncoding +/BaseFont /Times-Italic +/Type /Font +>> +endobj +18 0 obj +<< +/Subtype /Type1 +/Encoding /WinAnsiEncoding +/BaseFont /Times-Roman +/Type /Font +>> +endobj +14 0 obj +<< +/Subtype /Type1 +/Encoding /WinAnsiEncoding +/BaseFont /Symbol +/Type /Font +>> +endobj +6 0 obj +<< +/Subtype /Type1 +/Encoding /WinAnsiEncoding +/BaseFont /Courier-Bold +/Type /Font +>> +endobj +9 0 obj +<< +/Subtype /Type1 +/Encoding /WinAnsiEncoding +/BaseFont /Courier +/Type /Font +>> +endobj +12 0 obj +<< +/Subtype /Type1 +/Encoding /WinAnsiEncoding +/BaseFont /Helvetica-Oblique +/Type /Font +>> +endobj +16 0 obj +<< +/Subtype /Type1 +/Encoding /WinAnsiEncoding +/BaseFont /Times-BoldItalic +/Type /Font +>> +endobj +11 0 obj +<< +/Subtype /Type1 +/Encoding /WinAnsiEncoding +/BaseFont /Helvetica-BoldOblique +/Type /Font +>> +endobj +15 0 obj +<< +/Subtype /Type1 +/Encoding /WinAnsiEncoding +/BaseFont /Times-Bold +/Type /Font +>> +endobj +19 0 obj +<< +/Subtype /Type1 +/Encoding /WinAnsiEncoding +/BaseFont /ZapfDingbats +/Type /Font +>> +endobj +13 0 obj +<< +/Subtype /Type1 +/Encoding /WinAnsiEncoding +/BaseFont /Helvetica +/Type /Font +>> +endobj +10 0 obj +<< +/Subtype /Type1 +/Encoding /WinAnsiEncoding +/BaseFont /Helvetica-Bold +/Type /Font +>> +endobj +2 0 obj +<< +/Pages 1 0 R +/Type /Catalog +>> +endobj +1 0 obj +<< +/Kids [5 0 R] +/Type /Pages +/Count 1 +>> +endobj +xref +0 21 +0000000000 65535 f +0000003382 00000 n +0000003333 00000 n +0000000353 00000 n +0000000119 00000 n +0000000015 00000 n +0000002416 00000 n +0000001910 00000 n +0000002017 00000 n +0000002516 00000 n +0000003230 00000 n +0000002822 00000 n +0000002611 00000 n +0000003132 00000 n +0000002321 00000 n +0000002932 00000 n +0000002717 00000 n +0000002120 00000 n +0000002221 00000 n +0000003031 00000 n +0000001817 00000 n +trailer +<< +/Size 21 +/Root 2 0 R +/Info 20 0 R +>> +startxref +3439 +%%EOF