diff --git a/tools/epro2/kicad/_sexpr_reader.py b/tools/epro2/kicad/_sexpr_reader.py index 008eb47..50145c6 100644 --- a/tools/epro2/kicad/_sexpr_reader.py +++ b/tools/epro2/kicad/_sexpr_reader.py @@ -32,7 +32,7 @@ def tokens(src: str) -> Iterator[str]: ch = src[j] if ch == "\\" and j + 1 < n: nxt = src[j + 1] - buf.append({"\\": "\\", '"': '"', "n": "\n", "t": "\t"}.get(nxt, nxt)) + buf.append({"\\": "\\", '"': '"', "n": "\n", "t": "\t", "r": "\r"}.get(nxt, nxt)) j += 2 continue if ch == '"': diff --git a/tools/epro2/kicad/sexpr.py b/tools/epro2/kicad/sexpr.py index e3af2f8..dc502b6 100644 --- a/tools/epro2/kicad/sexpr.py +++ b/tools/epro2/kicad/sexpr.py @@ -52,7 +52,15 @@ def _emit(value: Any, out: io.StringIO, indent: int, *, pretty: bool) -> None: elif isinstance(value, (int, float)): out.write(_fmt_number(value)) elif isinstance(value, str): - escaped = value.replace("\\", "\\\\").replace('"', '\\"') + # KiCad's S-expr reader rejects literal newlines/CR/tabs inside + # quoted strings; we MUST escape them. Order matters: backslash first. + escaped = ( + value.replace("\\", "\\\\") + .replace('"', '\\"') + .replace("\n", "\\n") + .replace("\r", "\\r") + .replace("\t", "\\t") + ) out.write(f'"{escaped}"') elif value is None: # rare but sometimes a slot is intentionally empty diff --git a/tools/epro2/kicad/sym_writer.py b/tools/epro2/kicad/sym_writer.py index b8e9205..b5c44fc 100644 --- a/tools/epro2/kicad/sym_writer.py +++ b/tools/epro2/kicad/sym_writer.py @@ -165,9 +165,11 @@ def write_lib_symbol(doc: Document, *, lib_prefix: str = "facere") -> list | Non [Sym("number"), pin_number or "~", _font()], ]) + # KiCad 8 syntax: omit `(pin_numbers ...)` block entirely to mean "visible" + # (using `(pin_numbers (hide no))` is rejected as a parse error). To hide + # we'd emit the bare token `(pin_numbers hide)`. return [ Sym("symbol"), f"{lib_prefix}:{part_id}", - [Sym("pin_numbers"), [Sym("hide"), Sym("no")]], [Sym("pin_names"), [Sym("offset"), 1.016]], [Sym("in_bom"), Sym("yes")], [Sym("on_board"), Sym("yes")], diff --git a/tools/epro2/tests/test_sexpr.py b/tools/epro2/tests/test_sexpr.py index 6ca78e2..4128f80 100644 --- a/tools/epro2/tests/test_sexpr.py +++ b/tools/epro2/tests/test_sexpr.py @@ -19,6 +19,24 @@ def test_string_escaping(): assert parsed[1] == 'a "quote" + \\backslash' +def test_string_escapes_newlines_and_tabs(): + """KiCad 8 rejects literal newlines/CR/tabs inside quoted strings, so the + emitter must escape them. Round-trip restores the original characters.""" + src = "Battary\n3.7V 700mAH\twith\rtab" + text = to_sexpr([Sym("text"), src], pretty=False) + # Raw text must NOT contain literal newline / CR / tab inside quotes + assert "\\n" in text + assert "\\r" in text + assert "\\t" in text + quoted = text[text.index('"'):text.rindex('"') + 1] + assert "\n" not in quoted + assert "\r" not in quoted + assert "\t" not in quoted + # Round-trip restores the original (our reader handles these escapes) + parsed = parse(text) + assert parsed[1] == src + + def test_float_formatting_strips_trailing_zeros(): text = to_sexpr([Sym("x"), 1.500000], pretty=False) assert "1.5" in text diff --git a/tools/epro2/tests/test_sym_writer.py b/tools/epro2/tests/test_sym_writer.py index 7d381ac..7576dfb 100644 --- a/tools/epro2/tests/test_sym_writer.py +++ b/tools/epro2/tests/test_sym_writer.py @@ -40,6 +40,17 @@ def test_write_lib_symbol_emits_outer_wrapper_and_body(): assert inner[0][1] == "MyPart.1_1_1" +def test_lib_symbol_omits_pin_numbers_block(): + """KiCad 8 rejects (pin_numbers (hide no)). When pins should be visible + we must omit the pin_numbers block entirely (default = visible).""" + d = _sym_doc("sym1", "MyPart.1", []) + entry = write_lib_symbol(d) + text = to_sexpr(entry) + parsed = parse(text) + assert not _block(parsed, "pin_numbers"), \ + "pin_numbers block should be omitted (KiCad 8 syntax)" + + def test_pin_renders_with_attr_pulled_metadata(): d = _sym_doc("sym1", "MyPart.1", [ ("e5", {"_type": "PIN", "partId": "MyPart.1",