Merge branch 'main' into ODATA-1547

oasis-tcs · Jan 31, 2024 · a56e714 · a56e714
2 parents 1483462 + 6723b20
commit a56e714
Show file tree

Hide file tree

Showing 10 changed files with 1,819 additions and 203 deletions.
diff --git a/docs/odata-csdl-xml/odata-csdl-xml.html b/docs/odata-csdl-xml/odata-csdl-xml.html
diff --git a/docs/odata-csdl-xml/odata-csdl-xml.md b/docs/odata-csdl-xml/odata-csdl-xml.md
@@ -884,6 +884,7 @@ OData service.
 ::: {.varxml .example}
 Example 7:
 ```xml
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx"
            Version="4.01">
   <edmx:DataServices>
@@ -5431,6 +5432,7 @@ CSDL. These examples demonstrate many of the topics covered above.
 ::: {.varxml .example}
 Example 90:
 ```xml
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx"
            xmlns="http://docs.oasis-open.org/odata/ns/edm" Version="4.0">
   <edmx:Reference Uri="https://oasis-tcs.github.io/odata-vocabularies/vocabularies/Org.OData.Core.V1.xml">
@@ -5549,6 +5551,7 @@ Example 90:
 ::: {.varxml .example}
 Example 91:
 ```xml
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx"
            Version="4.01">
   <edmx:Reference Uri="http://host/service/$metadata">

diff --git a/docs/odata-data-aggregation-ext/odata-data-aggregation-ext.html b/docs/odata-data-aggregation-ext/odata-data-aggregation-ext.html
diff --git a/docs/odata-data-aggregation-ext/odata-data-aggregation-ext.md b/docs/odata-data-aggregation-ext/odata-data-aggregation-ext.md
@@ -2487,6 +2487,7 @@ The hierarchy terms can be applied to the [Example Data Model](#ExampleDataModel
 ::: example
 ⚠ Example 53: leveled hierarchies for products and time, and a recursive hierarchy for the sales organizations:
 ```xml
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx"
            Version="4.0">
   <edmx:Reference Uri="https://docs.oasis-open.org/odata/odata-data-

diff --git a/docs/odata-temporal-ext/odata-temporal-ext.html b/docs/odata-temporal-ext/odata-temporal-ext.html
diff --git a/docs/odata-temporal-ext/odata-temporal-ext.md b/docs/odata-temporal-ext/odata-temporal-ext.md
diff --git a/lib/number.js b/lib/number.js
@@ -145,7 +145,12 @@ class Number {
               lineno++;
               if (this.skip(line)) return;
               try {
-                var m1 = line.match(/^\$\$\$(.*?isec)\$\$\$$/);
+                var m1 = line.match(/^\$\$\$include\s+(.*?)\$\$\$\s*$/);
+                if (m1) {
+                  out.write(fs.readFileSync(this.dir + "/" + m1[1]));
+                  return;
+                }
+                m1 = line.match(/^\$\$\$(.*?isec)\$\$\$$/);
                 if (m1)
                   this.tableofcontents(this.toc[m1[1]]?.sub || [], out, "");
                 else {

diff --git a/odata-csdl/15 Identifier and Path Values.md b/odata-csdl/15 Identifier and Path Values.md
@@ -310,6 +310,7 @@ Example ##ex:
 ::: {.varxml .example}
 Example ##ex:
 ```xml
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx"
            xmlns="http://docs.oasis-open.org/odata/ns/edm" Version="4.0">
   <edmx:Reference Uri="https://oasis-tcs.github.io/odata-vocabularies/vocabularies/Org.OData.Core.V1.xml">
@@ -487,6 +488,7 @@ Example ##ex:
 ::: {.varxml .example}
 Example ##ex:
 ```xml
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx"
            Version="4.01">
   <edmx:Reference Uri="http://host/service/$metadata">

diff --git a/odata-csdl/4 CSDL Document.md b/odata-csdl/4 CSDL Document.md
@@ -69,6 +69,7 @@ OData service.
 ::: {.varxml .example}
 Example ##ex:
 ```xml
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx"
            Version="4.01">
   <edmx:DataServices>

diff --git a/odata-data-aggregation-ext/5 Vocabulary for Data Aggregation.md b/odata-data-aggregation-ext/5 Vocabulary for Data Aggregation.md
@@ -218,6 +218,7 @@ The hierarchy terms can be applied to the [Example Data Model](#ExampleDataModel
 ::: example
 ⚠ Example ##ex: leveled hierarchies for products and time, and a recursive hierarchy for the sales organizations:
 ```xml
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx"
            Version="4.0">
   <edmx:Reference Uri="https://docs.oasis-open.org/odata/odata-data-