more test fixes

TEIC · Nov 5, 2024 · 50473aa · 50473aa
1 parent 1da5fbc
commit 50473aa
Show file tree

Hide file tree

Showing 3 changed files with 147 additions and 129 deletions.
diff --git a/Test/expected-results/test33.json b/Test/expected-results/test33.json
@@ -1,129 +1,129 @@
 
-{ "title" : "Namespace Test",
-"edition" : "",
-"generator" : "odd2json3",
-
-"modules" : 
-[  ],
-"moduleRefs" : 
-[ 
-  { "key" : "core",
-    "desc" : 
-    [  ],
-    "shortDesc" : "",
-    "gloss" : 
-    [  ] },
-
-  { "key" : "header",
-    "desc" : 
-    [  ],
-    "shortDesc" : "",
-    "gloss" : 
-    [  ] },
-
-  { "key" : "linking",
-    "desc" : 
-    [  ],
-    "shortDesc" : "",
-    "gloss" : 
-    [  ] },
-
-  { "key" : "tei",
-    "desc" : 
-    [  ],
-    "shortDesc" : "",
-    "gloss" : 
-    [  ] },
-
-  { "key" : "textstructure",
-    "desc" : 
+  { "title" : "Namespace Test",
+    "edition" : "",
+    "generator" : "odd2json3",
+
+    "modules" : 
     [  ],
-    "shortDesc" : "",
-    "gloss" : 
-    [  ] } ],
-"elements" : 
-[ 
-  { "ident" : "cit",
-    "ns" : "http:\/\/foo.foo\/foo",
-    "type" : "elementSpec",
-    "module" : "",
-    "desc" : 
-    [ "<desc>\n            This element encodes a citation according to the foo standard.\n          <\/desc>" ],
-    "shortDesc" : "\n            This element encodes a citation according to the foo standard.\n          ",
-    "gloss" : 
-    [  ],
-    "altIdent" : 
-    [  ],
-    "classes" : 
-    { "model" : 
-      [ "model.quoteLike" ],
-      "atts" : 
-      [  ],
-      "unknown" : 
-      [  ] },
-    "attributes" : 
+    "moduleRefs" : 
     [ 
-      { "onElement" : true,
-        "ident" : "q",
-        "mode" : "add",
-        "ns" : "",
-        "usage" : "def",
+      { "key" : "core",
         "desc" : 
         [  ],
         "shortDesc" : "",
         "gloss" : 
+        [  ] },
+
+      { "key" : "header",
+        "desc" : 
         [  ],
-        "altIdent" : 
+        "shortDesc" : "",
+        "gloss" : 
+        [  ] },
+
+      { "key" : "linking",
+        "desc" : 
         [  ],
-        "valDesc" : 
+        "shortDesc" : "",
+        "gloss" : 
+        [  ] },
+
+      { "key" : "tei",
+        "desc" : 
         [  ],
-        "datatype" : 
-        { "min" : "1",
-          "max" : "1",
-          "type" : "rng",
-          "rngContent" : "<rng:text xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" xmlns:rng=\"http:\/\/relaxng.org\/ns\/structure\/1.0\"\/>" } },
+        "shortDesc" : "",
+        "gloss" : 
+        [  ] },
 
-      { "onElement" : true,
-        "ident" : "r",
-        "mode" : "add",
-        "ns" : "http:\/\/blah.blah\/blah",
-        "usage" : "def",
+      { "key" : "textstructure",
         "desc" : 
         [  ],
         "shortDesc" : "",
         "gloss" : 
+        [  ] } ],
+    "elements" : 
+    [ 
+      { "ident" : "cit",
+        "ns" : "http:\/\/foo.foo\/foo",
+        "type" : "elementSpec",
+        "module" : "",
+        "desc" : 
+        [ "<desc>\n            This element encodes a citation according to the foo standard.\n          <\/desc>" ],
+        "shortDesc" : "\n            This element encodes a citation according to the foo standard.\n          ",
+        "gloss" : 
         [  ],
         "altIdent" : 
         [  ],
-        "valDesc" : 
-        [  ],
-        "datatype" : 
-        { "min" : "1",
-          "max" : "1",
-          "type" : "rng",
-          "rngContent" : "<rng:text xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" xmlns:rng=\"http:\/\/relaxng.org\/ns\/structure\/1.0\"\/>" } } ],
-    "content" : 
-    [ 
-      { "type" : "rng",
-        "rngContent" : "<rng:ref xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" xmlns:rng=\"http:\/\/relaxng.org\/ns\/structure\/1.0\" name=\"ref\"\/>" },
-
-      { "type" : "rng",
-        "rngContent" : "<rng:oneOrMore xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" xmlns:rng=\"http:\/\/relaxng.org\/ns\/structure\/1.0\">\n              <rng:ref name=\"macro.specialPara\"\/>\n            <\/rng:oneOrMore>" },
-
-      { "type" : "rng",
-        "rngContent" : "<rng:text xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" xmlns:rng=\"http:\/\/relaxng.org\/ns\/structure\/1.0\"\/>" } ] } ],
-"classes" : 
-{ "models" : 
-  [  ],
-  "attributes" : 
-  [  ] },
-"elementRefs" : 
-[  ],
-"classRefs" : 
-[  ],
-"macros" : 
-[  ],
-"datatypes" : 
-[  ],
-"macroRefs" : 
-[  ] }
+        "classes" : 
+        { "model" : 
+          [ "model.quoteLike" ],
+          "atts" : 
+          [  ],
+          "unknown" : 
+          [  ] },
+        "attributes" : 
+        [ 
+          { "onElement" : true,
+            "ident" : "q",
+            "mode" : "add",
+            "ns" : "",
+            "usage" : "def",
+            "desc" : 
+            [  ],
+            "shortDesc" : "",
+            "gloss" : 
+            [  ],
+            "altIdent" : 
+            [  ],
+            "valDesc" : 
+            [  ],
+            "datatype" : 
+            { "min" : "1",
+              "max" : "1",
+              "type" : "rng",
+              "rngContent" : "<rng:text xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" xmlns:rng=\"http:\/\/relaxng.org\/ns\/structure\/1.0\"\/>" } },
+
+          { "onElement" : true,
+            "ident" : "r",
+            "mode" : "add",
+            "ns" : "http:\/\/blah.blah\/blah",
+            "usage" : "def",
+            "desc" : 
+            [  ],
+            "shortDesc" : "",
+            "gloss" : 
+            [  ],
+            "altIdent" : 
+            [  ],
+            "valDesc" : 
+            [  ],
+            "datatype" : 
+            { "min" : "1",
+              "max" : "1",
+              "type" : "rng",
+              "rngContent" : "<rng:text xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" xmlns:rng=\"http:\/\/relaxng.org\/ns\/structure\/1.0\"\/>" } } ],
+        "content" : 
+        [ 
+          { "type" : "rng",
+            "rngContent" : "<rng:ref xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" xmlns:rng=\"http:\/\/relaxng.org\/ns\/structure\/1.0\" name=\"ref\"\/>" },
+
+          { "type" : "rng",
+            "rngContent" : "<rng:oneOrMore xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" xmlns:rng=\"http:\/\/relaxng.org\/ns\/structure\/1.0\">\n              <rng:ref name=\"macro.specialPara\"\/>\n            <\/rng:oneOrMore>" },
+
+          { "type" : "rng",
+            "rngContent" : "<rng:text xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" xmlns:rng=\"http:\/\/relaxng.org\/ns\/structure\/1.0\"\/>" } ] } ],
+    "classes" : 
+    { "models" : 
+      [  ],
+      "attributes" : 
+      [  ] },
+    "elementRefs" : 
+    [  ],
+    "classRefs" : 
+    [  ],
+    "macros" : 
+    [  ],
+    "datatypes" : 
+    [  ],
+    "macroRefs" : 
+    [  ] }
diff --git a/Test/expected-results/test34.combined.json b/Test/expected-results/test34.combined.json
@@ -2300,11 +2300,14 @@
         [  ],
         "content" : 
         [ 
-          { "type" : "ref" },
+          { "type" : "rng",
+            "rngContent" : "<ref xmlns=\"http:\/\/relaxng.org\/ns\/structure\/1.0\" xmlns:bar=\"http:\/\/blah.blah\/bar\" xmlns:blah=\"http:\/\/blah.blah\/blah\" xmlns:rng=\"http:\/\/relaxng.org\/ns\/structure\/1.0\" xmlns:teix=\"http:\/\/www.tei-c.org\/ns\/Examples\" name=\"ref\"\/>" },
 
-          { "type" : "oneOrMore" },
+          { "type" : "rng",
+            "rngContent" : "<oneOrMore xmlns=\"http:\/\/relaxng.org\/ns\/structure\/1.0\" xmlns:bar=\"http:\/\/blah.blah\/bar\" xmlns:blah=\"http:\/\/blah.blah\/blah\" xmlns:rng=\"http:\/\/relaxng.org\/ns\/structure\/1.0\" xmlns:teix=\"http:\/\/www.tei-c.org\/ns\/Examples\"><ref name=\"macro.specialPara\"\/><\/oneOrMore>" },
 
-          { "type" : "text" } ] },
+          { "type" : "rng",
+            "rngContent" : "<rng:text xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" xmlns:bar=\"http:\/\/blah.blah\/bar\" xmlns:blah=\"http:\/\/blah.blah\/blah\" xmlns:rng=\"http:\/\/relaxng.org\/ns\/structure\/1.0\" xmlns:teix=\"http:\/\/www.tei-c.org\/ns\/Examples\"\/>" } ] },
 
       { "ident" : "cit",
         "ns" : "http:\/\/blah.blah\/bar",
@@ -2328,11 +2331,14 @@
         [  ],
         "content" : 
         [ 
-          { "type" : "ref" },
+          { "type" : "rng",
+            "rngContent" : "<ref xmlns=\"http:\/\/relaxng.org\/ns\/structure\/1.0\" xmlns:bar=\"http:\/\/blah.blah\/bar\" xmlns:blah=\"http:\/\/blah.blah\/blah\" xmlns:rng=\"http:\/\/relaxng.org\/ns\/structure\/1.0\" xmlns:teix=\"http:\/\/www.tei-c.org\/ns\/Examples\" name=\"ref\"\/>" },
 
-          { "type" : "oneOrMore" },
+          { "type" : "rng",
+            "rngContent" : "<oneOrMore xmlns=\"http:\/\/relaxng.org\/ns\/structure\/1.0\" xmlns:bar=\"http:\/\/blah.blah\/bar\" xmlns:blah=\"http:\/\/blah.blah\/blah\" xmlns:rng=\"http:\/\/relaxng.org\/ns\/structure\/1.0\" xmlns:teix=\"http:\/\/www.tei-c.org\/ns\/Examples\"><ref name=\"macro.specialPara\"\/><\/oneOrMore>" },
 
-          { "type" : "text" } ] },
+          { "type" : "rng",
+            "rngContent" : "<rng:text xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" xmlns:bar=\"http:\/\/blah.blah\/bar\" xmlns:blah=\"http:\/\/blah.blah\/blah\" xmlns:rng=\"http:\/\/relaxng.org\/ns\/structure\/1.0\" xmlns:teix=\"http:\/\/www.tei-c.org\/ns\/Examples\"\/>" } ] },
 
       { "ident" : "citeData",
         "ns" : "http:\/\/foo.foo\/foo",
@@ -8983,11 +8989,14 @@
         [  ],
         "content" : 
         [ 
-          { "type" : "ref" },
+          { "type" : "rng",
+            "rngContent" : "<ref xmlns=\"http:\/\/relaxng.org\/ns\/structure\/1.0\" xmlns:bar=\"http:\/\/blah.blah\/bar\" xmlns:blah=\"http:\/\/blah.blah\/blah\" xmlns:rng=\"http:\/\/relaxng.org\/ns\/structure\/1.0\" xmlns:teix=\"http:\/\/www.tei-c.org\/ns\/Examples\" name=\"ref\"\/>" },
 
-          { "type" : "oneOrMore" },
+          { "type" : "rng",
+            "rngContent" : "<oneOrMore xmlns=\"http:\/\/relaxng.org\/ns\/structure\/1.0\" xmlns:bar=\"http:\/\/blah.blah\/bar\" xmlns:blah=\"http:\/\/blah.blah\/blah\" xmlns:rng=\"http:\/\/relaxng.org\/ns\/structure\/1.0\" xmlns:teix=\"http:\/\/www.tei-c.org\/ns\/Examples\"><ref name=\"macro.specialPara\"\/><\/oneOrMore>" },
 
-          { "type" : "text" } ] },
+          { "type" : "rng",
+            "rngContent" : "<rng:text xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" xmlns:bar=\"http:\/\/blah.blah\/bar\" xmlns:blah=\"http:\/\/blah.blah\/blah\" xmlns:rng=\"http:\/\/relaxng.org\/ns\/structure\/1.0\" xmlns:teix=\"http:\/\/www.tei-c.org\/ns\/Examples\"\/>" } ] },
 
       { "ident" : "quotation",
         "ns" : "http:\/\/foo.foo\/foo",

diff --git a/Test/expected-results/test34.json b/Test/expected-results/test34.json
@@ -65,11 +65,14 @@
         [  ],
         "content" : 
         [ 
-          { "type" : "ref" },
+          { "type" : "rng",
+            "rngContent" : "<rng:ref xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" xmlns:bar=\"http:\/\/blah.blah\/bar\" xmlns:blah=\"http:\/\/blah.blah\/blah\" xmlns:rng=\"http:\/\/relaxng.org\/ns\/structure\/1.0\" name=\"ref\"\/>" },
 
-          { "type" : "oneOrMore" },
+          { "type" : "rng",
+            "rngContent" : "<rng:oneOrMore xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" xmlns:bar=\"http:\/\/blah.blah\/bar\" xmlns:blah=\"http:\/\/blah.blah\/blah\" xmlns:rng=\"http:\/\/relaxng.org\/ns\/structure\/1.0\">\n              <rng:ref name=\"macro.specialPara\"\/>\n            <\/rng:oneOrMore>" },
 
-          { "type" : "text" } ] },
+          { "type" : "rng",
+            "rngContent" : "<rng:text xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" xmlns:bar=\"http:\/\/blah.blah\/bar\" xmlns:blah=\"http:\/\/blah.blah\/blah\" xmlns:rng=\"http:\/\/relaxng.org\/ns\/structure\/1.0\"\/>" } ] },
 
       { "ident" : "cit",
         "ns" : "http:\/\/blah.blah\/bar",
@@ -93,11 +96,14 @@
         [  ],
         "content" : 
         [ 
-          { "type" : "ref" },
+          { "type" : "rng",
+            "rngContent" : "<rng:ref xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" xmlns:bar=\"http:\/\/blah.blah\/bar\" xmlns:blah=\"http:\/\/blah.blah\/blah\" xmlns:rng=\"http:\/\/relaxng.org\/ns\/structure\/1.0\" name=\"ref\"\/>" },
 
-          { "type" : "oneOrMore" },
+          { "type" : "rng",
+            "rngContent" : "<rng:oneOrMore xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" xmlns:bar=\"http:\/\/blah.blah\/bar\" xmlns:blah=\"http:\/\/blah.blah\/blah\" xmlns:rng=\"http:\/\/relaxng.org\/ns\/structure\/1.0\">\n              <rng:ref name=\"macro.specialPara\"\/>\n            <\/rng:oneOrMore>" },
 
-          { "type" : "text" } ] },
+          { "type" : "rng",
+            "rngContent" : "<rng:text xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" xmlns:bar=\"http:\/\/blah.blah\/bar\" xmlns:blah=\"http:\/\/blah.blah\/blah\" xmlns:rng=\"http:\/\/relaxng.org\/ns\/structure\/1.0\"\/>" } ] },
 
       { "ident" : "q",
         "ns" : "http:\/\/blah.blah\/blah",
@@ -121,11 +127,14 @@
         [  ],
         "content" : 
         [ 
-          { "type" : "ref" },
+          { "type" : "rng",
+            "rngContent" : "<rng:ref xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" xmlns:bar=\"http:\/\/blah.blah\/bar\" xmlns:blah=\"http:\/\/blah.blah\/blah\" xmlns:rng=\"http:\/\/relaxng.org\/ns\/structure\/1.0\" name=\"ref\"\/>" },
 
-          { "type" : "oneOrMore" },
+          { "type" : "rng",
+            "rngContent" : "<rng:oneOrMore xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" xmlns:bar=\"http:\/\/blah.blah\/bar\" xmlns:blah=\"http:\/\/blah.blah\/blah\" xmlns:rng=\"http:\/\/relaxng.org\/ns\/structure\/1.0\">\n              <rng:ref name=\"macro.specialPara\"\/>\n            <\/rng:oneOrMore>" },
 
-          { "type" : "text" } ] } ],
+          { "type" : "rng",
+            "rngContent" : "<rng:text xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" xmlns:bar=\"http:\/\/blah.blah\/bar\" xmlns:blah=\"http:\/\/blah.blah\/blah\" xmlns:rng=\"http:\/\/relaxng.org\/ns\/structure\/1.0\"\/>" } ] } ],
     "classes" : 
     { "models" : 
       [  ],