--- xmhtml-1.1.7.orig/Makefile.org +++ xmhtml-1.1.7/Makefile.org @@ -65,7 +65,7 @@ # # ##################### CC = gcc -CFLAGS = -g -funroll-loops -Wall -pipe -ansi +CFLAGS = -g -funroll-loops -Wall -pipe -ansi $(EXTRA_CFLAGS) LDFLAGS = # The following flags are *very* usefull if you are getting unresolved @@ -214,6 +214,8 @@ # final line fed to the linker LOADLIBES = $(LIBDIR) $(LIBS) $(IMAGELIBS) +OBJENDING ?= o + ### End of User configurable section ### pass_flags = SHELL='$(SHELL)' \ @@ -233,7 +235,10 @@ LOADLIBES='$(LOADLIBES)' \ DMALLOCLIB='$(DMALLOCLIB)' \ ZLIBLIB='$(ZLIBLIB)' \ - PLATFORM='$(PLATFORM)' + PLATFORM='$(PLATFORM)' \ + OBJENDING='$(OBJENDING)' + +DESTDIR=/usr/local/lib all:: @( for dir in $(SUBDIRS) ; do \ @@ -309,3 +314,10 @@ tools/scansrc.sh ./lib/Motif >> docs/sources.desc tools/scansrc.sh ./lib/gtk >> docs/sources.desc +install:: + install -d $(DESTDIR)/usr/include/XmHTML + install include/XmHTML/* $(DESTDIR)/usr/include/XmHTML + install -d $(DESTDIR)/usr/lib + install lib/libXmHTML.a $(DESTDIR)/usr/lib + + --- xmhtml-1.1.7.orig/Makefile +++ xmhtml-1.1.7/Makefile @@ -65,7 +65,7 @@ # # ##################### CC = gcc -CFLAGS = -g -funroll-loops -Wall -pipe -ansi +CFLAGS = -g -funroll-loops -Wall -pipe -ansi $(EXTRA_CFLAGS) LDFLAGS = # The following flags are *very* usefull if you are getting unresolved @@ -214,6 +214,8 @@ # final line fed to the linker LOADLIBES = $(LIBDIR) $(LIBS) $(IMAGELIBS) +OBJENDING ?= o + ### End of User configurable section ### pass_flags = SHELL='$(SHELL)' \ @@ -233,7 +235,10 @@ LOADLIBES='$(LOADLIBES)' \ DMALLOCLIB='$(DMALLOCLIB)' \ ZLIBLIB='$(ZLIBLIB)' \ - PLATFORM='$(PLATFORM)' + PLATFORM='$(PLATFORM)' \ + OBJENDING='$(OBJENDING)' + +DESTDIR=/usr/local/lib all:: @( for dir in $(SUBDIRS) ; do \ @@ -309,3 +314,10 @@ tools/scansrc.sh ./lib/Motif >> docs/sources.desc tools/scansrc.sh ./lib/gtk >> docs/sources.desc +install:: + install -d $(DESTDIR)/usr/include/XmHTML + install include/XmHTML/* $(DESTDIR)/usr/include/XmHTML + install -d $(DESTDIR)/usr/lib + install lib/libXmHTML.a $(DESTDIR)/usr/lib + + --- xmhtml-1.1.7.orig/lib/Makefile.org +++ xmhtml-1.1.7/lib/Makefile.org @@ -45,7 +45,7 @@ $(TARGET):: common $(PLATFORM) $(RM) $@ \ - $(AR) $@ common/*.o $(PLATFORM)/*.o + $(AR) $@ common/*.$(OBJENDING) $(PLATFORM)/*.$(OBJENDING) $(RANLIB) $@ depend:: --- xmhtml-1.1.7.orig/lib/Makefile +++ xmhtml-1.1.7/lib/Makefile @@ -45,7 +45,7 @@ $(TARGET):: common $(PLATFORM) $(RM) $@ \ - $(AR) $@ common/*.o $(PLATFORM)/*.o + $(AR) $@ common/*.$(OBJENDING) $(PLATFORM)/*.$(OBJENDING) $(RANLIB) $@ depend:: --- xmhtml-1.1.7.orig/lib/common/debug.c +++ xmhtml-1.1.7/lib/common/debug.c @@ -110,7 +110,7 @@ /*** Private Function Prototype Declarations ****/ /*** Private Variable Declarations ***/ -static FILE *__rsd_debug_file = stdout; +static FILE *__rsd_debug_file; /***** * When debug output is send to a file, we register an exit func to close @@ -180,6 +180,8 @@ { int i; + __rsd_debug_file = stdout; + for(i = 0 ; i < MAX_DEBUG_LEVELS+1; i++) __rsd__debug_levels_defined[i] = 0; --- xmhtml-1.1.7.orig/lib/common/Makefile.org +++ xmhtml-1.1.7/lib/common/Makefile.org @@ -33,16 +33,12 @@ images.c readFLG.c readJPEG.c parse.c map.c layout.c LZWStream.c \ psoutput.c -COMMONOBJS= events.o hash.o stack.o format.o fonts.o paint.o readXPM.o \ - readJPEGplc.o quantize.o colors.o private.o readBitmap.o public.o \ - readPNG.o readGIFplc.o readGIF.o error.o callbacks.o StringUtil.o \ - images.o readFLG.o readJPEG.o parse.o map.o layout.o LZWStream.o \ - psoutput.o +COMMONOBJS= $(COMMONSRCS:%.c=%.$(OBJENDING)) # Comment these out if you don't want to include the debug routines. # or define NDEBUG in the toplevel Makefile. DEBSRCS= debug.c -DEBOBJS= debug.o +DEBOBJS= debug.$(OBJENDING) SRCS = $(COMMONSRCS) $(DEBSRCS) OBJS = $(COMMONOBJS) $(DEBOBJS) @@ -53,10 +49,12 @@ # Subdirectories to visit SUBDIRS= +.SUFFIXES: .pic_o + # rule to create .o files from .c files -.c.o: +.c.$(OBJENDING): $(RM) $@ - $(CC) $(CFLAGS) -DVERSION=$(VERSION) $(CPPFLAGS) $(INCLUDES) -c $< + $(CC) $(CFLAGS) -DVERSION=$(VERSION) $(CPPFLAGS) $(INCLUDES) -c $< -o $@ # targets to build all: $(TARGET) --- xmhtml-1.1.7.orig/lib/common/Makefile +++ xmhtml-1.1.7/lib/common/Makefile @@ -33,16 +33,12 @@ images.c readFLG.c readJPEG.c parse.c map.c layout.c LZWStream.c \ psoutput.c -COMMONOBJS= events.o hash.o stack.o format.o fonts.o paint.o readXPM.o \ - readJPEGplc.o quantize.o colors.o private.o readBitmap.o public.o \ - readPNG.o readGIFplc.o readGIF.o error.o callbacks.o StringUtil.o \ - images.o readFLG.o readJPEG.o parse.o map.o layout.o LZWStream.o \ - psoutput.o +COMMONOBJS= $(COMMONSRCS:%.c=%.$(OBJENDING)) # Comment these out if you don't want to include the debug routines. # or define NDEBUG in the toplevel Makefile. DEBSRCS= debug.c -DEBOBJS= debug.o +DEBOBJS= debug.$(OBJENDING) SRCS = $(COMMONSRCS) $(DEBSRCS) OBJS = $(COMMONOBJS) $(DEBOBJS) @@ -53,10 +49,12 @@ # Subdirectories to visit SUBDIRS= +.SUFFIXES: .pic_o + # rule to create .o files from .c files -.c.o: +.c.$(OBJENDING): $(RM) $@ - $(CC) $(CFLAGS) -DVERSION=$(VERSION) $(CPPFLAGS) $(INCLUDES) -c $< + $(CC) $(CFLAGS) -DVERSION=$(VERSION) $(CPPFLAGS) $(INCLUDES) -c $< -o $@ # targets to build all: $(TARGET) --- xmhtml-1.1.7.orig/lib/Motif/Makefile.org +++ xmhtml-1.1.7/lib/Motif/Makefile.org @@ -30,13 +30,12 @@ MOTIFSRCS= motif.c XmHTML.c output.c XmImage.c plc.c frames.c textsel.c \ forms.c XCC.c Balloon.c warnings.c strings.c -MOTIFOBJS= motif.o XmHTML.o output.o XmImage.o plc.o frames.o textsel.o \ - forms.o XCC.o Balloon.o warnings.o strings.o +MOTIFOBJS= $(MOTIFSRCS:%.c=%.$(OBJENDING)) # Comment these out if you don't want to include the debug routines. # or define NDEBUG in the toplevel Makefile. DEBSRCS= debug_menu.c -DEBOBJS= debug_menu.o +DEBOBJS= debug_menu.$(OBJENDING) SRCS = $(MOTIFSRCS) $(DEBSRCS) OBJS = $(MOTIFOBJS) $(DEBOBJS) @@ -47,10 +46,12 @@ # Subdirectories to visit SUBDIRS= +.SUFFIXES: .pic_o + # rule to create .o files from .c files -.c.o: +.c.$(OBJENDING): $(RM) $@ - $(CC) $(CFLAGS) -DVERSION=$(VERSION) $(CPPFLAGS) $(INCLUDES) -c $< + $(CC) $(CFLAGS) -DVERSION=$(VERSION) $(CPPFLAGS) $(INCLUDES) -c $< -o $@ # targets to build all: $(TARGET) --- xmhtml-1.1.7.orig/lib/Motif/Makefile +++ xmhtml-1.1.7/lib/Motif/Makefile @@ -30,13 +30,12 @@ MOTIFSRCS= motif.c XmHTML.c output.c XmImage.c plc.c frames.c textsel.c \ forms.c XCC.c Balloon.c warnings.c strings.c -MOTIFOBJS= motif.o XmHTML.o output.o XmImage.o plc.o frames.o textsel.o \ - forms.o XCC.o Balloon.o warnings.o strings.o +MOTIFOBJS= $(MOTIFSRCS:%.c=%.$(OBJENDING)) # Comment these out if you don't want to include the debug routines. # or define NDEBUG in the toplevel Makefile. DEBSRCS= debug_menu.c -DEBOBJS= debug_menu.o +DEBOBJS= debug_menu.$(OBJENDING) SRCS = $(MOTIFSRCS) $(DEBSRCS) OBJS = $(MOTIFOBJS) $(DEBOBJS) @@ -47,10 +46,12 @@ # Subdirectories to visit SUBDIRS= +.SUFFIXES: .pic_o + # rule to create .o files from .c files -.c.o: +.c.$(OBJENDING): $(RM) $@ - $(CC) $(CFLAGS) -DVERSION=$(VERSION) $(CPPFLAGS) $(INCLUDES) -c $< + $(CC) $(CFLAGS) -DVERSION=$(VERSION) $(CPPFLAGS) $(INCLUDES) -c $< -o $@ # targets to build all: $(TARGET) --- xmhtml-1.1.7.orig/debian/changelog +++ xmhtml-1.1.7/debian/changelog @@ -0,0 +1,137 @@ +xmhtml (1.1.7-17) unstable; urgency=low + + * QA upload. + * Allow for libmotif-dev to satisfy the lesstif2-dev dependency of xmhtml1-dev + (Closes: #636610). + + -- Michael Hanke Mon, 23 Apr 2012 13:46:35 +0200 + +xmhtml (1.1.7-16) unstable; urgency=low + + * QA upload. + * Build-depend on just libjpeg-dev, rather than on libjpeg62-dev | + libjpeg-dev (see + http://lists.debian.org/debian-devel-announce/2010/02/msg00006.html). + * Appease gcc -Werror=format-security, now enabled by default. + * Add ${misc:Depends}. + + -- Colin Watson Thu, 20 Oct 2011 18:40:19 +0100 + +xmhtml (1.1.7-15) unstable; urgency=low + + * Orphan the package. + + -- Torsten Werner Sun, 15 Feb 2009 20:57:59 +0100 + +xmhtml (1.1.7-14) unstable; urgency=low + + * added Build-Depends: libxmu-dev, libxpm-dev, closes: #256424 + + -- Torsten Werner Sun, 27 Jun 2004 21:38:38 +0200 + +xmhtml (1.1.7-13) unstable; urgency=low + + * converted from CBS to cdbs + * include patch from grace sources + * changed Standards-Version to 3.6.0 + + -- Torsten Werner Sat, 23 Aug 2003 19:03:20 +0200 + +xmhtml (1.1.7-12) unstable; urgency=low + + * rebuild with newer libpng12, closes: #196849 + + -- Torsten Werner Sat, 21 Jun 2003 16:19:02 +0200 + +xmhtml (1.1.7-11) unstable; urgency=low + + * really fixed disparity + + -- Torsten Werner Sat, 8 Mar 2003 19:30:44 +0100 + +xmhtml (1.1.7-10) unstable; urgency=low + + * linked against lesstif2 + * fixed control file (override disparity), closes: #172894 + * updated debian/rules + + -- Torsten Werner Sat, 8 Mar 2003 19:05:05 +0100 + +xmhtml (1.1.7-9) unstable; urgency=low + + * readded the lost -fPIC for compiling the shared library objects, + closes: #172257 + + -- Torsten Werner Fri, 13 Dec 2002 11:08:19 +0100 + +xmhtml (1.1.7-8) unstable; urgency=low + + * converted to CBS + + -- Torsten Werner Thu, 5 Dec 2002 18:32:54 +0100 + +xmhtml (1.1.7-7) unstable; urgency=low + + * new maintainer, closes: #99004 + + -- Torsten Werner Fri, 14 Sep 2001 09:33:34 +0200 + +xmhtml (1.1.7-6.1) unstable; urgency=low + + * NMU + * Added missing build-depends, closes: #107831 + * Removed call to dh_suidregister + + -- Matthew Wilcox Wed, 8 Aug 2001 13:02:51 -0600 + +xmhtml (1.1.7-6) unstable; urgency=low + + * Set maintainer to Debian QA Team + * Did the FHS transition. + * Added Build-depends on debhelper and lesstif-dev. + * Corrected GPL location in copyright file. + * Raised Standards-verion to 3.5.0 + + -- Bas Zoetekouw Sat, 4 Aug 2001 17:22:58 +0200 + +xmhtml (1.1.7-5) unstable; urgency=low + + * Add missing dependency, recompile against new lesstif package. + + -- Tyson Dowd Tue, 19 Oct 1999 06:46:26 +0200 + +xmhtml (1.1.7-4) unstable; urgency=low + + * Recompiled against potato. Fixes #35002. + + -- Tyson Dowd Wed, 28 Jul 1999 00:36:18 +0200 + +xmhtml (1.1.7-3) unstable; urgency=low + + * Make sure the postinst is part of the xhtml package. + + -- Tyson Dowd Tue, 23 Mar 1999 12:18:16 +1100 + +xmhtml (1.1.7-2) unstable; urgency=low + + * Fix "initializer element not constant" bug (stdout is no longer a + constant). Fixes #34574. + + -- Tyson Dowd Mon, 15 Mar 1999 13:27:06 +1100 + +xmhtml (1.1.7-1.1) unstable; urgency=low + + * debian/copyright: correct FSF address + * debian/control: fix spelling + * debian/postinst: added to call ldconfig for the library package + * debian/rules: fix modes on header files + * debian/rules: install CHANGES as changelog + + -- Dirk Eddelbuettel Wed, 10 Mar 1999 21:13:59 -0500 + +xmhtml (1.1.7-1) unstable; urgency=low + + * Initial Release. + + -- Tyson Dowd Tue, 9 Mar 1999 15:11:02 +1100 + --- xmhtml-1.1.7.orig/debian/rules +++ xmhtml-1.1.7/debian/rules @@ -0,0 +1,32 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/makefile.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +version=$(shell expr `pwd` : '.*-\([0-9.]*\)') +version_major=$(shell expr `pwd` : '.*-\([0-9]*\).[0-9.]*') + +DEB_MAKE_BUILD_TARGET := lib +DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(DEB_DESTDIR) + +common-build-arch:: + $(DEB_MAKE_INVOKE) OBJENDING="pic_o" $(DEB_MAKE_BUILD_TARGET) \ + CFLAGS="$(CFLAGS) -fPIC" + $(CC) -shared -Wl,-soname,libXmHTML.so.$(version_major) \ + -o libXmHTML.so.$(version) lib/*/*.pic_o -L/usr/X11R6/lib \ + -lXm -lXpm -lpng -ljpeg + +install/xmhtml1:: + install libXmHTML*.so* debian/tmp/usr/lib + ln -s libXmHTML.so.$(version) \ + debian/tmp/usr/lib/libXmHTML.so.$(version_major) + +install/xmhtml1-dev:: + ln -s libXmHTML.so.$(version_major) debian/tmp/usr/lib/libXmHTML.so + chmod 644 debian/tmp/usr/include/XmHTML/*.h + +clean:: + $(MAKE) clean OBJENDING="pic_o" + $(RM) libXmHTML*.so* + --- xmhtml-1.1.7.orig/debian/xmhtml1.install +++ xmhtml-1.1.7/debian/xmhtml1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/*.so.* --- xmhtml-1.1.7.orig/debian/compat +++ xmhtml-1.1.7/debian/compat @@ -0,0 +1 @@ +4 --- xmhtml-1.1.7.orig/debian/xmhtml1-dev.install +++ xmhtml-1.1.7/debian/xmhtml1-dev.install @@ -0,0 +1,4 @@ +debian/tmp/usr/lib/lib*.a +debian/tmp/usr/lib/lib*.so +debian/tmp/usr/include/XmHTML/*.h + --- xmhtml-1.1.7.orig/debian/xmhtml1-dev.docs +++ xmhtml-1.1.7/debian/xmhtml1-dev.docs @@ -0,0 +1,2 @@ +README TODO + --- xmhtml-1.1.7.orig/debian/control +++ xmhtml-1.1.7/debian/control @@ -0,0 +1,33 @@ +Source: xmhtml +Section: devel +Priority: optional +Maintainer: Debian QA Group +Standards-Version: 3.6.0 +Build-Depends: cdbs, debhelper (>= 4.1.0), lesstif2-dev, libpng12-dev | libpng-dev, libjpeg-dev, libxmu-dev, libxpm-dev + +Package: xmhtml1-dev +Architecture: any +Depends: ${misc:Depends}, xmhtml1, lesstif2-dev | libmotif-dev, libc6-dev +Provides: xmhtml-dev +Conflicts: xmhtml-dev +Description: A Motif widget for display HTML 3.2 + XmHTML is a high performance Motif Widget capable of displaying HTML + 3.2 confirming text. Graphics support, lesstif compatibility and + extensive documentation are amongst its many features. + . + This is the development kit, containing static libraries and header files + necessary to build programs that use xmhtml. The runtime library is + provided by the xmhtml package. + +Package: xmhtml1 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Section: libs +Description: A Motif widget for display HTML 3.2 + XmHTML is a high performance Motif Widget capable of displaying HTML + 3.2 confirming text. Graphics support, lesstif compatibility and + extensive documentation are amongst its many features. + . + This package provides the runtime shared library. The xmhtml-dev + package provides the header files, and the static library. + --- xmhtml-1.1.7.orig/debian/README.debian +++ xmhtml-1.1.7/debian/README.debian @@ -0,0 +1,8 @@ +xmhtml for DEBIAN +---------------------- + +This package is a relatively quick packaging of just enough so that +you can compile and use packages that use XmHTML. There are other +tools and libraries in the source tarball that are not packaged. + +Torsten Werner --- xmhtml-1.1.7.orig/debian/copyright +++ xmhtml-1.1.7/debian/copyright @@ -0,0 +1,42 @@ + +This is the Debian GNU/Linux prepackaged version of the XmHTML, a high +performance Motif Widget capable of displaying HTML 3.2 confirming text. +XmHTML was written by Koen D'Hondt (Ripley Software Development) +. + +This package was debianized by Tyson Dowd trd@cs.mu.oz.au on +Tue, 9 Mar 1999 15:11:02 +1100. It was downloaded from + http://www.xs4all.nl/~ripley/XmHTML/dist/XmHTML-1.1.7.tar.gz + +Note that the Debian package name is lowercase as per Debian's package +standards. + +XmHTML is released under the GNU LGPL: + + This is a public BETA release of XmHTML, a Motif Widget capable of + rendering HTML3.2 conforming documents. + + (C) Copyright 1993-1997 Ripley Software Development + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + Koen D'Hondt + + Ripley Software Development + ripley@xs4all.nl + http://www.xs4all.nl/~ripley + +On Debian GNU/Linux systems, the complete text of the GNU Library General +Public License can be found in `/usr/share/common-licenses'. --- xmhtml-1.1.7.orig/debian/patches/format-security.patch +++ xmhtml-1.1.7/debian/patches/format-security.patch @@ -0,0 +1,17 @@ +Description: Appease gcc -Werror=format-security +Author: Colin Watson +Forwarded: no +Last-Update: 2011-10-20 + +diff -Nur -x '*.orig' -x '*~' xmhtml-1.1.7/lib/common/parse.c xmhtml-1.1.7.new/lib/common/parse.c +--- xmhtml-1.1.7/lib/common/parse.c 2011-10-20 18:30:02.000000000 +0100 ++++ xmhtml-1.1.7.new/lib/common/parse.c 2011-10-20 18:32:28.000000000 +0100 +@@ -1935,7 +1935,7 @@ + sprintf(msg, XMHTML_MSG_128, html_tokens[id], html_tokens[current]); + break; + case HTML_INTERNAL: +- sprintf(msg, XMHTML_MSG_129); ++ sprintf(msg, "%s", XMHTML_MSG_129); + break; + case HTML_NOTIFY: /* not reached */ + return; --- xmhtml-1.1.7.orig/debian/patches/grace.patch +++ xmhtml-1.1.7/debian/patches/grace.patch @@ -0,0 +1,69 @@ +The patch fixes: +1)
placement +2) formatting inside 
 (not really nice HTML, but any browser
+   supports it)
+3) "Can't convert XmHTML_DEFAULT_GAMMA" runtime warning
+
+--- XmHTML-1.1.7/lib/common/layout.c.orig	Thu Jan 28 02:10:17 1999
++++ XmHTML-1.1.7/lib/common/layout.c	Mon Jun 12 21:55:01 2000
+@@ -2377,14 +2377,16 @@
+ 	* Linefeeds in rules are divided accross the rule: half above and
+ 	* half below.
+ 	*****/
+-	if(data->linefeed)
++	if(data->linefeed) {
++		box->y += data->linefeed;
+ 		y_offset = data->linefeed/2;
+-	else
++	} else {
+ 		y_offset = data->font->height/2; 
++	}
+ 
+ 	data->y = box->y + y_offset;
+-
+-	/* take height of rule into account as well */
++	
++        /* take height of rule into account as well */
+ 	y_offset += data->height/2;
+ 
+ 	/* full height of the box */
+--- XmHTML-1.1.7/lib/common/parse.c.orig	Wed Jan 20 07:13:08 1999
++++ XmHTML-1.1.7/lib/common/parse.c	Mon Jun 12 01:40:19 2000
+@@ -1258,6 +1258,24 @@
+ 				current == HT_U || current == HT_VAR ||
+ 				current == HT_FONT || current == HT_ZTEXT)
+ 				return(True);
++			
++            /* allow most container elements as well if we can relax */
++			if(!parser->strict_checking &&
++				(current == HT_TABLE || current == HT_TR || current == HT_TH ||
++					current == HT_TD || current == HT_OL || current == HT_UL ||
++					current == HT_DL || current == HT_P || current == HT_DIV ||
++					current == HT_BLOCKQUOTE || current == HT_CENTER ||
++					current == HT_FORM || current == HT_CAPTION ||
++					current == HT_H1 || current == HT_H2 || current == HT_H3 ||
++					current == HT_H4 || current == HT_H5 || current == HT_H6))
++			{
++#ifdef MINIPARSE
++				tag_is_wrong_but_allowed = True;
++#endif
++				/* but always issue a warning */
++				parserCallback(parser, current, state, HTML_VIOLATION);
++				return(True);
++			}
+ 			break;
+ 
+ 		case HT_ZTEXT:
+--- XmHTML-1.1.7/include/XmHTML/resources.h.orig	Sun Dec 13 14:48:46 1998
++++ XmHTML-1.1.7/include/XmHTML/resources.h	Tue Jun 13 02:29:30 2000
+@@ -102,7 +102,9 @@
+ #define _resources_h_
+ 
+ #define Offset(field) XtOffsetOf(XmHTMLRec, html.field)
+-#define Stringify(VAL)	#VAL
++/* Must use cpp prescan for two levels of macros */
++#define Stringify(VAL)  _Stringify(VAL)
++#define _Stringify(VAL) #VAL
+ 
+ static XtResource resources [] =
+ {