From 11ca09baa5979991650a11878ce807a21ba978ea Mon Sep 17 00:00:00 2001
From: Irene Schena <irene.schena@unibo.it>
Date: Mon, 20 May 2002 15:11:49 +0000
Subject: [PATCH] Modified Files: 1) query.xml xmathql.dtd: PATTERN changed

---
 helm/mathql/query.xml   |  3 +--
 helm/mathql/xmathql.dtd | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/helm/mathql/query.xml b/helm/mathql/query.xml
index 8e8f3792a..1910c00c0 100644
--- 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 f875f1022..e32b0299f 100644
--- 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 -->
 
-- 
2.39.2