[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue common/doc/RPC-grpc-file.dtd common/script...
|
From: |
Jason Cater |
|
Subject: |
gnue common/doc/RPC-grpc-file.dtd common/script... |
|
Date: |
Mon, 15 Jul 2002 16:00:18 -0400 |
CVSROOT: /cvsroot/gnue
Module name: gnue
Changes by: Jason Cater <address@hidden> 02/07/15 16:00:18
Modified files:
common/doc : RPC-grpc-file.dtd
common/scripts : gnuedtd
designer/src/schema/parser: gnue-schema.dtd
forms/doc : gnue-forms.dtd
navigator/doc : gnue-navigator.dtd
reports/doc : gnue-reports.dtd
Log message:
more changes to DTD to play nicer with emacs
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/doc/RPC-grpc-file.dtd.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/scripts/gnuedtd.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/schema/parser/gnue-schema.dtd.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/doc/gnue-forms.dtd.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/navigator/doc/gnue-navigator.dtd.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/doc/gnue-reports.dtd.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
Patches:
Index: gnue/common/doc/RPC-grpc-file.dtd
diff -c gnue/common/doc/RPC-grpc-file.dtd:1.3
gnue/common/doc/RPC-grpc-file.dtd:1.4
*** gnue/common/doc/RPC-grpc-file.dtd:1.3 Mon Jul 15 15:35:45 2002
--- gnue/common/doc/RPC-grpc-file.dtd Mon Jul 15 16:00:18 2002
***************
*** 26,34 ****
<!ENTITY % gt ">">
<!ENTITY % amp "&#38;">
! <!-- +---------------------------------------------------+ -->
! <!-- | Datatype entities to make DTD more human readable | -->
! <!-- +---------------------------------------------------+ -->
<!ENTITY % text "CDATA">
--- 26,34 ----
<!ENTITY % gt ">">
<!ENTITY % amp "&#38;">
! <!-- ================================================= -->
! <!-- Datatype entities to make DTD more human readable -->
! <!-- ================================================= -->
<!ENTITY % text "CDATA">
***************
*** 41,55 ****
! <!-- +-------------------+ -->
! <!-- | Top level element | -->
! <!-- +-------------------+ -->
<!ELEMENT gnurpc (exception*, method+, object*, raises*, service+)>
! <!-- +--------------------------+ -->
! <!-- | Child elements of gnurpc | -->
! <!-- +--------------------------+ -->
<!ELEMENT exception EMPTY>
<!ATTLIST exception name %name; #REQUIRED>
<!ATTLIST exception helptext %name; #IMPLIED>
--- 41,55 ----
! <!-- ================= -->
! <!-- Top level element -->
! <!-- ================= -->
<!ELEMENT gnurpc (exception*, method+, object*, raises*, service+)>
! <!-- ======================== -->
! <!-- Child elements of gnurpc -->
! <!-- ======================== -->
<!ELEMENT exception EMPTY>
<!ATTLIST exception name %name; #REQUIRED>
<!ATTLIST exception helptext %name; #IMPLIED>
***************
*** 72,80 ****
<!ATTLIST service helptext %name; #IMPLIED>
! <!-- +--------------------------+ -->
! <!-- | Child elements of method | -->
! <!-- +--------------------------+ -->
<!ELEMENT argument EMPTY>
<!ATTLIST argument name %name; #REQUIRED>
<!ATTLIST argument type %name; #REQUIRED>
--- 72,80 ----
<!ATTLIST service helptext %name; #IMPLIED>
! <!-- ======================== -->
! <!-- Child elements of method -->
! <!-- ======================== -->
<!ELEMENT argument EMPTY>
<!ATTLIST argument name %name; #REQUIRED>
<!ATTLIST argument type %name; #REQUIRED>
***************
*** 82,90 ****
<!ATTLIST argument helptext %name; #IMPLIED>
! <!-- +--------------------------+ -->
! <!-- | Child elements of object | -->
! <!-- +--------------------------+ -->
<!ELEMENT attribute EMPTY>
<!ATTLIST attribute name %name; #REQUIRED>
<!ATTLIST attribute type %name; #REQUIRED>
--- 82,90 ----
<!ATTLIST argument helptext %name; #IMPLIED>
! <!-- ======================== -->
! <!-- Child elements of object -->
! <!-- ======================== -->
<!ELEMENT attribute EMPTY>
<!ATTLIST attribute name %name; #REQUIRED>
<!ATTLIST attribute type %name; #REQUIRED>
***************
*** 94,98 ****
<!-- This DTD was created by gnuedtd
! Updated: 2002-07-15 14:33:34 -->
--- 94,98 ----
<!-- This DTD was created by gnuedtd
! Updated: 2002-07-15 14:57:22 -->
Index: gnue/common/scripts/gnuedtd
diff -c gnue/common/scripts/gnuedtd:1.6 gnue/common/scripts/gnuedtd:1.7
*** gnue/common/scripts/gnuedtd:1.6 Mon Jul 15 15:35:46 2002
--- gnue/common/scripts/gnuedtd Mon Jul 15 16:00:18 2002
***************
*** 131,139 ****
<!ENTITY % gt ">">
<!ENTITY % amp "&#38;">
! <!-- +---------------------------------------------------+ -->
! <!-- | Datatype entities to make DTD more human readable | -->
! <!-- +---------------------------------------------------+ -->
""")
if self.typecasts.has_key (GTypecast.text):
--- 131,139 ----
<!ENTITY % gt ">">
<!ENTITY % amp "&#38;">
! <!-- ================================================= -->
! <!-- Datatype entities to make DTD more human readable -->
! <!-- ================================================= -->
""")
if self.typecasts.has_key (GTypecast.text):
***************
*** 192,200 ****
if len (self.elementStack[0]) > 1:
elements = self.elementStack[0][1:]
elements.sort()
! dest.write('\n<!-- +-' + '-' * (len(self.elementStack[0][0])) + '-+
-->\n')
! dest.write('<!-- | %s | -->\n' % self.elementStack[0][0])
! dest.write('<!-- +-' + '-' * (len(self.elementStack[0][0])) + '-+
-->\n')
for element in elements:
self.handleElement(element)
self.elementStack.pop(0)
--- 192,200 ----
if len (self.elementStack[0]) > 1:
elements = self.elementStack[0][1:]
elements.sort()
! dest.write('\n<!-- ' + '=' * (len(self.elementStack[0][0])) + '
-->\n')
! dest.write('<!-- %s -->\n' % self.elementStack[0][0])
! dest.write('<!-- ' + '=' * (len(self.elementStack[0][0])) + ' -->\n')
for element in elements:
self.handleElement(element)
self.elementStack.pop(0)
***************
*** 415,421 ****
elif dflt != None:
indent = len(attdef)
attdef = attdef + ' %s #DEFAULT "%s">' \
! % (self.typecasts[datatype], dflt)
self.dest.write(self.wrap(indent, attdef, 0))
else:
--- 415,421 ----
elif dflt != None:
indent = len(attdef)
attdef = attdef + ' %s #DEFAULT "%s">' \
! % (self.typecasts[datatype], dflt)
self.dest.write(self.wrap(indent, attdef, 0))
else:
Index: gnue/designer/src/schema/parser/gnue-schema.dtd
diff -c gnue/designer/src/schema/parser/gnue-schema.dtd:1.2
gnue/designer/src/schema/parser/gnue-schema.dtd:1.3
*** gnue/designer/src/schema/parser/gnue-schema.dtd:1.2 Mon Jul 15 15:35:46 2002
--- gnue/designer/src/schema/parser/gnue-schema.dtd Mon Jul 15 16:00:18 2002
***************
*** 26,34 ****
<!ENTITY % gt ">">
<!ENTITY % amp "&#38;">
! <!-- +---------------------------------------------------+ -->
! <!-- | Datatype entities to make DTD more human readable | -->
! <!-- +---------------------------------------------------+ -->
<!ENTITY % text "CDATA">
--- 26,34 ----
<!ENTITY % gt ">">
<!ENTITY % amp "&#38;">
! <!-- ================================================= -->
! <!-- Datatype entities to make DTD more human readable -->
! <!-- ================================================= -->
<!ENTITY % text "CDATA">
***************
*** 44,52 ****
! <!-- +-------------------+ -->
! <!-- | Top level element | -->
! <!-- +-------------------+ -->
<!ELEMENT schema (data?, tables?)>
<!ATTLIST schema author %text; #IMPLIED>
<!ATTLIST schema description %text; #IMPLIED>
--- 44,52 ----
! <!-- ================= -->
! <!-- Top level element -->
! <!-- ================= -->
<!ELEMENT schema (data?, tables?)>
<!ATTLIST schema author %text; #IMPLIED>
<!ATTLIST schema description %text; #IMPLIED>
***************
*** 54,92 ****
<!ATTLIST schema version %text; #IMPLIED>
! <!-- +--------------------------+ -->
! <!-- | Child elements of schema | -->
! <!-- +--------------------------+ -->
<!ELEMENT data (tabledata*)>
<!ELEMENT tables (table*)>
! <!-- +------------------------+ -->
! <!-- | Child elements of data | -->
! <!-- +------------------------+ -->
<!ELEMENT tabledata (rows?)>
<!ATTLIST tabledata name %name; #REQUIRED>
<!ATTLIST tabledata tablename %name; #REQUIRED>
! <!-- +--------------------------+ -->
! <!-- | Child elements of tables | -->
! <!-- +--------------------------+ -->
<!ELEMENT table (constraints?, fields?, pkfield*, primarykey?)>
<!ATTLIST table name ID #REQUIRED>
<!ATTLIST table description %text; #IMPLIED>
! <!-- +-----------------------------+ -->
! <!-- | Child elements of tabledata | -->
! <!-- +-----------------------------+ -->
<!ELEMENT rows (row*)>
! <!-- +-------------------------+ -->
! <!-- | Child elements of table | -->
! <!-- +-------------------------+ -->
<!ELEMENT constraints (constraint*)>
<!ELEMENT fields (field*)>
--- 54,92 ----
<!ATTLIST schema version %text; #IMPLIED>
! <!-- ======================== -->
! <!-- Child elements of schema -->
! <!-- ======================== -->
<!ELEMENT data (tabledata*)>
<!ELEMENT tables (table*)>
! <!-- ====================== -->
! <!-- Child elements of data -->
! <!-- ====================== -->
<!ELEMENT tabledata (rows?)>
<!ATTLIST tabledata name %name; #REQUIRED>
<!ATTLIST tabledata tablename %name; #REQUIRED>
! <!-- ======================== -->
! <!-- Child elements of tables -->
! <!-- ======================== -->
<!ELEMENT table (constraints?, fields?, pkfield*, primarykey?)>
<!ATTLIST table name ID #REQUIRED>
<!ATTLIST table description %text; #IMPLIED>
! <!-- =========================== -->
! <!-- Child elements of tabledata -->
! <!-- =========================== -->
<!ELEMENT rows (row*)>
! <!-- ======================= -->
! <!-- Child elements of table -->
! <!-- ======================= -->
<!ELEMENT constraints (constraint*)>
<!ELEMENT fields (field*)>
***************
*** 98,120 ****
<!ATTLIST primarykey name %name; #REQUIRED>
! <!-- +------------------------+ -->
! <!-- | Child elements of rows | -->
! <!-- +------------------------+ -->
<!ELEMENT row (value*)>
! <!-- +-------------------------------+ -->
! <!-- | Child elements of constraints | -->
! <!-- +-------------------------------+ -->
<!ELEMENT constraint (constraintfield*)>
<!ATTLIST constraint name %name; #REQUIRED>
<!ATTLIST constraint type %name; #IMPLIED>
! <!-- +--------------------------+ -->
! <!-- | Child elements of fields | -->
! <!-- +--------------------------+ -->
<!ELEMENT field EMPTY>
<!ATTLIST field name ID #REQUIRED>
<!ATTLIST field type %name; #REQUIRED>
--- 98,120 ----
<!ATTLIST primarykey name %name; #REQUIRED>
! <!-- ====================== -->
! <!-- Child elements of rows -->
! <!-- ====================== -->
<!ELEMENT row (value*)>
! <!-- ============================= -->
! <!-- Child elements of constraints -->
! <!-- ============================= -->
<!ELEMENT constraint (constraintfield*)>
<!ATTLIST constraint name %name; #REQUIRED>
<!ATTLIST constraint type %name; #IMPLIED>
! <!-- ======================== -->
! <!-- Child elements of fields -->
! <!-- ======================== -->
<!ELEMENT field EMPTY>
<!ATTLIST field name ID #REQUIRED>
<!ATTLIST field type %name; #REQUIRED>
***************
*** 124,144 ****
<!ATTLIST field size %whole; #IMPLIED>
! <!-- +-----------------------+ -->
! <!-- | Child elements of row | -->
! <!-- +-----------------------+ -->
<!ELEMENT value EMPTY>
<!ATTLIST value field %name; #IMPLIED>
<!ATTLIST value type %name; #IMPLIED>
! <!-- +------------------------------+ -->
! <!-- | Child elements of constraint | -->
! <!-- +------------------------------+ -->
<!ELEMENT constraintfield EMPTY>
<!ATTLIST constraintfield name %name; #REQUIRED>
<!-- This DTD was created by gnuedtd
! Updated: 2002-07-15 14:34:13 -->
--- 124,144 ----
<!ATTLIST field size %whole; #IMPLIED>
! <!-- ===================== -->
! <!-- Child elements of row -->
! <!-- ===================== -->
<!ELEMENT value EMPTY>
<!ATTLIST value field %name; #IMPLIED>
<!ATTLIST value type %name; #IMPLIED>
! <!-- ============================ -->
! <!-- Child elements of constraint -->
! <!-- ============================ -->
<!ELEMENT constraintfield EMPTY>
<!ATTLIST constraintfield name %name; #REQUIRED>
<!-- This DTD was created by gnuedtd
! Updated: 2002-07-15 14:51:40 -->
Index: gnue/forms/doc/gnue-forms.dtd
diff -c gnue/forms/doc/gnue-forms.dtd:1.4 gnue/forms/doc/gnue-forms.dtd:1.5
*** gnue/forms/doc/gnue-forms.dtd:1.4 Mon Jul 15 15:35:46 2002
--- gnue/forms/doc/gnue-forms.dtd Mon Jul 15 16:00:18 2002
***************
*** 26,34 ****
<!ENTITY % gt ">">
<!ENTITY % amp "&#38;">
! <!-- +---------------------------------------------------+ -->
! <!-- | Datatype entities to make DTD more human readable | -->
! <!-- +---------------------------------------------------+ -->
<!ENTITY % text "CDATA">
--- 26,34 ----
<!ENTITY % gt ">">
<!ENTITY % amp "&#38;">
! <!-- ================================================= -->
! <!-- Datatype entities to make DTD more human readable -->
! <!-- ================================================= -->
<!ENTITY % text "CDATA">
***************
*** 44,52 ****
! <!-- +-------------------+ -->
! <!-- | Top level element | -->
! <!-- +-------------------+ -->
<!ELEMENT form (database*, datasource*, import*, import-datasource*,
import-page*, import-trigger*, menu*, options?, page+,
trigger*)>
--- 44,52 ----
! <!-- ================= -->
! <!-- Top level element -->
! <!-- ================= -->
<!ELEMENT form (database*, datasource*, import*, import-datasource*,
import-page*, import-trigger*, menu*, options?, page+,
trigger*)>
***************
*** 57,65 ****
<!ATTLIST form width %whole; #DEFAULT "40">
! <!-- +------------------------+ -->
! <!-- | Child elements of form | -->
! <!-- +------------------------+ -->
<!-- DEPRECATED: Use of the <database> element has been deprecated [Use the
external connections file format.] -->
<!ELEMENT database EMPTY>
--- 57,65 ----
<!ATTLIST form width %whole; #DEFAULT "40">
! <!-- ====================== -->
! <!-- Child elements of form -->
! <!-- ====================== -->
<!-- DEPRECATED: Use of the <database> element has been deprecated [Use the
external connections file format.] -->
<!ELEMENT database EMPTY>
***************
*** 144,158 ****
<!ATTLIST trigger type CDATA #IMPLIED>
! <!-- +------------------------------+ -->
! <!-- | Child elements of datasource | -->
! <!-- +------------------------------+ -->
<!ELEMENT conditions (condition*)>
! <!-- +---------------------------+ -->
! <!-- | Child elements of options | -->
! <!-- +---------------------------+ -->
<!ELEMENT author EMPTY>
<!ATTLIST author name %name; #FIXED "author">
<!ATTLIST author value %text; #IMPLIED>
--- 144,158 ----
<!ATTLIST trigger type CDATA #IMPLIED>
! <!-- ============================ -->
! <!-- Child elements of datasource -->
! <!-- ============================ -->
<!ELEMENT conditions (condition*)>
! <!-- ========================= -->
! <!-- Child elements of options -->
! <!-- ========================= -->
<!ELEMENT author EMPTY>
<!ATTLIST author name %name; #FIXED "author">
<!ATTLIST author value %text; #IMPLIED>
***************
*** 190,198 ****
<!ATTLIST width value %text; #IMPLIED>
! <!-- +------------------------+ -->
! <!-- | Child elements of page | -->
! <!-- +------------------------+ -->
<!ELEMENT block (box*, button*, entry*, import-button*, import-entry*,
label*,
scrollbar*)>
<!ATTLIST block name ID #REQUIRED>
--- 190,198 ----
<!ATTLIST width value %text; #IMPLIED>
! <!-- ====================== -->
! <!-- Child elements of page -->
! <!-- ====================== -->
<!ELEMENT block (box*, button*, entry*, import-button*, import-entry*,
label*,
scrollbar*)>
<!ATTLIST block name ID #REQUIRED>
***************
*** 257,272 ****
<!ATTLIST scrollbar y %whole; #REQUIRED>
! <!-- +------------------------------+ -->
! <!-- | Child elements of conditions | -->
! <!-- +------------------------------+ -->
<!ELEMENT condition (and*, between*, eq*, ge*, gt*, le*, like*, lt*, ne*,
negate*, not*, notbetween*, notlike*, or*)>
! <!-- +-------------------------+ -->
! <!-- | Child elements of block | -->
! <!-- +-------------------------+ -->
<!ELEMENT entry EMPTY>
<!ATTLIST entry name ID #REQUIRED>
<!ATTLIST entry x %whole; #REQUIRED>
--- 257,272 ----
<!ATTLIST scrollbar y %whole; #REQUIRED>
! <!-- ============================ -->
! <!-- Child elements of conditions -->
! <!-- ============================ -->
<!ELEMENT condition (and*, between*, eq*, ge*, gt*, le*, like*, lt*, ne*,
negate*, not*, notbetween*, notlike*, or*)>
! <!-- ======================= -->
! <!-- Child elements of block -->
! <!-- ======================= -->
<!ELEMENT entry EMPTY>
<!ATTLIST entry name ID #REQUIRED>
<!ATTLIST entry x %whole; #REQUIRED>
***************
*** 381,389 ****
<!ATTLIST import-entry width %whole; #IMPLIED>
! <!-- +-----------------------------+ -->
! <!-- | Child elements of condition | -->
! <!-- +-----------------------------+ -->
<!ELEMENT and (and*, between*, condition*, eq*, ge*, gt*, le*, like*, lt*,
ne*, negate*, not*, notbetween*, notlike*, or*)>
--- 381,389 ----
<!ATTLIST import-entry width %whole; #IMPLIED>
! <!-- =========================== -->
! <!-- Child elements of condition -->
! <!-- =========================== -->
<!ELEMENT and (and*, between*, condition*, eq*, ge*, gt*, le*, like*, lt*,
ne*, negate*, not*, notbetween*, notlike*, or*)>
***************
*** 417,425 ****
negate*, not*, notbetween*, notlike*, or*)>
! <!-- +---------------------------+ -->
! <!-- | Child elements of between | -->
! <!-- +---------------------------+ -->
<!ELEMENT add (add*, cconst*, cfield*, cparam*, div*, mul*, sub*)>
<!ELEMENT cconst EMPTY>
--- 417,425 ----
negate*, not*, notbetween*, notlike*, or*)>
! <!-- ========================= -->
! <!-- Child elements of between -->
! <!-- ========================= -->
<!ELEMENT add (add*, cconst*, cfield*, cparam*, div*, mul*, sub*)>
<!ELEMENT cconst EMPTY>
***************
*** 439,443 ****
<!-- This DTD was created by gnuedtd
! Updated: 2002-07-15 14:33:27 -->
--- 439,443 ----
<!-- This DTD was created by gnuedtd
! Updated: 2002-07-15 14:56:26 -->
Index: gnue/navigator/doc/gnue-navigator.dtd
diff -c gnue/navigator/doc/gnue-navigator.dtd:1.2
gnue/navigator/doc/gnue-navigator.dtd:1.3
*** gnue/navigator/doc/gnue-navigator.dtd:1.2 Mon Jul 15 15:35:46 2002
--- gnue/navigator/doc/gnue-navigator.dtd Mon Jul 15 16:00:18 2002
***************
*** 26,34 ****
<!ENTITY % gt ">">
<!ENTITY % amp "&#38;">
! <!-- +---------------------------------------------------+ -->
! <!-- | Datatype entities to make DTD more human readable | -->
! <!-- +---------------------------------------------------+ -->
<!ENTITY % text "CDATA">
--- 26,34 ----
<!ENTITY % gt ">">
<!ENTITY % amp "&#38;">
! <!-- ================================================= -->
! <!-- Datatype entities to make DTD more human readable -->
! <!-- ================================================= -->
<!ENTITY % text "CDATA">
***************
*** 37,52 ****
! <!-- +-------------------+ -->
! <!-- | Top level element | -->
! <!-- +-------------------+ -->
<!ELEMENT processes (import-process*, process*)>
<!ATTLIST processes title %text; #DEFAULT "Untitled Menu">
! <!-- +-----------------------------+ -->
! <!-- | Child elements of processes | -->
! <!-- +-----------------------------+ -->
<!ELEMENT import-process EMPTY>
<!ATTLIST import-process library %name; #REQUIRED>
<!ATTLIST import-process id ID #IMPLIED>
--- 37,52 ----
! <!-- ================= -->
! <!-- Top level element -->
! <!-- ================= -->
<!ELEMENT processes (import-process*, process*)>
<!ATTLIST processes title %text; #DEFAULT "Untitled Menu">
! <!-- =========================== -->
! <!-- Child elements of processes -->
! <!-- =========================== -->
<!ELEMENT import-process EMPTY>
<!ATTLIST import-process library %name; #REQUIRED>
<!ATTLIST import-process id ID #IMPLIED>
***************
*** 57,65 ****
<!ATTLIST process title %text; #IMPLIED>
! <!-- +---------------------------+ -->
! <!-- | Child elements of process | -->
! <!-- +---------------------------+ -->
<!ELEMENT step EMPTY>
<!ATTLIST step type (app | form | report) #IMPLIED>
<!ATTLIST step id ID #IMPLIED>
--- 57,65 ----
<!ATTLIST process title %text; #IMPLIED>
! <!-- ========================= -->
! <!-- Child elements of process -->
! <!-- ========================= -->
<!ELEMENT step EMPTY>
<!ATTLIST step type (app | form | report) #IMPLIED>
<!ATTLIST step id ID #IMPLIED>
***************
*** 68,72 ****
<!-- This DTD was created by gnuedtd
! Updated: 2002-07-15 14:33:49 -->
--- 68,72 ----
<!-- This DTD was created by gnuedtd
! Updated: 2002-07-15 14:56:27 -->
Index: gnue/reports/doc/gnue-reports.dtd
diff -c gnue/reports/doc/gnue-reports.dtd:1.2
gnue/reports/doc/gnue-reports.dtd:1.3
*** gnue/reports/doc/gnue-reports.dtd:1.2 Mon Jul 15 15:35:46 2002
--- gnue/reports/doc/gnue-reports.dtd Mon Jul 15 16:00:18 2002
***************
*** 26,34 ****
<!ENTITY % gt ">">
<!ENTITY % amp "&#38;">
! <!-- +---------------------------------------------------+ -->
! <!-- | Datatype entities to make DTD more human readable | -->
! <!-- +---------------------------------------------------+ -->
<!ENTITY % text "CDATA">
--- 26,34 ----
<!ENTITY % gt ">">
<!ENTITY % amp "&#38;">
! <!-- ================================================= -->
! <!-- Datatype entities to make DTD more human readable -->
! <!-- ================================================= -->
<!ENTITY % text "CDATA">
***************
*** 44,52 ****
! <!-- +-------------------+ -->
! <!-- | Top level element | -->
! <!-- +-------------------+ -->
<!ELEMENT report (layout, parameters?, sortoptions?, sources?)>
<!ATTLIST report author %text; #IMPLIED>
<!ATTLIST report description %text; #IMPLIED>
--- 44,52 ----
! <!-- ================= -->
! <!-- Top level element -->
! <!-- ================= -->
<!ELEMENT report (layout, parameters?, sortoptions?, sources?)>
<!ATTLIST report author %text; #IMPLIED>
<!ATTLIST report description %text; #IMPLIED>
***************
*** 54,62 ****
<!ATTLIST report version %name; #IMPLIED>
! <!-- +--------------------------+ -->
! <!-- | Child elements of report | -->
! <!-- +--------------------------+ -->
<!ELEMENT layout (param*, section+, summ*, #PCDATA)>
<!ATTLIST layout format %text; #IMPLIED>
<!ATTLIST layout suppressGNUeTags %boolean;>
--- 54,62 ----
<!ATTLIST report version %name; #IMPLIED>
! <!-- ======================== -->
! <!-- Child elements of report -->
! <!-- ======================== -->
<!ELEMENT layout (param*, section+, summ*, #PCDATA)>
<!ATTLIST layout format %text; #IMPLIED>
<!ATTLIST layout suppressGNUeTags %boolean;>
***************
*** 68,76 ****
<!ELEMENT sources (datasource*)>
! <!-- +--------------------------+ -->
! <!-- | Child elements of layout | -->
! <!-- +--------------------------+ -->
<!ELEMENT param EMPTY>
<!ATTLIST param name %name; #REQUIRED>
<!ATTLIST param format %name; #IMPLIED>
--- 68,76 ----
<!ELEMENT sources (datasource*)>
! <!-- ======================== -->
! <!-- Child elements of layout -->
! <!-- ======================== -->
<!ELEMENT param EMPTY>
<!ATTLIST param name %name; #REQUIRED>
<!ATTLIST param format %name; #IMPLIED>
***************
*** 88,96 ****
<!ATTLIST summ section %name; #IMPLIED>
! <!-- +------------------------------+ -->
! <!-- | Child elements of parameters | -->
! <!-- +------------------------------+ -->
<!ELEMENT parameter EMPTY>
<!ATTLIST parameter name ID #REQUIRED>
<!ATTLIST parameter description %text; #REQUIRED>
--- 88,96 ----
<!ATTLIST summ section %name; #IMPLIED>
! <!-- ============================ -->
! <!-- Child elements of parameters -->
! <!-- ============================ -->
<!ELEMENT parameter EMPTY>
<!ATTLIST parameter name ID #REQUIRED>
<!ATTLIST parameter description %text; #REQUIRED>
***************
*** 101,118 ****
<!ATTLIST parameter type %name; #DEFAULT "char">
! <!-- +-------------------------------+ -->
! <!-- | Child elements of sortoptions | -->
! <!-- +-------------------------------+ -->
<!ELEMENT sortoption (sortcolumn*)>
<!ATTLIST sortoption id ID #REQUIRED>
<!ATTLIST sortoption description %name; #REQUIRED>
<!ATTLIST sortoption default %boolean;>
! <!-- +---------------------------+ -->
! <!-- | Child elements of sources | -->
! <!-- +---------------------------+ -->
<!ELEMENT datasource (conditions?)>
<!ATTLIST datasource name ID #REQUIRED>
<!ATTLIST datasource cache %whole; #DEFAULT "5">
--- 101,118 ----
<!ATTLIST parameter type %name; #DEFAULT "char">
! <!-- ============================= -->
! <!-- Child elements of sortoptions -->
! <!-- ============================= -->
<!ELEMENT sortoption (sortcolumn*)>
<!ATTLIST sortoption id ID #REQUIRED>
<!ATTLIST sortoption description %name; #REQUIRED>
<!ATTLIST sortoption default %boolean;>
! <!-- ========================= -->
! <!-- Child elements of sources -->
! <!-- ========================= -->
<!ELEMENT datasource (conditions?)>
<!ATTLIST datasource name ID #REQUIRED>
<!ATTLIST datasource cache %whole; #DEFAULT "5">
***************
*** 126,134 ****
<!ATTLIST datasource type %name; #DEFAULT "object">
! <!-- +---------------------------+ -->
! <!-- | Child elements of section | -->
! <!-- +---------------------------+ -->
<!ELEMENT default EMPTY>
<!ELEMENT field EMPTY>
--- 126,134 ----
<!ATTLIST datasource type %name; #DEFAULT "object">
! <!-- ========================= -->
! <!-- Child elements of section -->
! <!-- ========================= -->
<!ELEMENT default EMPTY>
<!ELEMENT field EMPTY>
***************
*** 146,174 ****
<!ELEMENT notlastrow EMPTY>
! <!-- +------------------------------+ -->
! <!-- | Child elements of sortoption | -->
! <!-- +------------------------------+ -->
<!ELEMENT sortcolumn EMPTY>
<!ATTLIST sortcolumn name %name; #REQUIRED>
! <!-- +------------------------------+ -->
! <!-- | Child elements of datasource | -->
! <!-- +------------------------------+ -->
<!ELEMENT conditions (condition*)>
! <!-- +------------------------------+ -->
! <!-- | Child elements of conditions | -->
! <!-- +------------------------------+ -->
<!ELEMENT condition (and*, between*, eq*, ge*, gt*, le*, like*, lt*, ne*,
negate*, not*, notbetween*, notlike*, or*)>
! <!-- +-----------------------------+ -->
! <!-- | Child elements of condition | -->
! <!-- +-----------------------------+ -->
<!ELEMENT and (and*, between*, condition*, eq*, ge*, gt*, le*, like*, lt*,
ne*, negate*, not*, notbetween*, notlike*, or*)>
--- 146,174 ----
<!ELEMENT notlastrow EMPTY>
! <!-- ============================ -->
! <!-- Child elements of sortoption -->
! <!-- ============================ -->
<!ELEMENT sortcolumn EMPTY>
<!ATTLIST sortcolumn name %name; #REQUIRED>
! <!-- ============================ -->
! <!-- Child elements of datasource -->
! <!-- ============================ -->
<!ELEMENT conditions (condition*)>
! <!-- ============================ -->
! <!-- Child elements of conditions -->
! <!-- ============================ -->
<!ELEMENT condition (and*, between*, eq*, ge*, gt*, le*, like*, lt*, ne*,
negate*, not*, notbetween*, notlike*, or*)>
! <!-- =========================== -->
! <!-- Child elements of condition -->
! <!-- =========================== -->
<!ELEMENT and (and*, between*, condition*, eq*, ge*, gt*, le*, like*, lt*,
ne*, negate*, not*, notbetween*, notlike*, or*)>
***************
*** 202,210 ****
negate*, not*, notbetween*, notlike*, or*)>
! <!-- +---------------------------+ -->
! <!-- | Child elements of between | -->
! <!-- +---------------------------+ -->
<!ELEMENT add (add*, cconst*, cfield*, cparam*, div*, mul*, sub*)>
<!ELEMENT cconst EMPTY>
--- 202,210 ----
negate*, not*, notbetween*, notlike*, or*)>
! <!-- ========================= -->
! <!-- Child elements of between -->
! <!-- ========================= -->
<!ELEMENT add (add*, cconst*, cfield*, cparam*, div*, mul*, sub*)>
<!ELEMENT cconst EMPTY>
***************
*** 224,228 ****
<!-- This DTD was created by gnuedtd
! Updated: 2002-07-15 14:33:15 -->
--- 224,228 ----
<!-- This DTD was created by gnuedtd
! Updated: 2002-07-15 14:56:27 -->