Commits

Anonymous committed 6a378ac

Import from CVS: tag r20-0b91

Comments (0)

Files changed (186)

 							-*- indented-text -*-
+to 20.0 beta91
+-- func-menu.el-2.45
+-- ediff-2.64
+-- viper-2.92
+-- w3-3.0.50
+-- html 3.2 final dtd added.
+-- Miscellaneous bug fixes
+-- ps-print.el-3.05 Courtesy of Jacques Duthen Prestataire
+
 to 20.0 beta90
 -- ediff-2.64
 -- viper-2.92
+Wed Jan 22 21:07:17 1997  Steven L Baur  <steve@altair.xemacs.org>
+	* XEmacs 20.0-b91 (prerelease 2) is released.
+
+	* configure.in (--with-scrollbars): Add Athena3d as a toolkit
+	type.
+
+	* lwlib/lwlib-Xaw.c (xaw_update_one_widget): Let Athena 3d have 0
+	borderwidth.
+	(xaw_scrollbar_scroll): Use SCROLLBAR_LINE_UP and
+	SCROLLBAR_LINE_DOWN since that's current the only to get to the
+	bottom of the buffer. :-(
+
+Tue Jan 21 20:01:19 1997  Steven L. Baur  <steve@altair.xemacs.org>
+
+	* configure.in (beta): Add LWLIB_USES_ATHENA for odd
+	configurations that use both Motif and Athena.
+
+	* etc/sgml/HTML32.dtd: html-3.2 final dtd added.
+
+Wed Jan 15 12:55:19 1997  Steven L Baur  <steve@altair.xemacs.org>
+
+	* info/dir (Gnus): Updated spelling and info.
+
+Mon Jan 13 13:37:27 1997  Steven L Baur  <steve@altair.xemacs.org>
+
+	* configure.in: Remove assignment of NON_GNU_CPP for irix-6.0.
+
+Mon Jan 13 00:36:01 1997  Martin Buchholz  <mrb@eng.sun.com>
+
+	* lib-src/make-docfile.c (scan_lisp_file): eliminate doc-string
+	warnings for ccl-read-*
+
 Sat Jan 11 12:05:31 1997  Steven L Baur  <steve@altair.xemacs.org>
+
+	* etc/sample.emacs: Remove code snippet that wipes out the cycle
+	buffer modeline feature.
+
 	* XEmacs 20.0 beta90 (prerelease 1) is released.
 	* XEmacs 19.15 beta90 (prerelease 1) is released.
 	
 --with-menubars=TYPE	Use TYPE menubars (lucid, motif, or no).  The Lucid
 			widgets emulate Motif (mostly) but are faster.
 			*WARNING*  The Motif menubar is currently broken.
---with-scrollbars=TYPE	Use TYPE scrollbars (lucid, motif, athena, or no).
---with-dialogs=TYPE	Use TYPE dialog boxes (motif, athena, or no).
+--with-scrollbars=TYPE	Use TYPE scrollbars (lucid, motif, athena, 
+			athena3d, or no).
+--with-dialogs=TYPE	Use TYPE dialog boxes (motif, athena, athena3d, or no).
 			(Lucid menubars and scrollbars are the default.
 			 Motif dialog boxes will be used if Motif can be
 			 found.)
 	  case "${val}" in
 	    l | lu | luc | luci | lucid )		val=lucid  ;;
 	    m | mo | mot | moti | motif )		val=motif  ;;
+	    athena3d | athena-3d )			val=athena3d ;;
 	    a | at | ath | athe | athen | athena )	val=athena ;;
 	    n | no | non | none )			val=no ;;
 	    * )
   cydra*-cydrome-sysv* ) machine=cydra5 opsys=usg5-3 ;;
 
   ## Data General AViiON Machines
+  i586-dg-dgux*R4* | i586-dg-dgux5.4.4* ) machine=aviion opsys=dgux5-4r4 ;;
   m88k-dg-dgux5.4R3* | m88k-dg-dgux5.4.3* ) machine=aviion opsys=dgux5-4r3 ;;
   m88k-dg-dgux5.4R2* | m88k-dg-dgux5.4.2* ) machine=aviion opsys=dgux5-4r2 ;;
   m88k-dg-dgux* 			  ) machine=aviion opsys=dgux	   ;;
   ## Iris 4D
   mips-sgi-irix3.*      ) machine=iris4d opsys=irix3-3 ;;
   mips-sgi-irix4.*      ) machine=iris4d opsys=irix4-0 ;;
-  mips-sgi-irix6*       ) machine=iris4d opsys=irix6-0  NON_GNU_CPP=/lib/cpp ;;
+  mips-sgi-irix6*       ) machine=iris4d opsys=irix6-0 ;;
   mips-sgi-irix5.[3-9]* ) machine=iris4d opsys=irix5-3 ;;
   mips-sgi-irix5.2*     ) machine=iris4d opsys=irix5-2 ;;
   mips-sgi-irix5.1*     ) machine=iris4d opsys=irix5-1 ;;
 test "${with_menubars}"   = "motif" -o \
      "${with_scrollbars}" = "motif" -o \
      "${with_dialogs}"    = "motif"  && with_motif="yes"
+test "${with_menubars}"   = "athena" -o \
+     "${with_scrollbars}" = "athena" -o \
+     "${with_dialogs}"    = "athena"  && with_athena="yes"
+test "${with_menubars}"   = "athena3d" -o \
+     "${with_scrollbars}" = "athena3d" -o \
+     "${with_dialogs}"    = "athena3d"  && with_athena="yes"
 test "${with_menubars}"   = ""       && with_menubars="lucid"
 test "${with_menubars}"   = "athena" && with_menubars="lucid"
 test "${with_scrollbars}" = ""       && with_scrollbars="lucid"
 "
 }
 
+if test "${with_scrollbars}" = "athena3d"; then
+	
+{
+test -n "$verbose" && \
+echo "	defining LWLIB_SCROLLBARS_ATHENA"
+echo "#define" LWLIB_SCROLLBARS_ATHENA "1" >> confdefs.h
+DEFS="$DEFS -DLWLIB_SCROLLBARS_ATHENA=1"
+ac_sed_defs="${ac_sed_defs}\${ac_dA}LWLIB_SCROLLBARS_ATHENA\${ac_dB}LWLIB_SCROLLBARS_ATHENA\${ac_dC}1\${ac_dD}
+\${ac_uA}LWLIB_SCROLLBARS_ATHENA\${ac_uB}LWLIB_SCROLLBARS_ATHENA\${ac_uC}1\${ac_uD}
+\${ac_eA}LWLIB_SCROLLBARS_ATHENA\${ac_eB}LWLIB_SCROLLBARS_ATHENA\${ac_eC}1\${ac_eD}
+"
+}
+
+	
+{
+test -n "$verbose" && \
+echo "	defining LWLIB_SCROLLBARS_ATHENA3D"
+echo "#define" LWLIB_SCROLLBARS_ATHENA3D "1" >> confdefs.h
+DEFS="$DEFS -DLWLIB_SCROLLBARS_ATHENA3D=1"
+ac_sed_defs="${ac_sed_defs}\${ac_dA}LWLIB_SCROLLBARS_ATHENA3D\${ac_dB}LWLIB_SCROLLBARS_ATHENA3D\${ac_dC}1\${ac_dD}
+\${ac_uA}LWLIB_SCROLLBARS_ATHENA3D\${ac_uB}LWLIB_SCROLLBARS_ATHENA3D\${ac_uC}1\${ac_uD}
+\${ac_eA}LWLIB_SCROLLBARS_ATHENA3D\${ac_eB}LWLIB_SCROLLBARS_ATHENA3D\${ac_eC}1\${ac_eD}
+"
+}
+
+fi
 test "${with_dialogs}"    = "motif"  && 
 {
 test -n "$verbose" && \
 "
 }
 
+if test "${with_dialogs}"    = "athena3d"; then
+	
+{
+test -n "$verbose" && \
+echo "	defining LWLIB_DIALOGS_ATHENA"
+echo "#define" LWLIB_DIALOGS_ATHENA "1" >> confdefs.h
+DEFS="$DEFS -DLWLIB_DIALOGS_ATHENA=1"
+ac_sed_defs="${ac_sed_defs}\${ac_dA}LWLIB_DIALOGS_ATHENA\${ac_dB}LWLIB_DIALOGS_ATHENA\${ac_dC}1\${ac_dD}
+\${ac_uA}LWLIB_DIALOGS_ATHENA\${ac_uB}LWLIB_DIALOGS_ATHENA\${ac_uC}1\${ac_uD}
+\${ac_eA}LWLIB_DIALOGS_ATHENA\${ac_eB}LWLIB_DIALOGS_ATHENA\${ac_eC}1\${ac_eD}
+"
+}
+
+	
+{
+test -n "$verbose" && \
+echo "	defining LWLIB_DIALOGS_ATHENA3D"
+echo "#define" LWLIB_DIALOGS_ATHENA3D "1" >> confdefs.h
+DEFS="$DEFS -DLWLIB_DIALOGS_ATHENA3D=1"
+ac_sed_defs="${ac_sed_defs}\${ac_dA}LWLIB_DIALOGS_ATHENA3D\${ac_dB}LWLIB_DIALOGS_ATHENA3D\${ac_dC}1\${ac_dD}
+\${ac_uA}LWLIB_DIALOGS_ATHENA3D\${ac_uB}LWLIB_DIALOGS_ATHENA3D\${ac_uC}1\${ac_uD}
+\${ac_eA}LWLIB_DIALOGS_ATHENA3D\${ac_eB}LWLIB_DIALOGS_ATHENA3D\${ac_eC}1\${ac_eD}
+"
+}
+
+fi
 
 ############################################################################
 #									   #
 "
 }
 
+test "${with_athena}" = yes && 
+{
+test -n "$verbose" && \
+echo "	defining LWLIB_USES_ATHENA"
+echo "#define" LWLIB_USES_ATHENA "1" >> confdefs.h
+DEFS="$DEFS -DLWLIB_USES_ATHENA=1"
+ac_sed_defs="${ac_sed_defs}\${ac_dA}LWLIB_USES_ATHENA\${ac_dB}LWLIB_USES_ATHENA\${ac_dC}1\${ac_dD}
+\${ac_uA}LWLIB_USES_ATHENA\${ac_uB}LWLIB_USES_ATHENA\${ac_uC}1\${ac_uD}
+\${ac_eA}LWLIB_USES_ATHENA\${ac_eB}LWLIB_USES_ATHENA\${ac_eC}1\${ac_eD}
+"
+}
+
 test "${with_toolbars}" = yes && 
 {
 test -n "$verbose" && \
 test "$with_scrollbars" = lucid  && echo "  Using the Lucid scrollbar."
 test "$with_scrollbars" = motif  && echo "  Using the Motif scrollbar."
 test "$with_scrollbars" = athena && echo "  Using the Athena scrollbar."
+test "$with_scrollbars" = athena3d && echo "  Using the Athena-3d scrollbar."
 test "$with_dialogs"    = motif  && echo "  Using the Motif dialog boxes."
 test "$with_dialogs"    = athena && echo "  Using the Athena dialog boxes."
+test "$with_dialogs"    = athena3d && echo "  Using the Athena-3d dialog boxes."
 
 test "${use_union_type}"     = yes && echo "  Using the union type for Lisp_Objects."
 test "${debug}"              = yes && echo "  Compiling in extra code for debugging."
 --with-menubars=TYPE	Use TYPE menubars (lucid, motif, or no).  The Lucid
 			widgets emulate Motif (mostly) but are faster.
 			*WARNING*  The Motif menubar is currently broken.
---with-scrollbars=TYPE	Use TYPE scrollbars (lucid, motif, athena, or no).
---with-dialogs=TYPE	Use TYPE dialog boxes (motif, athena, or no).
+--with-scrollbars=TYPE	Use TYPE scrollbars (lucid, motif, athena, 
+			athena3d, or no).
+--with-dialogs=TYPE	Use TYPE dialog boxes (motif, athena, athena3d, or no).
 			(Lucid menubars and scrollbars are the default.
 			 Motif dialog boxes will be used if Motif can be
 			 found.)
 	  case "${val}" in
 	    l | lu | luc | luci | lucid )		val=lucid  ;;
 	    m | mo | mot | moti | motif )		val=motif  ;;
+	    athena3d | athena-3d )			val=athena3d ;;
 	    a | at | ath | athe | athen | athena )	val=athena ;;
 	    n | no | non | none )			val=no ;;
 	    * )
   cydra*-cydrome-sysv* ) machine=cydra5 opsys=usg5-3 ;;
 
   ## Data General AViiON Machines
+  i586-dg-dgux*R4* | i586-dg-dgux5.4.4* ) machine=aviion opsys=dgux5-4r4 ;;
   m88k-dg-dgux5.4R3* | m88k-dg-dgux5.4.3* ) machine=aviion opsys=dgux5-4r3 ;;
   m88k-dg-dgux5.4R2* | m88k-dg-dgux5.4.2* ) machine=aviion opsys=dgux5-4r2 ;;
   m88k-dg-dgux* 			  ) machine=aviion opsys=dgux	   ;;
   ## Iris 4D
   mips-sgi-irix3.*      ) machine=iris4d opsys=irix3-3 ;;
   mips-sgi-irix4.*      ) machine=iris4d opsys=irix4-0 ;;
-  mips-sgi-irix6*       ) machine=iris4d opsys=irix6-0  NON_GNU_CPP=/lib/cpp ;;
+  mips-sgi-irix6*       ) machine=iris4d opsys=irix6-0 ;;
   mips-sgi-irix5.[3-9]* ) machine=iris4d opsys=irix5-3 ;;
   mips-sgi-irix5.2*     ) machine=iris4d opsys=irix5-2 ;;
   mips-sgi-irix5.1*     ) machine=iris4d opsys=irix5-1 ;;
 test "${with_menubars}"   = "motif" -o \
      "${with_scrollbars}" = "motif" -o \
      "${with_dialogs}"    = "motif"  && with_motif="yes"
+test "${with_menubars}"   = "athena" -o \
+     "${with_scrollbars}" = "athena" -o \
+     "${with_dialogs}"    = "athena"  && with_athena="yes"
+test "${with_menubars}"   = "athena3d" -o \
+     "${with_scrollbars}" = "athena3d" -o \
+     "${with_dialogs}"    = "athena3d"  && with_athena="yes"
 test "${with_menubars}"   = ""       && with_menubars="lucid"
 test "${with_menubars}"   = "athena" && with_menubars="lucid"
 test "${with_scrollbars}" = ""       && with_scrollbars="lucid"
 test "${with_scrollbars}" = "lucid"  && AC_DEFINE(LWLIB_SCROLLBARS_LUCID)
 test "${with_scrollbars}" = "motif"  && AC_DEFINE(LWLIB_SCROLLBARS_MOTIF)
 test "${with_scrollbars}" = "athena" && AC_DEFINE(LWLIB_SCROLLBARS_ATHENA)
+if test "${with_scrollbars}" = "athena3d"; then
+	AC_DEFINE(LWLIB_SCROLLBARS_ATHENA)
+	AC_DEFINE(LWLIB_SCROLLBARS_ATHENA3D)
+fi
 test "${with_dialogs}"    = "motif"  && AC_DEFINE(LWLIB_DIALOGS_MOTIF)
 test "${with_dialogs}"    = "athena" && AC_DEFINE(LWLIB_DIALOGS_ATHENA)
+if test "${with_dialogs}"    = "athena3d"; then
+	AC_DEFINE(LWLIB_DIALOGS_ATHENA)
+	AC_DEFINE(LWLIB_DIALOGS_ATHENA3D)
+fi
 
 ############################################################################
 #									   #
 IF_YES_AC_DEFINE(rel_alloc,       REL_ALLOC)
 IF_YES_AC_DEFINE(LISP_FLOAT_TYPE, LISP_FLOAT_TYPE)
 IF_YES_AC_DEFINE(with_motif,      LWLIB_USES_MOTIF)
+IF_YES_AC_DEFINE(with_athena,	 LWLIB_USES_ATHENA)
 IF_YES_AC_DEFINE(with_toolbars,  HAVE_TOOLBARS)
 IF_YES_AC_DEFINE(with_tty,       HAVE_TTY)
 IF_YES_AC_DEFINE(with_tooltalk,  TOOLTALK)
 test "$with_scrollbars" = lucid  && echo "  Using the Lucid scrollbar."
 test "$with_scrollbars" = motif  && echo "  Using the Motif scrollbar."
 test "$with_scrollbars" = athena && echo "  Using the Athena scrollbar."
+test "$with_scrollbars" = athena3d && echo "  Using the Athena-3d scrollbar."
 test "$with_dialogs"    = motif  && echo "  Using the Motif dialog boxes."
 test "$with_dialogs"    = athena && echo "  Using the Athena dialog boxes."
+test "$with_dialogs"    = athena3d && echo "  Using the Athena-3d dialog boxes."
 
 test "${use_union_type}"     = yes && echo "  Using the union type for Lisp_Objects."
 test "${debug}"              = yes && echo "  Compiling in extra code for debugging."
 ;; and such.
 
 ;; Make F1 invoke help
-(global-set-key 'f1 'help-command)
+(global-set-key [f1] 'help-command)
 ;; Make F2 be `undo'
-(global-set-key 'f2 'undo)
+(global-set-key [f2] 'undo)
 ;; Make F3 be `find-file'
 ;; Note: it does not currently work to say
 ;;   (global-set-key 'f3 "\C-x\C-f")
 ;; The reason is that macros can't do interactive things properly.
 ;; This is an extremely longstanding bug in Emacs.  Eventually,
 ;; it will be fixed. (Hopefully ..)
-(global-set-key 'f3 'find-file)
+(global-set-key [f3] 'find-file)
 
 ;; Make F4 be "mark", F5 be "copy", F6 be "paste"
 ;; Note that you can set a key sequence either to a command or to another
 ;; key sequence.
-(global-set-key 'f4 'set-mark-command)
-(global-set-key 'f5 "\M-w")
-(global-set-key 'f6 "\C-y")
+(global-set-key [f4] 'set-mark-command)
+(global-set-key [f5] "\M-w")
+(global-set-key [f6]"\C-y")
 
 ;; Shift-F4 is "pop mark off of stack"
 (global-set-key '(shift f4) (lambda () (interactive) (set-mark-command t)))
 
 ;; Make F7 be `save-buffer'
-(global-set-key 'f7 'save-buffer)
+(global-set-key [f7] 'save-buffer)
 
 ;; Make F8 be "start macro", F9 be "end macro", F10 be "execute macro"
-(global-set-key 'f8 'start-kbd-macro)
-(global-set-key 'f9 'end-kbd-macro)
-(global-set-key 'f10 'call-last-kbd-macro)
+(global-set-key [f8] 'start-kbd-macro)
+(global-set-key [f9] 'end-kbd-macro)
+(global-set-key [f10] 'call-last-kbd-macro)
 
 ;; Here's an alternative binding if you don't use keyboard macros:
 ;; Make F8 be `save-buffer' followed by `delete-window'.
        ;; When running ispell, consider all 1-3 character words as correct.
        (setq ispell-extra-args '("-W" "3"))
 
-       ;; Change the way the buffer name is displayed in the
-       ;; modeline.  The variable for this is called
-       ;; 'modeline-buffer-identification but was called
-       ;; 'mode-line-buffer-identification in older XEmacsen.
-       (if (boundp 'modeline-buffer-identification)
-	   ;; Note that if you want to put more than one form in the
-	   ;; `THEN' clause of an IF-THEN-ELSE construct, you have to
-	   ;; surround the forms with `progn'.  You don't have to
-	   ;; do this for the `ELSE' clauses.
-	   (progn
-	     (setq-default modeline-buffer-identification '("XEmacs: %17b"))
-	     (setq         modeline-buffer-identification '("XEmacs: %17b")))
-	 (setq-default mode-line-buffer-identification '("XEmacs: %17b"))
-	 (setq         mode-line-buffer-identification '("XEmacs: %17b")))
-
        (cond ((or (not (fboundp 'device-type))
 		  (equal (device-type) 'x))
 	      ;; Code which applies only when running emacs under X goes here.

etc/sgml/HTML32.dtd

+<!--
+        W3C Document Type Definition for the HyperText Markup Language
+        version 3.2 as ratified by a vote of W3C member companies.
+        For more information on W3C look at  URL http://www.w3.org/
+
+        Date: Tuesday January 14th 1996
+
+        Author: Dave Raggett <dsr@w3.org>
+
+        HTML 3.2 aims to capture recommended practice as of early '96
+        and as such to be used as a replacement for HTML 2.0 (RFC 1866).
+        Widely deployed rendering attributes are included where they
+        have been shown to be interoperable. SCRIPT and STYLE are
+        included to smooth the introduction of client-side scripts
+        and style sheets. Browsers must avoid showing the contents
+        of these element Otherwise support for them is not required.
+        ID, CLASS and STYLE attributes are not included in this version
+        of HTML.
+-->
+
+<!ENTITY % HTML.Version
+        "-//W3C//DTD HTML 3.2 Final//EN"
+
+        -- Typical usage:
+
+            <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+            <html>
+            ...
+            </html>
+        --
+        >
+
+<!--================== Deprecated Features Switch =========================-->
+
+<!ENTITY % HTML.Deprecated "INCLUDE">
+
+<!--================== Imported Names =====================================-->
+
+<!ENTITY % Content-Type "CDATA"
+        -- meaning a MIME content type, as per RFC1521
+        -->
+
+<!ENTITY % HTTP-Method "GET | POST"
+        -- as per HTTP specification
+        -->
+
+<!ENTITY % URL "CDATA"
+        -- The term URL means a CDATA attribute
+           whose value is a Uniform Resource Locator,
+           See RFC1808 (June 95) and RFC1738 (Dec 94).
+        -->
+
+<!-- Parameter Entities -->
+
+<!ENTITY % head.misc "SCRIPT|STYLE|META|LINK" -- repeatable head elements -->
+
+<!ENTITY % heading "H1|H2|H3|H4|H5|H6">
+
+<!ENTITY % list "UL | OL |  DIR | MENU">
+
+<![ %HTML.Deprecated [
+    <!ENTITY % preformatted "PRE | XMP | LISTING">
+]]>
+
+<!ENTITY % preformatted "PRE">
+
+<!--================ Character mnemonic entities ==========================-->
+
+<!ENTITY % ISOlat1 PUBLIC
+       "ISO 8879-1986//ENTITIES Added Latin 1//EN//HTML">
+%ISOlat1;
+
+<!--================ Entities for special symbols =========================-->
+<!-- &trade and &cbsp are not widely deployed and so not included here -->
+
+<!ENTITY amp    CDATA "&#38;"   -- ampersand          -->
+<!ENTITY gt     CDATA "&#62;"   -- greater than       -->
+<!ENTITY lt     CDATA "&#60;"   -- less than          -->
+
+<!--=================== Text Markup =======================================-->
+
+<!ENTITY % font "TT | I | B  | U | STRIKE | BIG | SMALL | SUB | SUP">
+
+<!ENTITY % phrase "EM | STRONG | DFN | CODE | SAMP | KBD | VAR | CITE">
+
+<!ENTITY % special "A | IMG | APPLET | FONT | BASEFONT | BR | SCRIPT | MAP">
+
+<!ENTITY % form "INPUT | SELECT | TEXTAREA">
+
+<!ENTITY % text "#PCDATA | %font | %phrase | %special | %form">
+
+<!ELEMENT (%font|%phrase) - - (%text)*>
+
+<!-- there are also 16 widely known color names although
+  the resulting colors are implementation dependent:
+
+   aqua, black, blue, fuchsia, gray, green, lime, maroon,
+   navy, olive, purple, red, silver, teal, white, and yellow
+
+ These colors were originally picked as being the standard
+ 16 colors supported with the Windows VGA palette.
+ -->
+
+<!ELEMENT FONT - - (%text)*     -- local change to font -->
+<!ATTLIST FONT
+    size    CDATA   #IMPLIED    -- [+]nn e.g. size="+1", size=4 --
+    color   CDATA   #IMPLIED    -- #RRGGBB in hex, e.g. red: color="#FF0000" --
+    >
+
+<!ELEMENT BASEFONT - O EMPTY    -- base font size (1 to 7)-->
+<!ATTLIST BASEFONT
+    size    CDATA   #IMPLIED    -- e.g. size=3 --
+    >
+
+<!ELEMENT BR    - O EMPTY    -- forced line break -->
+<!ATTLIST BR
+        clear (left|all|right|none) none -- control of text flow --
+        >
+
+<!--================== HTML content models ================================-->
+<!--
+    HTML has three basic content models:
+
+        %text       character level elements and text strings
+        %flow       block-like elements e.g. paragraphs and lists
+        %bodytext   as %flow plus headers H1-H6 and ADDRESS
+-->
+
+<!ENTITY % block
+     "P | %list | %preformatted | DL | DIV | CENTER |
+      BLOCKQUOTE | FORM | ISINDEX | HR | TABLE">
+
+<!-- %flow is used for DD and LI -->
+
+<!ENTITY % flow "(%text | %block)*">
+
+<!--=================== Document Body =====================================-->
+
+<!ENTITY % body.content "(%heading | %text | %block | ADDRESS)*">
+
+<!ENTITY % color "CDATA" -- a color specification: #HHHHHH @@ details? -->
+
+<!ENTITY % body-color-attrs "
+        bgcolor %color #IMPLIED
+        text %color #IMPLIED
+        link %color #IMPLIED
+        vlink %color #IMPLIED
+        alink %color #IMPLIED
+        ">
+
+<!ELEMENT BODY O O  %body.content>
+<!ATTLIST BODY
+        background %URL #IMPLIED  -- texture tile for document background --
+        %body-color-attrs;  -- bgcolor, text, link, vlink, alink --
+        >
+
+<!ENTITY % address.content "((%text;) | P)*">
+
+<!ELEMENT ADDRESS - - %address.content>
+
+<!ELEMENT DIV - - %body.content>
+<!ATTLIST DIV
+        align   (left|center|right) #IMPLIED -- alignment of following text --
+        >
+
+<!-- CENTER is a shorthand for DIV with ALIGN=CENTER -->
+<!ELEMENT center - - %body.content>
+
+<!--================== The Anchor Element =================================-->
+
+<!ELEMENT A - - (%text)* -(A)>
+<!ATTLIST A
+        name    CDATA   #IMPLIED    -- named link end --
+        href    %URL    #IMPLIED    -- URL for linked resource --
+        rel     CDATA   #IMPLIED    -- forward link types --
+        rev     CDATA   #IMPLIED    -- reverse link types --
+        title   CDATA   #IMPLIED    -- advisory title string --
+        >
+
+<!--================== Client-side image maps ============================-->
+
+<!-- These can be placed in the same document or grouped in a
+     separate document although this isn't yet widely supported -->
+
+<!ENTITY % SHAPE "(rect|circle|poly)">
+<!ENTITY % COORDS "CDATA" -- comma separated list of numbers -->
+
+<!ELEMENT MAP - - (AREA)*>
+<!ATTLIST MAP
+    name    CDATA   #IMPLIED
+    >
+
+<!ELEMENT AREA - O EMPTY>
+<!ATTLIST AREA
+    shape   %SHAPE  rect
+    coords  %COORDS #IMPLIED  -- defines coordinates for shape --
+    href    %URL    #IMPLIED  -- this region acts as hypertext link --
+    nohref (nohref) #IMPLIED  -- this region has no action --
+    alt     CDATA   #REQUIRED -- needed for non-graphical user agents --
+    >
+
+<!--================== The LINK Element ==================================-->
+
+<!ENTITY % Types "CDATA"
+        -- See Internet Draft: draft-ietf-html-relrev-00.txt
+           LINK has been part of HTML since the early days
+           although few browsers as yet take advantage of it.
+
+           Relationship values can be used in principle:
+
+                a) for document specific toolbars/menus when used
+                   with the LINK element in the document head:
+                b) to link to a separate style sheet
+                c) to make a link to a script
+                d) by stylesheets to control how collections of
+                   html nodes are rendered into printed documents
+                e) to make a link to a printable version of this document
+                   e.g. a postscript or pdf version
+-->
+
+<!ELEMENT LINK - O EMPTY>
+<!ATTLIST LINK
+        href    %URL    #IMPLIED    -- URL for linked resource --
+        rel     %Types  #IMPLIED    -- forward link types --
+        rev     %Types  #IMPLIED    -- reverse link types --
+        title   CDATA   #IMPLIED    -- advisory title string --
+        >
+
+<!--=================== Images ============================================-->
+
+<!ENTITY % Length "CDATA"   -- nn for pixels or nn% for percentage length -->
+<!ENTITY % Pixels "CDATA"   -- integer representing length in pixels -->
+
+<!-- Suggested widths are used for negotiating image size
+     with the module responsible for painting the image.
+     align=left or right cause image to float to margin
+     and for subsequent text to wrap around image -->
+
+<!ENTITY % IAlign "(top|middle|bottom|left|right)">
+
+<!ELEMENT IMG    - O EMPTY --  Embedded image -->
+<!ATTLIST IMG
+        src     %URL     #REQUIRED  -- URL of image to embed --
+        alt     CDATA    #IMPLIED   -- for display in place of image --
+        align   %IAlign  #IMPLIED   -- vertical or horizontal alignment --
+        height  %Pixels  #IMPLIED   -- suggested height in pixels --
+        width   %Pixels  #IMPLIED   -- suggested width in pixels --
+        border  %Pixels  #IMPLIED   -- suggested link border width --
+        hspace  %Pixels  #IMPLIED   -- suggested horizontal gutter --
+        vspace  %Pixels  #IMPLIED   -- suggested vertical gutter --
+        usemap  %URL     #IMPLIED   -- use client-side image map --
+        ismap   (ismap)  #IMPLIED   -- use server image map --
+        >
+
+<!-- USEMAP points to a MAP element which may be in this document
+  or an external document, although the latter is not widely supported -->
+
+<!--=================== Java APPLET tag ===================================-->
+<!--
+  This tag is supported by all Java enabled browsers. Applet resources
+  (including their classes) are normally loaded relative to the document
+  URL (or <BASE> element if it is defined). The CODEBASE attribute is used
+  to change this default behavior. If the CODEBASE attribute is defined then
+  it specifies a different location to find applet resources. The value
+  can be an absolute URL or a relative URL. The absolute URL is used as is
+  without modification and is not effected by the documents <BASE> element.
+  When the codebase attribute is relative, then it is relative to the
+  document URL (or <BASE> tag if defined).
+-->
+<!ELEMENT APPLET - - (PARAM | %text)*>
+<!ATTLIST APPLET
+        codebase %URL     #IMPLIED   -- code base --
+        code     CDATA    #REQUIRED  -- class file --
+        alt      CDATA    #IMPLIED   -- for display in place of applet --
+        name     CDATA    #IMPLIED   -- applet name --
+        width    %Pixels  #REQUIRED  -- suggested width in pixels --
+        height   %Pixels  #REQUIRED  -- suggested height in pixels --
+        align    %IAlign  #IMPLIED   -- vertical or horizontal alignment --
+        hspace   %Pixels  #IMPLIED   -- suggested horizontal gutter --
+        vspace   %Pixels  #IMPLIED   -- suggested vertical gutter --
+        >
+
+<!ELEMENT PARAM - O EMPTY>
+<!ATTLIST PARAM
+        name    NMTOKEN   #REQUIRED  -- The name of the parameter --
+        value   CDATA     #IMPLIED   -- The value of the parameter --
+        >
+
+<!--
+Here is an example:
+
+    <applet codebase="applets/NervousText"
+        code=NervousText.class
+        width=300
+        height=50>
+    <param name=text value="Java is Cool!">
+    <img src=sorry.gif alt="This looks better with Java support">
+    </applet>
+-->
+
+<!--=================== Horizontal Rule ===================================-->
+
+<!ELEMENT HR    - O EMPTY>
+<!ATTLIST HR
+        align (left|right|center) #IMPLIED
+        noshade (noshade) #IMPLIED
+        size  %Pixels #IMPLIED
+        width %Length #IMPLIED
+        >
+<!--=================== Paragraphs=========================================-->
+
+<!ELEMENT P     - O (%text)*>
+<!ATTLIST P
+        align  (left|center|right) #IMPLIED
+        >
+
+<!--=================== Headings ==========================================-->
+
+<!--
+  There are six levels of headers from H1 (the most important)
+  to H6 (the least important).
+-->
+
+<!ELEMENT ( %heading )  - -  (%text;)*>
+<!ATTLIST ( %heading )
+        align  (left|center|right) #IMPLIED
+        >
+
+<!--=================== Preformatted Text =================================-->
+
+<!-- excludes images and changes in font size -->
+
+<!ENTITY % pre.exclusion "IMG|BIG|SMALL|SUB|SUP|FONT">
+
+<!ELEMENT PRE - - (%text)* -(%pre.exclusion)>
+<!ATTLIST PRE
+        width NUMBER #implied -- is this widely supported? --
+        >
+
+<![ %HTML.Deprecated [
+
+<!ENTITY % literal "CDATA"
+        -- historical, non-conforming parsing mode where
+           the only markup signal is the end tag
+           in full
+        -->
+
+<!ELEMENT (XMP|LISTING) - -  %literal>
+<!ELEMENT PLAINTEXT - O %literal>
+
+]]>
+
+<!--=================== Block-like Quotes =================================-->
+
+<!ELEMENT BLOCKQUOTE - - %body.content>
+
+<!--=================== Lists =============================================-->
+
+<!--
+    HTML 3.2 allows you to control the sequence number for ordered lists.
+    You can set the sequence number with the START and VALUE attributes.
+    The TYPE attribute may be used to specify the rendering of ordered
+    and unordered lists.
+-->
+
+<!-- definition lists - DT for term, DD for its definition -->
+
+<!ELEMENT DL    - -  (DT|DD)+>
+<!ATTLIST DL
+        compact (compact) #IMPLIED -- more compact style --
+        >
+
+<!ELEMENT DT - O  (%text)*>
+<!ELEMENT DD - O  %flow;>
+
+<!-- Ordered lists OL, and unordered lists UL -->
+<!ELEMENT (OL|UL) - -  (LI)+>
+
+<!--
+       Numbering style
+    1   arablic numbers     1, 2, 3, ...
+    a   lower alpha         a, b, c, ...
+    A   upper alpha         A, B, C, ...
+    i   lower roman         i, ii, iii, ...
+    I   upper roman         I, II, III, ...
+
+    The style is applied to the sequence number which by default
+    is reset to 1 for the first list item in an ordered list.
+
+    This can't be expressed directly in SGML due to case folding.
+-->
+
+<!ENTITY % OLStyle "CDATA" -- constrained to: [1|a|A|i|I] -->
+
+<!ATTLIST OL -- ordered lists --
+        type      %OLStyle   #IMPLIED   -- numbering style --
+        start     NUMBER     #IMPLIED   -- starting sequence number --
+        compact  (compact)   #IMPLIED   -- reduced interitem spacing --
+        >
+
+<!-- bullet styles -->
+
+<!ENTITY % ULStyle "disc|square|circle">
+
+<!ATTLIST UL -- unordered lists --
+        type    (%ULStyle)   #IMPLIED   -- bullet style --
+        compact (compact)    #IMPLIED   -- reduced interitem spacing --
+        >
+
+<!ELEMENT (DIR|MENU) - -  (LI)+ -(%block)>
+<!ATTLIST DIR
+        compact (compact) #IMPLIED
+        >
+<!ATTLIST MENU
+        compact (compact) #IMPLIED
+        >
+
+<!-- <DIR>              Directory list                  -->
+<!-- <DIR COMPACT>      Compact list style              -->
+<!-- <MENU>             Menu list                       -->
+<!-- <MENU COMPACT>     Compact list style              -->
+
+<!-- The type attribute can be used to change the bullet style
+     in unordered lists and the numbering style in ordered lists -->
+
+<!ENTITY % LIStyle "CDATA" -- constrained to: "(%ULStyle|%OLStyle)" -->
+
+<!ELEMENT LI - O %flow -- list item -->
+<!ATTLIST LI
+        type    %LIStyle     #IMPLIED   -- list item style --
+        value    NUMBER      #IMPLIED   -- reset sequence number --
+        >
+
+<!--================ Forms ===============================================-->
+
+<!ELEMENT FORM - - %body.content -(FORM)>
+<!ATTLIST FORM
+        action %URL #IMPLIED  -- server-side form handler --
+        method (%HTTP-Method) GET -- see HTTP specification --
+        enctype %Content-Type; "application/x-www-form-urlencoded"
+        >
+
+<!ENTITY % InputType
+        "(TEXT | PASSWORD | CHECKBOX | RADIO | SUBMIT
+            | RESET | FILE | HIDDEN | IMAGE)">
+
+<!ELEMENT INPUT - O EMPTY>
+<!ATTLIST INPUT
+        type %InputType TEXT     -- what kind of widget is needed --
+        name  CDATA #IMPLIED     -- required for all but submit and reset --
+        value CDATA #IMPLIED     -- required for radio and checkboxes --
+        checked (checked) #IMPLIED -- for radio buttons and check boxes --
+        size CDATA  #IMPLIED     -- specific to each type of field --
+        maxlength NUMBER #IMPLIED
+        src   %URL  #IMPLIED     -- for fields with background images --
+        align  (top|middle|bottom|left|right) top -- image alignment --
+        >
+
+<!ELEMENT SELECT - - (OPTION+)>
+<!ATTLIST SELECT
+        name CDATA #REQUIRED
+        size NUMBER #IMPLIED
+        multiple (multiple) #IMPLIED
+        >
+
+<!ELEMENT OPTION - O (#PCDATA)*>
+<!ATTLIST OPTION
+        selected (selected) #IMPLIED
+        value  CDATA  #IMPLIED -- defaults to element content --
+        >
+
+<!-- Multi-line text input field. -->
+
+<!ELEMENT TEXTAREA - - (#PCDATA)*>
+<!ATTLIST TEXTAREA
+        name CDATA #REQUIRED
+        rows NUMBER #REQUIRED
+        cols NUMBER #REQUIRED
+        >
+
+<!--======================= Tables ========================================-->
+
+<!-- Widely deployed subset of the full table standard, see RFC 1942
+     e.g. at http://www.ics.uci.edu/pub/ietf/html/rfc1942.txt -->
+
+<!-- horizontal placement of table relative to window -->
+<!ENTITY % Where "(left|center|right)">
+
+<!-- horizontal alignment attributes for cell contents -->
+<!ENTITY % cell.halign
+        "align  (left|center|right) #IMPLIED"
+        >
+
+<!-- vertical alignment attributes for cell contents -->
+<!ENTITY % cell.valign
+        "valign  (top|middle|bottom)  #IMPLIED"
+        >
+
+<!ELEMENT table - - (caption?, tr+)>
+<!ELEMENT tr - O (th|td)*>
+<!ELEMENT (th|td) - O %body.content>
+
+<!ATTLIST table                       -- table element --
+        align     %Where;   #IMPLIED  -- table position relative to window --
+        width     %Length   #IMPLIED  -- table width relative to window --
+        border    %Pixels   #IMPLIED  -- controls frame width around table --
+        cellspacing %Pixels #IMPLIED  -- spacing between cells --
+        cellpadding %Pixels #IMPLIED  -- spacing within cells --
+        >
+
+<!ELEMENT CAPTION - - (%text;)* -- table or figure caption -->
+<!ATTLIST CAPTION
+        align (top|bottom) #IMPLIED
+        >
+
+<!ATTLIST tr                       -- table row --
+        %cell.halign;              -- horizontal alignment in cells --
+        %cell.valign;              -- vertical alignment in cells --
+        >
+
+<!ATTLIST (th|td)                  -- header or data cell --
+        nowrap (nowrap)  #IMPLIED  -- suppress word wrap --
+        rowspan NUMBER   1         -- number of rows spanned by cell --
+        colspan NUMBER   1         -- number of cols spanned by cell --
+        %cell.halign;              -- horizontal alignment in cell --
+        %cell.valign;              -- vertical alignment in cell --
+        width   %Pixels  #IMPLIED  -- suggested width for cell --
+        height  %Pixels  #IMPLIED  -- suggested height for cell --
+        >
+
+<!--================ Document Head ========================================-->
+
+<!-- %head.misc defined earlier on as "SCRIPT|STYLE|META|LINK" -->
+
+<!ENTITY % head.content "TITLE & ISINDEX? & BASE?">
+
+<!ELEMENT HEAD O O  (%head.content) +(%head.misc)>
+
+<!ELEMENT TITLE - -  (#PCDATA)* -(%head.misc)
+          -- The TITLE element is not considered part of the flow of text.
+             It should be displayed, for example as the page header or
+             window title.
+          -->
+
+<!ELEMENT ISINDEX - O EMPTY>
+<!ATTLIST ISINDEX
+        prompt CDATA #IMPLIED -- prompt message -->
+
+<!--
+    The BASE element gives an absolute URL for dereferencing relative
+    URLs, e.g.
+
+         <BASE href="http://foo.com/index.html">
+         ...
+         <IMG SRC="images/bar.gif">
+
+    The image is deferenced to
+
+         http://foo.com/images/bar.gif
+
+   In the absence of a BASE element the document URL should be used.
+   Note that this is not necessarily the same as the URL used to
+   request the document, as the base URL may be overridden by an HTTP
+   header accompanying the document.
+-->
+
+<!ELEMENT BASE - O EMPTY>
+<!ATTLIST BASE
+        href %URL  #REQUIRED
+        >
+
+<!ELEMENT META - O EMPTY -- Generic Metainformation -->
+<!ATTLIST META
+        http-equiv  NAME    #IMPLIED  -- HTTP response header name  --
+        name        NAME    #IMPLIED  -- metainformation name       --
+        content     CDATA   #REQUIRED -- associated information     --
+        >
+
+<!-- SCRIPT/STYLE are place holders for transition to next version of HTML -->
+
+<!ELEMENT STYLE  - - (#PCDATA)*  -(%head.misc) -- style info -->
+<!ELEMENT SCRIPT - - (#PCDATA)*  -(%head.misc) -- script statements -->
+
+<!--================ Document Structure ===================================-->
+
+<!ENTITY % version.attr "VERSION CDATA #FIXED '%HTML.Version;'">
+
+<![ %HTML.Deprecated [
+    <!ENTITY % html.content "HEAD, BODY, PLAINTEXT?">
+]]>
+
+<!ENTITY % html.content "HEAD, BODY">
+
+<!ELEMENT HTML O O  (%html.content)>
+<!ATTLIST HTML
+        %version.attr;
+        >
+

etc/toolbar/ediff-A-up.xbm

Added
New image
+#define ediff-A-up_width 15
+#define ediff-A-up_height 15
+static char ediff-A-up_bits[] = {
+ 0x00,0x80,0x00,0x80,0x00,0x80,0xc0,0x81,0xe0,0x83,0x60,0x83,0x70,0x87,0x30,
+ 0x86,0x38,0x8e,0xf8,0x8f,0x18,0x8c,0x18,0x8c,0x00,0x80,0x00,0x80,0x00,0x80
+ };

etc/toolbar/ediff-A-up.xpm

Added
New image
+/* XPM */
+static char *ediff_A[] = {
+/* width height num_colors chars_per_pixel */
+"    15   15       2            1",
+/* colors */
+". c blue",
+"# c Gray75 s backgroundToolBarColor",
+/* pixels */
+"###############",
+"###############",
+"###############",
+"######...######",
+"#####.....#####",
+"#####..#..#####",
+"####...#...####",
+"####..###..####",
+"###...###...###",
+"###.........###",
+"###..#####..###",
+"###..#####..###",
+"###############",
+"###############",
+"###############",
+};

etc/toolbar/ediff-A-xx.xpm

Added
New image
+/* XPM */
+static char *ediff_A[] = {
+/* width height num_colors chars_per_pixel */
+"    15   15       2            1",
+/* colors */
+". c gray60",
+"# c Gray75 s backgroundToolBarColor",
+/* pixels */
+"###############",
+"###############",
+"###############",
+"######...######",
+"#####.....#####",
+"#####..#..#####",
+"####...#...####",
+"####..###..####",
+"###...###...###",
+"###.........###",
+"###..#####..###",
+"###..#####..###",
+"###############",
+"###############",
+"###############",
+};

etc/toolbar/ediff-B-up.xbm

Added
New image
+#define ediff-B-up_width 15
+#define ediff-B-up_height 15
+static char ediff-B-up_bits[] = {
+ 0x00,0x80,0x00,0x80,0xf8,0x81,0xf8,0x83,0x38,0x87,0x38,0x86,0xf8,0x83,0xf8,
+ 0x87,0x38,0x8e,0x38,0x8c,0x38,0x8e,0xf8,0x87,0xf8,0x83,0x00,0x80,0x00,0x80
+ };

etc/toolbar/ediff-B-up.xpm

Added
New image
+/* XPM */
+static char *ediff-B-up[] = {
+/* width height num_colors chars_per_pixel */
+"    15    15        2            1",
+/* colors */
+". c blue",
+"# c Gray75 s backgroundToolBarColor",
+/* pixels */
+"###############",
+"###############",
+"###......######",
+"###.......#####",
+"###...##...####",
+"###...###..####",
+"###.......#####",
+"###........####",
+"###...###...###",
+"###...####..###",
+"###...###...###",
+"###........####",
+"###.......#####",
+"###############",
+"###############",
+"###############"
+};

etc/toolbar/ediff-B-xx.xpm

Added
New image
+/* XPM */
+static char *ediff-B-up[] = {
+/* width height num_colors chars_per_pixel */
+"    15    15        2            1",
+/* colors */
+". c gray60",
+"# c Gray75 s backgroundToolBarColor",
+/* pixels */
+"###############",
+"###############",
+"###......######",
+"###.......#####",
+"###...##...####",
+"###...###..####",
+"###.......#####",
+"###........####",
+"###...###...###",
+"###...####..###",
+"###...###...###",
+"###........####",
+"###.......#####",
+"###############",
+"###############",
+"###############"
+};

etc/toolbar/ediff-help.xbm

Added
New image
+#define ediff-help_width 15
+#define ediff-help_height 15
+static char ediff-help_bits[] = {
+ 0x00,0x80,0xf0,0x83,0x0c,0x86,0xe4,0x8c,0x74,0x8d,0xb4,0x8c,0x58,0x86,0x20,
+ 0x83,0xa0,0x83,0xa0,0x81,0xc0,0x80,0x20,0x83,0x20,0x83,0xc0,0x81,0x00,0x80
+ };

etc/toolbar/ediff-help.xpm

Added
New image
+/* XPM */
+static char *help[] = {
+/* width height num_colors chars_per_pixel */
+"    15    15        3            1",
+/* colors */
+". c #000000",
+"b c Gray75 s backgroundToolBarColor",
+"c c #ffff00",
+/* pixels */
+"bbbbbbbbbbbbbbb",
+"bbbb......bbbbb",
+"bbb.ccccc..bbbb",
+"bb.cc...cc..bbb",
+"bb.c..bb.c..bbb",
+"bb.c..b.cc..bbb",
+"bbb..b.cc..bbbb",
+"bbbbb.cc..bbbbb",
+"bbbbb.c..bbbbbb",
+"bbbbb.c..bbbbbb",
+"bbbbbb..bbbbbbb",
+"bbbbb.cc..bbbbb",
+"bbbbb.cc..bbbbb",
+"bbbbbb...bbbbbb",
+"bbbbbbbbbbbbbbb"
+"bbbbbbbbbbbbbbb"
+};

etc/toolbar/ediff-next.xbm

Added
New image
+#define ediff-next_width 15
+#define ediff-next_height 15
+static char ediff-next_bits[] = {
+ 0x00,0x80,0x80,0x80,0x80,0x83,0x80,0x82,0xfe,0x8c,0x02,0x8a,0xfa,0xb7,0xfa,
+ 0xbf,0xfa,0x9f,0xfe,0x8f,0xfe,0x87,0x80,0x83,0x80,0x81,0x80,0x80,0x00,0x80
+ };

etc/toolbar/ediff-next.xpm

Added
New image
+/* XPM */
+static char * file[] = {
+/* width height num_colors chars_per_pixel */
+"15 15 5 1",
+" 	c Gray75 s backgroundToolBarColor",
+".	c black",
+"X	c white",
+"o	c black",
+"O	c black",
+"               ",
+"       .       ",
+"       ..      ",
+"       .X.     ",
+" .......XX.    ",
+" .XXXXXXXoX.   ",
+" .XooooooooX.  ",
+" .Xoooooooooo. ",
+" .XooooooooO.  ",
+" .oOOOOOOoO.   ",
+" .......OO.    ",
+"       .O.     ",
+"       ..      ",
+"       .       ",
+"               ",
+};

etc/toolbar/ediff-prev.xbm

Added
New image
+#define ediff-prev_width 15
+#define ediff-prev_height 15
+static char ediff-prev_bits[] = {
+ 0x00,0x80,0x00,0x81,0x80,0x81,0x40,0x81,0x20,0xbf,0x50,0xa0,0xe8,0xaf,0xfc,
+ 0xaf,0xf8,0xaf,0xf0,0xbf,0xe0,0xbf,0xc0,0x81,0x80,0x81,0x00,0x81,0x00,0x80
+ };

etc/toolbar/ediff-prev.xpm

Added
New image
+/* XPM */
+static char * left-arrow_xpm[] = {
+/* width height num_colors chars_per_pixel */
+"15 15 3 1",
+" 	c Gray75 s backgroundToolBarColor",
+".	c black",
+"X	c white",
+"               ",
+"        .      ",
+"       ..      ",
+"      .X.      ",
+"     .XX...... ",
+"    .X.XXXXXX. ",
+"   .X.......X. ",
+"  ..........X. ",
+"   .........X. ",
+"    .......... ",
+"     ......... ",
+"      ...      ",
+"       ..      ",
+"        .      ",
+"               ",
+};

etc/toolbar/ediff-quit.xbm

Added
New image
+#define ediff-quit_width 15
+#define ediff-quit_height 15
+static char ediff-quit_bits[] = {
+ 0x00,0x80,0x06,0xb0,0x1e,0x98,0x3c,0x8c,0x70,0x82,0xe0,0x83,0xc0,0x81,0xe0,
+ 0x83,0x70,0x86,0x38,0x8c,0x1c,0x88,0x1c,0x90,0x08,0x80,0x00,0x80,0x00,0x80
+ };

etc/toolbar/ediff-quit.xpm

Added
New image
+/* XPM */
+static char *delete[] = {
+/* width height num_colors chars_per_pixel */
+"    15    15        4            1",
+/* colors */
+". c #808080",
+"# c #800000",
+"a c #ffffff",
+"b c #c0c0c0",
+/* pixels */
+"bbbbbbbbbbbbbbb",
+"b##abbbbbbbb##a",
+"b####abbbbb##ab",
+"bb####abbb##abb",
+"bbbb###ab#abbbb",
+"bbbbb#####abbbb",
+"bbbbbb###abbbbb",
+"bbbbb#####abbbb",
+"bbbb###ab##abbb",
+"bbb###abbb##abb",
+"bb###abbbbb#abb",
+"bb###abbbbbb#ab",
+"bbb#abbbbbbbbbb",
+"bbb#abbbbbbbbbb",
+"bbbbbbbbbbbbbbb",
+};

etc/toolbar/ediff-refine.xbm

Added
New image
+#define ediff-refine_width 15
+#define ediff-refine_height 15
+static char ediff-refine_bits[] = {
+ 0x00,0x80,0x80,0x80,0x84,0x90,0x8c,0x98,0x98,0x8c,0xf0,0x87,0xe0,0x83,0xe0,
+ 0x83,0xe0,0x83,0xf0,0x87,0x98,0x8c,0x8c,0x98,0x84,0x90,0x80,0x80,0x00,0x80
+ };

etc/toolbar/ediff-refine.xpm

Added
New image
+/* XPM */
+static char *help[] = {
+/* width height num_colors chars_per_pixel */
+"    15    15        2           1",
+/* colors */
+"# c #000000",
+"a c Gray75 s backgroundToolBarColor",
+/* pixels */
+"aaaaaaaaaaaaaaa",
+"aaaaaaa#aaaaaaa",
+"aa#aaaa#aaaa#aa",
+"aa##aaa#aaa##aa",
+"aaa##aa#aa##aaa",
+"aaaa#######aaaa",
+"aaaaa#####aaaaa",
+"aaaaa#####aaaaa",
+"aaaaa#####aaaaa",
+"aaaa#######aaaa",
+"aaa##aa#aa##aaa",
+"aa##aaa#aaa##aa",
+"aa#aaaa#aaaa#aa",
+"aaaaaaa#aaaaaaa",
+"aaaaaaaaaaaaaaa",
+};

etc/toolbar/ediff-save-xx.xbm

Added
New image
+#define disk-xx_width 15
+#define disk-xx_height 15
+static char disk-xx_bits[] = {
+ 0x00,0x00,0x0a,0x28,0x00,0x00,0x0a,0x28,0x00,0x00,0x0a,0x28,0x00,0x00,0xfa,
+ 0x2f,0x00,0x00,0x02,0x20,0x00,0x00,0x0a,0x29,0x00,0x00,0xf8,0x3f,0x00,0x00
+ };

etc/toolbar/ediff-save-xx.xpm

Added
New image
+/* XPM */
+static char * disk[] = {
+"15 15 5 1",
+"X	c Gray75 s backgroundToolBarColor",
+"o	c Gray60",
+"O	c Gray60",
+"+	c Gray90",
+"@	c Gray40",
+"XXXXXXXXXXXXXXX",
+"XXXXXXXXXXXXXXX",
+"XoooooooooooooX",
+"XoOo+++++++oOoX",
+"XoOo+++++++oOoX",
+"XoOo+++++++oOoX",
+"XoOo+++++++oOoX",
+"XoOoooooooooOoX",
+"XoOOOOOOOOOOOoX",
+"XoOoooooooooOoX",
+"XoOo@@@@o++oOoX",
+"XoOo@@@@o++oOoX",
+"XoOo@@@@o++oOoX",
+"XXooooooooooooX",
+"XXXXXXXXXXXXXXX",
+"XXXXXXXXXXXXXXX"
+};

etc/toolbar/ediff-save.xbm

Added
New image
+#define disk-up_width 15
+#define disk-up_height 15
+static char disk-up_bits[] = {
+ 0x00,0x00,0xfe,0x3f,0x0a,0x28,0x0a,0x28,0x0a,0x38,0x0a,0x28,0x0a,0x28,0xfa,
+ 0x2f,0x02,0x20,0xfa,0x2f,0x0a,0x29,0x0a,0x29,0x0c,0x29,0xf8,0x3f,0x00,0x00
+ };

etc/toolbar/ediff-save.xpm

Added
New image
+/* XPM */
+static char * disk[] = {
+"15 15 5 1",
+"X	c Gray75 s backgroundToolBarColor",
+"o	c black",
+"O	c Gray60",
+"+	c Gray90",
+"@	c Gray40",
+"XXXXXXXXXXXXXXX",
+"XXXXXXXXXXXXXXX",
+"XoooooooooooooX",
+"XoOo+++++++oOoX",
+"XoOo+++++++oOoX",
+"XoOo+++++++oOoX",
+"XoOo+++++++oOoX",
+"XoOoooooooooOoX",
+"XoOOOOOOOOOOOoX",
+"XoOoooooooooOoX",
+"XoOo@@@@o++oOoX",
+"XoOo@@@@o++oOoX",
+"XoOo@@@@o++oOoX",
+"XXooooooooooooX",
+"XXXXXXXXXXXXXXX",
+"XXXXXXXXXXXXXXX"
+};

etc/toolbar/ediff-toggle-split-up.xbm

Added
New image
+#define ediff-toggle-split-up_width 15
+#define ediff-toggle-split-up_height 15
+static char ediff-toggle-split-up_bits[] = {
+ 0x00,0x80,0xfe,0x87,0xfe,0x87,0x00,0x80,0x00,0xb0,0x7e,0xb0,0x1e,0xb0,0x1e,
+ 0xb0,0x3e,0xb2,0x72,0xb3,0xe2,0xb3,0xc0,0xb3,0xc0,0xb3,0xf0,0xb7,0x00,0x80
+ };

etc/toolbar/ediff-toggle-split-up.xpm

Added
New image
+/* XPM */
+static char *ediff-toggle-split-up[] = {
+/* width height num_colors chars_per_pixel */
+"    15    15        3            1",
+/* colors */
+"# c #000000",
+"a c firebrick",
+"f c Gray75 s backgroundToolBarColor",
+/* pixels */
+"fffffffffffffff",
+"faaaaaaaaaaffff",
+"faaaaaaaaaaffff",
+"fffffffffffffff",
+"ffffffffffffaaf",
+"f######fffffaaf",
+"f####fffffffaaf",
+"f####fffffffaaf",
+"f#####fff#ffaaf",
+"f#ff###ff#ffaaf",
+"f#fff#####ffaaf",
+"ffffff####ffaaf",
+"ffffff####ffaaf",
+"ffff######ffaaf",
+"fffffffffffffff",
+};

etc/toolbar/ediff-update.xbm

Added
New image
+#define ediff-update_width 15
+#define ediff-update_height 15
+static char ediff-update_bits[] = {
+ 0x00,0x80,0x78,0x80,0xcc,0x99,0x04,0x9b,0x04,0x9c,0x04,0x9e,0x0c,0x9f,0x00,
+ 0x80,0x7c,0x98,0x3c,0x90,0x1c,0x90,0x6c,0x90,0xcc,0x99,0x00,0x8f,0x00,0x80
+ };

etc/toolbar/ediff-update.xpm

Added
New image
+/* XPM */
+static char *update[] = {
+/* width height num_colors chars_per_pixel */
+"    15    15        3            1",
+/* colors */
+". c #000000",
+"a c #000080",
+"c c Gray75 s backgroundToolBarColor",
+/* pixels */
+"ccccccccccccccc",
+"ccc.aaacccccccc",
+"cc.acccaacccacc",
+"ccaccccccacaacc",
+"ccacccccccaaacc",
+"ccaccccccaaaacc",
+"cc.accccaaaaacc",
+"ccccccccccccccc",
+"ccaaaaacccca.cc",
+"ccaaaaccccccacc",
+"ccaaacccccccacc",
+"ccaacaccccccacc",
+"ccacccaaccca.cc",
+"ccccccccaaa.ccc",
+"ccccccccccccccc",
+};

etc/w3/stylesheet

-/*       File: default.css
+/******************************************************************************
+**       File: default.css
 **    Purpose: Default Stylesheet for Emacs-W3
 **       Info: Copyright (c) 1995 William M. Perry <wmperry@spry.com>
 **    Created: William M. Perry <wmperry@spry.com>, Aug-31-1995
 ** Maintainer: William M. Perry <wmperry@spry.com>
 **
 **  This contains the top level fallback default styles for Emacs-w3
-*/
+**
+******************************************************************************
+**
+** To specify device-dependent styles, you must mark a section with
+** :devicetype:
+** If you are not using 'devicetype', then anything up to the next
+** :xxx: media descriptor is ignored.
+**
+** There are a few special Emacs-W3 sections
+**
+**  emacs - only include this chunk if you are using Emacs 19
+** speech - only include this chunk if you are using Emacspeak for audio
+** xemacs - only include this chunk if you are using XEmacs
+** normal - always include this chunk (useful for switching out of another 
+**          device-type block
+******************************************************************************/
 
 /*
 ** Headers
 h1,h2,h3,
 h4,h5,h6  {
 	    display: block;
-            font-family : utopia charter times itc-zapf-chancery inja;
+            font-family : serif;
             font-weight : bold;
           }
 
 ** we only use them under XEmacs.  Hopefully, this will change soon.
 */
 
-:xemacs:
-      h1  { font-size : 24pt }
-      h2  { font-size : 18pt }
-      h3  { font-size : 16pt }
-      h4  { font-size : 14pt }
-      h5  { font-size : 12pt }
-      h6  { font-size : 10pt }
+@media xemacs {
+      h1  { font-size : +12pt }
+      h2  { font-size : +6pt  }
+      h3  { font-size : +4pt  }
+      h5  { font-size : -2pt  }
+      h6  { font-size : -4pt  }
+/*
+** Emacs-19 also doesn't handle how Emacs-W3 changes this type of font
+** very well, so lets only do it under XEmacs for now.  Emacs-19 can only
+** do monospaced fonts anyway, so its redundant.
+*/
+   pre,xmp,
+  plaintext { font-family: monospace }
+key,code,tt { font-family: monospace }
+} // @media xemacs
 
 /*
 ** Best we can do under Emacs-19 is use the default font and try to make
 ** the headers stand out somehow.
 */
 
-:emacs:
+@media emacs {
 h1,h2,h3,
-h4,h5,h6  { font-style: small-caps; text-decoration: underline }
+h4,h5,h6  { 
+            font-style: small-caps;
+            text-decoration: underline;
+	    color: blue;
+          }
 
-:normal:
+strong,em { color: red         }
+      dfn { font-style: italic }
+ s,strike { color: green       }
+
+} // @media emacs
+
        p  { display: block }
+ pre,xmp  { display: block; white-space: pre; }
+blockquote{ display: block; margin-left: 5; margin-right: 5; }
 
 /*
 ** List formatting instructions
 */
 
- dl,ul,ol {
- 	    display: block;
-	    margin-left: 5em
-	  }
+       ul { display: block;     }
+       ol { display: block;     }
+       dl { display: block;     }
+      dir { display: block;     }
+     menu { display: block;     }
+       dt { font-weight: bold; display: list-item }
+       dd { display: list-item; margin-left: 5; }
+       li { display: list-item; margin-left: 5; }
+    ul li { list-style: circle; }
+    ol li { list-style: decimal; }
 
-       li { display: list-item }
-       dt { font-weight: bold; display: block }
-       dd { insert-before: 3em; display: list-item }
-
-/*
-** All items that require fixed-width fonts
-*/
-
-   pre,xmp,
-  plaintext { font-family: monospace; display: block }
-key,code,tt { font-family: monospace }
+/* These are to make nested list items look better */
+ul ul,ol ul,ol ol,ul ol { display: line; }
 
 /*
 ** All logical emphasis tags, the way god intended
 */
 
-  strong,em { font-weight: bold }
-        dfn { font-style: italic }
+        div { display: line;                }
+  strong,em { font-weight: bold             }
+        dfn { font-style: italic            }
    s,strike { text-decoration: line-through }
-        sub { text-position: sub }
-        sup { text-position: sup }
-     secret { text-transform: rot13 }
+        sub { text-position: sub            }
+        sup { text-position: sup            }
+     secret { text-transform: rot13         }
 
 /*
 ** Physical emphasis - spawn of evil
 	  i { font-style: italic }
           u { text-decoration: underline }
       blink { text-decoration: blink }
-
+     center { display: line; text-align: center; }
 /*
 ** Various and sundry
 */
-         br { display: list-item }
-         hr { display: list-item }
-    hr[SRC] { replace: {SRC} }
+         br { display: line }
+         hr { display: line; text-align: center; }
 
 
 /*
 */
 
 a         { cursor: hand2  }
-a.link    { color: #FF0000 }
-a.visited { color: #B22222 }
-a.active  { color: #FF0000 }
+a:link    { color: #FF0000 }
+a:visited { color: #B22222 }
+a:active  { color: #FF0000 }
+
+/*
+** Table formatting
+*/
+table     { display: block;    }
+   th     { display: block; font-weight: bold; text-align: center; }
+   td     { display: block; text-align: left; }
+caption   { display: block; text-align: center; }
 
 /*
 ** Various other character-level formatting issues
 */
 
- address { align : right }
-abstract { font-style : bold & italic ; align : indent }
-   quote { font-style : italic ; align : indent }
+ address { text-align: right; display: line; }
+abstract { font-style: bold & italic ; text-align : indent }
+   quote { font-style: italic ; text-align : indent }
 
 /*
 ** Now for monochrome defaults
-** Anything up to the next :xxx: media descriptor is only used if
-** you are on that type of media.
 */
-:mono:
-   a.link { color: black; text-decoration: underline }
-a.visited { color: black; text-decoration: underline }
- a.active { color: white }
-
+@media mono {
+   a:link { color: black; text-decoration: underline }
+a:visited { color: black; text-decoration: underline }
+ a:active { color: white }
+} // @media mono
 /*
 ** All the TTY specific formatting
 */
 
-:tty:
-
+@media tty {
 /*
 ** First, handle some stuff for generic TTYs to emulate our old
 ** behaviour with w3-delimit-links and a subset of w3-delimit-emphasis
            insert-after: *
          }
 
-a.visited{
-           insert.before: "{{";
-           insert.after: "}}"
+a:visited{
+           insert-before: "{{";
+           insert-after: "}}"
          }
 
-a.link   {
-           insert.before: "[[";
-           insert.after: "]]"
+a:link   {
+           insert-before: "[[";
+           insert-after: "]]"
          }
+} // @media tty
 
-/* End Generic TTY */
 
-:ansi-tty:
-
+@media ansi-tty {
 /*
 ** Now comes the cool TTY stuff.  You will need to be using XEmacs 19.14
 ** or later (or Emacs 19.30 under DOS) in order to get any benefit from
 
 h1,h2,h3,
 h4,h5,h6  { color : cyan     }
-a.visited { color : magenta  }
-   a.link { color : red      }
- a.active { color : yellow   }
+a:visited { color : magenta  }
+   a:link { color : red      }
+ a:active { color : yellow   }
+} // @media ansi-tty
+
+@media speech {
+h1,h2,h3,
+h4,h5,h6 { voice-family: paul; stress: 2; richness: 9; }
+      h1 { pitch: 1; pitch-range: 9; }
+      h2 { pitch: 2; pitch-range: 8; }
+      h3 { pitch: 3; pitch-range: 7; }
+      h4 { pitch: 4; pitch-range: 6; }
+      h5 { pitch: 5; pitch-range: 5; }
+      h6 { pitch: 6; pitch-range: 4; }
+
+li,dt,dd { pitch: 6; richness: 6; }
+      dt { stress: 8; }
+
+pre,xmp,plaintext,key,code,tt { pitch: 1; 
+				pitch-range: 1;
+				stress: 1;
+				richness: 8;
+			      }
+      em { pitch: 6; pitch-range: 6; stress: 6; richness: 5; }
+  strong { pitch: 6; pitch-range: 6; stress: 9; richness: 9; }
+     dfn { pitch: 7; pitch-range: 6; stress: 6; }
+s,strike { richness: 0; }
+       i { pitch: 6; pitch-range: 6; stress: 6; richness: 5 }
+       b { pitch: 6; pitch-range: 6; stress: 9; richness: 9; }
+       u { richness: 0; }
+   a:link { voice-family: harry; }
+a:visited { voice-family: betty;}
+ a:active { voice-family: betty; pitch-range: 8; pitch: 8 }
+
+} // @media speech
 * External-Widget::
 		Use XEmacs as a text widget inside of another program.
 * Forms::	A package for editing databases by filling in forms.
-* GNUS::	An NNTP-based newsreader for XEmacs.
+* Gnus::	A netnews and mail reader for XEmacs.
 * Hyperbole::	A programmable information management and hypertext system.
 * ILISP::	Multi-dialect inferior LISP interface.
 * Ispell::	Interactive spelling corrector.

lib-src/make-docfile.c

 	      /* Skip until the first newline; remember the two previous chars. */
 	      while (c != '\n' && c >= 0)
 		{
+		  /* ### Kludge -- Ignore any ESC x x ISO2022 sequences */
+		  if (c == 27)
+		    {
+		      getc (infile);
+		      getc (infile);
+		      goto nextchar;
+		    }
+		  
 		  c2 = c1;
 		  c1 = c;
+		nextchar:
 		  c = getc (infile);
 		}
 	  
 	    }
 	}
 
-#ifdef DEBUG
+#if 0 /* causes crash */
       else if (! strcmp (buffer, "if") ||
 	       ! strcmp (buffer, "byte-code"))
 	;
 #!/bin/sh -
 #
-# $Id: tm-au,v 1.3 1997/01/11 20:13:51 steve Exp $
+# $Id: tm-au,v 1.4 1997/01/23 05:29:22 steve Exp $
 #
 
 PATH=${PATH:-/usr/bin:/bin}:`dirname $0 2>/dev/null`; export PATH
 	echo "$2; $3 ->"
 	tmdecode $3 $1 $filename
 	if [ "$AUDIOSERVER" = "" ]; then
-		if [ `uname` = "IRIX" ]; then
-			sfplay $filename
-		else
-			cat $filename > /dev/audio
-		fi
+          case "`uname`" in
+            IRIX )  sfplay $filename           ;;
+            OSF1 )  decsound -play $filename   ;;
+            *    )  cat $filename > /dev/audio ;;
+          esac
 	else
-		autool -v 40 $filename
+          autool -v 40 $filename
 	fi
+        
 	trap 'rm -f $filename' 0 1 2 3 13 15
 	;;
 "extract")
+Thu Jan  9 13:32:01 1997  Jacques Duthen Prestataire  <duthen@cegelec-red.fr>
+
+	* ps-print.el: Merge patch from [simon] Oct 8, 1996 Simon Marshall
+	<simon@gnu.ai.mit.edu>
+	(ps-print-version): Fix value.
+	(cl lisp-float-type): Require them.
+	(ps-number-of-columns ps-*-font-size): Try to select defaults
+	better suited when `ps-landscape-mode' is non-nil. 
+	(ps-*-faces): Change default for Font Lock mode faces when
+	`ps-print-color-p' is nil. 
+	(ps-right-header): Replace `time-stamp-yy/mm/dd'
+	by `time-stamp-mon-dd-yyyy'. 
+	(ps-end-file ps-begin-page): Fix bug in page count for Ghostview. 
+	(ps-generate-postscript-with-faces): Replace `ps-sorter' by
+	`car-less-than-car'.  
+	(ps-plot ps-generate): Replace `%d' by `%3d'.  
+
+Wed Jan 22 15:32:39 1997  Greg Klanderman  <greg@alphatech.com>
+
+	* modes/rsz-minibuf.el (resize-minibuffer-setup): Resize the
+	minibuffer earlier than the first received event.
+
+Wed Jan 22 15:29:08 1997  Barry A. Warsaw  <bwarsaw@CNRI.Reston.VA.US>
+
+	* modes/imenu.el (imenu-add-to-menubar): Don't attempt anything if
+	menu-bar lookup fails.
+
+Wed Jan 22 01:03:42 1997  Martin Buchholz  <mrb@eng.sun.com>
+
+	* lisp/x11/x-font-menu.el: Make font menus work better in a
+	Japanese environment.
+
+Tue Jan 21 19:56:26 1997  Martin Buchholz  <mrb@eng.sun.com>
+
+	* lisp/mule/mule-init.el (init-mule): Get Japanese man pages working.
+
+Fri Jan 17 17:22:54 1997  Hrvoje Niksic  <hniksic@bjesomar.srce.hr>
+ 
+	* man.el (Manual-mode): Don't mess with scrollbars if they aren't
+	present.
+
+Tue Jan 21 19:52:45 1997  Steven L Baur  <steve@altair.xemacs.org>
+
+	* utils/timezone.el (timezone-parse-date): Fix Y2K bug.
+
+Tue Jan 21 19:32:44 1997  Barry A. Warsaw  <bwarsaw@anthem.cnri.reston.va.us>
+
+	* prim/files.el (hack-local-variables-prop-line): XEmacs should
+	not query to set local variables in the -*- line if there aren't
+	any to set!
+
+Thu Jan 16 18:24:20 1997  Steven L Baur  <steve@miranova.com>
+
+	* psgml/psgml.el: Use newer interface form for nsgmls.
+
+Thu Jan 16 04:06:24 1997  Steven L Baur  <steve@altair.xemacs.org>
+
+	* comint/telnet.el (rsh): (Mostly) correct dealing with detection
+	of password prompt at login.
+
+Thu Jan 16 03:28:25 1997  Martin Buchholz  <mrb@eng.sun.com>
+
+	* modes/view.el (View-scroll-lines-forward): Correct format typo.
+
+Mon Jan 13 22:50:23 1997  David Moore  <dmoore@UCSD.EDU>
+
+	* packages/compile.el: Clean up regexps.
+
+Sun Jan 12 20:50:08 1997  Steven L Baur  <steve@altair.xemacs.org>
+
+	* modes/m4-mode.el: Changed m4-program to point to /usr/bin/m4.
+
+Sun Jan 12 18:49:30 1997   $B<i2,(B $BCNI'(B/MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+	* mule/mule-misc.el: `-columns' -> `-width' and define `-columns'
+	alias
+	Import definition of `truncate-string-to-width' from Emacs/mule-delta.
+
+Sun Jan 12 13:57:11 1997  Kyle Jones  <kyle_jones@wonderworks.com>
+
+	* prim/window.el (shrink-window-if-larger-than-buffer): Don't let
+	readjusted window change the buffer order stack.
+
+Sat Jan 11 20:12:47 1997  Vinnie Shelton  <shelton@icd.teradyne.com>
+
+	* utils/finder.el (finder-insert-at-column): Correct off-by-one
+	error affecting long file names.
+
 Fri Jan 10 22:27:58 1997  Shane Holder  <holder@rsn.hp.com>
 
 	* utils/bench.el:  New version.
 
 	* utils/smtpmail.el: New file from Emacs 19.34.
 
-Fri Dec  6 09:28:04 1996  MORIOKA Tomohiko <morioka@jaist.ac.jp>
+Fri Dec  6 09:28:04 1996  $B<i2,(B $BCNI'(B/MORIOKA Tomohiko <morioka@jaist.ac.jp>
 
 	* prim/startup.el (set-default-load-path): Set default-load-path
 	dynamically since file-detect.el is dumped with XEmacs.

lisp/comint/telnet.el

 (defvar telnet-count 0
   "Number of output strings read from the telnet process
 while looking for the initial password.")
-(make-variable-buffer-local 'telnet-count)
+;; (make-variable-buffer-local 'telnet-count)