X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmathql%2Fxmathql.dtd;h=e32b0299fb7dbe57b8a7289fb0de99288cc6273e;hb=11ca09baa5979991650a11878ce807a21ba978ea;hp=f875f1022bc820351c64b8a72e7f83c606f833f9;hpb=58848ea9446dd2d55da06bbd5fc8b0eea68735df;p=helm.git

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 -->