Modified Files:

1) query.xml xmathql.dtd: PATTERN changed

diff --git a/helm/mathql/query.xml b/helm/mathql/query.xml
index 8e8f3792a0a13d2b5384e27462d0d89d86905bc2..1910c00c05c28192d98df1cfc18fcf6f880e4fad 100644 (file)
--- a/helm/mathql/query.xml
+++ b/helm/mathql/query.xml
@@ -20,9 +20,8 @@
       <SLASH/>
       <CONST>Equality</CONST>
       <SLASH/>
-      <CONST>eq</CONST>
+      <CONST>eq.ind</CONST>
      </TokenList>
-     <Extension>ind</Extension>
     </Pattern>
     <Position binder="$1"/>
    </Use>

diff --git a/helm/mathql/xmathql.dtd b/helm/mathql/xmathql.dtd
index f875f1022bc820351c64b8a72e7f83c606f833f9..e32b0299fb7dbe57b8a7289fb0de99288cc6273e 100644 (file)
--- a/helm/mathql/xmathql.dtd
+++ b/helm/mathql/xmathql.dtd
@@ -99,7 +99,7 @@
 
 <!ELEMENT ConstructorsOf %queryexpr;>
 
-<!ELEMENT Pattern (Prefix, (TokenList, (Extension, FragmentID?)?)?)>
+<!ELEMENT Pattern (Prefix, TokenList, (FragmentID?))>
 
 <!ELEMENT InTheory (%queryexpr;, ItemType)>
 
@@ -141,13 +141,21 @@
 
 <!ELEMENT QUESTIONMARK EMPTY>
 
+<!ELEMENT NUMBER EMPTY>
+<!ATTLIST NUMBER
+          value NMTOKEN #REQUIRED>
+
+<!-- STAR expands only to objects of the specified dir before the last "/": 
+     ex. cic:/Algebra/* expands to every object in Algebra only            -->
+<!-- TWOSTARS expands till the most complete name (with extension if not 
+     specifified)                                                          -->
+<!-- QUESTIONMARK matches one character except "/"                         --> 
 <!ELEMENT TokenList (CONST|STAR|TWOSTARS|SLASH|QUESTIONMARK)+>
 
 <!ELEMENT Prefix (#PCDATA)>
 
-<!ELEMENT Extension (#PCDATA)>
-
-<!ELEMENT FragmentID (#PCDATA)>
+<!-- XPointers have max depth = 2 (see CIC inductive definitions) -->
+<!ELEMENT FragmentID ((NUMBER|STAR), (NUMBER|STAR)?)>
 
 <!-- MathQL boolean expressions -->