*** HDF5-File-1.2.2.dtd	Wed Dec 13 14:40:37 2000
--- HDF5-File-1.4.dtd	Tue Jan 23 16:25:58 2001
***************
*** 1,6 ****
  <!--  
  
!       DTD for NCSA Hierarchical Data Format, Version 5.1.2
  
        The HDF Software Copyright notice:
            Copyright Notice and Statement for NCSA Hierarchical Data Format (HDF)   Software Library and Utilities
--- 1,6 ----
  <!--  
  
!       DTD for NCSA Hierarchical Data Format, Version 5.1.4 (revised)
  
        The HDF Software Copyright notice:
            Copyright Notice and Statement for NCSA Hierarchical Data Format (HDF)   Software Library and Utilities
***************
*** 97,102 ****
--- 97,107 ----
  <!ATTLIST SimpleDataspace
        Ndims CDATA #REQUIRED
  >
+ 
+ <!-- 
+      Note: ComplexDataspace is not defined or implemented by the 
+      HDF5.1.4 library 
+ -->
  <!ELEMENT ComplexDataspace EMPTY>
  <!ELEMENT NamedDataTypePtr EMPTY>
  <!ATTLIST NamedDataTypePtr
***************
*** 111,118 ****
  <!--
       The DataType elements describe the HDF5 DataType Object, which describes
       the layout of a data element in the HDF-5 file.
  -->
! <!ELEMENT DataType (AtomicType|CompoundType|VLType)>
  <!ELEMENT AtomicType (IntegerType|FloatType|StringType|TimeType|BitfieldType|OpaqueType|ReferenceType|EnumType)>
  <!ELEMENT IntegerType EMPTY>
  <!ATTLIST IntegerType
--- 116,125 ----
  <!--
       The DataType elements describe the HDF5 DataType Object, which describes
       the layout of a data element in the HDF-5 file.
+ 
+      For HDF5.1.4, note new <ArrayType>
  -->
! <!ELEMENT DataType (AtomicType|CompoundType|VLType|ArrayType)>
  <!ELEMENT AtomicType (IntegerType|FloatType|StringType|TimeType|BitfieldType|OpaqueType|ReferenceType|EnumType)>
  <!ELEMENT IntegerType EMPTY>
  <!ATTLIST IntegerType
***************
*** 137,144 ****
--- 144,163 ----
        StrSize CDATA #REQUIRED
        StrPad (H5T_STR_NULLTERM|H5T_STR_NULLPAD|H5T_STR_SPACEPAD) #REQUIRED
  >
+ 
+ <!-- BitField was not specified in earlier versions of the DTD -->
  <!ELEMENT BitfieldType EMPTY>
+ <!ATTLIST BitFieldType
+       ByteOrder (BE|LE) #REQUIRED
+       Size (1|2|4|8) #REQUIRED
+ >
+ 
+ <!-- OpaqueType was not specified in earlier versions of the DTD -->
  <!ELEMENT OpaqueType EMPTY>
+ <!ATTLIST OpaqueType
+       Tag CDATA #REQUIRED
+       Size CDATA #REQUIRED
+ >
  <!ELEMENT ReferenceType (ObjectReferenceType|RegionReferenceType)>
  <!ELEMENT ObjectReferenceType EMPTY>
  <!ELEMENT RegionReferenceType EMPTY>
***************
*** 148,176 ****
  >
  <!ELEMENT EnumElement (#PCDATA)>
  <!ELEMENT EnumValue (#PCDATA)>
  <!ELEMENT CompoundType (Field)+>
  
! <!ELEMENT FieldDimension EMPTY>
! <!ATTLIST FieldDimension
!       DimSize CDATA "0"
  >
  
! <!ELEMENT FieldDims (FieldDimension)+>
! <!ATTLIST FieldDims
        Ndims CDATA #IMPLIED
  >
! <!ELEMENT Field (DataType,FieldDims)>
! <!ATTLIST Field
!       FieldName CDATA #REQUIRED
  >
! <!ELEMENT VLType (DataType)>
  <!-- 
       The StorageLayout describes optional schemes for organizing the storage
       in the HDF-5 file.
  -->
  <!ELEMENT StorageLayout (ContiguousLayout|ChunkedLayout|CompactLayout|ExternalLayout)>
  <!ELEMENT CompactLayout EMPTY>
! <!ELEMENT ChunkedLayout (Compression,ChunkDimension+)>
  <!ATTLIST ChunkedLayout
        Ndims CDATA #REQUIRED
  >
--- 167,217 ----
  >
  <!ELEMENT EnumElement (#PCDATA)>
  <!ELEMENT EnumValue (#PCDATA)>
+ 
+ <!--  
+      CompoundType is simplified in 5.1.4, eliminating the dimensions.
+      See the ArrayType below.
+  -->
  <!ELEMENT CompoundType (Field)+>
  
! <!ELEMENT Field (DataType)>
! <!ATTLIST Field
!       FieldName CDATA #REQUIRED
  >
+ <!ELEMENT VLType (DataType)>
  
! <!--  
!       ArrayType is new in 1.4. This replaces the dimensions in the
!       CompoundType
!  -->
! <!ELEMENT ArrayType (ArrayDimension+,DataType)>
! <!ATTLIST ArrayType
        Ndims CDATA #IMPLIED
  >
! <!-- Note: Dim permutations not implemented yet in library -->
! <!ELEMENT ArrayDimension EMPTY>
! <!ATTLIST ArrayDimension
!       DimSize CDATA "0"
!       DimPerm CDATA "0"
  >
! 
  <!-- 
       The StorageLayout describes optional schemes for organizing the storage
       in the HDF-5 file.
  -->
  <!ELEMENT StorageLayout (ContiguousLayout|ChunkedLayout|CompactLayout|ExternalLayout)>
+ 
+ <!--
+     Note:  ContiguousLayout is the default.  If no StorageLayout is
+     specified, ContiguousLayout must be used.
+ -->
  <!ELEMENT CompactLayout EMPTY>
! 
! <!--
!    Minor change:  Compression information is optional.
!    Note that Compression element is not defined yet.
! -->
! <!ELEMENT ChunkedLayout (Compression?,ChunkDimension+)>
  <!ATTLIST ChunkedLayout
        Ndims CDATA #REQUIRED
  >
***************
*** 194,199 ****
--- 235,244 ----
      This element is not specified in detail.  Future versions
      of the DTD will add more detailed mark-up for describing
      the data. 
+ 
+     In version 5.1.4, the h5dump utility emits XML.  The
+     output of this utility is the default format for 
+     <DataFromFile>
  -->
  
  <!-- The description above of the object that contains this data -->