ctrl-kd 4.6.0__tar.gz → 4.7.1__tar.gz

{ctrl_kd-4.6.0/src/ctrl_kd.egg-info → ctrl_kd-4.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ctrl-kd
-Version: 4.6.0
+Version: 4.7.1
 Summary: Convert WordStar 4-7 documents and print-to-disk files to text, Markdown, HTML, RTF, or PDF. ^KD: save and done.
 Author: Jon Michaels
 License: MIT
@@ -28,8 +28,8 @@ Dynamic: license-file
 
 Convert WordStar for DOS v4-v7 files to modern formats. **^KD: save and done.**
 
-`ctrl-kd` reads WordStar for DOS documents, and WordStar print stream files, 
-and writes plain text, Markdown, HTML, RTF, or PDF (set on a viewer's 
+`ctrl-kd` reads WordStar for DOS documents, WordStar print stream files, and 
+MailMerge data files, and writes plain text, Markdown, HTML, RTF, or PDF (set on a viewer's 
 built-in base-14 fonts — no dependencies, nothing embedded, the page as it 
 would have printed: printed mode follows the document's own font blocks and 
 its own layout arithmetic, while modern mode is the same document reflowed 

{ctrl_kd-4.6.0 → ctrl_kd-4.7.1}/README.md

@@ -9,8 +9,8 @@
 
 Convert WordStar for DOS v4-v7 files to modern formats. **^KD: save and done.**
 
-`ctrl-kd` reads WordStar for DOS documents, and WordStar print stream files, 
-and writes plain text, Markdown, HTML, RTF, or PDF (set on a viewer's 
+`ctrl-kd` reads WordStar for DOS documents, WordStar print stream files, and 
+MailMerge data files, and writes plain text, Markdown, HTML, RTF, or PDF (set on a viewer's 
 built-in base-14 fonts — no dependencies, nothing embedded, the page as it 
 would have printed: printed mode follows the document's own font blocks and 
 its own layout arithmetic, while modern mode is the same document reflowed 

{ctrl_kd-4.6.0 → ctrl_kd-4.7.1}/pyproject.toml

@@ -61,6 +61,6 @@ testpaths = ["tests"]
 markers = [
     "sawyer: opt-in tier 2 -- an explicit, committed list of documents from Robert J. Sawyer's public WordStar 7 archive (arm with CTRLKD_SAWYER_ARCHIVE)",
     "pcl: opt-in -- coordinate-level fidelity gate against real WordStar 7 LaserJet PCL captures (arm with CTRLKD_PRIVATE_CORPUS); see tools/pcl_tolerance.py and tests/test_pcl_fidelity.py",
-    "paper: opt-in -- machine-readable verdicts for the 69 M479fdw paper-scan pages (arm with CTRLKD_PRIVATE_CORPUS); see tools/PAPER-VERDICTS.md and tests/test_paper_verdicts.py",
+    "paper: PARKED BY RULING 2026-09-14 (paper_verdicts.PARKED_BY_RULING) -- machine-readable verdicts for the 69 M479fdw paper-scan pages; every page skips with that citation and is reported as parked by ruling, never as a red. Arm with CTRLKD_PRIVATE_CORPUS to see the citation per page; see tools/PAPER-VERDICTS.md and tests/test_paper_verdicts.py",
 ]
 addopts = "-m \"not sawyer and not pcl and not paper\""

{ctrl_kd-4.6.0 → ctrl_kd-4.7.1/src/ctrl_kd.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ctrl-kd
-Version: 4.6.0
+Version: 4.7.1
 Summary: Convert WordStar 4-7 documents and print-to-disk files to text, Markdown, HTML, RTF, or PDF. ^KD: save and done.
 Author: Jon Michaels
 License: MIT
@@ -28,8 +28,8 @@ Dynamic: license-file
 
 Convert WordStar for DOS v4-v7 files to modern formats. **^KD: save and done.**
 
-`ctrl-kd` reads WordStar for DOS documents, and WordStar print stream files, 
-and writes plain text, Markdown, HTML, RTF, or PDF (set on a viewer's 
+`ctrl-kd` reads WordStar for DOS documents, WordStar print stream files, and 
+MailMerge data files, and writes plain text, Markdown, HTML, RTF, or PDF (set on a viewer's 
 built-in base-14 fonts — no dependencies, nothing embedded, the page as it 
 would have printed: printed mode follows the document's own font blocks and 
 its own layout arithmetic, while modern mode is the same document reflowed 

{ctrl_kd-4.6.0 → ctrl_kd-4.7.1}/src/ctrl_kd.egg-info/SOURCES.txt

@@ -29,12 +29,17 @@ src/ctrlkd/samples/TWAINLET.WS
 src/ctrlkd/samples/WARPRAYR.WS
 tests/test_bare_tab_modulus8.py
 tests/test_ctrlkd.py
+tests/test_dot_comment_prints_nothing.py
+tests/test_driver_substitutions_exports.py
 tests/test_endnote_leading_gap.py
 tests/test_fidelity_gate.py
 tests/test_flags_toc_inline.py
+tests/test_form_feed_line_marks.py
 tests/test_glyph_aspect.py
 tests/test_graphic_cell_ops.py
 tests/test_graphic_cells.py
+tests/test_head_foot_timing.py
+tests/test_html_print_stylesheet.py
 tests/test_justification.py
 tests/test_layout_marks.py
 tests/test_lj6dtp_bullet_glyph.py
@@ -47,12 +52,15 @@ tests/test_lj6dtp_pcl_rectangles.py
 tests/test_lj6dtp_shading_table_rules.py
 tests/test_lj6dtp_table_rule_weight.py
 tests/test_load_plugins.py
+tests/test_mailmerge_data_files.py
+tests/test_merge_page_number_variable.py
 tests/test_modern_blank_after_tightened_line.py
 tests/test_modern_box_regions.py
 tests/test_modern_centring_clip.py
 tests/test_modern_line_spacing.py
 tests/test_modern_lint.py
 tests/test_modern_page_baseline.py
+tests/test_modern_rtf_structure_rows.py
 tests/test_modern_verse_defrow.py
 tests/test_note_rulings_20260824.py
 tests/test_page_parity.py
@@ -62,21 +70,35 @@ tests/test_pcl_page_membership.py
 tests/test_pcl_page_size_eject.py
 tests/test_pcl_tolerance.py
 tests/test_pcl_transparent_print.py
+tests/test_pcl_v4_column_geometry.py
+tests/test_pcl_v4_untriaged_fixes.py
 tests/test_pcl_vertical_wraparound.py
 tests/test_peseta_euro_driver.py
+tests/test_pf_print_reformat.py
 tests/test_pictures.py
 tests/test_pix.py
+tests/test_pn_page_timing.py
 tests/test_polarity_gate.py
+tests/test_print_control_labels_invisible.py
 tests/test_printed_fidelity.py
+tests/test_rtf_facing_pages.py
+tests/test_rtf_head_style_attrs.py
+tests/test_rtf_keep_with_next.py
+tests/test_rtf_page_numbers.py
+tests/test_rtf_section_spine.py
 tests/test_samples.py
 tests/test_sawyer_corpus.py
 tests/test_screenplay_detection.py
 tests/test_screenplay_pdf.py
 tests/test_screenplay_rendering.py
 tests/test_sentence_spacing_n9.py
+tests/test_structural_checks.py
 tests/test_style_leading.py
 tests/test_symbol_span_graphic_chars.py
+tests/test_trailing_pa_break.py
 tests/test_verse_quote_couplet.py
 tests/test_verse_spacing.py
+tests/test_width_and_cp1252_memo.py
 tests/test_writer.py
-tests/test_wschange.py
+tests/test_wschange.py
+tests/test_zero_width_tab.py

{ctrl_kd-4.6.0 → ctrl_kd-4.7.1}/src/ctrlkd/__init__.py

@@ -8,4 +8,4 @@ from .pdf import emit_pdf                        # registers the 'pdf' format
 from .convert import convert, select_notes, DEFAULT_NOTE_KINDS, ALL_NOTE_KINDS
 from .info import document_info
 
-__version__ = '4.6.0'
+__version__ = '4.7.1'

{ctrl_kd-4.6.0 → ctrl_kd-4.7.1}/src/ctrlkd/afm.py

@@ -336,6 +336,17 @@ WIDTHS = {
 }
 
 
+# Perf (planning #271 M7): both of these are asked the SAME (text, basefont)
+# question tens of thousands of times over a novel-length document -- one
+# call per Modern token per pass, and a 302-page document's vocabulary is a
+# few thousand distinct words. The answer is a pure function of its two
+# arguments (`WIDTHS` is module-level and never rebuilt), so a bounded memo
+# is exact, not approximate. Measured on -HOLYMAC.WS: 140,242 calls,
+# ~4,800 distinct keys.
+_WIDTH_MEMO = {}
+_WIDTH_MEMO_CAP = 1 << 16
+
+
 def string_width_1000(text, basefont):
     """Natural width of `text` set in `basefont`, in 1/1000 em.
 
@@ -347,8 +358,16 @@ def string_width_1000(text, basefont):
     An unknown basefont falls back to Courier's fixed 600: a face this table
     does not carry cannot be measured, and 600 is this emitter's own default
     pitch, not a guess at the missing face."""
+    key = (text, basefont)
+    hit = _WIDTH_MEMO.get(key)
+    if hit is not None:
+        return hit
     table = WIDTHS.get(basefont, _COURIER)
-    return sum(table[b] for b in text.encode('cp1252', 'replace'))
+    total = sum(table[b] for b in text.encode('cp1252', 'replace'))
+    if len(_WIDTH_MEMO) >= _WIDTH_MEMO_CAP:
+        _WIDTH_MEMO.clear()
+    _WIDTH_MEMO[key] = total
+    return total
 
 
 def string_width_pt(text, basefont, size):

{ctrl_kd-4.6.0 → ctrl_kd-4.7.1}/src/ctrlkd/cli.py

@@ -138,12 +138,13 @@ def main(argv=None):
                          '.pc positions, a separate mechanism from a # the '
                          'author placed inside a real .he/.fo (that always '
                          'prints, unaffected by this flag). Printed PDF '
-                         'only. auto (DEFAULT): the document\'s own dot '
+                         'and both RTF modes. auto (DEFAULT): the '
+                         'document\'s own dot '
                          'commands decide -- .pn/.pg turn it on, .op turns '
                          'it off, exactly like real WordStar; a document '
-                         'that never touches any of the four gets no '
-                         'number, byte-identical to before this flag '
-                         'existed. on: force stock default numbering '
+                         'that never touches any of them gets stock '
+                         'WordStar 7\'s own number, which is ON. '
+                         'on: force stock default numbering '
                          '(bottom-center; .pc repositions it) even on a '
                          'silent document. off: suppress it unconditionally. '
                          'A declared footer always pre-empts it, in every '
@@ -284,7 +285,13 @@ def main(argv=None):
         # modern and the input can only render printed, say so once instead
         # of silently disobeying the flag. The override itself stands -- a
         # print stream has no soft returns to unwrap.
+        # planning #264, mail-merge scope: a MailMerge DATA file saved in
+        # non-document mode classifies as `printstream` on its bytes and
+        # reflows perfectly well -- it is a record list, not a captured
+        # page -- so the notice must not tell its reader otherwise.
+        from .core import MERGE_DATA_KIND
         if (mode_explicit and a.mode == 'modern'
+                and doc.meta.get('kind') != MERGE_DATA_KIND
                 and (doc.meta.get('variant') == 'printstream'
                      or doc.meta.get('columnar'))):
             kind = ('print stream' if doc.meta.get('variant') == 'printstream'