ctrl-kd 1.1.2__tar.gz → 1.1.4__tar.gz

{ctrl_kd-1.1.2/src/ctrl_kd.egg-info → ctrl_kd-1.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ctrl-kd
-Version: 1.1.2
+Version: 1.1.4
 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
@@ -80,15 +80,12 @@ against surviving period printouts of the same documents. Its rules are empirica
 
 ## Install
 
-Straight from GitHub (not yet on PyPI):
-
 ```console
-$ pipx install git+https://github.com/jonmichaels/ctrl-kd
+$ brew install jonmichaels/tap/ctrl-kd     # macOS / Linuxbrew
+$ pipx install ctrl-kd                     # or: pip install ctrl-kd
 ```
 
-or `pip install git+https://github.com/jonmichaels/ctrl-kd` into an environment
-of your choice. Python ≥ 3.9, no dependencies.
-Library API: `ctrlkd.convert(data, to='html')`.
+Python ≥ 3.9, no dependencies. Library API: `ctrlkd.convert(data, to='html')`.
 
 ## Adding an output format
 

{ctrl_kd-1.1.2 → ctrl_kd-1.1.4}/README.md

@@ -61,15 +61,12 @@ against surviving period printouts of the same documents. Its rules are empirica
 
 ## Install
 
-Straight from GitHub (not yet on PyPI):
-
 ```console
-$ pipx install git+https://github.com/jonmichaels/ctrl-kd
+$ brew install jonmichaels/tap/ctrl-kd     # macOS / Linuxbrew
+$ pipx install ctrl-kd                     # or: pip install ctrl-kd
 ```
 
-or `pip install git+https://github.com/jonmichaels/ctrl-kd` into an environment
-of your choice. Python ≥ 3.9, no dependencies.
-Library API: `ctrlkd.convert(data, to='html')`.
+Python ≥ 3.9, no dependencies. Library API: `ctrlkd.convert(data, to='html')`.
 
 ## Adding an output format
 

{ctrl_kd-1.1.2 → ctrl_kd-1.1.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ctrl-kd"
-version = "1.1.2"
+version = "1.1.4"
 description = "Convert WordStar 4-7 documents and print-to-disk files to text, Markdown, HTML, RTF, or PDF. ^KD: save and done."
 readme = "README.md"
 license = {text = "MIT"}

{ctrl_kd-1.1.2 → ctrl_kd-1.1.4/src/ctrl_kd.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ctrl-kd
-Version: 1.1.2
+Version: 1.1.4
 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
@@ -80,15 +80,12 @@ against surviving period printouts of the same documents. Its rules are empirica
 
 ## Install
 
-Straight from GitHub (not yet on PyPI):
-
 ```console
-$ pipx install git+https://github.com/jonmichaels/ctrl-kd
+$ brew install jonmichaels/tap/ctrl-kd     # macOS / Linuxbrew
+$ pipx install ctrl-kd                     # or: pip install ctrl-kd
 ```
 
-or `pip install git+https://github.com/jonmichaels/ctrl-kd` into an environment
-of your choice. Python ≥ 3.9, no dependencies.
-Library API: `ctrlkd.convert(data, to='html')`.
+Python ≥ 3.9, no dependencies. Library API: `ctrlkd.convert(data, to='html')`.
 
 ## Adding an output format
 

{ctrl_kd-1.1.2 → ctrl_kd-1.1.4}/src/ctrlkd/__init__.py

@@ -4,7 +4,7 @@ from .emit import (emit_text, emit_markdown, emit_html, emit_rtf,
                    emitter, get_emitter, formats, load_plugins)
 from .pdf import emit_pdf                        # registers the 'pdf' format
 
-__version__ = '1.1.2'
+__version__ = '1.1.4'
 
 def convert(data: bytes, to: str = 'markdown', mode: str = 'modern',
             encoding: str = 'cp437', **options) -> str:

{ctrl_kd-1.1.2 → ctrl_kd-1.1.4}/src/ctrlkd/cli.py

@@ -25,8 +25,8 @@ def main(argv=None):
     ap = argparse.ArgumentParser(
         prog='ctrl-kd',
         description='Convert WordStar 4-7 documents and print-to-disk files to '
-                    'text, Markdown, HTML, or RTF (extensible: see EXTENDING.md). '
-                    '^KD: save and done.')
+                    'text, Markdown, HTML, RTF, or PDF (extensible: see '
+                    'EXTENDING.md). ^KD: save and done.')
     ap.add_argument('files', nargs='+', help='input file(s)')
     ap.add_argument('-t', '--to', action='append', choices=emit.formats(),
                     help='output format (repeatable; default: markdown)')

{ctrl_kd-1.1.2 → ctrl_kd-1.1.4}/src/ctrlkd/emit.py

@@ -92,7 +92,12 @@ def _md_span(s):
     lead = esc[:len(esc) - len(esc.lstrip())]
     trail = esc[len(esc.rstrip()):]
     core = esc.strip()
-    for st in s.styles:
+    # sorted: frozenset iteration order varies with hash seed, which made multi-style
+    # nesting order (e.g. bold+strike) nondeterministic BETWEEN RUNS. Alphabetical
+    # order happens to nest delimiter styles (b, i, strike) inside tag styles
+    # (sub, sup, u), which is also what the Swift port documents. Found by the
+    # ctrlkd-swift port's pre-vector determinism check (2026-07-29).
+    for st in sorted(s.styles):
         if st in _MD:
             core = f'{_MD[st]}{core}{_MD[st]}'
         elif st in _MD_HTML:

{ctrl_kd-1.1.2 → ctrl_kd-1.1.4}/tests/test_ctrlkd.py

@@ -276,3 +276,11 @@ def test_pdf_chapter_drop_survives():
     ys = [float(m) for m in re.findall(rb'([0-9.]+) Td \(Chapter', pdf)]
     y2 = [float(m) for m in re.findall(rb'([0-9.]+) Td \(Second', pdf)]
     assert ys and y2 and ys[0] < y2[0]   # page-1 text starts LOWER than page-2 text
+
+def test_md_multistyle_span_is_deterministic():
+    # frozenset iteration made bold+strike nesting vary across runs (hash seed);
+    # found by the Swift port. sorted() pins it: delimiters inside, tags outside.
+    from ctrlkd.emit import _md_span
+    from ctrlkd.core import Span
+    assert _md_span(Span('w', frozenset({'b', 'strike'}))) == '~~**w**~~'
+    assert _md_span(Span('w', frozenset({'b', 'u'}))) == '<u>**w**</u>'