Import DeuTex 4.4.0

CHANGES

@@ -3,6 +3,59 @@ Edit docsrc/changes.html instead.
 
                          History of changes for DeuTex
 
+   DeuTex 4.4.0 (AYM 2000-01-05)
+
+          + Game: Hexen: musics are now identified and extracted
+            properly.
+            The old music identification code assumed that any lump whose
+            name does not begin with either "D_" or "MUS_" can't be a
+            music. It worked for Doom, Heretic and Strife but, for Hexen,
+            it caused all musics to be seen as plain lumps and extracted
+            accordingly into the lumps/ directory. DeuTex even tried to
+            interprete STALKR and WINNOWR as pictures and said silly
+            things about them having a "width greater than 4096".
+            The new code really checks whether the lump begins with
+            "MUS\x1a" instead of just looking at its name. A lump is now
+            deemed to be a music if and only if it begins with "MUS\x1a".
+            As a side-effect, certain operations (appending sprites and
+            flats and merging) must have become slower. Furthermore,
+            since these used to blindly assume that any lump whose name
+            begins with either "D_" or "MUS_" is a music, their semantics
+            might have changed. If you find they don't do what you want,
+            try again using the -musid option and let me know whether it
+            improves your condition.
+          + Game: Hexen, Doom alpha 0.4/0.5: levels are now properly
+            extracted and included.
+            There have been changes in the undocumented details of
+            DeuTex's behaviour with respect to levels. The one that is
+            most likely to be noticed is that, when including a level,
+            DeuTex now copies the entire contents of the levels/ pwad,
+            starting from the level label. Previously, it included at
+            most the 11 following lumps, and only if they had the
+            expected names (THINGS, VERTEXES and so on).
+            But, basically, if the levels/ pwads contain, as they should,
+            all the needed lumps and nothing else, there shouldn't be any
+            trouble.
+          + Game: Heretic and Hexen: does not abort anymore with "Bug:
+            *** idinx (12) ***" when trying to include the graphic lumps
+            (resp. CREDIT, E2END, FINAL1, FINAL2, HELP1, HELP2, TITLE and
+            CREDIT, FINALE1, FINALE2, FINALE3, HELP1, HELP2, INTERPIC,
+            TITLE). More generally, DeuTex now accepts to compose wads
+            even when there are graphic files in lumps/.
+          + Game: Hexen: does not abort anymore with "Height of FLAT
+            ./flats/x_001.ppm is not 64 or 65" when trying to include
+            flats X_001 through X_011. In addition, DeuTex now just emits
+            a warning instead of aborting for other oddball heights (i.e.
+            not 64, 65 or 128). Have fun. ;-) This is true for all iwads,
+            not only Hexen.
+          + Graphics: the annoying "quantisation is slow" warnings now
+            appear at most once.
+          + Misc: to disambiguate the "<count> warnings omitted" message,
+            added optional scope prefix and changed the picture
+            extraction function to use it.
+          + Misc: got rid of the "don't bother Olivier" banner. People
+            must have got the message by now.
+
    DeuTex 4.3.0 (AYM 1999-12-24)
 
           + Graphics: fixed ancient bug where DeuTex sometimes failed to
@@ -22,6 +75,8 @@ Edit docsrc/changes.html instead.
           + Misc: more error handling improvements.
           + Misc: bumped version number and cleaned things up for public
             release.
+          + Misc: decreased maximum number of warnings per picture from
+            10 to 5.
           + Platform: fixed ftruncate() being undeclared when compiling
             with DJGPP and updated the building-on-DOS section of the
             doc.

LICENSE

@@ -3,7 +3,7 @@
 ------------------------------------------------------------------------
 
 DeuTex is Copyright � 1994-1995 Olivier Montanuy,
-      and Copyright � 1999 Andr� Majorel.
+      and Copyright � 1999-2000 Andr� Majorel.
 
 The parts of DeuTex that have been written by Olivier Montanuy,
 Kevin McGrail, Andr� Majorel and other contributors are
@@ -71,4 +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
+-- AYM 1999-12-30

README

@@ -1,4 +1,4 @@
-DeuTex 4.3.0
+DeuTex 4.4.0
 
 WHAT ARE DEUTEX AND DEUSF
 
@@ -22,15 +22,15 @@ BUILDING AND INSTALLING ON DOS
 LEGAL
 
   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.
+  Majorel 1999-2000 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]>.
 
--- AYM 1999-11-21
+-- AYM 1999-12-30

TODO

@@ -44,42 +44,26 @@ Game support
           + create corresponding -sprites-like option
      * When extracting the Doom alpha 0.2 iwad, "Can't find PNAMES in
        wad".
-     * Doom Alpha: extracting levels not possible yet.
      * DeuTex should not look for doom.wad in the directory set by
        -heretic !
-     * Heretic: CREDIT, E2END, FINAL1, FINAL2, HELP1, HELP2 and TITLE are
-       correctly identified as graphics and extracted accordingly but
-       into lumps/ !
      * Heretic: E2END is extracted with the wrong palette.
-     * Hexen: CREDIT, FINALE1, FINALE2, FINALE3, HELP1, HELP2, INTERPIC
-       and TITLE are correctly identified as graphics and extracted
-       accordingly but into lumps/ !
-     * Hexen: WINNOWR and STALKR should be extracted into mus/ (begin
-       with MUS\x1a), not lumps/.
-     * Hexen: DeuTex does not handle the BEHAVIOR lumps correctly.
      * Hexen: does not extract graphics quite correctly (applies
        transparent colour translation to opaque images such as FINALE1
        and FINALE2. This is probably related to [1].
-     * Hexen: when trying to build back the hexen wad, got
-Color palette is unknown
-WARNING unknown palette. Using colour 0xff as transparentcolour.
-Some graphics may appear moth-eaten.
-Making lumps
-Bug: *** idinx ***
      * Make sure that support for Strife is complete.
 
 Graphics
 
      * Patches > 255 high
-     * Why does DeuTex sometimes include patches even if you don't
-       mention them explicitly and sometimes doesn't ?
      * The presence of the GIF routines might prevent DeuTex to be
        distributed in the main section of Debian. Would it be sufficient
        to #ifdef them out ?
-     * PPM to Doom graphics: the warning "quantisation is slow" should
-       either mention the name of the file or appear only once.
      * Determine why converting Doom graphics to PPM and back does not
        yield the same thing. This also happens with BMP but much less so.
+       Update 2000-01-04 : for example, with Heretic, patch WALL17 has
+       its (4Eh, 50h, 4Dh) pixels turned into (4Eh, 4Eh, 4Eh). It seems
+       DeuTex sometimes uses a close match even when an exact match
+       exists.
      * Bug: some flats seem to be extracted with certain pixels set to
        the transparent colour (Doom's CEIL4_1). DeuTex 3.6 for DOS
        exhibits the same problem [1].

VERSION

@@ -1 +1 @@
-4.3.0
+4.4.0

deutex.6

@@ -4,7 +4,7 @@
 .\" public domain in 1994 by Raphaël Quinet and Brendon Wyber.
 .\" 
 .\" DeuTex is Copyright © 1994-1995 Olivier Montanuy,
-.\"           Copyright © 1999 André Majorel.
+.\"           Copyright © 1999-2000 André Majorel.
 .\" 
 .\" This program is free software; you can redistribute it and/or modify it
 .\" under the terms of the GNU General Public License as published by the
@@ -20,7 +20,7 @@
 .\" with this library; if not, write to the Free Software Foundation, Inc.,
 .\" 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 .\" 
-.TH DEUTEX 6 1999-12-24 "DeuTex 4.3.0"
+.TH DEUTEX 6 2000-01-05 "DeuTex 4.4.0"
 .SH NAME
 deutex, deusf \- do things with wad files
 .SH SYNOPSIS
@@ -138,7 +138,7 @@ Same as above.
 Print list of options in troff -man format.
 .TP 14
 \fB\--version\fP
-Print version number.
+Print version number and exit successfully.
 .TP 14
 \fB\-syntax\fP
 Print the syntax of wad creation directives.
@@ -155,6 +155,9 @@ Debug mode.
 \fB\-di \fP\fIname\fP
 (opt.) Debug identification of entry.
 .TP 14
+\fB\-musid\fP
+(opt.) Use old music identification method.
+.TP 14
 \fB\-overwrite\fP
 (opt.) Overwrite all.
 .TP 14
@@ -388,6 +391,9 @@ and friends.
 .SH BUGS
 See \fBTODO\fP.
 .SH LEGAL
+DeuTex is copyright © 1994-1995 Olivier Montanuy, copyright ©
+1999-2000 André Majorel.
+
 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
@@ -404,7 +410,8 @@ From 1994 to 1996, DeuTex was maintained by Olivier Montanuy
 Mathews <[email protected]> and Chuck Rossi. The
 original manual was written by Kevin McGrail <[email protected]>.
 
-The current maintainer is André Majorel <[email protected]>.
+As of version 4 (1999), the maintainer is André Majorel
+<[email protected]>.
 
 Questions and bug reports should be sent to the current
 maintainer, \fInot\fP to the original authors.

docsrc/README

@@ -22,10 +22,10 @@ BUILDING AND INSTALLING ON DOS
 LEGAL
 
   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.
+  Majorel 1999-2000 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
 

docsrc/changes.html

@@ -6,6 +6,76 @@
 <h1>History of changes for DeuTex</h1>
 
 <dl>
+<p><dt>DeuTex 4.4.0 (AYM 2000-01-05)
+<dd>
+	<ul>
+	<p><li>Game: Hexen: musics are now identified and extracted properly.
+
+	<p>The old music identification code assumed that any lump whose name
+	does not begin with either "<code>D_</code>" or "<code>MUS_</code>"
+	can't be a music. It worked for Doom, Heretic and Strife but, for
+	Hexen, it caused all musics to be seen as plain lumps and extracted
+	accordingly into the <code>lumps/</code> directory. DeuTex even tried
+	to interprete <code>STALKR</code> and <code>WINNOWR</code> as pictures
+	and said silly things about them having a "width greater than 4096".
+
+	<p>The new code really checks whether the lump begins with
+	"<code>MUS\x1a</code>" instead of just looking at its name. A lump is
+	now deemed to be a music if and only if it begins with
+	"<code>MUS\x1a</code>".
+
+	<p>As a side-effect, certain operations (appending sprites and flats
+	and merging) must have become slower. Furthermore, since these used to
+	blindly assume that any lump whose name begins with either
+	"<code>D_</code>" or "<code>MUS_</code>" is a music, their semantics
+	might have changed. If you find they don't do what you want, try again
+	using the <code>-musid</code> option and let me know whether it
+	improves your condition.
+
+	<p><li>Game: Hexen, Doom alpha 0.4/0.5: levels are now properly
+	extracted and included.
+
+	<p>There have been changes in the undocumented details of DeuTex's
+	behaviour with respect to levels. The one that is most likely to be
+	noticed is that, when including a level, DeuTex now copies the entire
+	contents of the <code>levels/</code> pwad, starting from the level
+	label. Previously, it included at most the 11 following lumps, and only
+	if they had the expected names (<code>THINGS</code>,
+	<code>VERTEXES</code> and so on).
+
+	<p>But, basically, if the <code>levels/</code> pwads contain, as they
+	should, all the needed lumps and nothing else, there shouldn't be any
+	trouble.
+
+	<p><li>Game: Heretic and Hexen: does not abort anymore with
+	"<code>Bug: *** idinx (12) ***</code>" when trying to include the
+	graphic lumps (resp. <code>CREDIT</code>, <code>E2END</code>,
+	<code>FINAL1</code>, <code>FINAL2</code>, <code>HELP1</code>,
+	<code>HELP2</code>, <code>TITLE</code> and <code>CREDIT</code>,
+	<code>FINALE1</code>, <code>FINALE2</code>, <code>FINALE3</code>,
+	<code>HELP1</code>, <code>HELP2</code>, <code>INTERPIC</code>,
+	<code>TITLE</code>). More generally, DeuTex now accepts to compose wads
+	even when there are graphic files in <code>lumps/</code>.
+
+	<p><li>Game: Hexen: does not abort anymore with "<code>Height of FLAT
+	./flats/x_001.ppm is not 64 or 65</code>" when trying to include flats
+	<code>X_001</code> through <code>X_011</code>. In addition, DeuTex now
+	just emits a warning instead of aborting for other oddball heights
+	(i.e. not 64, 65 or 128). Have fun. <code>;-)</code> This is true for
+	all iwads, not only Hexen.
+
+	<p><li>Graphics: the annoying "<code>quantisation is slow</code>"
+	warnings now appear at most once.
+
+	<p><li>Misc: to disambiguate the "<code>&lt;count&gt; warnings
+	omitted</code>" message, added optional scope prefix and changed the
+	picture extraction function to use it.
+
+	<p><li>Misc: got rid of the "don't bother Olivier" banner. People must
+	have got the message by now.
+
+	</ul>
+
 <p><dt>DeuTex 4.3.0 (AYM 1999-12-24)
 <dd>
 	<ul>
@@ -32,6 +102,9 @@ <h1>History of changes for DeuTex</h1>
 	<p><li>Misc: bumped version number and cleaned things up for public
 	release.
 
+	<p><li>Misc: decreased maximum number of warnings per picture from 10
+	to 5.
+
 	<p><li>Platform: fixed <code>ftruncate()</code> being undeclared when
 	compiling with DJGPP and updated the building-on-DOS section of the
 	doc.

docsrc/deutex.6

@@ -4,7 +4,7 @@
 .\" public domain in 1994 by Raphaël Quinet and Brendon Wyber.
 .\" 
 .\" DeuTex is Copyright © 1994-1995 Olivier Montanuy,
-.\"           Copyright © 1999 André Majorel.
+.\"           Copyright © 1999-2000 André Majorel.
 .\" 
 .\" This program is free software; you can redistribute it and/or modify it
 .\" under the terms of the GNU General Public License as published by the
@@ -138,7 +138,7 @@ Same as above.
 Print list of options in troff -man format.
 .TP 14
 \fB\--version\fP
-Print version number.
+Print version number and exit successfully.
 .TP 14
 \fB\-syntax\fP
 Print the syntax of wad creation directives.
@@ -155,6 +155,9 @@ Debug mode.
 \fB\-di \fP\fIname\fP
 (opt.) Debug identification of entry.
 .TP 14
+\fB\-musid\fP
+(opt.) Use old music identification method.
+.TP 14
 \fB\-overwrite\fP
 (opt.) Overwrite all.
 .TP 14
@@ -388,6 +391,9 @@ and friends.
 .SH BUGS
 See \fBTODO\fP.
 .SH LEGAL
+DeuTex is copyright © 1994-1995 Olivier Montanuy, copyright ©
+1999-2000 André Majorel.
+
 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
@@ -404,7 +410,8 @@ From 1994 to 1996, DeuTex was maintained by Olivier Montanuy
 Mathews <[email protected]> and Chuck Rossi. The
 original manual was written by Kevin McGrail <[email protected]>.
 
-The current maintainer is André Majorel <[email protected]>.
+As of version 4 (1999), the maintainer is André Majorel
+<[email protected]>.
 
 Questions and bug reports should be sent to the current
 maintainer, \fInot\fP to the original authors.

docsrc/readme.dos

@@ -18,10 +18,10 @@ INSTALLING
 LEGAL
 
   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.
+  Majorel 1999-2000 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