From 9aa99b16fe7f7d7eb2f2f3d6b8a08736e0c06309 Mon Sep 17 00:00:00 2001
From: Anders Broman <anders.broman@ericsson.com>
Date: Mon, 29 May 2006 20:44:06 +0000
Subject: Ethereal->Wireshark

svn path=/trunk/; revision=18248
---
 dtds/dc.dtd         |  46 ++---
 dtds/itunes.dtd     |  50 +++---
 dtds/reginfo.dtd    |   2 +-
 dtds/rss.dtd        | 212 +++++++++++-----------
 dtds/smil.dtd       | 504 ++++++++++++++++++++++++++--------------------------
 epan/dtd_parse.l    |   6 +-
 epan/dtd_preparse.l |   4 +-
 7 files changed, 412 insertions(+), 412 deletions(-)

diff --git a/dtds/dc.dtd b/dtds/dc.dtd
index f3253f36cb..4c566216cd 100644
--- a/dtds/dc.dtd
+++ b/dtds/dc.dtd
@@ -1,24 +1,24 @@
-<? ethereal:protocol proto_name="dc" description="Dublin Core Metadata (DC)" ?>
-
-<!--
-    elements definitions for the Dublin Core Metadata DC schema
-    element names obtained from http://www.dublincore.org/schemas/xmls/qdc/2003/04/02/dc.xsd
--->
-
-<!DOCTYPE dc [
-    <!ELEMENT title (#PCDATA) >
-    <!ELEMENT creator (#PCDATA) >
-    <!ELEMENT subject (#PCDATA) >
-    <!ELEMENT description (#PCDATA) >
-    <!ELEMENT publisher (#PCDATA) >
-    <!ELEMENT contributor (#PCDATA) >
-    <!ELEMENT date (#PCDATA) >
-    <!ELEMENT type (#PCDATA) >
-    <!ELEMENT format (#PCDATA) >
-    <!ELEMENT identifier (#PCDATA) >
-    <!ELEMENT source (#PCDATA) >
-    <!ELEMENT language (#PCDATA) >
-    <!ELEMENT relation (#PCDATA) >
-    <!ELEMENT coverage (#PCDATA) >
-    <!ELEMENT rights (#PCDATA) >
+<? wireshark:protocol proto_name="dc" description="Dublin Core Metadata (DC)" ?>
+
+<!--
+    elements definitions for the Dublin Core Metadata DC schema
+    element names obtained from http://www.dublincore.org/schemas/xmls/qdc/2003/04/02/dc.xsd
+-->
+
+<!DOCTYPE dc [
+    <!ELEMENT title (#PCDATA) >
+    <!ELEMENT creator (#PCDATA) >
+    <!ELEMENT subject (#PCDATA) >
+    <!ELEMENT description (#PCDATA) >
+    <!ELEMENT publisher (#PCDATA) >
+    <!ELEMENT contributor (#PCDATA) >
+    <!ELEMENT date (#PCDATA) >
+    <!ELEMENT type (#PCDATA) >
+    <!ELEMENT format (#PCDATA) >
+    <!ELEMENT identifier (#PCDATA) >
+    <!ELEMENT source (#PCDATA) >
+    <!ELEMENT language (#PCDATA) >
+    <!ELEMENT relation (#PCDATA) >
+    <!ELEMENT coverage (#PCDATA) >
+    <!ELEMENT rights (#PCDATA) >
 ]>
\ No newline at end of file
diff --git a/dtds/itunes.dtd b/dtds/itunes.dtd
index 8f83e9e3f2..50e64ebfc2 100644
--- a/dtds/itunes.dtd
+++ b/dtds/itunes.dtd
@@ -1,25 +1,25 @@
-<? ethereal:protocol proto_name="itunes" hierarchy="yes" description="iTunes podCast rss elements" ?>
-
-<!DOCTYPE itunes [
-    
-    <!ELEMENT author (#PCDATA) >
-    
-    <!ELEMENT block (#PCDATA) >
-    
-    <!ELEMENT category (#PCDATA) >
-    <!ATTLIST category text CDATA #IMPLIED >
-    
-    <!ELEMENT duration (#PCDATA) >
-    
-    <!ELEMENT explicit (#PCDATA) >
-    
-    <!ELEMENT keywords (#PCDATA) >
-    
-    <!ELEMENT owner (#PCDATA) >
-    
-    <!ELEMENT subtitle (#PCDATA) >
-    
-    <!ELEMENT summary (#PCDATA) >
-
-]>
-
+<? wireshark:protocol proto_name="itunes" hierarchy="yes" description="iTunes podCast rss elements" ?>
+
+<!DOCTYPE itunes [
+    
+    <!ELEMENT author (#PCDATA) >
+    
+    <!ELEMENT block (#PCDATA) >
+    
+    <!ELEMENT category (#PCDATA) >
+    <!ATTLIST category text CDATA #IMPLIED >
+    
+    <!ELEMENT duration (#PCDATA) >
+    
+    <!ELEMENT explicit (#PCDATA) >
+    
+    <!ELEMENT keywords (#PCDATA) >
+    
+    <!ELEMENT owner (#PCDATA) >
+    
+    <!ELEMENT subtitle (#PCDATA) >
+    
+    <!ELEMENT summary (#PCDATA) >
+
+]>
+
diff --git a/dtds/reginfo.dtd b/dtds/reginfo.dtd
index d419948db1..4a70e0936a 100644
--- a/dtds/reginfo.dtd
+++ b/dtds/reginfo.dtd
@@ -1,4 +1,4 @@
-<? ethereal:protocol
+<? wireshark:protocol
    proto_name="reginfo"
    description="Reginfo XML doc (RFC 3680)"
    hierarchy="yes" ?>
diff --git a/dtds/rss.dtd b/dtds/rss.dtd
index b381ea9b1e..c67f9fa650 100644
--- a/dtds/rss.dtd
+++ b/dtds/rss.dtd
@@ -1,106 +1,106 @@
-<? ethereal:protocol proto_name="rss" hierarchy="yes" ?>
-
-<!--
-    this DTD is made so that wireshark can dissect RSS up to 2.0, do not try to use it for validating RSS documents
-    http://blogs.law.harvard.edu/tech/rss
--->
-
-<!ELEMENT rss (channel) >
-
-<!ATTLIST rss version CDATA #REQUIRED >
-
-<!ELEMENT channel ( title
-                  | description
-                  | link
-                  | language
-                  | item+
-                  | rating?
-                  | image?
-                  | textinput?
-                  | copyright?
-                  | pubDate?
-                  | lastBuildDate?
-                  | docs?
-                  | managingEditor?
-                  | webMaster?
-                  | skipHours?
-                  | skipDays?
-                  
-                  | cloud
-                  | ttl
-                  )*>
-
-<!ELEMENT title (#PCDATA)>
-
-<!ELEMENT description (#PCDATA)>
-
-<!ELEMENT link (#PCDATA)>
-
-<!ELEMENT image (title | url | link | width? | height? | description?)*>
-
-<!ELEMENT url (#PCDATA)>
-
-<!ELEMENT item ( title | link | description
-               | author | category | comments | enclosure | guid | pubDate | source )*>
-
-<!ELEMENT textinput (title | description | name | link)*>
-
-<!ELEMENT name (#PCDATA)>
-
-<!ELEMENT rating (#PCDATA)>
-
-<!ELEMENT language (#PCDATA)>
-
-<!ELEMENT width (#PCDATA)>
-
-<!ELEMENT height (#PCDATA)>
-
-<!ELEMENT copyright (#PCDATA)>
-
-<!ELEMENT pubDate (#PCDATA)>
-
-<!ELEMENT lastBuildDate (#PCDATA)>
-
-<!ELEMENT docs (#PCDATA)>
-
-<!ELEMENT managingEditor (#PCDATA)>
-
-<!ELEMENT webMaster (#PCDATA)>
-
-<!ELEMENT hour (#PCDATA)>
-
-<!ELEMENT day (#PCDATA)>
-
-<!ELEMENT skipHours (hour+)>
-
-<!ELEMENT skipDays (day+)>
-
-<!ELEMENT cloud (#PCDATA)>
-
-<!ATTLIST cloud domain CDATA #IMPLIED
-                port CDATA #IMPLIED
-                registerProcedure CDATA #IMPLIED
-                protocol CDATA #IMPLIED
-                path CDATA #IMPLIED >
-                    
-<!ELEMENT ttl (#PCDATA)>
-
-<!ELEMENT source (#PCDATA)>
-<!ATTLIST source url CDATA #IMPLIED >
-
-<!ELEMENT enclosure (#PCDATA)>
-<!ATTLIST enclosure url CDATA #IMPLIED
-                    length CDATA #IMPLIED
-                    type CDATA #IMPLIED >
-
-
-<!ELEMENT category (#PCDATA)>
-<!ATTLIST category domain CDATA #IMPLIED >
-
-<!ELEMENT guid (#PCDATA)>
-<!ATTLIST guid isPermaLink CDATA #IMPLIED >
-
-<!ELEMENT author (#PCDATA)>
-
-<!ELEMENT comments (#PCDATA)>
-
+<? wireshark:protocol proto_name="rss" hierarchy="yes" ?>
+
+<!--
+    this DTD is made so that wireshark can dissect RSS up to 2.0, do not try to use it for validating RSS documents
+    http://blogs.law.harvard.edu/tech/rss
+-->
+
+<!ELEMENT rss (channel) >
+
+<!ATTLIST rss version CDATA #REQUIRED >
+
+<!ELEMENT channel ( title
+                  | description
+                  | link
+                  | language
+                  | item+
+                  | rating?
+                  | image?
+                  | textinput?
+                  | copyright?
+                  | pubDate?
+                  | lastBuildDate?
+                  | docs?
+                  | managingEditor?
+                  | webMaster?
+                  | skipHours?
+                  | skipDays?
+                  
+                  | cloud
+                  | ttl
+                  )*>
+
+<!ELEMENT title (#PCDATA)>
+
+<!ELEMENT description (#PCDATA)>
+
+<!ELEMENT link (#PCDATA)>
+
+<!ELEMENT image (title | url | link | width? | height? | description?)*>
+
+<!ELEMENT url (#PCDATA)>
+
+<!ELEMENT item ( title | link | description
+               | author | category | comments | enclosure | guid | pubDate | source )*>
+
+<!ELEMENT textinput (title | description | name | link)*>
+
+<!ELEMENT name (#PCDATA)>
+
+<!ELEMENT rating (#PCDATA)>
+
+<!ELEMENT language (#PCDATA)>
+
+<!ELEMENT width (#PCDATA)>
+
+<!ELEMENT height (#PCDATA)>
+
+<!ELEMENT copyright (#PCDATA)>
+
+<!ELEMENT pubDate (#PCDATA)>
+
+<!ELEMENT lastBuildDate (#PCDATA)>
+
+<!ELEMENT docs (#PCDATA)>
+
+<!ELEMENT managingEditor (#PCDATA)>
+
+<!ELEMENT webMaster (#PCDATA)>
+
+<!ELEMENT hour (#PCDATA)>
+
+<!ELEMENT day (#PCDATA)>
+
+<!ELEMENT skipHours (hour+)>
+
+<!ELEMENT skipDays (day+)>
+
+<!ELEMENT cloud (#PCDATA)>
+
+<!ATTLIST cloud domain CDATA #IMPLIED
+                port CDATA #IMPLIED
+                registerProcedure CDATA #IMPLIED
+                protocol CDATA #IMPLIED
+                path CDATA #IMPLIED >
+                    
+<!ELEMENT ttl (#PCDATA)>
+
+<!ELEMENT source (#PCDATA)>
+<!ATTLIST source url CDATA #IMPLIED >
+
+<!ELEMENT enclosure (#PCDATA)>
+<!ATTLIST enclosure url CDATA #IMPLIED
+                    length CDATA #IMPLIED
+                    type CDATA #IMPLIED >
+
+
+<!ELEMENT category (#PCDATA)>
+<!ATTLIST category domain CDATA #IMPLIED >
+
+<!ELEMENT guid (#PCDATA)>
+<!ATTLIST guid isPermaLink CDATA #IMPLIED >
+
+<!ELEMENT author (#PCDATA)>
+
+<!ELEMENT comments (#PCDATA)>
+
diff --git a/dtds/smil.dtd b/dtds/smil.dtd
index ca6e85c2d7..983816b5e6 100644
--- a/dtds/smil.dtd
+++ b/dtds/smil.dtd
@@ -1,252 +1,252 @@
-<? ethereal:protocol
-	proto_name="smil"
-	media="application/smil"
-	description="Synchronized Multimedia Integration Language"
-	?>
-
-<!--
-
-    This is the XML document type definition (DTD) for SMIL 1.0.
-
-    Date: 1998/06/15 08:56:30
-
-    Authors: 
-        Jacco van Ossenbruggen <jrvosse@cwi.nl> 
-        Sjoerd Mullender       <sjoerd@cwi.nl>
-        
-    Further information about SMIL is available at:
-
-          http://www.w3.org/AudioVideo/
-
--->
-
-
-<!-- Generally useful entities -->
-<!ENTITY % id-attr "id ID #IMPLIED">
-<!ENTITY % title-attr "title CDATA #IMPLIED">
-<!ENTITY % skip-attr "skip-content (true|false) 'true'">
-<!ENTITY % desc-attr "
-        %title-attr;
-        abstract        CDATA   #IMPLIED
-        author          CDATA   #IMPLIED
-        copyright       CDATA   #IMPLIED
-">
-
-<!--=================== SMIL Document =====================================-->
-<!--
-     The root element SMIL contains all other elements.
--->
-<!ELEMENT smil (head?,body?)>
-<!ATTLIST smil
-        %id-attr;
->
-
-<!--=================== The Document Head =================================-->
-<!ENTITY % layout-section "layout|switch">
-
-<!ENTITY % head-element "(meta*,((%layout-section;), meta*))?">
-
-<!ELEMENT head %head-element;>
-<!ATTLIST head %id-attr;>
-
-
-<!--=================== Layout Element ====================================-->
-<!--
-     Layout contains the region and root-layout elements defined by
-     smil-basic-layout or other elements defined an external layout 
-     mechanism.
--->
-<!ELEMENT layout (region|root-layout)>
-<!ATTLIST layout
-        %id-attr;
-        type CDATA      "text/smil-basic-layout"
->
-
-
-<!--=================== Region Element ===================================-->
-<!ENTITY % viewport-attrs "
-        height              CDATA    #IMPLIED
-        width               CDATA    #IMPLIED
-        background-color    CDATA    #IMPLIED
-">
-
-<!ELEMENT region EMPTY>
-<!ATTLIST region
-        %id-attr;
-        %title-attr;
-        %viewport-attrs;
-        left                CDATA    "0"
-        top                 CDATA    "0"
-        z-index             CDATA    "0"
-        fit                 (hidden|fill|meet|scroll|slice)    "hidden"
-        %skip-attr;
->
-
-<!--=================== Root-layout Element ================================-->
-<!ELEMENT root-layout EMPTY>
-<!ATTLIST root-layout
-        %id-attr;
-        %title-attr;
-        %viewport-attrs;
-        %skip-attr;
->
-
-
-<!--=================== Meta Element=======================================-->
-<!ELEMENT meta EMPTY>
-<!ATTLIST meta
-        name    NMTOKEN #REQUIRED
-        content CDATA   #REQUIRED
-        %skip-attr;
->
-
-<!--=================== The Document Body =================================-->
-<!ENTITY % media-object "audio|video|text|img|animation|textstream|ref">
-<!ENTITY % schedule "par|seq|(%media-object;)">
-<!ENTITY % inline-link "a">
-<!ENTITY % assoc-link "anchor">
-<!ENTITY % link "%inline-link;">
-<!ENTITY % container-content "(%schedule;)|switch|(%link;)">
-<!ENTITY % body-content "(%container-content;)">
-
-<!ELEMENT body (%body-content;)*>
-<!ATTLIST body %id-attr;>
-
-<!--=================== Synchronization Attributes ========================-->
-<!ENTITY % sync-attributes "
-        begin   CDATA   #IMPLIED
-        end     CDATA   #IMPLIED
-">
-
-<!--=================== Switch Parameter Attributes =======================-->
-<!ENTITY % system-attribute "
-        system-bitrate             CDATA                #IMPLIED
-        system-language            CDATA                #IMPLIED
-        system-required            NMTOKEN              #IMPLIED
-        system-screen-size         CDATA                #IMPLIED
-        system-screen-depth        CDATA                #IMPLIED
-        system-captions            (on|off)             #IMPLIED
-        system-overdub-or-caption  (caption|overdub)    #IMPLIED
-">
-
-<!--=================== Fill Attribute ====================================-->
-<!ENTITY % fill-attribute "
-        fill    (remove|freeze)    'remove'
-">
-
-
-<!--=================== The Parallel Element ==============================-->
-<!ENTITY % par-content "%container-content;">
-<!ELEMENT par    (%par-content;)*>
-<!ATTLIST par
-        %id-attr;
-        %desc-attr;
-        endsync CDATA           "last"
-        dur     CDATA           #IMPLIED
-        repeat  CDATA           "1"
-        region  IDREF           #IMPLIED
-        %sync-attributes;
-        %system-attribute;
->
-
-<!--=================== The Sequential Element ============================-->
-<!ENTITY % seq-content "%container-content;">
-<!ELEMENT seq    (%seq-content;)*>
-<!ATTLIST seq
-        %id-attr;
-        %desc-attr;
-        dur     CDATA           #IMPLIED
-        repeat  CDATA           "1"
-        region  IDREF           #IMPLIED
-        %sync-attributes;
-        %system-attribute;
->
-
-<!--=================== The Switch Element ================================-->
-<!-- In the head, a switch may contain only layout elements,
-     in the body, only container elements. However, this
-     constraint cannot be expressed in the DTD (?), so
-     we allow both:
--->
-<!ENTITY % switch-content "layout|(%container-content;)">
-<!ELEMENT switch (%switch-content;)*>
-<!ATTLIST switch
-        %id-attr;
-        %title-attr;
->
-
-<!--=================== Media Object Elements =============================-->
-<!-- SMIL only defines the structure. The real media data is
-     referenced by the src attribute of the media objects.
--->
-
-<!-- Furthermore, they have the following attributes as defined
-     in the SMIL specification:
--->
-<!ENTITY % mo-attributes "
-        %id-attr;
-        %desc-attr;
-        region     IDREF           #IMPLIED
-        alt        CDATA           #IMPLIED
-        longdesc   CDATA           #IMPLIED
-        src        CDATA           #IMPLIED
-        type       CDATA           #IMPLIED
-        dur        CDATA           #IMPLIED
-        repeat     CDATA           '1'
-        %fill-attribute;
-        %sync-attributes;
-        %system-attribute;
-">
-
-<!--
-     Most info is in the attributes, media objects are empty or
-     contain associated link elements:
--->
-<!ENTITY % mo-content "(%assoc-link;)*">
-<!ENTITY % clip-attrs "
-        clip-begin      CDATA   #IMPLIED
-        clip-end        CDATA   #IMPLIED
-">
-
-<!ELEMENT ref           %mo-content;>
-<!ELEMENT audio         %mo-content;>
-<!ELEMENT img           %mo-content;>
-<!ELEMENT video         %mo-content;>
-<!ELEMENT text          %mo-content;>
-<!ELEMENT textstream    %mo-content;>
-<!ELEMENT animation     %mo-content;>
-
-<!ATTLIST ref           %mo-attributes; %clip-attrs;>
-<!ATTLIST audio         %mo-attributes; %clip-attrs;>
-<!ATTLIST video         %mo-attributes; %clip-attrs;>
-<!ATTLIST animation     %mo-attributes; %clip-attrs;>
-<!ATTLIST textstream    %mo-attributes; %clip-attrs;>
-<!ATTLIST text          %mo-attributes;>
-<!ATTLIST img           %mo-attributes;>
-
-<!--=================== Link Elements =====================================-->
-
-<!ENTITY % smil-link-attributes "
-        %id-attr;
-        %title-attr;
-        href            CDATA                   #REQUIRED
-        show            (replace|new|pause)     'replace'
-">
-
-
-<!--=================== Inline Link Element ===============================-->
-<!ELEMENT a (%schedule;|switch)*>
-<!ATTLIST a
-        %smil-link-attributes;
->
-
-
-<!--=================== Associated Link Element ===========================-->
-<!ELEMENT anchor EMPTY>
-<!ATTLIST anchor
-        %skip-attr;
-        %smil-link-attributes;
-        %sync-attributes;
-        coords          CDATA                   #IMPLIED
->
-
+<? wireshark:protocol
+	proto_name="smil"
+	media="application/smil"
+	description="Synchronized Multimedia Integration Language"
+	?>
+
+<!--
+
+    This is the XML document type definition (DTD) for SMIL 1.0.
+
+    Date: 1998/06/15 08:56:30
+
+    Authors: 
+        Jacco van Ossenbruggen <jrvosse@cwi.nl> 
+        Sjoerd Mullender       <sjoerd@cwi.nl>
+        
+    Further information about SMIL is available at:
+
+          http://www.w3.org/AudioVideo/
+
+-->
+
+
+<!-- Generally useful entities -->
+<!ENTITY % id-attr "id ID #IMPLIED">
+<!ENTITY % title-attr "title CDATA #IMPLIED">
+<!ENTITY % skip-attr "skip-content (true|false) 'true'">
+<!ENTITY % desc-attr "
+        %title-attr;
+        abstract        CDATA   #IMPLIED
+        author          CDATA   #IMPLIED
+        copyright       CDATA   #IMPLIED
+">
+
+<!--=================== SMIL Document =====================================-->
+<!--
+     The root element SMIL contains all other elements.
+-->
+<!ELEMENT smil (head?,body?)>
+<!ATTLIST smil
+        %id-attr;
+>
+
+<!--=================== The Document Head =================================-->
+<!ENTITY % layout-section "layout|switch">
+
+<!ENTITY % head-element "(meta*,((%layout-section;), meta*))?">
+
+<!ELEMENT head %head-element;>
+<!ATTLIST head %id-attr;>
+
+
+<!--=================== Layout Element ====================================-->
+<!--
+     Layout contains the region and root-layout elements defined by
+     smil-basic-layout or other elements defined an external layout 
+     mechanism.
+-->
+<!ELEMENT layout (region|root-layout)>
+<!ATTLIST layout
+        %id-attr;
+        type CDATA      "text/smil-basic-layout"
+>
+
+
+<!--=================== Region Element ===================================-->
+<!ENTITY % viewport-attrs "
+        height              CDATA    #IMPLIED
+        width               CDATA    #IMPLIED
+        background-color    CDATA    #IMPLIED
+">
+
+<!ELEMENT region EMPTY>
+<!ATTLIST region
+        %id-attr;
+        %title-attr;
+        %viewport-attrs;
+        left                CDATA    "0"
+        top                 CDATA    "0"
+        z-index             CDATA    "0"
+        fit                 (hidden|fill|meet|scroll|slice)    "hidden"
+        %skip-attr;
+>
+
+<!--=================== Root-layout Element ================================-->
+<!ELEMENT root-layout EMPTY>
+<!ATTLIST root-layout
+        %id-attr;
+        %title-attr;
+        %viewport-attrs;
+        %skip-attr;
+>
+
+
+<!--=================== Meta Element=======================================-->
+<!ELEMENT meta EMPTY>
+<!ATTLIST meta
+        name    NMTOKEN #REQUIRED
+        content CDATA   #REQUIRED
+        %skip-attr;
+>
+
+<!--=================== The Document Body =================================-->
+<!ENTITY % media-object "audio|video|text|img|animation|textstream|ref">
+<!ENTITY % schedule "par|seq|(%media-object;)">
+<!ENTITY % inline-link "a">
+<!ENTITY % assoc-link "anchor">
+<!ENTITY % link "%inline-link;">
+<!ENTITY % container-content "(%schedule;)|switch|(%link;)">
+<!ENTITY % body-content "(%container-content;)">
+
+<!ELEMENT body (%body-content;)*>
+<!ATTLIST body %id-attr;>
+
+<!--=================== Synchronization Attributes ========================-->
+<!ENTITY % sync-attributes "
+        begin   CDATA   #IMPLIED
+        end     CDATA   #IMPLIED
+">
+
+<!--=================== Switch Parameter Attributes =======================-->
+<!ENTITY % system-attribute "
+        system-bitrate             CDATA                #IMPLIED
+        system-language            CDATA                #IMPLIED
+        system-required            NMTOKEN              #IMPLIED
+        system-screen-size         CDATA                #IMPLIED
+        system-screen-depth        CDATA                #IMPLIED
+        system-captions            (on|off)             #IMPLIED
+        system-overdub-or-caption  (caption|overdub)    #IMPLIED
+">
+
+<!--=================== Fill Attribute ====================================-->
+<!ENTITY % fill-attribute "
+        fill    (remove|freeze)    'remove'
+">
+
+
+<!--=================== The Parallel Element ==============================-->
+<!ENTITY % par-content "%container-content;">
+<!ELEMENT par    (%par-content;)*>
+<!ATTLIST par
+        %id-attr;
+        %desc-attr;
+        endsync CDATA           "last"
+        dur     CDATA           #IMPLIED
+        repeat  CDATA           "1"
+        region  IDREF           #IMPLIED
+        %sync-attributes;
+        %system-attribute;
+>
+
+<!--=================== The Sequential Element ============================-->
+<!ENTITY % seq-content "%container-content;">
+<!ELEMENT seq    (%seq-content;)*>
+<!ATTLIST seq
+        %id-attr;
+        %desc-attr;
+        dur     CDATA           #IMPLIED
+        repeat  CDATA           "1"
+        region  IDREF           #IMPLIED
+        %sync-attributes;
+        %system-attribute;
+>
+
+<!--=================== The Switch Element ================================-->
+<!-- In the head, a switch may contain only layout elements,
+     in the body, only container elements. However, this
+     constraint cannot be expressed in the DTD (?), so
+     we allow both:
+-->
+<!ENTITY % switch-content "layout|(%container-content;)">
+<!ELEMENT switch (%switch-content;)*>
+<!ATTLIST switch
+        %id-attr;
+        %title-attr;
+>
+
+<!--=================== Media Object Elements =============================-->
+<!-- SMIL only defines the structure. The real media data is
+     referenced by the src attribute of the media objects.
+-->
+
+<!-- Furthermore, they have the following attributes as defined
+     in the SMIL specification:
+-->
+<!ENTITY % mo-attributes "
+        %id-attr;
+        %desc-attr;
+        region     IDREF           #IMPLIED
+        alt        CDATA           #IMPLIED
+        longdesc   CDATA           #IMPLIED
+        src        CDATA           #IMPLIED
+        type       CDATA           #IMPLIED
+        dur        CDATA           #IMPLIED
+        repeat     CDATA           '1'
+        %fill-attribute;
+        %sync-attributes;
+        %system-attribute;
+">
+
+<!--
+     Most info is in the attributes, media objects are empty or
+     contain associated link elements:
+-->
+<!ENTITY % mo-content "(%assoc-link;)*">
+<!ENTITY % clip-attrs "
+        clip-begin      CDATA   #IMPLIED
+        clip-end        CDATA   #IMPLIED
+">
+
+<!ELEMENT ref           %mo-content;>
+<!ELEMENT audio         %mo-content;>
+<!ELEMENT img           %mo-content;>
+<!ELEMENT video         %mo-content;>
+<!ELEMENT text          %mo-content;>
+<!ELEMENT textstream    %mo-content;>
+<!ELEMENT animation     %mo-content;>
+
+<!ATTLIST ref           %mo-attributes; %clip-attrs;>
+<!ATTLIST audio         %mo-attributes; %clip-attrs;>
+<!ATTLIST video         %mo-attributes; %clip-attrs;>
+<!ATTLIST animation     %mo-attributes; %clip-attrs;>
+<!ATTLIST textstream    %mo-attributes; %clip-attrs;>
+<!ATTLIST text          %mo-attributes;>
+<!ATTLIST img           %mo-attributes;>
+
+<!--=================== Link Elements =====================================-->
+
+<!ENTITY % smil-link-attributes "
+        %id-attr;
+        %title-attr;
+        href            CDATA                   #REQUIRED
+        show            (replace|new|pause)     'replace'
+">
+
+
+<!--=================== Inline Link Element ===============================-->
+<!ELEMENT a (%schedule;|switch)*>
+<!ATTLIST a
+        %smil-link-attributes;
+>
+
+
+<!--=================== Associated Link Element ===========================-->
+<!ELEMENT anchor EMPTY>
+<!ATTLIST anchor
+        %skip-attr;
+        %smil-link-attributes;
+        %sync-attributes;
+        coords          CDATA                   #IMPLIED
+>
+
diff --git a/epan/dtd_parse.l b/epan/dtd_parse.l
index 25e6513fad..24fe042ad8 100644
--- a/epan/dtd_parse.l
+++ b/epan/dtd_parse.l
@@ -7,7 +7,7 @@
 %{
 
 	/* dtd_parse.l
-	* an XML dissector for ethereal 
+	* an XML dissector for Wireshark 
 	* lexical analyzer for DTDs
 	*
 	* Copyright 2004, Luis E. Garcia Ontanon <luis.ontanon@gmail.com>
@@ -96,8 +96,8 @@ comment_stop "-->"
 
 start_xmlpi "<?"
 
-location_xmlpi "ethereal:location"
-protocol_xmlpi "ethereal:protocol"
+location_xmlpi "wireshark:location"
+protocol_xmlpi "wireshark:protocol"
 
 get_attr_quote =[:blank:]*["]
 avoid_editor_bug ["]
diff --git a/epan/dtd_preparse.l b/epan/dtd_preparse.l
index b5ce8fbe84..86a9bd6b23 100644
--- a/epan/dtd_preparse.l
+++ b/epan/dtd_preparse.l
@@ -9,7 +9,7 @@
 	/*
 	 * dtd_preparser.l
 	 *
-	 * an XML dissector for ethereal 
+	 * an XML dissector for wireshark 
 	 *
 	 * DTD Preparser -  import a dtd file into a GString
 	 *					including files, removing comments
@@ -149,7 +149,7 @@ static const gchar* location(void) {
     
 	if (loc) g_free(loc);
     
-	loc = g_strdup_printf("<? ethereal:location %s:%u ?>", filename, linenum);
+	loc = g_strdup_printf("<? wireshark:location %s:%u ?>", filename, linenum);
 	
 	return loc;
 }
-- 
cgit v1.2.3