From c207fad0087947cd4bc303bffb0a185c90f50193 Mon Sep 17 00:00:00 2001
From: Mike Gerwitz <mike.gerwitz@rtspecialty.com>
Date: Mon, 4 Dec 2017 13:38:48 -0500
Subject: [PATCH] Allow ##other nodes in apply nodes

The primary motivation for this is to allow for template conditionals.

* src/current/calc.xsd (applyArgs): New group.
  (apply,recurse): Use it in sequence.
---
 src/current/calc.xsd | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/current/calc.xsd b/src/current/calc.xsd
index c5b95723..ac1b49f1 100644
--- a/src/current/calc.xsd
+++ b/src/current/calc.xsd
@@ -461,7 +461,7 @@
           <xs:complexContent>
             <xs:extension base="operatorBaseType">
               <xs:sequence>
-                <xs:element name="arg" type="applyArgumentType" minOccurs="0" maxOccurs="unbounded" />
+                <xs:group ref="applyArgs" minOccurs="0" maxOccurs="unbounded" />
               </xs:sequence>
 
               <xs:attribute name="name" type="nameType" use="required">
@@ -479,6 +479,12 @@
         </xs:complexType>
       </xs:element>
 
+      <xs:group name="applyArgs">
+        <xs:choice>
+          <xs:element name="arg" type="applyArgumentType" minOccurs="0" maxOccurs="unbounded" />
+          <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
+        </xs:choice>
+      </xs:group>
 
       <xs:complexType name="applyArgumentType">
         <xs:annotation>
@@ -514,7 +520,7 @@
           <xs:complexContent>
             <xs:extension base="operatorBaseType">
               <xs:sequence>
-                <xs:element name="arg" type="applyArgumentType" minOccurs="0" maxOccurs="unbounded" />
+                <xs:group ref="applyArgs" minOccurs="0" maxOccurs="unbounded" />
               </xs:sequence>
 
               <!-- argument shorthand -->