A major mode for editing SGML and XML documents for emacs.

PR:		ports/9635
Submitted by:	Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>

5 files changed, 142 insertions, 0 deletions

diff --git a/editors/psgml-emacs/files/patch-ac b/editors/psgml-emacs/files/patch-ac
new file mode 100644
index 000000000000..640c089d0e43
--- /dev/null
+++ b/editors/psgml-emacs/files/patch-ac
@@ -0,0 +1,27 @@
+--- psgml.el.orig	Mon Nov 16 06:45:03 1998
++++ psgml.el	Sat Jan 23 19:14:44 1999
+@@ -335,7 +335,7 @@
+ (put 'sgml-system-path 'sgml-type 'file-list)
+ 
+ (defvar sgml-public-map (or (sgml-parse-colon-path (getenv "SGML_PATH"))
+-			    '("%S" "/usr/local/lib/sgml/%o/%c/%d" ))
++			    '("%S" "@prefix@/share/sgml/%o/%c/%d" ))
+   "*Mapping from public identifiers to file names.
+ This is a list of possible file names.  To find the file for a public
+ identifier the elements of the list are used one at the time from the
+@@ -361,13 +361,13 @@
+ (defvar sgml-catalog-files (or (delete nil
+ 				       (sgml-parse-colon-path
+ 					(getenv "SGML_CATALOG_FILES")))
+-			       '("catalog" "/usr/local/lib/sgml/catalog"))
++			       '("catalog" "@prefix@/share/sgml/catalog"))
+   "*List of catalog entry files.
+ The files are in the format defined in the SGML Open Draft Technical
+ Resolution on Entity Management.")
+ (put 'sgml-catalog-files 'sgml-type 'file-list)
+ 
+-(defvar sgml-ecat-files '("ECAT" "~/sgml/ECAT" "/usr/local/lib/sgml/ECAT")
++(defvar sgml-ecat-files '("ECAT" "~/sgml/ECAT" "@prefix@/share/sgml/ECAT")
+   "*List of catalog files for PSGML.")
+ (put 'sgml-ecat-files 'sgml-type 'file-list)
+ 
diff --git a/editors/psgml-emacs/files/patch-ad b/editors/psgml-emacs/files/patch-ad
new file mode 100644
index 000000000000..ba3f8cf7f553
--- /dev/null
+++ b/editors/psgml-emacs/files/patch-ad
@@ -0,0 +1,13 @@
+--- Makefile.in.orig	Sat Jan 23 20:58:07 1999
++++ Makefile.in	Sat Jan 23 20:58:55 1999
+@@ -81,8 +81,8 @@
+ 	$(INSTALL_DATA) psgml-api.info $(infodir)
+ 	if $(SHELL) -c 'install-info --version' \
+ 		>/dev/null 2>&1; then \
+-		install-info --info-dir=$(infodir) psgml.info; \
+-		install-info --info-dir=$(infodir) psgml-api.info; \
++		install-info $(infodir)/psgml.info $(infodir)/dir; \
++		install-info $(infodir)/psgml-api.info $(infodir)/dir; \
+ 	else true; fi
+ 
+ 
diff --git a/editors/psgml-emacs/files/patch-ae b/editors/psgml-emacs/files/patch-ae
new file mode 100644
index 000000000000..6910b39d7a89
--- /dev/null
+++ b/editors/psgml-emacs/files/patch-ae
@@ -0,0 +1,47 @@
+--- psgml.texi.orig	Mon Nov 16 06:45:07 1998
++++ psgml.texi	Sat Jan 23 21:10:21 1999
+@@ -11,10 +11,9 @@
+ 
+ @ifinfo
+-@format
+-START-INFO-DIR-ENTRY
++@dircategory The Emacs editor and associated tools
++@direntry
+ * PSGML: (psgml).          PSGML, a major mode for SGML documents.
+-END-INFO-DIR-ENTRY
+-@end format
++@end direntry
+ @end ifinfo
+ 
+ @ifinfo
+@@ -401,10 +400,10 @@
+ @code{SGML_PATH}.
+ 
+ Given the public identifier above and the file name template 
+-@samp{/usr/local/lib/sgml/%o/%c/%d}, the resulting file name is
++@samp{@prefix@/share/sgml/%o/%c/%d}, the resulting file name is
+ 
+ @example
+-/usr/local/lib/sgml/ISO_8879:1986/entities/Added_Latin_1
++@prefix@/share/sgml/ISO_8879:1986/entities/Added_Latin_1
+ @end example
+ 
+ Note: blanks are transliterated to @samp{_} (and also @samp{/} to
+@@ -420,7 +419,7 @@
+ is undefined the default is
+ 
+ @lisp
+-("CATALOG" "/usr/local/lib/sgml/CATALOG")
++("catalog" "@prefix@/share/sgml/catalog")
+ @end lisp
+ @end defopt
+ 
+@@ -448,7 +447,7 @@
+ environment variable is undefined the default is
+ 
+ @lisp
+-("%S" "/usr/local/lib/sgml/%o/%c/%d")
++("%S" "@prefix@/share/sgml/%o/%c/%d")
+ @end lisp
+ @c Mapping from public identifiers to file names.
+ @end defopt
diff --git a/editors/psgml-emacs/files/patch-af b/editors/psgml-emacs/files/patch-af
new file mode 100644
index 000000000000..18a916598525
--- /dev/null
+++ b/editors/psgml-emacs/files/patch-af
@@ -0,0 +1,16 @@
+--- psgml-api.texi.orig	Mon Nov 16 06:45:06 1998
++++ psgml-api.texi	Sat Jan 23 21:11:18 1999
+@@ -8,10 +8,9 @@
+ 
+ @ifinfo
+-@format
+-START-INFO-DIR-ENTRY
++@dircategory The Emacs editor and associated tools
++@direntry
+ * PSGML-API: (psgml-api).  PSGML, the API documentation.
+-END-INFO-DIR-ENTRY
+-@end format
++@end direntry
+ @end ifinfo
+ 
+ @ifinfo
diff --git a/editors/psgml-emacs/files/patch-ag b/editors/psgml-emacs/files/patch-ag
new file mode 100644
index 000000000000..90792b64da9a
--- /dev/null
+++ b/editors/psgml-emacs/files/patch-ag
@@ -0,0 +1,39 @@
+--- psgml-parse.el.orig	Mon Nov 16 06:45:04 1998
++++ psgml-parse.el	Sat Jan 23 20:28:15 1999
+@@ -1217,6 +1217,11 @@
+     (sgml-check-dtd-subset)
+     (sgml-pop-entity)
+     (erase-buffer)
++    ;; For Mule
++    (if (string-match "Emacs 20\." (emacs-version))
++	(set-buffer-file-coding-system 'binary)
++      (if (boundp 'MULE)
++	  (set-file-coding-system *noconv*)))
+     (sgml-write-dtd sgml-dtd-info to-file)
+     t))
+ 
+@@ -1244,6 +1249,10 @@
+   "Merge the binary coded dtd in the current buffer with the current dtd.
+ The current dtd is the variable sgml-dtd-info.  Return t if mereged
+ was successfull or nil if failed."
++  (if (string-match "Emacs 20\." (emacs-version))
++      (set-buffer-file-coding-system 'binary)
++    (if (boundp 'MULE)
++	(set-file-coding-system *noconv*)))
+   (goto-char (point-min))
+   (sgml-read-sexp)			; skip filev
+   (let ((dependencies (sgml-read-sexp))
+@@ -2461,7 +2470,12 @@
+     (set-buffer sgml-scratch-buffer)
+     ;; For MULE to not misinterpret binary data set the mc-flag
+     ;; (reported by Jeffrey Friedl <jfriedl@nff.ncl.omron.co.jp>)
+-    (set 'mc-flag nil)			
++    (set 'mc-flag nil)
++    ;; For MULE/Emacs 20 to not misinterpret binary data
++    (if (string-match "Emacs 20\." (emacs-version))
++	(set-buffer-file-coding-system 'binary)
++       (if (boundp 'MULE)
++	   (set-file-coding-system *noconv*)))
+     (when (eq sgml-scratch-buffer (default-value 'sgml-scratch-buffer))
+       (make-local-variable 'sgml-scratch-buffer)
+       (setq sgml-scratch-buffer nil))