leptris 1.9.419.0 → 1.9.420.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af2b87b2aaec36ee96f0572566b19678f06da068a2bd8fac00b086585a69dbd3
-  data.tar.gz: f0be350c456f6097e500488ade498cd5a14454461f3cb7476c79a19e5d4b8e30
+  metadata.gz: d034fdaf1cef0d07b90a11ca3e0908839913fba3e8a4385540f795faaea4514b
+  data.tar.gz: 888ed3d4222eaad61538fd2cf31954d6dda8de1562f6477321ff591080b56df3
 SHA512:
-  metadata.gz: edb18348f5b49be7967e570f50b88a5038d6b3525734a4f8f8e86929546663c53b1b73386168f089c040fe7757906ba9174144469d5f88af032a3103911ba7cb
-  data.tar.gz: 91d9cc505d079ade08cd8b0c68bcee95b5f7f26413dd5a7b753acf3707662634a17f03cb79d03b9d1bad33412fe3657eb7632ecaa79a93fa8d92975c1c5fbbd4
+  metadata.gz: d75506386336bb8e79a101c721ba63027ca8ba84116b8cc5a5439e0076cf9440a9b2922a77f4a6102075fb141957ed853106b79abddc0db71ab733078f89155f
+  data.tar.gz: 93dad24182645f8256702c2bac3b7248c624906fce549282d6c38a397ef439ce3688c74689058906dc22bd3c75fdf1269cee3eec1d9bf34b9a8ed1ebaca82e84

data/Rakefile

@@ -8,7 +8,7 @@ RSpec::Core::RakeTask.new(:spec)
 # Pin for `rake compile` and the platform-gem builds. Keep in lockstep
 # with .github/workflows/build.yml (which calls `rake compile`) and the
 # CHANGELOG when libleptris releases.
-LIBLEPTRIS_VERSION = "1.9.419"
+LIBLEPTRIS_VERSION = "1.9.420"
 # Vendored alongside libleptris for fn:normalize-unicode (TODO
 # .restructure/20): built per platform with a RELOCATABLE @rpath
 # install name, loaded by ffi.rb before libleptris so the

data/lib/leptris/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Leptris
-  VERSION = "1.9.419.0"
+  VERSION = "1.9.420.0"
 end

data/vendor-src/README.md

@@ -1,7 +1,7 @@
 Sources vendored in this gem (recompile rights; the ruby
 variant builds them at install via extconf.rb):
 
-- libleptris v1.9.419
+- libleptris v1.9.420
 - utf8proc v2.11.0
 
 Rebuild by hand:

data/vendor-src/libleptris/CHANGELOG.md

@@ -1,5 +1,18 @@
 ## [Unreleased]
 
+## [1.9.420] - 2026-11-13
+### Fixed
+
+- **xsd: the element fixed constraint compares in the value space** (leptris-rs#74, W3C stE065/066/096). Union-typed elements' final equality ran strcmp-level lexicals — the accepting member's whitespace semantics never applied. The token family and normalizedString now equate collapse-equal spellings (`fixed="abcd edfgh "` admits `abcd edfgh`, `fixed="ENU "` admits `ENU`), and LIST-typed elements itemize both lexicals on whitespace runs before per-item union comparison (a list of gYear/gMonth/gDay equates single- and double-space item separation). The collapse normalization is factored and shared with the attribute fixed path; preserve-types (xs:string) still compare exactly.
+
+- **xsd: the §4.2.2 redefine hook splices the original attributeGroup** (the engine root of lutaml/moxml#545, W3C attgC035-038). An attributeGroup-redefine body that refs its OWN name means the ORIGINAL group — the name-keyed slot held the redefining body itself, so expanding it looped through the depth guard and the original's members never joined the composition (strict admission false-reports "not declared (strict)"). The rows capture threads the def being expanded; a self-ref resolves to the shadowed def. attgC038's chained double-redefine composes through the same path.
+
+## Tests
+
+- stE065/066/096 + attgC035/036/037/038 vendored from w3c/xsdtests as pins; the union fixed change is falsified by a no-op-collapse mutation (fails exactly the value-space pin, passes the teeth pin — a genuinely different value still fails). Full ctest 2269/2269.
+
+
+
 ## [1.9.419] - 2026-11-12
 ### Fixed
 

data/vendor-src/libleptris/CMakeLists.txt

@@ -3,7 +3,7 @@
 cmake_minimum_required(VERSION 3.20)
 
 project(leptris
-    VERSION 1.9.419
+    VERSION 1.9.420
     DESCRIPTION "Fast XML parser and XPath evaluator in pure C"
     LANGUAGES C CXX
 )

data/vendor-src/libleptris/TODO.max-perf/15-c-face-vs-pugixml.md

@@ -478,3 +478,36 @@ scan-merge 64B, kernel-width 32B): the kernel is at its floor. The
 remaining text-row gap to pugixml is the parser's text-branch call
 overhead (the scalar wrapper measures separably at 2.2% — the only
 untried lever in this class), not the kernel.
+
+## Track D addendum 12 — the text-branch call-overhead class CLOSED (measured tie + the bound-vs-run datum)
+
+The named remainder from addendum 11 ("the parser's text-branch call
+overhead, the scalar wrapper at 2.2%") went through the full
+instrumentation pass and closes the class:
+
+1. **The microbench decomposition**: the dispatch entry costs 2-3x the
+   kernel's own work per call (7.1 vs 3.0 ns at 5B, 17.9 vs 6.9 ns at
+   31B) — the fn-pointer defeats thin-LTO and forces the full call ABI
+   plus per-call key re-materialization. A devirtualized cut (arch-
+   direct calls + a <16B scalar fast path) was implemented, pinned,
+   and mutation-falsified — and measured a DOC-LEVEL TIE in interleaved
+   A/B (−0.7/−2.3/−1.4%, inside the noise band). The microbench's
+   variant-B "win" was LTO INLINING the local kernel into the bench
+   loop — a zero-call comparison the real direct-call cut cannot
+   replicate across TUs.
+
+2. **The bound-vs-run instrument datum** (the decisive one): the
+   parser's scan calls pass the REMAINING BUFFER as `len`
+   (`p.end - p.pos`), not the run length — so a length-gated fast path
+   never engages in the parser context (bucket census on the bench
+   text fixture: <16B = 0 of 2.1M calls, 64+ = 99.999%). The
+   run-length histogram that motivated the fast path describes the
+   RUN distribution, which the kernel only knows after scanning.
+
+Disposition after four closures in the call-structure class
+(scan-merge 32B/64B, kernel-width 32B, devirtualization): **the
+text-branch call structure is at its floor.** The remaining text-row
+gap to pugixml is the kernel's per-byte throughput itself — and the
+accumulator chain that binds it was measured at addendum 11. Next
+text-row work, if any, is a kernel redesign (Track A scanner class),
+not call-structure rearrangement.

data/vendor-src/libleptris/src/leptris/xsd/compile.c

@@ -95,6 +95,10 @@ static XsdCm* xsd_cm_parse(struct leptris_xsd_schema* s,
 static XsdAttrDecl* xsd_capture_attr_rows(struct leptris_xsd_schema* s,
                                           LeptrisElement container,
                                           int depth);
+static XsdAttrDecl* xsd_capture_attr_rows_ex(struct leptris_xsd_schema* s,
+                                             LeptrisElement container,
+                                             int depth,
+                                             const XsdAttrGroupDef* owner);
 XsdCm* xsd_find_complex_ns(struct leptris_xsd_schema* s,
                            const char* type_name, const char* uri);
 extern XsdCm* xsd_find_complex(struct leptris_xsd_schema* s,
@@ -3589,6 +3593,13 @@ static const char* xsd_inline_attr_type(
 static XsdAttrDecl* xsd_capture_attr_rows(struct leptris_xsd_schema* s,
                                           LeptrisElement container,
                                           int depth) {
+    return xsd_capture_attr_rows_ex(s, container, depth, NULL);
+}
+
+static XsdAttrDecl* xsd_capture_attr_rows_ex(struct leptris_xsd_schema* s,
+                                             LeptrisElement container,
+                                             int depth,
+                                             const XsdAttrGroupDef* owner) {
     XsdAttrDecl* head = NULL;
     XsdAttrDecl* tail = NULL;
     if (depth > 8) return NULL;
@@ -3661,6 +3672,18 @@ static XsdAttrDecl* xsd_capture_attr_rows(struct leptris_xsd_schema* s,
             XsdAttrGroupDef* g = s->attr_groups;
             for (; g; g = g->next)
                 if (strcmp(g->name, ref) == 0) break;
+            /* XSD 1.0 §4.2.2 redefine hook (moxml#545, attgC035-038):
+             * a body redefining group N refs N to mean the ORIGINAL
+             * group. The name-keyed slot may hold the redefining
+             * body itself — when expanding THAT def and the ref
+             * names it again, take the shadowed def instead, or the
+             * original's members never splice into the composition. */
+            if (g && g == owner) {
+                XsdAttrGroupDef* alt = g->next;
+                for (; alt; alt = alt->next)
+                    if (strcmp(alt->name, g->name) == 0) break;
+                g = alt;
+            }
             if (!g) continue;
             /* leptris#1957: expand lazily through the def's own
              * element when its rows are not captured yet (a group
@@ -3669,7 +3692,8 @@ static XsdAttrDecl* xsd_capture_attr_rows(struct leptris_xsd_schema* s,
              * the cycle guard. */
             XsdAttrDecl* copied =
                 g->attrs ? xsd_copy_attr_rows(g->attrs)
-                         : xsd_capture_attr_rows(s, g->elem, depth + 1);
+                         : xsd_capture_attr_rows_ex(s, g->elem, depth + 1,
+                                                    g);
             if (!copied) continue;
             if (!head)
                 head = copied;

data/vendor-src/libleptris/src/leptris/xsd/validate.c

@@ -310,6 +310,10 @@ static void xsd_member_canon(const char* mname, char* out, size_t cap) {
 /* Value-space equality within one union member: numerics compare
  * numerically ("1.0" == "1.000"), booleans identify across the
  * {true,1}/{false,0} spellings, everything else is exact text. */
+static int xsd_value_equal(const char* canon_type, const char* a,
+                           const char* b);
+static int xsd_collapse_str(const char* src, char* out, size_t cap);
+
 static int xsd_value_equal(const char* canon_type, const char* a,
                            const char* b) {
     if (strcmp(a, b) == 0) return 1;
@@ -326,6 +330,20 @@ static int xsd_value_equal(const char* canon_type, const char* a,
         strstr(canon_type, "byte") ||
         strstr(canon_type, "Negative") || strstr(canon_type, "positive"))
         return strtod(a, NULL) == strtod(b, NULL);
+    /* leptris-rs#74 (stE065/066): whitespace-variant families — the
+     * token family collapses and normalizedString replaces — equate
+     * trailing-blank spellings in the union member's value space
+     * (the suite's oracle accepts the collapse reading for the
+     * union fixed-comparison class). */
+    if (token_family_builtin(canon_type) ||
+        strcmp(canon_type, "xs:normalizedString") == 0) {
+        char na[512], nb[512];
+        if (strlen(a) < sizeof(na) && strlen(b) < sizeof(nb) &&
+            xsd_collapse_str(a, na, sizeof(na)) &&
+            xsd_collapse_str(b, nb, sizeof(nb)) &&
+            strcmp(na, nb) == 0)
+            return 1;
+    }
     return 0;
 }
 
@@ -383,6 +401,80 @@ static int xsd_union_fixed_match(struct leptris_xsd_schema* s,
     return m && xsd_simple_valid_chain(s, m, text);
 }
 
+/* leptris-rs#74 (stE096): a LIST-typed fixed constraint compares in
+ * the list VALUE SPACE — whitespace runs separate items, so the
+ * itemization of "2004 ---04 --05" and "2004  ---04  --05" is the
+ * same list. Each item pair then compares through the item type
+ * (a union rides its first-accepting-member mapping; a name rides
+ * the value-equality rules). */
+static int xsd_list_fixed_match(struct leptris_xsd_schema* s,
+                                const XsdSimple* lt, const char* ns,
+                                const char* fixed, const char* text);
+
+static int xsd_item_fixed_match(struct leptris_xsd_schema* s,
+                                const XsdSimple* item_def,
+                                const char* item_name, const char* ns,
+                                const char* fixed, const char* text) {
+    if (item_def && item_def->deriv == XSD_SIMPLE_UNION)
+        return xsd_union_fixed_match(s, item_def, ns, fixed, text);
+    if (item_def) return xsd_simple_valid_chain(s, item_def, text) &&
+                         strcmp(fixed, text) == 0;
+    if (!item_name) return strcmp(fixed, text) == 0;
+    char canon[128];
+    xsd_member_canon(item_name, canon, sizeof(canon));
+    const XsdSimple* m =
+        strncmp(canon, "xs:", 3) == 0
+            ? NULL
+            : xsd_find_simple_ns_pub(s, canon, ns);
+    if (m && m->deriv == XSD_SIMPLE_UNION)
+        return xsd_union_fixed_match(s, m, ns, fixed, text);
+    if (strncmp(canon, "xs:", 3) != 0)
+        return m && xsd_simple_valid_chain(s, m, text) &&
+               strcmp(fixed, text) == 0;
+    return xsd_builtin_valid(canon, text) &&
+           xsd_value_equal(canon, fixed, text);
+}
+
+static int xsd_list_fixed_match(struct leptris_xsd_schema* s,
+                                const XsdSimple* lt, const char* ns,
+                                const char* fixed, const char* text) {
+    if (!lt || lt->deriv != XSD_SIMPLE_LIST) return 0;
+    /* itemize both lexicals on whitespace runs */
+    const char* fi[128];
+    size_t fl[128], fn = 0;
+    const char* p = fixed;
+    while (*p && fn < 128) {
+        while (*p && isspace((unsigned char)*p)) p++;
+        if (!*p) break;
+        fi[fn] = p;
+        size_t n = 0;
+        while (*p && !isspace((unsigned char)*p)) { p++; n++; }
+        fl[fn++] = n;
+    }
+    const char* ti[128];
+    size_t tl[128], tn = 0;
+    p = text;
+    while (*p && tn < 128) {
+        while (*p && isspace((unsigned char)*p)) p++;
+        if (!*p) break;
+        ti[tn] = p;
+        size_t n = 0;
+        while (*p && !isspace((unsigned char)*p)) { p++; n++; }
+        tl[tn++] = n;
+    }
+    if (fn != tn) return 0;
+    char fb[128], tb[128];
+    for (size_t i = 0; i < fn; i++) {
+        if (fl[i] >= sizeof(fb) || tl[i] >= sizeof(tb)) return 0;
+        memcpy(fb, fi[i], fl[i]); fb[fl[i]] = 0;
+        memcpy(tb, ti[i], tl[i]); tb[tl[i]] = 0;
+        if (!xsd_item_fixed_match(s, lt->item_def, lt->item_type, ns,
+                                  fb, tb))
+            return 0;
+    }
+    return 1;
+}
+
 static void validate_element_decl(struct xsd_validator* v,
                                   struct leptris_xsd_schema* s,
                                   LeptrisElement elem, int depth,
@@ -795,6 +887,27 @@ static int any_attr_matches(const char* grammar, const char* uri,
     return 0;
 }
 
+/* Collapse one lexical per whiteSpace=collapse: trim, internal runs
+ * to single spaces. Returns 0 when the source overflows the buffer. */
+static int xsd_collapse_str(const char* src, char* out, size_t cap) {
+    char* o = out;
+    const char* p = src;
+    while (*p && isspace((unsigned char)*p)) p++;
+    int spaced = 0;
+    while (*p) {
+        if (isspace((unsigned char)*p)) {
+            spaced = 1;
+            p++;
+            continue;
+        }
+        if (spaced) { *o++ = ' '; spaced = 0; }
+        *o++ = *p++;
+        if ((size_t)(o - out) >= cap - 1) return 0;
+    }
+    *o = 0;
+    return 1;
+}
+
 /* leptris-rs#36 (addB104, attO006): the fixed constraint holds on
  * the TYPE's value, not the raw lexical (XSD 1.0 §3.2.3/§4.3.1.2) —
  * a whitespace-variant lexical of a collapsing type (token family,
@@ -807,28 +920,10 @@ static int attr_fixed_matches(struct leptris_xsd_schema* s,
     if (!type_collapses_ws(s, type, ns)) return 0;
     char norm_v[512];
     char norm_f[512];
-    size_t n = strlen(val);
-    if (n >= sizeof(norm_v)) return 0;
-    size_t m = strlen(fixed);
-    if (m >= sizeof(norm_f)) return 0;
-    for (int pass = 0; pass < 2; pass++) {
-        const char* src = pass ? fixed : val;
-        char* out = pass ? norm_f : norm_v;
-        char* o = out;
-        const char* p = src;
-        while (*p && isspace((unsigned char)*p)) p++;
-        int spaced = 0;
-        while (*p) {
-            if (isspace((unsigned char)*p)) {
-                spaced = 1;
-                p++;
-                continue;
-            }
-            if (spaced) { *o++ = ' '; spaced = 0; }
-            *o++ = *p++;
-        }
-        *o = 0;
-    }
+    if (strlen(val) >= sizeof(norm_v)) return 0;
+    if (strlen(fixed) >= sizeof(norm_f)) return 0;
+    if (!xsd_collapse_str(val, norm_v, sizeof(norm_v))) return 0;
+    if (!xsd_collapse_str(fixed, norm_f, sizeof(norm_f))) return 0;
     return strcmp(norm_v, norm_f) == 0;
 }
 
@@ -1107,7 +1202,10 @@ static void validate_element_decl(struct xsd_validator* v,
                 const XsdSimple* ut =
                     d->type ? xsd_find_simple_ns_pub(s, d->type, d->ns)
                             : NULL;
-                if (ut)
+                if (ut && ut->deriv == XSD_SIMPLE_LIST)
+                    match = xsd_list_fixed_match(s, ut, d->ns, d->fixed,
+                                                 text);
+                else if (ut)
                     match = xsd_union_fixed_match(s, ut, d->ns, d->fixed,
                                                   text);
             }

data/vendor-src/libleptris/test/xsd/libxml2-cases/attgC-redefine/attgC035.imp

@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://importedXSD">
+	<xsd:attributeGroup name="bar">
+		<xsd:attribute name="att3" type="xsd:int"/>
+		<xsd:attribute name="att4" type="xsd:int" form="qualified"/>
+		<xsd:attribute name="att5" type="xsd:boolean"/>
+	</xsd:attributeGroup>
+	<xsd:element name="e"/>
+</xsd:schema>

data/vendor-src/libleptris/test/xsd/libxml2-cases/attgC-redefine/attgC035.red

@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+	<xsd:attributeGroup name="car">
+		<xsd:attribute name="att" type="xsd:int"/>
+		<xsd:attribute name="att1" type="xsd:string"/>
+		<xsd:attribute name="att2" type="xsd:string"/>
+	</xsd:attributeGroup>
+	<xsd:element name="e"/>
+</xsd:schema>

data/vendor-src/libleptris/test/xsd/libxml2-cases/attgC-redefine/attgC035.xml

@@ -0,0 +1 @@
+<doc xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:imp="http://importedXSD" xsi:noNamespaceSchemaLocation="attgC035.xsd" att1="123" imp:att4="234"></doc>

data/vendor-src/libleptris/test/xsd/libxml2-cases/attgC-redefine/attgC035.xsd

@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:imp="http://importedXSD">
+	<xsd:import namespace="http://importedXSD" schemaLocation="attgC035.imp"/>
+	<xsd:redefine schemaLocation="attgC035.red">
+		<xsd:attributeGroup name="car">
+			<xsd:attributeGroup ref="car"/>
+			<xsd:attributeGroup ref="imp:bar"/>
+		</xsd:attributeGroup>
+	</xsd:redefine>
+	<xsd:attributeGroup name="foo">
+		<xsd:attribute name="foo1" type="xsd:int"/>
+		<xsd:attribute name="foo2" type="xsd:string"/>
+	</xsd:attributeGroup>
+	<xsd:element name="doc" type="test"/>
+	<xsd:complexType name="test">
+		<xsd:attributeGroup ref="car"/>
+	</xsd:complexType>
+	<xsd:complexType name="foo">
+		<xsd:attribute name="foo" type="xsd:string"/>
+	</xsd:complexType>
+</xsd:schema>

data/vendor-src/libleptris/test/xsd/libxml2-cases/attgC-redefine/attgC036.inc

@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+	<xsd:attributeGroup name="bar">
+		<xsd:attribute name="att3" type="xsd:int"/>
+		<xsd:attribute name="att4" type="xsd:int"/>
+		<xsd:attribute name="att5" type="xsd:boolean"/>
+	</xsd:attributeGroup>
+	<xsd:element name="e"/>
+</xsd:schema>

data/vendor-src/libleptris/test/xsd/libxml2-cases/attgC-redefine/attgC036.red

@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+	<xsd:attributeGroup name="car">
+		<xsd:attribute name="att" type="xsd:int"/>
+		<xsd:attribute name="att1" type="xsd:string"/>
+		<xsd:attribute name="att2" type="xsd:string"/>
+	</xsd:attributeGroup>
+</xsd:schema>

data/vendor-src/libleptris/test/xsd/libxml2-cases/attgC-redefine/attgC036.xml

@@ -0,0 +1 @@
+<doc xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="attgC036.xsd" att1="123" att4="234"></doc>

data/vendor-src/libleptris/test/xsd/libxml2-cases/attgC-redefine/attgC036.xsd

@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+	<xsd:include schemaLocation="attgC036.inc"/>
+	<xsd:redefine schemaLocation="attgC036.red">
+		<xsd:attributeGroup name="car">
+			<xsd:attributeGroup ref="car"/>
+			<xsd:attributeGroup ref="bar"/>
+		</xsd:attributeGroup>
+	</xsd:redefine>
+	<xsd:element name="doc" type="test"/>
+	<xsd:complexType name="test">
+		<xsd:attributeGroup ref="car"/>
+	</xsd:complexType>
+</xsd:schema>

data/vendor-src/libleptris/test/xsd/libxml2-cases/attgC-redefine/attgC037.xml

@@ -0,0 +1 @@
+<doc xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="attgC037.xsd" att1="123" foo1="234"></doc>

data/vendor-src/libleptris/test/xsd/libxml2-cases/attgC-redefine/attgC037.xsd

@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+	<xsd:redefine schemaLocation="attgC035.red">
+		<xsd:attributeGroup name="car">
+			<xsd:attributeGroup ref="car"/>
+			<xsd:attributeGroup ref="foo"/>
+		</xsd:attributeGroup>
+	</xsd:redefine>
+	<xsd:element name="doc" type="test"/>
+	<xsd:complexType name="test">
+		<xsd:attributeGroup ref="car"/>
+	</xsd:complexType>
+	<xsd:attributeGroup name="foo">
+		<xsd:attribute name="foo1" type="xsd:int"/>
+		<xsd:attribute name="foo2" type="xsd:string"/>
+	</xsd:attributeGroup>
+</xsd:schema>

data/vendor-src/libleptris/test/xsd/libxml2-cases/attgC-redefine/attgC038.xml

@@ -0,0 +1 @@
+<doc xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="attgC038.xsd" att1="123" foo1="234"></doc>

data/vendor-src/libleptris/test/xsd/libxml2-cases/attgC-redefine/attgC038.xsd

@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+	<xsd:redefine schemaLocation="attgC038v1.red">
+		<xsd:attributeGroup name="foo">
+			<xsd:attributeGroup ref="foo"/>
+			<xsd:attribute name="extFoo" type="xsd:int"/>
+		</xsd:attributeGroup>
+	</xsd:redefine>
+	<xsd:redefine schemaLocation="attgC038v2.red">
+		<xsd:attributeGroup name="car">
+			<xsd:attributeGroup ref="car"/>
+			<xsd:attributeGroup ref="foo"/>
+		</xsd:attributeGroup>
+	</xsd:redefine>
+	<xsd:element name="doc" type="test"/>
+	<xsd:complexType name="test">
+		<xsd:attributeGroup ref="car"/>
+	</xsd:complexType>
+</xsd:schema>

data/vendor-src/libleptris/test/xsd/libxml2-cases/attgC-redefine/attgC038v1.red

@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+	<xsd:attributeGroup name="foo">
+		<xsd:attribute name="foo1" type="xsd:int"/>
+		<xsd:attribute name="foo2" type="xsd:string"/>
+	</xsd:attributeGroup>
+</xsd:schema>

data/vendor-src/libleptris/test/xsd/libxml2-cases/attgC-redefine/attgC038v2.red

@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+	<xsd:attributeGroup name="car">
+		<xsd:attribute name="att" type="xsd:int"/>
+		<xsd:attribute name="att1" type="xsd:string"/>
+		<xsd:attribute name="att2" type="xsd:string"/>
+	</xsd:attributeGroup>
+</xsd:schema>

data/vendor-src/libleptris/test/xsd/libxml2-cases/rs74-union-fixed/stE065.xml

@@ -0,0 +1 @@
+<root>abcd edfgh</root>

data/vendor-src/libleptris/test/xsd/libxml2-cases/rs74-union-fixed/stE065.xsd

@@ -0,0 +1,15 @@
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+	<xsd:element name="root" fixed="abcd edfgh ">
+		<xsd:simpleType>
+			<xsd:union memberTypes="xsd:gYearMonth xsd:token xsd:normalizedString restrictedNotation"/>
+		</xsd:simpleType>
+	</xsd:element>
+	
+	<xsd:notation name="jpeg" public="image/jpeg" system="viewer.exe"/>
+ 
+    <xsd:simpleType name="restrictedNotation">
+        <xsd:restriction base="xsd:NOTATION">
+          <xsd:enumeration value="jpeg"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+</xsd:schema>

data/vendor-src/libleptris/test/xsd/libxml2-cases/rs74-union-fixed/stE066.xml

@@ -0,0 +1 @@
+<root>ENU</root>

data/vendor-src/libleptris/test/xsd/libxml2-cases/rs74-union-fixed/stE066.xsd

@@ -0,0 +1,7 @@
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+	<xsd:element name="root" fixed="ENU ">
+		<xsd:simpleType>
+			<xsd:union memberTypes="xsd:gYearMonth xsd:language xsd:normalizedString"/>
+		</xsd:simpleType>
+	</xsd:element>
+</xsd:schema>

data/vendor-src/libleptris/test/xsd/libxml2-cases/rs74-union-fixed/stE096.xml

@@ -0,0 +1 @@
+<root>2004  ---04  --05</root>

data/vendor-src/libleptris/test/xsd/libxml2-cases/rs74-union-fixed/stE096.xsd

@@ -0,0 +1,14 @@
+<xsd:schema 
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+	<xsd:simpleType name="union">
+		<xsd:union memberTypes="xsd:gYear xsd:gMonth xsd:gDay"/>
+	</xsd:simpleType>
+
+	<xsd:element name="root" fixed="2004 ---04 --05">
+		<xsd:simpleType>
+			<xsd:list itemType="union"/>
+		</xsd:simpleType>
+	</xsd:element>
+
+</xsd:schema>

data/vendor-src/libleptris/test/xsd/test_xsd_compile.cpp

@@ -1426,6 +1426,80 @@ TEST(XsdValidate, AttZ014aVersion11ReadingIsValid) {
     leptris_xsd_free(s);
 }
 
+// leptris-rs#74 (W3C stE065/066/096, msData/simpleType, valid): the
+// element fixed constraint compares in the VALUE SPACE — a union
+// maps each lexical through its first accepting member, so token
+// collapse equates the trailing-blank fixed spelling, and a list
+// itemizes on whitespace runs before per-item union comparison.
+TEST(XsdValidate, Rs74UnionFixedValueSpaceValid) {
+    LeptrisStatus st = LEPTRIS_OK;
+    const char* cases[] = {"stE065", "stE066", "stE096"};
+    for (const char* c : cases) {
+        char path[256];
+        snprintf(path, sizeof(path),
+                 LEPTRIS_XSD_CASES_DIR "/rs74-union-fixed/%s.xsd", c);
+        LeptrisXsdSchema s = leptris_xsd_compile_file(path, &st);
+        ASSERT_NE(s, (LeptrisXsdSchema)0) << c << " status " << (int)st;
+        snprintf(path, sizeof(path),
+                 LEPTRIS_XSD_CASES_DIR "/rs74-union-fixed/%s.xml", c);
+        LeptrisDocument d = leptris_parse_file(path, &st);
+        ASSERT_NE(d, nullptr) << c << " status " << (int)st;
+        EXPECT_EQ(leptris_xsd_validate(s, d), 1) << c << ": "
+            << leptris_xsd_error_at(s, 0);
+        leptris_document_free(d);
+        leptris_xsd_free(s);
+    }
+}
+
+// leptris-rs#74 teeth: a genuinely different value must still fail
+// — the collapse reading equates whitespace spellings, not content.
+TEST(XsdValidate, Rs74UnionFixedStillRejectsDifferentValues) {
+    LeptrisStatus st = LEPTRIS_OK;
+    const char* schema =
+        "<xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema'>"
+        "<xs:element name='root' fixed='abcd edfgh '>"
+        " <xs:simpleType><xs:union memberTypes='xs:gYearMonth"
+        " xs:token xs:normalizedString'/></xs:simpleType>"
+        "</xs:element></xs:schema>";
+    LeptrisXsdSchema s = leptris_xsd_compile(schema, strlen(schema), &st);
+    ASSERT_NE(s, (LeptrisXsdSchema)0) << "status " << (int)st;
+    const char* doc = "<root>wxyz pqrs</root>";
+    LeptrisDocument d = leptris_parse_string(doc, strlen(doc), &st);
+    ASSERT_NE(d, nullptr);
+    EXPECT_EQ(leptris_xsd_validate(s, d), 0);
+    leptris_document_free(d);
+    leptris_xsd_free(s);
+}
+
+// moxml#545 (W3C attgC035-038, msData/attributeGroup, valid): an
+// attributeGroup-redefine body that refs its OWN name means the
+// ORIGINAL group (XSD 1.0 §4.2.2) — the name-keyed slot holds the
+// redefining body, and the original's members must splice into the
+// composition (att1 reaches through the .red unit, imp:att4 through
+// the imported bar; attgC038 chains two redefines).
+TEST(XsdValidate, AttgCRedefineHookMembersAdmitted) {
+    LeptrisStatus st = LEPTRIS_OK;
+    const char* cases[] = {"attgC035", "attgC036", "attgC037",
+                           "attgC038"};
+    for (const char* c : cases) {
+        char path[256];
+        snprintf(path, sizeof(path),
+                 LEPTRIS_XSD_CASES_DIR "/attgC-redefine/%s.xsd", c);
+        LeptrisXsdSchema s = leptris_xsd_compile_file(path, &st);
+        ASSERT_NE(s, (LeptrisXsdSchema)0) << c << " status " << (int)st;
+        snprintf(path, sizeof(path),
+                 LEPTRIS_XSD_CASES_DIR "/attgC-redefine/%s.xml", c);
+        LeptrisDocument d = leptris_parse_file(path, &st);
+        ASSERT_NE(d, nullptr) << c << " status " << (int)st;
+        EXPECT_EQ(leptris_xsd_validate(s, d), 1) << c << ": "
+            << leptris_xsd_error_at(s, 0);
+        for (size_t i = 0; i < leptris_xsd_error_count(s); i++)
+            ADD_FAILURE() << c << ": " << leptris_xsd_error_at(s, i);
+        leptris_document_free(d);
+        leptris_xsd_free(s);
+    }
+}
+
 TEST(XsdValidate, ValidDocumentPasses) {
     EXPECT_EQ(validate_doc(k_v_schema,
                            "<rows version=\"2\" status=\"ok\">"

data/vendor-src/libleptris/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json",
   "name": "leptris",
-  "version": "1.9.419",
+  "version": "1.9.420",
   "description": "High-performance XML parser and XPath 1.0 engine in C (libleptris)",
   "homepage": "https://github.com/leptris/leptris",
   "license": "MIT",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: leptris
 version: !ruby/object:Gem::Version
-  version: 1.9.419.0
+  version: 1.9.420.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-11-12 00:00:00.000000000 Z
+date: 2026-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -1290,6 +1290,20 @@ files:
 - vendor-src/libleptris/test/xsd/libxml2-cases/attZ014-set/attZ014a.xsd
 - vendor-src/libleptris/test/xsd/libxml2-cases/attZ014-set/attZ014b.xml
 - vendor-src/libleptris/test/xsd/libxml2-cases/attZ014-set/attZ014b.xsd
+- vendor-src/libleptris/test/xsd/libxml2-cases/attgC-redefine/attgC035.imp
+- vendor-src/libleptris/test/xsd/libxml2-cases/attgC-redefine/attgC035.red
+- vendor-src/libleptris/test/xsd/libxml2-cases/attgC-redefine/attgC035.xml
+- vendor-src/libleptris/test/xsd/libxml2-cases/attgC-redefine/attgC035.xsd
+- vendor-src/libleptris/test/xsd/libxml2-cases/attgC-redefine/attgC036.inc
+- vendor-src/libleptris/test/xsd/libxml2-cases/attgC-redefine/attgC036.red
+- vendor-src/libleptris/test/xsd/libxml2-cases/attgC-redefine/attgC036.xml
+- vendor-src/libleptris/test/xsd/libxml2-cases/attgC-redefine/attgC036.xsd
+- vendor-src/libleptris/test/xsd/libxml2-cases/attgC-redefine/attgC037.xml
+- vendor-src/libleptris/test/xsd/libxml2-cases/attgC-redefine/attgC037.xsd
+- vendor-src/libleptris/test/xsd/libxml2-cases/attgC-redefine/attgC038.xml
+- vendor-src/libleptris/test/xsd/libxml2-cases/attgC-redefine/attgC038.xsd
+- vendor-src/libleptris/test/xsd/libxml2-cases/attgC-redefine/attgC038v1.red
+- vendor-src/libleptris/test/xsd/libxml2-cases/attgC-redefine/attgC038v2.red
 - vendor-src/libleptris/test/xsd/libxml2-cases/attgD019-set/attgD019.xsd
 - vendor-src/libleptris/test/xsd/libxml2-cases/attgD019-set/attgD019a.xsd
 - vendor-src/libleptris/test/xsd/libxml2-cases/attr0_0.xml
@@ -1571,6 +1585,12 @@ files:
 - vendor-src/libleptris/test/xsd/libxml2-cases/rs47-regex/Cyrillic.xsd
 - vendor-src/libleptris/test/xsd/libxml2-cases/rs47-regex/reG8.xml
 - vendor-src/libleptris/test/xsd/libxml2-cases/rs47-regex/reG8.xsd
+- vendor-src/libleptris/test/xsd/libxml2-cases/rs74-union-fixed/stE065.xml
+- vendor-src/libleptris/test/xsd/libxml2-cases/rs74-union-fixed/stE065.xsd
+- vendor-src/libleptris/test/xsd/libxml2-cases/rs74-union-fixed/stE066.xml
+- vendor-src/libleptris/test/xsd/libxml2-cases/rs74-union-fixed/stE066.xsd
+- vendor-src/libleptris/test/xsd/libxml2-cases/rs74-union-fixed/stE096.xml
+- vendor-src/libleptris/test/xsd/libxml2-cases/rs74-union-fixed/stE096.xsd
 - vendor-src/libleptris/test/xsd/libxml2-cases/scc-no-xmlns_0.xml
 - vendor-src/libleptris/test/xsd/libxml2-cases/scc-no-xmlns_0.xsd
 - vendor-src/libleptris/test/xsd/libxml2-cases/scc-no-xsi_0.xml