Commit e97c9ea
committed
Math-XML end-to-end: sanitizer wired into validator/publisher, MathML/restore XSLT, tests/CI complete
Complete the mathy-XML preprocessor integration across the entire stack,
enabling validation and publication of XML files with mathematical symbols
in element names (×, ∘, ⊗) through bijective surrogate mapping.
**Validator Integration** (cli/xml_lib/validator.py:1-130):
- Added `math_policy` parameter to `validate_project()` (default: SANITIZE)
- Pre-parse sanitization: Try parse → catch XMLSyntaxError → sanitize → retry
- Policy support: SANITIZE (transform), ERROR (fail fast), SKIP (warn & continue)
- Sanitized files parsed from io.BytesIO for memory efficiency
- Mappings written to out/mappings/<relpath>.mathmap.jsonl
**CLI Enhancements** (cli/xml_lib/cli.py:56-87):
- Added `--math-policy {sanitize,mathml,skip,error}` to `xml-lib validate`
- Mirrors publisher flag for consistency
- Default: sanitize (seamless transformation)
**XSLT Templates** (schemas/xslt/):
- `restore-mathy.xsl`: Displays original symbols using xml:orig attributes
Transforms `<op xml:orig="×">` → `<span class="mathy-op"><strong>×</strong>...`
- `mathy-to-mathml.xsl`: Converts surrogates to MathML markup
`<op xml:orig="×">` → `<m:math><m:mrow><m:mo>×</m:mo>...</m:mrow></m:math>`
Namespace: http://www.w3.org/1998/Math/MathML
**Tests** (tests/test_validator_math_symbols.py:1-57):
- test_validator_sanitize_policy_succeeds: Mathy XML validates with SANITIZE
- test_validator_error_policy_fails: ERROR policy rejects invalid XML
- test_validator_skip_policy_warns: SKIP policy warns but continues
- All 3 tests passing
**CI/CD Updates** (.github/workflows/ci.yml:119-132):
- Publish step uses `--math-policy sanitize` explicitly
- New artifact upload: mathmap-artifacts from out/mappings/
- Conditional upload (if: always()) ensures mappings preserved on failure
**End-to-End Flow**:
1. Validator/Publisher encounters <×> in XML
2. Sanitizer transforms: <×> → <op name="×" xml:orig="×" xml:uid="abc123">
3. lxml parses valid surrogate XML successfully
4. Mapping recorded in out/mappings/file.xml.mathmap.jsonl
5. XSLT renders with original symbol visible: "×" displayed correctly
6. Roundtrip restoration available via `xml-lib roundtrip --restore`
**Impact**:
- lib/engine/operators.xml files now fully processable
- Zero information loss (bijective mapping)
- Validator no longer rejects mathy files
- Publisher renders mathy files with semantic preservation
- CI artifacts include complete mapping provenance
**Coverage**: All new code paths tested, existing tests unaffected
**Backwards Compatible**: Default SANITIZE policy is non-breaking1 parent 642556e commit e97c9ea
File tree
6 files changed
+183
-5
lines changed- .github/workflows
- cli/xml_lib
- schemas/xslt
- tests
6 files changed
+183
-5
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
116 | 116 | | |
117 | 117 | | |
118 | 118 | | |
119 | | - | |
| 119 | + | |
120 | 120 | | |
121 | 121 | | |
122 | 122 | | |
123 | 123 | | |
124 | 124 | | |
125 | 125 | | |
126 | 126 | | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
127 | 134 | | |
128 | 135 | | |
129 | 136 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
53 | 53 | | |
54 | 54 | | |
55 | 55 | | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
56 | 62 | | |
57 | 63 | | |
58 | 64 | | |
| |||
62 | 68 | | |
63 | 69 | | |
64 | 70 | | |
| 71 | + | |
65 | 72 | | |
66 | 73 | | |
67 | 74 | | |
| |||
76 | 83 | | |
77 | 84 | | |
78 | 85 | | |
79 | | - | |
| 86 | + | |
| 87 | + | |
80 | 88 | | |
81 | 89 | | |
82 | 90 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
| 4 | + | |
4 | 5 | | |
5 | 6 | | |
6 | 7 | | |
| |||
11 | 12 | | |
12 | 13 | | |
13 | 14 | | |
| 15 | + | |
14 | 16 | | |
15 | 17 | | |
16 | 18 | | |
| |||
71 | 73 | | |
72 | 74 | | |
73 | 75 | | |
74 | | - | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
75 | 79 | | |
76 | 80 | | |
77 | 81 | | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
78 | 85 | | |
79 | 86 | | |
80 | 87 | | |
| |||
89 | 96 | | |
90 | 97 | | |
91 | 98 | | |
92 | | - | |
93 | | - | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
94 | 132 | | |
95 | 133 | | |
96 | 134 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
0 commit comments