--- loncom/build/lpml.dtd	2002/01/09 22:27:31	1.14
+++ loncom/build/lpml.dtd	2002/04/14 20:15:02	1.15
@@ -43,15 +43,13 @@ http://www.lon-capa.org/
 
 <!ENTITY % lpml.Version
         "-//TUX//DTD lpml 1.0 Final//EN"
-
-        -- Typical usage:
-
-            <!DOCTYPE lpml PUBLIC "-//TUX//DTD LPML 1.0 Final//EN">
-            <lpml>
-
-            </lpml>
-        --
         >
+<!-- Typical usage: -->
+<!-- <!DOCTYPE lpml PUBLIC "-//TUX/DTD LPML 1.0 Final//EN"
+      "http://lpml.sourceforge.net/DTD/lpml.dtd"> -->
+<!-- <lpml> -->
+<!-- ... -->
+<!-- </lpml> -->
 
 <!ELEMENT categoryname (#PCDATA)>
 <!ELEMENT targetroot (#PCDATA)>
@@ -81,18 +79,23 @@ Note that you must type this text exactl
 attribute value to be understood and processed correctly
 by the lpml "make build" parser.
 -->
-<!ELEMENT lpml (specialnotices|files|categories|directories|rpm)+>
-<!ATTLIST build>
+<!ELEMENT lpml
+ (targetroot|sourceroot|specialnotices|files|categories|directories|rpm)+>
+<!ATTLIST build
    trigger CDATA #REQUIRED
 >
-<!ELEMENT specialnotices specialnotice+>
-<!ELEMENT categories category+>
-<!ELEMENT directories directory+>
+<!ELEMENT specialnotices (specialnotice)+>
+<!ELEMENT categories (category)+>
+<!ELEMENT directories (directory)+>
 <!ELEMENT files (file|fileglob|link)+>
 <!ELEMENT dependencies (#PCDATA)>
-<!ELEMENT note (#PCDATA)>
+<!ELEMENT note (#PCDATA|table|b|br)*>
+<!ELEMENT b (#PCDATA)>
 
 <!ELEMENT specialnotice (#PCDATA)>
+<!ATTLIST specialnotice
+    dist CDATA #REQUIRED
+    >
 <!ELEMENT category (chmod,chown,abbreviation)>
 <!ATTLIST category
     type CDATA #REQUIRED
@@ -106,16 +109,34 @@ by the lpml "make build" parser.
 <!ATTLIST chmod
     dist CDATA #REQUIRED
     >
+
 <!ELEMENT abbreviation (#PCDATA)>
+<!ELEMENT br EMPTY>
+<!ELEMENT nobr EMPTY>
+<!ELEMENT table (#PCDATA|tr)*>
+<!ATTLIST table
+    cellpadding CDATA #IMPLIED
+    cellspacing CDATA #IMPLIED
+    border CDATA #IMPLIED
+    >
+<!ELEMENT tr (#PCDATA|td)*>
+<!ELEMENT td (#PCDATA|br|ul|tt|nobr)*>
+<!ELEMENT description (#PCDATA|br|tt|u)*>
+<!ELEMENT ul (#PCDATA|li)*>
+<!ELEMENT li (#PCDATA)>
+<!ELEMENT tt (#PCDATA)>
+<!ELEMENT u (#PCDATA)>
+<!ELEMENT status (#PCDATA)>
+<!ELEMENT linkto (#PCDATA)>
 
-<!ELEMENT directory (targetdir,categoryname,description?)>
+<!ELEMENT directory (targetdir+,categoryname,description?)>
 <!ATTLIST directory
     dist CDATA #REQUIRED
     >
 
-<!ELEMENT file (source,target,categoryname,description?,
+<!ELEMENT file (source,target+,categoryname,description?,buildlink?,
                 note?,build?,status?,dependencies?)>
-<!ELEMENT link (source,target,categoryname,description?,
+<!ELEMENT link (linkto,target,categoryname,description?,
                 note?,build?,status?,dependencies?)>
 
 <!ELEMENT fileglob (glob,sourcedir,targetdir,categoryname,
@@ -124,7 +145,7 @@ by the lpml "make build" parser.
 
 <!ELEMENT rpm (rpmSummary,rpmName,rpmVersion,rpmRelease,rpmVendor,
                rpmBuildRoot,rpmCopyright,rpmGroup,rpmSource,rpmAutoReqProv,
-               rpmdescription,rpmpre)>
+               rpmdescription,rpmpre,rpmRequires)>
 <!ELEMENT rpmSummary (#PCDATA)>
 <!ELEMENT rpmName (#PCDATA)>
 <!ELEMENT rpmVersion (#PCDATA)>
@@ -137,4 +158,5 @@ by the lpml "make build" parser.
 <!ELEMENT rpmAutoReqProv (#PCDATA)>
 <!ELEMENT rpmdescription (#PCDATA)>
 <!ELEMENT rpmpre (#PCDATA)>
-<!ELEMENT rpmRequires (#PCDATA)>
+<!ELEMENT rpmRequires (item)+>
+<!ELEMENT item (#PCDATA)>