Am Dienstag, den 21.05.2013, 00:10 +0900 schrieb Osamu Aoki:
> Hi,
> 
> Since my debiandoc-sgml depends on this package and this has been
> orphaned, I decided to take over and updated package in modern style.
> 
> As for this bug, http://bugs.debian.org/305736
> 
> in message #20:
> 
> ----------------
> Michael Smith <sm...@xml-doc.org> writes:
> 
> > I guess it doesn't hurt, as long as the filenames of the *.ent
> > files are consistent between the dbcentx.mod file and the filenames
> > in /usr/share/xml/entities/xml-iso-entities-8879.1986/
> [...]
> > So I think maybe sgml-data needs to be updated so that
> > /usr/share/xml/entities/xml-iso-entities-8879.1986/ includes the
> > filenames like "isoamsa.ent". They can just be made symlinks to,
> > e.g., "ISOamsa.ent".
> 
> I agree.  I'll redirect this bug to sgml-data.  I wonder why I was 
> using the upper cased versions in the first place.
> ----------------
> 
> As I see the content of the catalog/catalog.xml file in xml side,
> 
> <!-- derived from V0.3, see 
> http://www.oasis-open.org/committees/docbook/xmlcharent/
>      Note: file names changed to comply with LSB SGML/XML Recommendations, 
> R006
> 
> So this seems to have some reason and the above link is dead link.
> 
> Can anyone elucidate me.
> 
> There are only 2 bugs on this package and both seems to be the same
> issue.

The files are officially named this way:
http://www.w3.org/2003/entities/iso8879/

Please note, that sgml-data needs an update of several files and of some
catalogs. The Public identifiers have changed too. Attached is a local
diff against what I've already committed to the debian-xml-sgml
subversion tree:

svn+ssh://svn.debian.org/svn/debian-xml-sgml/packages/sgml-data

I hope, you'll find it useful. It also contains an update to the
debian/copyright file.


HTH and regards, Daniel
Index: branches/experimental/debian/copyright
===================================================================
--- branches/experimental/debian/copyright	(Revision 2170)
+++ branches/experimental/debian/copyright	(Arbeitskopie)
@@ -1,7 +1,105 @@
 This package was originally Debianized by Susan G. Kleinmann
 <s...@kleinmann.com> on Thu, 13 Feb 1997.  Maintenance is now handled
-by Adam Di Carlo <a...@debian.org>.
+by Adam Di Carlo <a...@debian.org> and the Debian XML/SGML Group
+<debian-xml-sgml-p...@lists.alioth.debian.org>.
 
+==============================================================================
+
+Files: sgml/declaration/big5sgml*.decl, sgml/dtd/rdf.dtd
+Files: xml/declaration/big5xml.decl
+Upstream-Maintainer: Rick Jelliffe <ri...@gate.sinica.edu.tw>
+Upstream-Source: http://xml.ascc.net/xml/resource/
+Copyright: Copyright 1999 Academia Sinica Computing Centre
+License: MPL | GPL
+
+Files: sgml/entities/Hewlett-Packard
+Upstream-Name: Hewlett-Packard DTDs and entities
+Upstream-Maintainer: Hewlett-Packard Company
+Upstream-Source: none
+Copyright: Copyright 1987-1994 Hewlett-Packard Company
+License: other
+ Permission to use, copy, and distribute this Document Type
+ Definition (DTD) entity set is hereby granted, provided that the above
+ copyright notice appear in all copies and that both that copyright
+ notice and this permission notice appear in supporting hardcopy and
+ online documentation.  All other rights reserved.
+ .    
+ The name of Hewlett-Packard Company or the Hewlett-Packard logo may
+ not be used in advertising or publicity pertaining to distribution
+ of this DTD without specific, written prior permission.
+ Hewlett-Packard Company makes no representations about the
+ suitability of this DTD for any purpose.  It is provided "as is"
+ without express or implied warranty.
+ .
+ Hewlett-Packard disclaims all warranties with regard to this DTD,
+ including all implied warranties of merchantability and fitness, in
+ no event shall Hewlett-Packard Company be liable for any special,
+ indirect or consequential damages or any damages whatsoever
+ resulting from loss of use, data or profits, whether in an action
+ of contract, negligence or other tortious action, arising out of or
+ in connection with the use or performance of this DTD.
+
+Files: sgml/entities/sgml-iso-entities-8879.1986/ISO*
+Upstream-Name: 8879:1965 entity sets
+Upstream-Source: ftp://ftp.ifi.uio.no/pub/SGML/ENTITIES/
+Copyright: Copyright 1986 International Organization for Standardization
+License: other
+ Permission to copy in any form is granted for use with
+ conforming SGML systems and applications as defined in
+ ISO 8879, provided this notice is included in all copies.
+
+Files: sgml/entities/sgml-iso-entities-9573-13.1991/ISO*
+Upstream-Name: ISO 9573-13:1991 entity sets
+Upstream-Maintainer: Anders Berglund
+Upstream-Source: http://xml.coverpages.org/ptext13.zip
+Copyright: Copyright 1991 International Organization for Standardization
+License: other
+ Permission to copy in any form is granted for use with
+ conforming SGML systems and applications as defined in
+ ISO 8879, provided this notice is included in all copies.
+
+Files: sgml/html/dtd/html-mcom*.dtd
+Upstream-Name: Mozilla DTDs
+Upstream-Maintainer: Dan Connolly <conno...@w3.org>
+Upstream-Maintainer: Mark Gaither <ma...@webtechs.com>
+Upstream-Source: http://www.webtechs.com/ (via archive.org)
+Copyright: Copyright 1996 WebTechs (Austin, TX)
+License: PD (?)
+
+Files: sgml/html/dtd/iso-15445/15445*
+Upstream-Name: ISO/IEC 15445:2000  Hypertext Markup Language (HTML)
+Upstream-Source: https://www.cs.tcd.ie/15445/
+Copyright: Copyright 2000-2003, IETF, W3C (MIT, Inria, Keio), ISO/IEC.
+License: other
+ Permission to copy in any form is granted for use with
+ validating and conforming systems and applications as defined
+ in ISO/IEC 15445:2000, provided this copyright notice is included
+ with all copies.  
+
+Files: xml/entities/*
+Upstream-Name: XML Entity Declarations for Characters
+Upstream-Maintainer: W3C
+Upstream-Source: http://www.w3.org/2003/entities/
+License: other
+ Permission to copy in any form is granted for use with conforming SGML
+ systems and applications as defined in ISO 8879, provided this notice is
+ included in all copies.
+
+Files: xml/qaml/qaml-xml.dtd
+Upstream-Name: QAML
+Upstream-Maintainer: Justin Higgins
+Upstream-Maintainer: Rick Jelliffe
+Upstream-Source: http://xml.ascc.net/xml/resource/
+Copyright: Copyright 1994-1999 Justin Higgins
+Copyright: Copyright 1994-1999 Rick Jelliffe
+License: MPL | GPL
+ You can use it freely for any purpose under the terms
+ of the MPL or GPL. Documents created using this DTD are copyright
+ their (human or corporate) authors and maintainers, subject to
+ local law, unless explicitly noted in the FAQ text or markup.
+
+==============================================================================
+
 * Catchall download location
 
 Material not otherwise specified is available from
@@ -14,34 +112,6 @@
 htmlpro DTD is protected under the GNU Copyleft License (GPL), which
 on Debian systems may be found in '/usr/share/common-licenses/GPL'.
 
-* QAML
-
-[The QAML] DTD is copyright 1994-1999 Justin Higgins and Rick
-  Jelliffe. You can use it freely for any purpose under the terms 
-  of the MPL or GPL. Documents created using this DTD are copyright
-  their (human or corporate) authors and maintainers, subject to 
-  local law, unless explicitly noted in the FAQ text or markup.
-
-It was downloaded from <URL:http://xml.ascc.net/xml/resource/qaml-xml.dtd>
-On Debian systems, the GPL may be found in '/usr/share/common-licenses/GPL'.
-
-* RDF, Big5
-
-The RDF DTD carried this notice:
-  Created by: 
-      Rick Jelliffe, Academia Sinica Computing Centre
-      ri...@gate.sinica.edu.tw
-      http://xml.ascc.net/
-      1999-02-26
-      Copyright (C) 1999 Academia Sinica Computing Centre
-      Free use granted under the MPL or GPL.
-
-The same author and copyright applies to the big5*.dcl Chinese
-declarations.  The Big5 declarations and RDF DTDs were
-downloaded from
-<URL:http://xml.ascc.net/xml/en/utf-8/resource_index.html>.
-
-
 * ISO General Document
 
 ISO General Document and standard entities were downloaded from 
@@ -66,66 +136,6 @@
     paper copy, except as required by law.
 
 
-* ISO/IEC 15445:2000
-
-ISO/IEC 15445:2000 HTML carries this copyright:
-     Copyright (C) 2000 IETF, W3C (MIT, Inria, Keio), ISO/IEC
-               All Rights Reserved
-
-     Permission to copy in any form is granted for use with
-     validating and conforming systems and applications as defined 
-     in ISO/IEC 15445, provided this copyright notice is included
-     with all copies.
-It may be downloaded from <URL:ftp://ftp.cs.tcd.ie/isohtml/>
-
-
-* ISO 9573-13:1991
-
-ISO 9573-13:1991 entities carry this copyright:
-     (C) International Organization for Standardization 1991.
-     Permission to copy in any form is granted for use with
-     conforming SGML systems and applications as defined in
-     ISO 8879, provided this notice is included in all copies.
-The entities were downloaded from
-<URL:http://xml.coverpages.org/ptext13.zip>, provided by Anders
-Berglund, the editor of the ISO 9573-13.
-
-
-* HP
-
-The Hewlett-Packard DTDs and entities carry this copyright:
-     (c) Copyright 1987-1994 Hewlett-Packard Company
-    
-     Permission to use, copy, and distribute this Document Type
-     Definition (DTD) entity set is hereby granted, provided that the above
-     copyright notice appear in all copies and that both that copyright
-     notice and this permission notice appear in supporting hardcopy and
-     online documentation.  All other rights reserved.
-    
-     The name of Hewlett-Packard Company or the Hewlett-Packard logo may
-     not be used in advertising or publicity pertaining to distribution
-     of this DTD without specific, written prior permission.
-     Hewlett-Packard Company makes no representations about the
-     suitability of this DTD for any purpose.  It is provided "as is"
-     without express or implied warranty.
-    
-     Hewlett-Packard disclaims all warranties with regard to this DTD,
-     including all implied warranties of merchantability and fitness, in
-     no event shall Hewlett-Packard Company be liable for any special,
-     indirect or consequential damages or any damages whatsoever
-     resulting from loss of use, data or profits, whether in an action
-     of contract, negligence or other tortious action, arising out of or
-     in connection with the use or performance of this DTD.
-
-
-* Mozilla
-
-The Mozilla DTDs (html-mcom.dtd and html-mcoms.dtd) are 
-  Copyright (c) 1996 - WebTechs - Austin, TX http://www.webtechs.com/.  
-  It was written by Dan Connolly <conno...@w3.org> and is maintained 
-  by Mark Gaither (ma...@webtechs.com).
-
-
 * MSIE
 
 The Internet Explorer DTD's are written by Mark 
Index: branches/experimental/debian/get-orig-source
===================================================================
--- branches/experimental/debian/get-orig-source	(Revision 2170)
+++ branches/experimental/debian/get-orig-source	(Arbeitskopie)
@@ -1,4 +1,6 @@
 #!/usr/bin/make -f
+#
+# the get-orig-source target needs: coreutils, tofrodos, unzip, wget
 
 TMPDIR = download
 
@@ -26,6 +28,7 @@
 		http://www.renderx.com/Tests/validator/fo.zip
 	wget -N -P sgml/dtd \
 		http://xml.ascc.net/resource/rdf.dtd
+	fromdos sgml/dtd/rdf.dtd
 	unzip -u -o -d sgml/dtd $(TMPDIR)/fo.zip || true
 
 get-orig-source-sgml-entities:
@@ -101,6 +104,7 @@
 	mkdir -p xml/qaml
 	wget -N -P xml/qaml \
 		http://xml.ascc.net/xml/resource/qaml-xml.dtd
+	fromdos xml/qaml/qaml-xml.dtd
 
 get-orig-source-xml-svg:
 	mkdir -p xml/svg
Index: branches/experimental/sgml/entities/sgml-iso-entities-8879.1986/catalog
===================================================================
--- branches/experimental/sgml/entities/sgml-iso-entities-8879.1986/catalog	(Revision 2170)
+++ branches/experimental/sgml/entities/sgml-iso-entities-8879.1986/catalog	(Arbeitskopie)
@@ -1,47 +1,52 @@
+  -- ...................................................................... --
+  -- SGML TR9401 Catalog for XML Character Entities ....................... --
+
+  -- ...................................................................... --
+  -- prefer PUBID over SYSID .............................................. --
 OVERRIDE	YES
 
-        -- ISO latin 1 entity set for HTML --
-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN"                              ISOlat1.ent
-PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN"                              ISOlat1.ent -- deprecated --
-        -- note that often people really want "-//W3C//ENTITIES Latin1//EN//HTML" instead of this --
-        -- this is deprecated --
-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN//HTML"                        ISOlat1.ent
-PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN//HTML"                        ISOlat1.ent -- deprecated --
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN"        "ISOamsa.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN"       "ISOamsb.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN"             "ISOamsc.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN"      "ISOamsn.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN"               "ISOamso.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN"              "ISOamsr.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN"                       "ISObox.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN"                           "ISOcyr1.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"                       "ISOcyr2.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN"                          "ISOdia.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN"                              "ISOgrk1.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN"                           "ISOgrk2.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN"                              "ISOgrk3.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN"                  "ISOgrk4.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN"                              "ISOlat1.ent"
+  -- note that often people really want "-//W3C//ENTITIES Latin1//EN//HTML" --
+  -- instead of this ...................................................... --
+PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN//HTML"                        "ISOlat1.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN"                              "ISOlat2.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN"                "ISOnum.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN"                                 "ISOpub.ent"
+PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN"                          "ISOtech.ent"
 
-        -- ISO extended entities --
-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN"                              ISOlat2.ent
-PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN"                              ISOlat2.ent -- deprecated --
-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN"                                 ISOpub.ent
-PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN"                                 ISOpub.ent -- deprecated --
-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN"                          ISOtech.ent
-PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN"                          ISOtech.ent -- deprecated --
-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN"                ISOnum.ent
-PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN"                ISOnum.ent -- deprecated --
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN"        ISOamsa.ent
-PUBLIC "ISO 8879-1986//ENTITIES Added Math Symbols: Arrow Relations//EN"        ISOamsa.ent -- deprecated --
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN"       ISOamsb.ent
-PUBLIC "ISO 8879-1986//ENTITIES Added Math Symbols: Binary Operators//EN"       ISOamsb.ent -- deprecated --
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN"             ISOamsc.ent
-PUBLIC "ISO 8879-1986//ENTITIES Added Math Symbols: Delimiters//EN"             ISOamsc.ent -- deprecated --
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN"      ISOamsn.ent
-PUBLIC "ISO 8879-1986//ENTITIES Added Math Symbols: Negated Relations//EN"      ISOamsn.ent -- deprecated --
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN"               ISOamso.ent
-PUBLIC "ISO 8879-1986//ENTITIES Added Math Symbols: Ordinary//EN"               ISOamso.ent -- deprecated --
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN"              ISOamsr.ent
-PUBLIC "ISO 8879-1986//ENTITIES Added Math Symbols: Relations//EN"              ISOamsr.ent -- deprecated --
-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN"                       ISObox.ent
-PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN"                       ISObox.ent -- deprecated --
-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN"                           ISOcyr1.ent
-PUBLIC "ISO 8879-1986//ENTITIES Russian Cyrillic//EN"                           ISOcyr1.ent -- deprecated --
-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"                       ISOcyr2.ent
-PUBLIC "ISO 8879-1986//ENTITIES Non-Russian Cyrillic//EN"                       ISOcyr2.ent -- deprecated --
-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN"                          ISOdia.ent
-PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN"                          ISOdia.ent -- deprecated --
-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN"                              ISOgrk1.ent
-PUBLIC "ISO 8879-1986//ENTITIES Greek Letters//EN"                              ISOgrk1.ent -- deprecated --
-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN"                           ISOgrk2.ent
-PUBLIC "ISO 8879-1986//ENTITIES Monotoniko Greek//EN"                           ISOgrk2.ent -- deprecated --
-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN"                              ISOgrk3.ent
-PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN"                              ISOgrk3.ent -- deprecated --
-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN"                  ISOgrk4.ent
-PUBLIC "ISO 8879-1986//ENTITIES Alternative Greek Symbols//EN"                  ISOgrk4.ent -- deprecated --
+  -- ...................................................................... --
+  -- deprecated ........................................................... --
+PUBLIC "ISO 8879-1986//ENTITIES Added Math Symbols: Arrow Relations//EN"        "ISOamsa.ent"
+PUBLIC "ISO 8879-1986//ENTITIES Added Math Symbols: Binary Operators//EN"       "ISOamsb.ent"
+PUBLIC "ISO 8879-1986//ENTITIES Added Math Symbols: Delimiters//EN"             "ISOamsc.ent"
+PUBLIC "ISO 8879-1986//ENTITIES Added Math Symbols: Negated Relations//EN"      "ISOamsn.ent"
+PUBLIC "ISO 8879-1986//ENTITIES Added Math Symbols: Ordinary//EN"               "ISOamso.ent"
+PUBLIC "ISO 8879-1986//ENTITIES Added Math Symbols: Relations//EN"              "ISOamsr.ent"
+PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN"                       "ISObox.ent"
+PUBLIC "ISO 8879-1986//ENTITIES Russian Cyrillic//EN"                           "ISOcyr1.ent"
+PUBLIC "ISO 8879-1986//ENTITIES Non-Russian Cyrillic//EN"                       "ISOcyr2.ent"
+PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN"                          "ISOdia.ent"
+PUBLIC "ISO 8879-1986//ENTITIES Greek Letters//EN"                              "ISOgrk1.ent"
+PUBLIC "ISO 8879-1986//ENTITIES Monotoniko Greek//EN"                           "ISOgrk2.ent"
+PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN"                              "ISOgrk3.ent"
+PUBLIC "ISO 8879-1986//ENTITIES Alternative Greek Symbols//EN"                  "ISOgrk4.ent"
+PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN"                              "ISOlat1.ent"
+PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN//HTML"                        "ISOlat1.ent" 
+PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN"                              "ISOlat2.ent"
+PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN"                "ISOnum.ent"
+PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN"                                 "ISOpub.ent"
+PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN"                          "ISOtech.ent"
Index: branches/experimental/sgml/html/dtd/4.0/HTML4.decl
===================================================================
--- branches/experimental/sgml/html/dtd/4.0/HTML4.decl	(Revision 2170)
+++ branches/experimental/sgml/html/dtd/4.0/HTML4.decl	(Arbeitskopie)
@@ -4,9 +4,6 @@
  
          With support for the first 17 planes of ISO 10646 and
          increased limits for tag and literal lengths etc.
-
-         Modified by jjc to work around SP's 16-bit character limit.
-         Modified by jjc to support hex character references.
     --
  
     CHARSET
@@ -21,13 +18,9 @@
                  32      95      32
                  127     1       UNUSED
                  128     32      UNUSED
-              -- jjc: changed the rest of the DESCSET.
-                 Note that surrogates are not declared UNUSED;
-                 this allows non-BMP characters to be parsed. --
-                 160     65376   160
-              -- 160     55136   160
-                 55296   2048    UNUSED
-                 57344   1056768 57344 --
+                 160     55136   160
+                 55296   2048    UNUSED  -- SURROGATES --
+                 57344   1056768 57344
 
 CAPACITY        SGMLREF
                 TOTALCAP        150000
@@ -56,7 +49,7 @@
                   NAMECASE GENERAL YES
                            ENTITY  NO
          DELIM    GENERAL  SGMLREF
-                           HCRO "&#38;#X" -- added by jjc --
+                  HCRO "&#38;#x" -- 38 is the number for ampersand --
                   SHORTREF SGMLREF
          NAMES    SGMLREF
          QUANTITY SGMLREF
Index: branches/experimental/sgml/html/dtd/4.0/loose.dtd
===================================================================
--- branches/experimental/sgml/html/dtd/4.0/loose.dtd	(Revision 2170)
+++ branches/experimental/sgml/html/dtd/4.0/loose.dtd	(Arbeitskopie)
@@ -10,7 +10,7 @@
     direction text, and enhancements to forms for improved
     accessibility for people with disabilities.
 
-          Draft: $Date: 2001/03/11 06:00:56 $
+          Draft: $Date: 1998/04/02 00:17:00 $
 
           Authors:
               Dave Raggett <d...@w3.org>
@@ -168,20 +168,17 @@
 
 <!ENTITY % HTMLlat1 PUBLIC
    "-//W3C//ENTITIES Latin1//EN//HTML"
-   -- comment out URI so we can use local copy instead
-   "http://www.w3.org/TR/1998/REC-html40-19980424/HTMLlat1.ent"-->
+   "http://www.w3.org/TR/1998/REC-html40-19980424/HTMLlat1.ent";>
 %HTMLlat1;
 
 <!ENTITY % HTMLsymbol PUBLIC
    "-//W3C//ENTITIES Symbols//EN//HTML"
-   -- comment out URI so we can use local copy instead
-   "http://www.w3.org/TR/1998/REC-html40-19980424/HTMLsymbol.ent"-->
+   "http://www.w3.org/TR/1998/REC-html40-19980424/HTMLsymbol.ent";>
 %HTMLsymbol;
 
 <!ENTITY % HTMLspecial PUBLIC
    "-//W3C//ENTITIES Special//EN//HTML"
-   -- comment out URI so we can use local copy instead
-   "http://www.w3.org/TR/1998/REC-html40-19980424/HTMLspecial.ent"-->
+   "http://www.w3.org/TR/1998/REC-html40-19980424/HTMLspecial.ent";>
 %HTMLspecial;
 <!--=================== Generic Attributes ===============================-->
 
Index: branches/experimental/sgml/html/dtd/4.0/strict.dtd
===================================================================
--- branches/experimental/sgml/html/dtd/4.0/strict.dtd	(Revision 2170)
+++ branches/experimental/sgml/html/dtd/4.0/strict.dtd	(Arbeitskopie)
@@ -10,7 +10,7 @@
     direction text, and enhancements to forms for improved
     accessibility for people with disabilities.
 
-          Draft: $Date: 2001/03/11 06:00:56 $
+          Draft: $Date: 1998/04/02 00:17:00 $
 
           Authors:
               Dave Raggett <d...@w3.org>
@@ -142,20 +142,17 @@
 
 <!ENTITY % HTMLlat1 PUBLIC
    "-//W3C//ENTITIES Latin1//EN//HTML"
-   -- comment out URI so we can use local copy instead
-   "http://www.w3.org/TR/1998/REC-html40-19980424/HTMLlat1.ent"-->
+   "http://www.w3.org/TR/1998/REC-html40-19980424/HTMLlat1.ent";>
 %HTMLlat1;
 
 <!ENTITY % HTMLsymbol PUBLIC
    "-//W3C//ENTITIES Symbols//EN//HTML"
-   -- comment out URI so we can use local copy instead
-   "http://www.w3.org/TR/1998/REC-html40-19980424/HTMLsymbol.ent"-->
+   "http://www.w3.org/TR/1998/REC-html40-19980424/HTMLsymbol.ent";>
 %HTMLsymbol;
 
 <!ENTITY % HTMLspecial PUBLIC
    "-//W3C//ENTITIES Special//EN//HTML"
-   -- comment out URI so we can use local copy instead
-   "http://www.w3.org/TR/1998/REC-html40-19980424/HTMLspecial.ent"-->
+   "http://www.w3.org/TR/1998/REC-html40-19980424/HTMLspecial.ent";>
 %HTMLspecial;
 <!--=================== Generic Attributes ===============================-->
 
Index: trunk/sgml/entities/sgml-iso-entities-8879.1986/catalog
===================================================================
--- trunk/sgml/entities/sgml-iso-entities-8879.1986/catalog	(Revision 2170)
+++ trunk/sgml/entities/sgml-iso-entities-8879.1986/catalog	(Arbeitskopie)
@@ -1,47 +1,47 @@
 OVERRIDE	YES
 
         -- ISO latin 1 entity set for HTML --
-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN"                              ISOlat1.ent
-PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN"                              ISOlat1.ent -- deprecated --
+PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN"                              "ISOlat1.ent"
+PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN"                              "ISOlat1.ent" -- deprecated --
         -- note that often people really want "-//W3C//ENTITIES Latin1//EN//HTML" instead of this --
         -- this is deprecated --
-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN//HTML"                        ISOlat1.ent
-PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN//HTML"                        ISOlat1.ent -- deprecated --
+PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN//HTML"                        "ISOlat1.ent"
+PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN//HTML"                        "ISOlat1.ent" -- deprecated --
 
         -- ISO extended entities --
-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN"                              ISOlat2.ent
-PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN"                              ISOlat2.ent -- deprecated --
-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN"                                 ISOpub.ent
-PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN"                                 ISOpub.ent -- deprecated --
-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN"                          ISOtech.ent
-PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN"                          ISOtech.ent -- deprecated --
-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN"                ISOnum.ent
-PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN"                ISOnum.ent -- deprecated --
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN"        ISOamsa.ent
-PUBLIC "ISO 8879-1986//ENTITIES Added Math Symbols: Arrow Relations//EN"        ISOamsa.ent -- deprecated --
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN"       ISOamsb.ent
-PUBLIC "ISO 8879-1986//ENTITIES Added Math Symbols: Binary Operators//EN"       ISOamsb.ent -- deprecated --
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN"             ISOamsc.ent
-PUBLIC "ISO 8879-1986//ENTITIES Added Math Symbols: Delimiters//EN"             ISOamsc.ent -- deprecated --
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN"      ISOamsn.ent
-PUBLIC "ISO 8879-1986//ENTITIES Added Math Symbols: Negated Relations//EN"      ISOamsn.ent -- deprecated --
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN"               ISOamso.ent
-PUBLIC "ISO 8879-1986//ENTITIES Added Math Symbols: Ordinary//EN"               ISOamso.ent -- deprecated --
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN"              ISOamsr.ent
-PUBLIC "ISO 8879-1986//ENTITIES Added Math Symbols: Relations//EN"              ISOamsr.ent -- deprecated --
-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN"                       ISObox.ent
-PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN"                       ISObox.ent -- deprecated --
-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN"                           ISOcyr1.ent
-PUBLIC "ISO 8879-1986//ENTITIES Russian Cyrillic//EN"                           ISOcyr1.ent -- deprecated --
-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"                       ISOcyr2.ent
-PUBLIC "ISO 8879-1986//ENTITIES Non-Russian Cyrillic//EN"                       ISOcyr2.ent -- deprecated --
-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN"                          ISOdia.ent
-PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN"                          ISOdia.ent -- deprecated --
-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN"                              ISOgrk1.ent
-PUBLIC "ISO 8879-1986//ENTITIES Greek Letters//EN"                              ISOgrk1.ent -- deprecated --
-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN"                           ISOgrk2.ent
-PUBLIC "ISO 8879-1986//ENTITIES Monotoniko Greek//EN"                           ISOgrk2.ent -- deprecated --
-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN"                              ISOgrk3.ent
-PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN"                              ISOgrk3.ent -- deprecated --
-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN"                  ISOgrk4.ent
-PUBLIC "ISO 8879-1986//ENTITIES Alternative Greek Symbols//EN"                  ISOgrk4.ent -- deprecated --
+PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN"                              "ISOlat2.ent"
+PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN"                              "ISOlat2.ent" -- deprecated --
+PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN"                                 "ISOpub.ent"
+PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN"                                 "ISOpub.ent"  -- deprecated --
+PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN"                          "ISOtech.ent"
+PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN"                          "ISOtech.ent" -- deprecated --
+PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN"                "ISOnum.ent"
+PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN"                "ISOnum.ent"  -- deprecated --
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN"        "ISOamsa.ent"
+PUBLIC "ISO 8879-1986//ENTITIES Added Math Symbols: Arrow Relations//EN"        "ISOamsa.ent" -- deprecated --
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN"       "ISOamsb.ent"
+PUBLIC "ISO 8879-1986//ENTITIES Added Math Symbols: Binary Operators//EN"       "ISOamsb.ent" -- deprecated --
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN"             "ISOamsc.ent"
+PUBLIC "ISO 8879-1986//ENTITIES Added Math Symbols: Delimiters//EN"             "ISOamsc.ent" -- deprecated --
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN"      "ISOamsn.ent"
+PUBLIC "ISO 8879-1986//ENTITIES Added Math Symbols: Negated Relations//EN"      "ISOamsn.ent" -- deprecated --
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN"               "ISOamso.ent"
+PUBLIC "ISO 8879-1986//ENTITIES Added Math Symbols: Ordinary//EN"               "ISOamso.ent" -- deprecated --
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN"              "ISOamsr.ent"
+PUBLIC "ISO 8879-1986//ENTITIES Added Math Symbols: Relations//EN"              "ISOamsr.ent" -- deprecated --
+PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN"                       "ISObox.ent"
+PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN"                       "ISObox.ent"  -- deprecated --
+PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN"                           "ISOcyr1.ent"
+PUBLIC "ISO 8879-1986//ENTITIES Russian Cyrillic//EN"                           "ISOcyr1.ent" -- deprecated --
+PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"                       "ISOcyr2.ent"
+PUBLIC "ISO 8879-1986//ENTITIES Non-Russian Cyrillic//EN"                       "ISOcyr2.ent" -- deprecated --
+PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN"                          "ISOdia.ent"
+PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN"                          "ISOdia.ent"  -- deprecated --
+PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN"                              "ISOgrk1.ent"
+PUBLIC "ISO 8879-1986//ENTITIES Greek Letters//EN"                              "ISOgrk1.ent" -- deprecated --
+PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN"                           "ISOgrk2.ent"
+PUBLIC "ISO 8879-1986//ENTITIES Monotoniko Greek//EN"                           "ISOgrk2.ent" -- deprecated --
+PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN"                              "ISOgrk3.ent"
+PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN"                              "ISOgrk3.ent" -- deprecated --
+PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN"                  "ISOgrk4.ent"
+PUBLIC "ISO 8879-1986//ENTITIES Alternative Greek Symbols//EN"                  "ISOgrk4.ent" -- deprecated --
Index: trunk/sgml/entities/sgml-iso-entities-9573-13.1991/catalog
===================================================================
--- trunk/sgml/entities/sgml-iso-entities-9573-13.1991/catalog	(Revision 2170)
+++ trunk/sgml/entities/sgml-iso-entities-9573-13.1991/catalog	(Arbeitskopie)
@@ -1,30 +1,29 @@
 OVERRIDE YES
 
 -- ...................................................................... --
--- these materials are based on the following standard:                   --
--- ISO/IEC TR 9573-13:1991                                                --
--- Techniques for using SGML                                              --
--- Part 13: Public entity sets for mathematics and science                --
+-- These materials are based on the following standard: ................. --
+-- ISO/IEC TR 9573-13:1991 .............................................. --
+-- Techniques for using SGML ............................................ --
+-- Part 13: Public entity sets for mathematics and science .............. --
 -- ...................................................................... --
 
 -- need file !! --
-PUBLIC "ISO 9573-13:1991//ENTITIES General Technical//EN"                     ISOtech.ent
+PUBLIC "ISO 9573-13:1991//ENTITIES General Technical//EN"                     "ISOtech.ent"
 
 -- these are pretty much redundant with the materials in ISO 8879:1986 --
-PUBLIC "ISO 9573-13:1991//ENTITIES Greek Symbols//EN"                         ISOgrk3.ent
-PUBLIC "ISO 9573-13:1991//ENTITIES Alternative Greek Symbols//EN"             ISOgrk4.ent
+PUBLIC "ISO 9573-13:1991//ENTITIES Greek Symbols//EN"                         "ISOgrk3.ent"
+PUBLIC "ISO 9573-13:1991//ENTITIES Alternative Greek Symbols//EN"             "ISOgrk4.ent"
 
-PUBLIC "ISO 9573-13:1991//ENTITIES Added Math Symbols: Ordinary//EN"          ISOamso.ent
-PUBLIC "ISO 9573-13:1991//ENTITIES Added Math Symbols: Binary Operators//EN"  ISOamsb.ent
-PUBLIC "ISO 9573-13:1991//ENTITIES Added Math Symbols: Relations//EN"         ISOamsr.ent
-PUBLIC "ISO 9573-13:1991//ENTITIES Added Math Symbols: Negated Relations//EN" ISOamsn.ent
-PUBLIC "ISO 9573-13:1991//ENTITIES Added Math Symbols: Arrow Relations//EN"   ISOamsa.ent
-PUBLIC "ISO 9573-13:1991//ENTITIES Added Math Symbols: Delimiters//EN"        ISOamsc.ent
+PUBLIC "ISO 9573-13:1991//ENTITIES Added Math Symbols: Arrow Relations//EN"   "ISOamsa.ent"
+PUBLIC "ISO 9573-13:1991//ENTITIES Added Math Symbols: Binary Operators//EN"  "ISOamsb.ent"
+PUBLIC "ISO 9573-13:1991//ENTITIES Added Math Symbols: Delimiters//EN"        "ISOamsc.ent"
+PUBLIC "ISO 9573-13:1991//ENTITIES Added Math Symbols: Negated Relations//EN" "ISOamsn.ent"
+PUBLIC "ISO 9573-13:1991//ENTITIES Added Math Symbols: Ordinary//EN"          "ISOamso.ent"
+PUBLIC "ISO 9573-13:1991//ENTITIES Added Math Symbols: Relations//EN"         "ISOamsr.ent"
 
-PUBLIC "ISO 9573-13:1991//ENTITIES Math Alphabets: Fraktur//EN"               ISOmfrk.ent
-PUBLIC "ISO 9573-13:1991//ENTITIES Math Alphabets: Open Face//EN"             ISOmopf.ent
-PUBLIC "ISO 9573-13:1991//ENTITIES Math Alphabets: Script//EN"                ISOmscr.ent
+PUBLIC "ISO 9573-13:1991//ENTITIES Math Alphabets: Fraktur//EN"               "ISOmfrk.ent"
+PUBLIC "ISO 9573-13:1991//ENTITIES Math Alphabets: Open Face//EN"             "ISOmopf.ent"
+PUBLIC "ISO 9573-13:1991//ENTITIES Math Alphabets: Script//EN"                "ISOmscr.ent"
 
+PUBLIC "ISO 9573-13:1991//ENTITIES Chemistry//EN"                             "ISOchem.ent"
 
-PUBLIC "ISO 9573-13:1991//ENTITIES Chemistry//EN"                             ISOchem.ent
-
Index: trunk/xml/entities/xml-iso-entities-8879.1986/catalog
===================================================================
--- trunk/xml/entities/xml-iso-entities-8879.1986/catalog	(Revision 2170)
+++ trunk/xml/entities/xml-iso-entities-8879.1986/catalog	(Arbeitskopie)
@@ -1,29 +1,55 @@
-OVERRIDE	YES
+  -- ...................................................................... --
+  -- This catalog was written for the Debian system ....................... --
+  -- ...................................................................... --
 
--- ...................................................................... --
--- SGML TR9401 Catalog for XML Character Entities ....................... --
--- ...................................................................... --
+  -- ...................................................................... --
+  -- SGML TR9401 Catalog for XML Character Entities ....................... --
+  -- http://www.w3.org/2003/entities/iso8879/ ............................. --
 
--- derived from V0.3, see http://www.oasis-open.org/committees/docbook/xmlcharent/
-   Note: file names changed to comply with LSB SGML/XML Recommendations, R006
---
+  -- ...................................................................... --
+  -- prefer PUBID over SYSID .............................................. --
+OVERRIDE YES
 
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN//XML"   ISOamsa.ent
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML"  ISOamsb.ent
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN//XML"        ISOamsc.ent
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN//XML" ISOamsn.ent
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN//XML"		ISOamso.ent
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN//XML"         ISOamsr.ent
-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML"                  ISObox.ent
-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML"                      ISOcyr1.ent
-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML"                  ISOcyr2.ent
-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML"                     ISOdia.ent
-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN//XML"                         ISOgrk1.ent
-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML"                      ISOgrk2.ent
-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN//XML"                         ISOgrk3.ent
-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN//XML"             ISOgrk4.ent
-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"                         ISOlat1.ent
-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN//XML"                         ISOlat2.ent
-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML"           ISOnum.ent
-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN//XML"                            ISOpub.ent
-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN//XML"                     ISOtech.ent
+  -- derived from V0.3, see http://www.oasis-open.org/committees/docbook/xmlcharent/
+     Note: file names changed to comply with LSB SGML/XML Recommendations, R006
+  --
+
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN//XML"   "ISOamsa.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML"  "ISOamsb.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN//XML"        "ISOamsc.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN//XML" "ISOamsn.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN//XML"          "ISOamso.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN//XML"         "ISOamsr.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML"                  "ISObox.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML"                      "ISOcyr1.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML"                  "ISOcyr2.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML"                     "ISOdia.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN//XML"                         "ISOgrk1.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML"                      "ISOgrk2.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN//XML"                         "ISOgrk3.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN//XML"             "ISOgrk4.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"                         "ISOlat1.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN//XML"                         "ISOlat2.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML"           "ISOnum.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN//XML"                            "ISOpub.ent"
+PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN//XML"                     "ISOtech.ent"
+
+SYSTEM "http://www.w3.org/2003/entities/iso8879/isoamsa.ent"; "ISOamsa.ent"
+SYSTEM "http://www.w3.org/2003/entities/iso8879/isoamsb.ent"; "ISOamsb.ent"
+SYSTEM "http://www.w3.org/2003/entities/iso8879/isoamsc.ent"; "ISOamsc.ent"
+SYSTEM "http://www.w3.org/2003/entities/iso8879/isoamsn.ent"; "ISOamsn.ent"
+SYSTEM "http://www.w3.org/2003/entities/iso8879/isoamso.ent"; "ISOamso.ent"
+SYSTEM "http://www.w3.org/2003/entities/iso8879/isoamsr.ent"; "ISOamsr.ent"
+SYSTEM "http://www.w3.org/2003/entities/iso8879/isobox.ent";  "ISObox.ent"
+SYSTEM "http://www.w3.org/2003/entities/iso8879/isocyr1.ent"; "ISOcyr1.ent"
+SYSTEM "http://www.w3.org/2003/entities/iso8879/isocyr2.ent"; "ISOcyr2.ent"
+SYSTEM "http://www.w3.org/2003/entities/iso8879/isodia.ent";  "ISOdia.ent"
+SYSTEM "http://www.w3.org/2003/entities/iso8879/isogrk1.ent"; "ISOgrk1.ent"
+SYSTEM "http://www.w3.org/2003/entities/iso8879/isogrk2.ent"; "ISOgrk2.ent"
+SYSTEM "http://www.w3.org/2003/entities/iso8879/isogrk3.ent"; "ISOgrk3.ent"
+SYSTEM "http://www.w3.org/2003/entities/iso8879/isogrk4.ent"; "ISOgrk4.ent"
+SYSTEM "http://www.w3.org/2003/entities/iso8879/isolat1.ent"; "ISOlat1.ent"
+SYSTEM "http://www.w3.org/2003/entities/iso8879/isolat2.ent"; "ISOlat2.ent"
+SYSTEM "http://www.w3.org/2003/entities/iso8879/isonum.ent";  "ISOnum.ent"
+SYSTEM "http://www.w3.org/2003/entities/iso8879/isopub.ent";  "ISOpub.ent"
+SYSTEM "http://www.w3.org/2003/entities/iso8879/isotech.ent"; "ISOtech.ent"
Index: trunk/xml/entities/xml-iso-entities-8879.1986/catalog.xml
===================================================================
--- trunk/xml/entities/xml-iso-entities-8879.1986/catalog.xml	(Revision 2170)
+++ trunk/xml/entities/xml-iso-entities-8879.1986/catalog.xml	(Arbeitskopie)
@@ -2,15 +2,20 @@
 <!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" 
     "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd";>
 
+<!-- ..................................................................... -->
+<!-- This catalog was written for the Debian system. ..................... -->
+<!-- ..................................................................... -->
+
 <!-- ...................................................................... -->
 <!-- XML Catalog data for XML Character Entities .......................... -->
-<!-- ...................................................................... -->
+<!-- http://www.w3.org/2003/entities/iso8879/ ............................. -->
 
 <!-- derived from V0.3, see http://www.oasis-open.org/committees/docbook/xmlcharent/
      Note: file names changed to comply with LSB SGML/XML Recommendations, R006
   -->
 
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="public">
+
   <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN//XML"   uri="ISOamsa.ent"/>
   <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML"  uri="ISOamsb.ent"/>
   <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN//XML"        uri="ISOamsc.ent"/>
@@ -30,4 +35,47 @@
   <public publicId="ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML"           uri="ISOnum.ent" />
   <public publicId="ISO 8879:1986//ENTITIES Publishing//EN//XML"                            uri="ISOpub.ent" />
   <public publicId="ISO 8879:1986//ENTITIES General Technical//EN//XML"                     uri="ISOtech.ent"/>
-</catalog>
\ Kein Zeilenumbruch am Ende der Datei
+
+  <system systemId="http://www.w3.org/2003/entities/iso8879/isoamsa.ent"; uri="ISOamsa.ent"/>
+  <system systemId="http://www.w3.org/2003/entities/iso8879/isoamsb.ent"; uri="ISOamsb.ent"/>
+  <system systemId="http://www.w3.org/2003/entities/iso8879/isoamsc.ent"; uri="ISOamsc.ent"/>
+  <system systemId="http://www.w3.org/2003/entities/iso8879/isoamsn.ent"; uri="ISOamsn.ent"/>
+  <system systemId="http://www.w3.org/2003/entities/iso8879/isoamso.ent"; uri="ISOamso.ent"/>
+  <system systemId="http://www.w3.org/2003/entities/iso8879/isoamsr.ent"; uri="ISOamsr.ent"/>
+  <system systemId="http://www.w3.org/2003/entities/iso8879/isobox.ent";  uri="ISObox.ent" />
+  <system systemId="http://www.w3.org/2003/entities/iso8879/isocyr1.ent"; uri="ISOcyr1.ent"/>
+  <system systemId="http://www.w3.org/2003/entities/iso8879/isocyr2.ent"; uri="ISOcyr2.ent"/>
+  <system systemId="http://www.w3.org/2003/entities/iso8879/isodia.ent";  uri="ISOdia.ent" />
+  <system systemId="http://www.w3.org/2003/entities/iso8879/isogrk1.ent"; uri="ISOgrk1.ent"/>
+  <system systemId="http://www.w3.org/2003/entities/iso8879/isogrk2.ent"; uri="ISOgrk2.ent"/>
+  <system systemId="http://www.w3.org/2003/entities/iso8879/isogrk3.ent"; uri="ISOgrk3.ent"/>
+  <system systemId="http://www.w3.org/2003/entities/iso8879/isogrk4.ent"; uri="ISOgrk4.ent"/>
+  <system systemId="http://www.w3.org/2003/entities/iso8879/isolat1.ent"; uri="ISOlat1.ent"/>
+  <system systemId="http://www.w3.org/2003/entities/iso8879/isolat2.ent"; uri="ISOlat2.ent"/>
+  <system systemId="http://www.w3.org/2003/entities/iso8879/isonum.ent";  uri="ISOnum.ent" />
+  <system systemId="http://www.w3.org/2003/entities/iso8879/isopub.ent";  uri="ISOpub.ent" />
+  <system systemId="http://www.w3.org/2003/entities/iso8879/isotech.ent"; uri="ISOtech.ent"/>
+
+<!--  The following works, but also rewrites e.g.
+      http://www.w3.org/2003/entities/iso8879/iso8879map.xsl to a local resource,
+      where it is not installed. Maybe we will need it later, so I leave it here.
+  -->
+<!--
+  <rewriteURI
+    uriStartString="http://www.w3.org/2003/entities/iso8879/iso";
+    rewritePrefix="file:///usr/share/xml/entities/xml-iso-entities-8879.1986/ISO"/>
+
+  <rewriteSystem
+    systemIdStartString="http://www.w3.org/2003/entities/iso8879/iso";
+    rewritePrefix="file:///usr/share/xml/entities/xml-iso-entities-8879.1986/ISO"/>
+
+  <rewriteURI
+    uriStartString="http://www.w3.org/2003/entities/iso8879/";
+    rewritePrefix="file:///usr/share/xml/entities/xml-iso-entities-8879.1986/"/>
+  
+  <rewriteSystem
+    systemIdStartString="http://www.w3.org/2003/entities/iso8879/";
+    rewritePrefix="file:///usr/share/xml/entities/xml-iso-entities-8879.1986/"/>
+  -->
+
+</catalog>

Reply via email to