--- psgml-parse.el.old	Tue Feb 13 09:06:19 2001
+++ psgml-parse.el	Mon Sep 10 19:14:21 2001
@@ -1375,6 +1375,16 @@
       "XML-PIC"    "?>"			; end an XML processing instruction
       "XML-SCOM"   "<!--"		; start an XML comment
       "XML-TAGCE"  "/>"			; end an XML empty element
+      "XML-SCOM2"   "[-"		; start an XML comment
+      "XML-ECOM2"   "-]"		; end an XML comment
+      "XML-SCOM3"   "[+"		; start an XML comment
+      "XML-ECOM3"   "+]"		; end an XML comment
+      "XML-SCOM4"   "[$"		; start an XML comment
+      "XML-ECOM4"   "$]"		; end an XML comment
+      "XML-SCOM5"   "[#"		; start an XML comment
+      "XML-ECOM5"   "#]"		; end an XML comment
+      "XML-SCOM6"   "[*"		; start an XML comment
+      "XML-ECOM6"   "*]"		; end an XML comment
       ;; Pseudo
       "NULL"  ""
       )))
@@ -1746,7 +1756,23 @@
       (progn (sgml-skip-upto "XML-ECOM")
 	     (sgml-check-delim "XML-ECOM")
              (sgml-set-markup-type 'comment)
-	     t)))
+	     t))
+  (if (sgml-parse-delim "XML-SCOM2")
+      (progn (sgml-skip-upto "XML-ECOM2")
+	     (sgml-check-delim "XML-ECOM2")
+             (sgml-set-markup-type 'comment)
+	     t))
+  (if (sgml-parse-delim "XML-SCOM3")
+      (progn (sgml-skip-upto "XML-ECOM3")
+	     (sgml-check-delim "XML-ECOM3")
+             (sgml-set-markup-type 'comment)
+	     t))
+  (if (sgml-parse-delim "XML-SCOM4")
+      (progn (sgml-skip-upto "XML-ECOM4")
+	     (sgml-check-delim "XML-ECOM4")
+             (sgml-set-markup-type 'comment)
+	     t))
+)
 
 (defun sgml-skip-cs ()
   "Skip over the separator used in the catalog.
@@ -3510,7 +3536,7 @@
 (defun sgml-skip-until-dsc ()
   (while (progn
 	   (if sgml-xml-p
-	       (sgml-skip-upto ("DSO" "DSC" "LITA" "LIT" "XML-SCOM" "COM"))
+	       (sgml-skip-upto ("DSO" "DSC" "LITA" "LIT" "XML-SCOM" "XML-SCOM2" "XML-SCOM3" "XML-SCOM4" "XML-SCOM5" "XML-SCOM6" "COM"))
 	     (sgml-skip-upto ("DSO" "DSC" "LITA" "LIT" "COM")))
 	   (not (sgml-parse-delim "DSC")))
     (cond ((sgml-parse-literal))
@@ -3720,7 +3746,8 @@
 	      (t (sgml-parse-error
 		  "Illegal markup declaration %s" tok)))))
      (t
-      (setq sgml-markup-type 'comment)))
+      (setq sgml-markup-type 'comment)
+      ))
     (sgml-skip-ps)
     (sgml-check-delim "MDC")
     (unless (eq option 'ignore)		; Set the markup type given
@@ -3728,7 +3755,43 @@
 	(sgml-set-markup-type sgml-markup-type)))
     t)
    ((sgml-parse-delim "MS-START")
-    (sgml-do-marked-section))))
+    (sgml-do-marked-section))
+   ((sgml-parse-delim "XML-SCOM2")
+	(sgml-skip-upto "XML-ECOM2")
+	(sgml-parse-delim "XML-ECOM2")
+	(unless (eq option 'ignore)
+	    (sgml-set-markup-type 'comment)
+	)
+    )
+   ((sgml-parse-delim "XML-SCOM3")
+	(sgml-skip-upto "XML-ECOM3")
+	(sgml-parse-delim "XML-ECOM3")
+	(unless (eq option 'ignore)
+	    (sgml-set-markup-type 'comment)
+	)
+    )
+   ((sgml-parse-delim "XML-SCOM4")
+	(sgml-skip-upto "XML-ECOM4")
+	(sgml-parse-delim "XML-ECOM4")
+	(unless (eq option 'ignore)
+	    (sgml-set-markup-type 'comment)
+	)
+    )
+   ((sgml-parse-delim "XML-SCOM5")
+	(sgml-skip-upto "XML-ECOM5")
+	(sgml-parse-delim "XML-ECOM5")
+	(unless (eq option 'ignore)
+	    (sgml-set-markup-type 'comment)
+	)
+    )
+   ((sgml-parse-delim "XML-SCOM6")
+	(sgml-skip-upto "XML-ECOM6")
+	(sgml-parse-delim "XML-ECOM6")
+	(unless (eq option 'ignore)
+	    (sgml-set-markup-type 'comment)
+	)
+    )
+  ))
 
 ;;;; Parsing attribute values