Import DeuTex 4.0.2

CHANGES

@@ -3,6 +3,51 @@ Edit docsrc/changes.html instead.
 
                          History of changes for DeuTex
 
+   DeuTex 4.0.2 (AYM 1999-09-19)
+
+          + CLI: new options
+               o -doom02 (implies -ipf alpha, -itf none and -itl none)
+               o -doom04 (implies -ipf alpha, -itf nameless and -itl
+                 textures)
+               o -doom05 (implies -ipf alpha and -itl textures)
+               o -doompr (implies -ipf pr)
+            Use those options where you would have used -doom and
+            friends. For example, to extract the contents of the Doom 0.4
+            iwad that is in c:\doom0_4, type "deutex -doom04 c:\doom0_4
+            -xtract".
+          + Code: replaced certain unjustified uses of Int32 by long.
+          + Doc: removed old/readme.txt. It's so out of date that it's
+            more confusing than useful.
+          + Game: Doom alpha and Doom PR: it's now possible to extract
+            graphics, patches, sprites and textures from those iwads.
+            Three new options :
+
+              -ipf {normal|pr|alpha}
+                      Use alpha for Doom alpha 0.2, 0.4 and 0.5.
+                      Use pr for Doom PR (press release pre-beta).
+                      Use normal for everything else.
+
+              -itf {normal|nameless|none}
+                      Use none for Doom alpha 0.2.
+                      Use nameless for Doom alpha 0.4.
+                      Use normal for everything else, including Doom
+                      alpha 0.5.
+
+              -itl {normal|textures|none}
+                      Use none for Doom alpha 0.2.
+                      Use textures for Doom alpha 0.4 and 0.5.
+                      Use normal for everything else, including Doom
+                      alpha 0.5.
+
+            You shouldn't ever have to use those options directly. It's
+            better to use just -doom02, -doom04, -doom05 and -doompr,
+            which take care of setting ipf, itf and itl properly for you.
+            Note that extracting levels and some other lumps from the
+            Doom alpha iwads does not work yet.
+          + Platform: new target in the makefile to generate a binary DOS
+            distribution with the executables and the user documentation
+            in DOS format, with DOS-ish names.
+
    DeuTex 4.0.1 (AYM 1999-09-10)
 
           + CLI: reworked the command line arguments parsing, with the
@@ -145,11 +190,11 @@ Edit docsrc/changes.html instead.
             F_END, you don't need DeuSF to get Doom to see your new
             flats. Should you need to, it's still possible to get FF_END
             by using -fend.
-          + Graphics: the default transparent colour is now rgb:00/2f/2f.
-            It used to be cyan (rgb:00/ff/ff) which was blindingly
-            bright, especially compared to the usually dark colours used
-            in Doom textures. It's no fun to tweak shades of dark brown
-            on a cyan background.
+          + Graphics: the default transparent colour is now a dark
+            blue-green (rgb:00/2f/2f). It used to be cyan (rgb:00/ff/ff)
+            which was blindingly bright, especially compared to the
+            usually dark colours used in Doom textures. It's no fun to
+            tweak shades of dark brown on a cyan background.
             To reuse images done with/for a previous version of DeuTex,
             you need to either invoke DeuTex with "-rgb 0 255 255" or
             convert your images by replacing all occurrences of colour

INSTALL

@@ -4,6 +4,7 @@
 
         by Olivier Montanuy <[email protected]>
 	Revised AYM 1999-08-12
+	Last update 1999-09-09
 
 
 

LICENSE

@@ -71,3 +71,4 @@ written by other people or distributed under different licenses :
 4. The files endianio.c and endianm.c are Copyright � Andr� Majorel 1999
    and available under the terms of the LGPL.
 
+-- AYM 1999-09-09

Makefile

@@ -6,9 +6,9 @@
 #   Unix    User targets should work on all Unices. Some _developer_
 #           targets, however, require lynx, GCC or GNU tar and gzip.
 #
-#   DOS     "make [all]" should work with any C compiler.
-#           "make install" will most likely not work. You'll have to
-#           install the executables by hand.
+#   DOS     "make [all]" should work with DJGPP and Cygwin. With other
+#           compilers, use the provided batch files. "make install"
+#           will most likely not work. Install the executables by hand.
 #
 #   Others  Don't know. Send feedback to the maintainer.
 #
@@ -28,27 +28,47 @@ DLDFLAGS = -g
 #DEFINES = -DDT_ALPHA
 
 ######### do not edit after this line #########
-DISTARC    = deutex-$$(cat VERSION).tar.gz	# "deutex-4.0.0.tar.gz"
-DISTARCDOS = dtex$$(tr -cd '[0-9]' <VERSION).zip  # "dtex400.zip"
-DISTDIR    = deutex-$$(cat VERSION)		# "deutex-4.0.0"
-DISTDIRDOS = dtex$$(tr -cd '[0-9]' <VERSION)	# "dtex400"
-DISTFILES  = $(DOC) $(DOC_SRC) $(HEADERS) $(MISCFILES) $(SCRIPTS) $(SRC)
-DOC_SRC = \
+VERSION       = $$(cat VERSION)
+DISTARC       = deutex-$(VERSION).tar.gz
+DISTARCDOS    = deutex-$(VERSION).zip
+DISTARCDOS8   = dtex$$(tr -cd '[0-9]' <VERSION).zip
+BINZIP        = deutex-$(VERSION).bin.dos.zip
+DISTDIR       = deutex-$(VERSION)		# "deutex-4.0.0"
+DISTDIRDOS    = dtex$$(tr -cd '[0-9]' <VERSION)	# "dtex400"
+DISTFILES     = $(DOC_SRC) $(HEADERS) $(MISCFILES) $(MISCSRC)\
+		$(SCRIPTS) $(SRC)
+DISTFILESBIN  = $(MISCFILES) deutex.exe deusf.exe
+
+DOC_SRC =\
 	docsrc/README\
 	docsrc/changes.html\
 	docsrc/deutex.6\
-	docsrc/dtexman6.txt\
 	docsrc/hackers_guide.html\
+	docsrc/readme.dos\
 	docsrc/todo.html\
 
-DOC = \
-	CHANGES\
-	README\
-	TODO\
-	deusf.6\
-	deutex.6\
-
-HEADERS = \
+DDOCUNIX =\
+	unixtmp1/CHANGES\
+	unixtmp1/COPYING\
+	unixtmp1/COPYING.LIB\
+	unixtmp1/INSTALL\
+	unixtmp1/LICENSE\
+	unixtmp1/README\
+	unixtmp1/TODO\
+	unixtmp1/deutex.6\
+	unixtmp1/dtexman6.txt\
+
+DDOCDOS =\
+	dostmp1/changes.txt\
+	dostmp1/copying\
+	dostmp1/copying.lib\
+	dostmp1/dtexman6.txt\
+	dostmp1/license\
+	dostmp1/manpage.txt\
+	dostmp1/readme.txt\
+	dostmp1/todo.txt\
+
+HEADERS =\
 	src/color.h\
 	src/deutex.h\
 	src/endianio.h\
@@ -66,29 +86,27 @@ HEADERS = \
 	src/tools.h\
 	src/wadio.h\
 
-MISCFILES = \
-	COPYING\
-	COPYING.LIB\
-	INSTALL\
-	LICENSE\
-	Makefile\
+MISCFILES =\
 	VERSION\
+
+# Only in source distributions
+MISCSRC =\
+	Makefile\
 	dos/buildbc.bat\
 	dos/buildmsc.bat\
 	old/deusf.ide\
 	old/deutex.ide\
 	old/dos2unix.sh\
-	old/readme.txt\
 	old/save.bat\
 	src/deusf.def\
 	src/deusfos.def\
 	src/deutex.def\
 	src/deutexos.def\
 
-SCRIPTS = \
+SCRIPTS =\
 	scripts/process\
 
-SRC = \
+SRC =\
 	src/color.c\
 	src/compose.c\
 	src/deutex.c\
@@ -130,7 +148,7 @@ DOBJTEX = $(SRC:.c=.otd)
 .c.osd:
 	$(DCC) $(DCFLAGS) $(DEFINES) -DDeuSF  -o $@ -c $<
 
-all: deutex deusf doc
+all: deutex deusf
 
 deutex: $(OBJTEX) .deutex
 	$(CC) $(LDFLAGS) -o deutex $(OBJTEX) -lm
@@ -163,64 +181,121 @@ install:
 	install -p -m 0755 deutex   $(PREFIX)/bin
 	install -p -m 0755 deusf    $(PREFIX)/bin
 	install -p -m 0644 deutex.6 $(PREFIX)/man/man6
-	install -p -m 0644 deusf.6  $(PREFIX)/man/man6
+	ln -sf deutex.6             $(PREFIX)/man/man6/deusf.6
 
 src/version.c: VERSION
-	printf "const char deutex_version[] = \"%s\";\n" $$(cat VERSION) >$@
+	printf "const char deutex_version[] = \"%s\";\n" $(VERSION) >$@
 
 strip: deutex deusf
 	strip deutex
 	strip deusf
 
 doc: $(DOC)
 
-CHANGES: docsrc/changes.htm* VERSION
+unixtmp1/CHANGES: docsrc/changes.htm* VERSION
 	echo 'THIS IS A GENERATED FILE -- DO NOT EDIT !' >$@
 	echo 'Edit docsrc/changes.html instead.' >>$@
 	lynx -dump $< >>$@
 
-README: docsrc/README VERSION scripts/process
-	scripts/process $< $(SRC_NON_GEN) >$@
+unixtmp1/COPYING: docsrc/COPYING
+	cp -p $< $@
+
+unixtmp1/COPYING.LIB: docsrc/COPYING.LIB
+	cp -p $< $@
 
-TODO: docsrc/todo.htm* VERSION
+unixtmp1/INSTALL: docsrc/INSTALL VERSION scripts/process
+	scripts/process $< >$@
+
+unixtmp1/LICENSE: docsrc/LICENSE VERSION scripts/process
+	scripts/process $< >$@
+
+unixtmp1/README: docsrc/README VERSION scripts/process
+	scripts/process $< >$@
+
+unixtmp1/TODO: docsrc/todo.htm* VERSION
 	echo 'THIS IS A GENERATED FILE -- DO NOT EDIT !' >$@
 	echo 'Edit docsrc/todo.html instead.' >>$@
 	lynx -dump $< >>$@
 
-deutex.6: docsrc/deutex.6 VERSION scripts/process
-	scripts/process $< $(SRC_NON_GEN) >$@
+unixtmp1/deutex.6: docsrc/deutex.6 VERSION scripts/process
+	scripts/process $< >$@
+
+unixtmp1/dtexman6.txt: docsrc/dtexman6.txt
+	cp -p $< $@
 
-deusf.6: deutex.6
-	@if [ ! -e $@ ]; then ln -s $< $@; fi
-	@if [ ! -L $@ ]; then echo "Can't overwrite $@"; false; fi
+dostmp1/changes.txt: unixtmp1/CHANGES
+	todos <$< >$@
+	touch -r $< $@
+
+dostmp1/copying: unixtmp1/COPYING
+	todos <$< >$@;
+	touch -r $< $@
+
+dostmp1/copying.lib: unixtmp1/COPYING.LIB
+	todos <$< >$@
+	touch -r $< $@
+
+dostmp1/dtexman6.txt: unixtmp1/dtexman6.txt
+	todos <$< >$@
+	touch -r $< $@
+
+dostmp1/license: unixtmp1/LICENSE
+	todos <$< >$@
+	touch -r $< $@
+
+dostmp1/manpage.txt: unixtmp1/deutex.6
+	nroff -man -Tlatin1 $< | ul -t dumb | todos >$@
+	touch -r $< $@
+
+dostmp1/readme.txt: docsrc/readme.dos
+	scripts/process $< | todos >$@
+
+dostmp1/todo.txt: unixtmp1/TODO
+	todos <$< >$@
+	touch -r $< $@
 
 clean:
 	rm -f $(OBJTEX) $(OBJSF) $(DOBJTEX) $(DOBJSF) deutex deusf
 	if [ -f deutex.exe ]; then rm deutex.exe; fi
 	if [ -f deusf.exe ]; then rm deusf.exe; fi
 
 # dist - make the distribution archive for Unix (.tar.gz)
-dist: $(DISTFILES)
+dist: $(DISTFILES) $(DDOCUNIX)
 	mkdir -p $(DISTDIR)
 	cp -dpP $(DISTFILES) $(DISTDIR)
+	cp -p $(DDOCUNIX) $(DISTDIR)
 	tar -zcf $(DISTARC) $(DISTDIR)
 	rm -rf $(DISTDIR)
 
 # distdos - make the distribution archive DOS (.zip, 8+3)
-distdos: $(DISTFILES)
+distdos: $(DISTFILES) $(DDOCDOS)
 	mkdir -p $(DISTDIRDOS)
 	cp -dpP $(DISTFILES) $(DISTDIRDOS)
+	cp -p $(DDOCDOS) $(DISTDIRDOS)
 	if [ -e $(DISTARCDOS) ]; then rm $(DISTARCDOS); fi
 	zip -D -X -9 -r $(DISTARCDOS) $(DISTDIRDOS)
 	rm -rf $(DISTDIRDOS)
 	printf 'DeuTex %s\nhttp://www.teaser.fr/~amajorel/deutex/'\
-	  "$$(cat VERSION)" | zip -z $(DISTARCDOS)
+	  "$(VERSION)" | zip -z $(DISTARCDOS)
+
+# distbindos - make the DOS binary distribution archive (.zip, 8+3)
+TMP=tmpd
+distbindos: $(DISTFILESBIN) $(DDOCDOS)
+	mkdir -p $(TMP)
+	cp -dpP $(DISTFILESBIN) $(TMP)
+	cp -p $(DDOCDOS) $(TMP)
+	if [ -e $(BINZIP) ]; then rm $(BINZIP); fi
+	export name=$$(pwd)/$(BINZIP); cd $(TMP); zip -D -X -9 -R $$name '*'
+	rm -rf $(TMP)
+	printf 'DeuTex %s\nhttp://www.teaser.fr/~amajorel/deutex/'\
+	  "$(VERSION)" | zip -z $(BINZIP)
 
 # save - your daily backup
 save:
 	tar -zcvf ../deutex-$$(date '+%Y%m%d').tar.gz\
 	  --exclude "*~" --exclude "*.o"\
-	  --exclude "*.os" --exclude "*.ot" .
+	  --exclude "*.os" --exclude "*.ot"\
+	  --exclude "*.osd" --exclude "*.otd" .
 
 help:
 	@echo "Targets for end users:"

README

@@ -1,4 +1,4 @@
-DeuTex 4.0.1
+DeuTex 4.0.2
 
 WHAT ARE DEUTEX AND DEUSF
 
@@ -17,22 +17,20 @@ BUILDING AND INSTALLING ON UNIX
 
 BUILDING AND INSTALLING ON DOS
 
-  You need a C compiler, such as DJGPP, Cygwin or Borland C. See
-  INSTALL.
+  See INSTALL.
 
 LEGAL
 
-  Most of this program is GPL'd but some of it is available under
-  other licenses. This program 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 LICENSE for specific information and copyright notices. All
-  trademarks are the property of their owners.
+  DeuTex is Copyright Olivier Montanuy 1994-1995 and Copyright Andr�
+  Majorel 1999 and available under the terms of the GPL, except lzw.c
+  which is Copyright David Koblas and others and available under the
+  terms of the PBMPLUS license. See the LICENSE file.
+  All trademarks are the property of their owners.
 
 CONTACT
 
-  Home page                 http://www.teaser.fr/~amajorel/deutex/
-  General newbie questions  news:rec.games.computer.doom.editing
-  Maintainer                Andr� Majorel <[email protected]>.
+  Home page                : http://www.teaser.fr/~amajorel/deutex/
+  General newbie questions : news:rec.games.computer.doom.editing
+  Maintainer               : Andr� Majorel <[email protected]>.
 
--- AYM 1999-09-09
+-- AYM 1999-09-19