From 558a1435283ac927877b627b80efcb1b4ddcbbe8 Mon Sep 17 00:00:00 2001
From: Nick Nicholas <opoudjis@gmail.com>
Date: Mon, 11 Nov 2024 20:46:31 +1100
Subject: [PATCH] remove XSLT from Presentation XML grammar:
 https://github.com/metanorma/isodoc/issues/609

---
 grammars/isodoc-presentation.rnc | 10 +---------
 grammars/isodoc.rng              | 10 +++++-----
 grammars/relaton-model-bsi       |  2 +-
 grammars/relaton-model-gb        |  2 +-
 grammars/relaton-model-iso       |  2 +-
 grammars/relaton-models          |  2 +-
 6 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/grammars/isodoc-presentation.rnc b/grammars/isodoc-presentation.rnc
index e241b9e..723d5a3 100644
--- a/grammars/isodoc-presentation.rnc
+++ b/grammars/isodoc-presentation.rnc
@@ -14,7 +14,7 @@ tab = element tab { empty }
 ## * Extract any attachments into an _{output filename}_attachments folder, to be linked to in HTML.
 misccontainer = element metanorma-extension { 
   AnyElement+, 
-  (ext_toc+ & preprocess-xslt* & localized-strings & metanorma-source-container & source-highlighter-css)
+  (ext_toc+ & localized-strings & metanorma-source-container & source-highlighter-css)
 }
 
 ## CSS of the Rouge code highlighter for the document: consists of flavour default,
@@ -29,14 +29,6 @@ ext_toc = element toc {
   element title { PureTextElement+ }
 }
 
-## Preprocessing XSLT to apply for a specific output format
-preprocess-xslt = element preprocess-xslt {
-  ## The format on which to run this Preprocessing XSLT
-  attribute format { "html" | "pdf" | "doc" },
-  ## The XSLT to run on the Presentation XML, before passing it for processing on to the target format
-  AnyElement+
-}
-
 ## i18n equivalents, to be applied in PDF when needing to generate i18n output on the fly
 localized-strings = element localized-strings {
   localized-string+
diff --git a/grammars/isodoc.rng b/grammars/isodoc.rng
index e0aea0c..66bd631 100644
--- a/grammars/isodoc.rng
+++ b/grammars/isodoc.rng
@@ -325,7 +325,7 @@ normative or informative references, some split references into sections organiz
       <a:documentation>Content of note</a:documentation>
       <oneOrMore>
         <choice>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="ul"/>
           <ref name="ol"/>
           <ref name="dl"/>
@@ -411,7 +411,7 @@ normative or informative references, some split references into sections organiz
       <element name="note">
         <ref name="OptionalId"/>
         <oneOrMore>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
         </oneOrMore>
       </element>
     </define>
@@ -1976,7 +1976,7 @@ used in document amendments</a:documentation>
       <oneOrMore>
         <choice>
           <a:documentation>Content of the verbal representation of the term</a:documentation>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="dl"/>
           <ref name="ol"/>
           <ref name="ul"/>
@@ -2014,7 +2014,7 @@ used in document amendments</a:documentation>
       <oneOrMore>
         <choice>
           <a:documentation>Content of the term note</a:documentation>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="ul"/>
           <ref name="ol"/>
           <ref name="dl"/>
@@ -2036,7 +2036,7 @@ used in document amendments</a:documentation>
           <ref name="dl"/>
           <ref name="quote"/>
           <ref name="sourcecode"/>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="figure"/>
         </choice>
       </oneOrMore>
diff --git a/grammars/relaton-model-bsi b/grammars/relaton-model-bsi
index 284b191..05655e7 160000
--- a/grammars/relaton-model-bsi
+++ b/grammars/relaton-model-bsi
@@ -1 +1 @@
-Subproject commit 284b191a26306f198cc4b32b56b017208fbfbd6d
+Subproject commit 05655e78d5533df8f19a59b1c8e5c99983f6c948
diff --git a/grammars/relaton-model-gb b/grammars/relaton-model-gb
index 1bb2b2c..ea6ab06 160000
--- a/grammars/relaton-model-gb
+++ b/grammars/relaton-model-gb
@@ -1 +1 @@
-Subproject commit 1bb2b2c33e409c9963b644103a27265ca22e8dc1
+Subproject commit ea6ab06b4e650c0ada84a79d7afa08237a678621
diff --git a/grammars/relaton-model-iso b/grammars/relaton-model-iso
index a262f09..62d2a92 160000
--- a/grammars/relaton-model-iso
+++ b/grammars/relaton-model-iso
@@ -1 +1 @@
-Subproject commit a262f091bbc5fb75d764340cff4077990eed00dd
+Subproject commit 62d2a9284e0ca6c559f27cc85714e0eedf5ee37c
diff --git a/grammars/relaton-models b/grammars/relaton-models
index 83449f8..0951d42 160000
--- a/grammars/relaton-models
+++ b/grammars/relaton-models
@@ -1 +1 @@
-Subproject commit 83449f8113f6c2fe681bb17b53fed9e76f44d73a
+Subproject commit 0951d4243815cdd9123c2a7ec47e56ef353a1bb8