Import DeuTex 4.0.3

CHANGES

@@ -3,6 +3,21 @@ Edit docsrc/changes.html instead.
 
                          History of changes for DeuTex
 
+   DeuTex 4.0.3 (AYM 1999-10-02)
+
+          + CLI: new option -doom2 as suggested by Matthew Miller.
+          + Graphics: now accepts to extract pictures as large as
+            4096�4096 (previously the limit was 320�200). This fixes
+            "Failed to write sprite" errors when trying to extract PSYBA0
+            and PSYBB0 from strain.wad. Thanks to Matthew miller for
+            reporting the bug.
+          + Misc: added a useful URL to the GIF warning.
+          + Sound: fixed a bug that caused DeuTex to extract sounds with
+            unlikely sample rates like 4 GHz whenever the sample rate in
+            the lump was higher than 32767 Hz (for example DSVILACT and
+            DSVILSIT from ncc1701.wad, with a sample rate of 44.1 kHz).
+            Thanks to Matthew Miller for reporting the bug.
+
    DeuTex 4.0.2 (AYM 1999-09-19)
 
           + CLI: new options

Makefile

@@ -150,10 +150,10 @@ DOBJTEX = $(SRC:.c=.otd)
 
 all: deutex deusf
 
-deutex: $(OBJTEX) .deutex
+deutex: $(OBJTEX) tmp/_deutex
 	$(CC) $(LDFLAGS) -o deutex $(OBJTEX) -lm
 
-deusf: $(OBJSF) .deusf
+deusf: $(OBJSF) tmp/_deusf
 	$(CC) $(LDFLAGS) -o deusf $(OBJSF) -lm
 
 dall: ddeutex ddeusf
@@ -165,17 +165,21 @@ dds: ddeusf
 
 ddeutex: $(DOBJTEX)
 	$(DCC) $(DLDFLAGS) -o deutex $(DOBJTEX) -lm
-	(sleep 1; touch .deutex) &  # Force next "make deutex" to relink
+	# Force next "make deutex" to relink
+	(sleep 1; mkdir -p tmp; touch tmp/_deutex) &
 
 ddeusf: $(DOBJSF)
 	$(DCC) $(DLDFLAGS) -o deusf $(DOBJSF) -lm
-	(sleep 1; touch .deusf) &  # Force next "make deusf" to relink
+	# Force next "make deusf" to relink
+	(sleep 1; mkdir -p tmp; touch tmp/_deusf) &
 
-.deutex:
-	touch .deutex
+tmp/_deutex:
+	-mkdir tmp
+	touch $@
 
-.deusf:
-	touch .deusf
+tmp/_deusf:
+	-mkdir tmp
+	touch $@
 
 install:
 	install -p -m 0755 deutex   $(PREFIX)/bin
@@ -293,6 +297,7 @@ distbindos: $(DISTFILESBIN) $(DDOCDOS)
 # save - your daily backup
 save:
 	tar -zcvf ../deutex-$$(date '+%Y%m%d').tar.gz\
+	  --exclude dostmp1 --exclude unixtmp1\
 	  --exclude "*~" --exclude "*.o"\
 	  --exclude "*.os" --exclude "*.ot"\
 	  --exclude "*.osd" --exclude "*.otd" .

README

@@ -1,4 +1,4 @@
-DeuTex 4.0.2
+DeuTex 4.0.3
 
 WHAT ARE DEUTEX AND DEUSF
 

TODO

@@ -98,7 +98,7 @@ Edit docsrc/todo.html instead.
        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.
-     * Bug: certain flats seem to be extracted with certain pixels set to
+     * 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].
      * Hexen: DeuTex does not handle the BEHAVIOR lumps correctly.
@@ -111,18 +111,49 @@ WARNING unknown palette. Using colour 0xff as transparentcolour.
 Some graphics may appear moth-eaten.
 Making lumps
 Bug: *** idinx ***
-     * WinTex status: add link to www.doomworld.com/deskdoom/
-       ([email protected])
      * Why does "deutex -ipf alpha -doom .. -sprites -graphics -patches
        -xtract" trigger "Error: *** Can't open file ./lumps/titlepic.lmp
        ***" ?
      * When extracting the Doom alpha 0.2 iwad, "Can't find PNAMES in
        wad".
      * Alpha: extracting levels not possible yet. Some graphics are
        extracted as lumps (MSKUL*, TITLEPIC...).
-     * Building seems to be slower than extracting. Perhaps RAWtoPIC
+     * Building seems to be slower than extracting. Perhaps RAWtoPIC()
        could use some optimization.
-     * Include the palettes in the distribution.
+     * Include the Gimp and PSP palettes in the distribution.
+     * Matthew Miller wants to be able to specify the name of the iwad
+       instead of just its path (this is how it should have been done
+       from the start, IMHO). Possible ways to do that :
+          + stat() the argument to -doom, -heretic, etc. If it's a file
+            and not a directory, use that.
+          + Look for a different basename in the iwad directory,
+            depending on the option through which the directory was
+            specified. E.G. if it was set with -doom2, look for doom2.wad
+            first. And if doom2.wad was not found, emit a warning. -doom
+            and -heretic should look for all basenames because that's
+            what previous versions of DeuTex did.
+          + Add an option to specify the name of the iwad file, without
+            specifying which iwad it is and let DeuTex guess what needs
+            to be guessed. Apparently, there's already such an option
+            (-main) but it's for DeuSF only. Why ?
+     * Look into importing sounds as .wav's. What are the highest
+       supported sample rates and resolution ? Seems to depend on the
+       engine.
+     * When saving a picture fails, tell why.
+     * todo.html grows faster than changes.html. Fix that. ;-)
+     * For people who have old graphics files generated by DeuTex 3 with
+       cyan (0, 255, 255) as the transparent colour : it would be nice if
+       DeuTex 4 could import those files automatically. The way I see it,
+       if no transparent pixel has been found in an image so far and if a
+       cyan pixel is found, a warning is emitted ("Warning: xxxxxxxx.xxx:
+       assuming the transparent colour is cyan.") and the transparent
+       colour for this image is set to cyan. This would make for a smooth
+       transition from DeuTex 3 to DeuTex 4. There should be a
+       command-line switch to disable that feature.
+     * When extracting from the Doom alpha 0.4 iwad, why do I get
+       ";TITLEPIC�-" in wadinfo.txt after TEXTURE1 ?
+     * There are too many warnings for a 25-line display. Keep a copy in
+       deutex.log ?
 
 References
 

VERSION

@@ -1 +1 @@
-4.0.2
+4.0.3

deutex.6

@@ -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-09-19 "DeuTex 4.0.2"
+.TH DEUTEX 6 1999-09-23 "DeuTex 4.0.3"
 .SH NAME
 deutex, deusf \- do things with wad files
 .SH SYNOPSIS
@@ -138,7 +138,10 @@ Debug mode.
 (opt.) WinTex shortcut.
 .TP 14
 \fB\-doom \fP\fIdir\fP
-(opt.) Indicate the directory of Doom/Doom II.
+(opt.) Indicate the directory of Doom.
+.TP 14
+\fB\-doom2 \fP\fIdir\fP
+(opt.) Indicate the directory of Doom II.
 .TP 14
 \fB\-doom02 \fP\fIdir\fP
 (opt.) Indicate the directory of Doom alpha 0.2.
@@ -150,7 +153,7 @@ Debug mode.
 (opt.) Indicate the directory of Doom alpha 0.5.
 .TP 14
 \fB\-doompr \fP\fIdir\fP
-(opt.) Indicate the directory of Doom press release pre-beta.
+(opt.) Indicate the directory of Doom PR pre-beta.
 .TP 14
 \fB\-heretic \fP\fIdir\fP
 (opt.) Indicate the directory of Heretic.
@@ -231,7 +234,7 @@ Same as above.
 (opt.) Set verbosity level to 1.
 .TP 14
 \fB\-v2\fP
-(opt.) Set verbosity level to 2.
+(opt.) Set verbosity level to 2 (default).
 .TP 14
 \fB\-v3\fP
 (opt.) Set verbosity level to 3.
@@ -263,7 +266,7 @@ Same as above.
 \fB\-ipf \fP\fR{\fP\fBalpha\fP\fR|\fP\fBpr\fP\fR|\fP\fBnormal\fP\fR}\fP
 (opt.) Picture format (default is "normal").
 .TP 14
-\fB\-ipf \fP\fR{\fP\fBnone\fP\fR|\fP\fBnameless\fP\fR|\fP\fBnormal\fP\fR}\fP
+\fB\-itf \fP\fR{\fP\fBnone\fP\fR|\fP\fBnameless\fP\fR|\fP\fBnormal\fP\fR}\fP
 (opt.) Texture format (default is "normal").
 .TP 14
 \fB\-itl \fP\fR{\fP\fBnone\fP\fR|\fP\fBtextures\fP\fR|\fP\fBnormal\fP\fR}\fP

docsrc/changes.html

@@ -6,6 +6,30 @@
 <h1>History of changes for DeuTex</h1>
 
 <dl>
+<p><dt>DeuTex 4.0.3 (AYM 1999-10-02)
+<dd>
+	<ul>
+	<p><li>CLI: new option <code>-doom2</code> as suggested by Matthew
+	Miller.
+
+	<p><li>Graphics: now accepts to extract pictures as large as
+	4096&times;4096 (previously the limit was 320&times;200). This fixes
+	"<code>Failed to write sprite</code>" errors when trying to extract
+	<code>PSYBA0</code> and <code>PSYBB0</code> from
+	<code>strain.wad</code>. Thanks to Matthew miller for reporting the
+	bug.
+
+	<p><li>Misc: added a useful URL to the GIF warning.
+
+	<p><li>Sound: fixed a bug that caused DeuTex to extract sounds with
+	unlikely sample rates like 4&nbsp;GHz whenever the sample rate in the
+	lump was higher than 32767&nbsp;Hz (for example <code>DSVILACT</code>
+	and <code>DSVILSIT</code> from <code>ncc1701.wad</code>, with a sample
+	rate of 44.1&nbsp;kHz). Thanks to Matthew Miller for reporting the
+	bug.
+
+	</ul>
+
 <p><dt>DeuTex 4.0.2 (AYM 1999-09-19)
 <dd>
 	<ul>

docsrc/deutex.6

@@ -138,7 +138,10 @@ Debug mode.
 (opt.) WinTex shortcut.
 .TP 14
 \fB\-doom \fP\fIdir\fP
-(opt.) Indicate the directory of Doom/Doom II.
+(opt.) Indicate the directory of Doom.
+.TP 14
+\fB\-doom2 \fP\fIdir\fP
+(opt.) Indicate the directory of Doom II.
 .TP 14
 \fB\-doom02 \fP\fIdir\fP
 (opt.) Indicate the directory of Doom alpha 0.2.
@@ -150,7 +153,7 @@ Debug mode.
 (opt.) Indicate the directory of Doom alpha 0.5.
 .TP 14
 \fB\-doompr \fP\fIdir\fP
-(opt.) Indicate the directory of Doom press release pre-beta.
+(opt.) Indicate the directory of Doom PR pre-beta.
 .TP 14
 \fB\-heretic \fP\fIdir\fP
 (opt.) Indicate the directory of Heretic.
@@ -231,7 +234,7 @@ Same as above.
 (opt.) Set verbosity level to 1.
 .TP 14
 \fB\-v2\fP
-(opt.) Set verbosity level to 2.
+(opt.) Set verbosity level to 2 (default).
 .TP 14
 \fB\-v3\fP
 (opt.) Set verbosity level to 3.
@@ -263,7 +266,7 @@ Same as above.
 \fB\-ipf \fP\fR{\fP\fBalpha\fP\fR|\fP\fBpr\fP\fR|\fP\fBnormal\fP\fR}\fP
 (opt.) Picture format (default is "normal").
 .TP 14
-\fB\-ipf \fP\fR{\fP\fBnone\fP\fR|\fP\fBnameless\fP\fR|\fP\fBnormal\fP\fR}\fP
+\fB\-itf \fP\fR{\fP\fBnone\fP\fR|\fP\fBnameless\fP\fR|\fP\fBnormal\fP\fR}\fP
 (opt.) Texture format (default is "normal").
 .TP 14
 \fB\-itl \fP\fR{\fP\fBnone\fP\fR|\fP\fBtextures\fP\fR|\fP\fBnormal\fP\fR}\fP

docsrc/hackers_guide.html

@@ -14,30 +14,29 @@ <h2>Endianness</h2>
 the native endianness.
 
 <ul>
-<li>To read an integer from a file with a particular endianness,
+<p><li>To read an integer from a file with a particular endianness,
 use use <code>fread_i16_le()</code>,
 <code>fread_i16_be()</code>, <code>fread_i32_le()</code> and
 <code>fread_i32_be()</code>. The first argument is the file
 descriptor, the second argument is a pointer on a variable that
-will receive the value read from the file.</p>
+will receive the value read from the file.
 
-<li>To write an integer to a file with a particular endianness,
+<p><li>To write an integer to a file with a particular endianness,
 use <code>fwrite_i16_le()</code>, <code>fwrite_i16_be()</code>,
 <code>fwrite_i32_le()</code> and <code>fwrite_i32_be()</code>.
 The first argument is the file descriptor, the second argument
-is the value to write.</p>
+is the value to write.
 
-<li>To read an integer with a particular endianness from a
+<p><li>To read an integer with a particular endianness from a
 memory area, use <code>read_i16_le()</code>,
 <code>read_i16_be()</code>, <code>read_i32_le()</code> and
 <code>read_i32_be()</code>. The first argument is a pointer on
 the memory area, the second argument is a pointer on a variable
 that will receive the value read from the memory area.
 Alternatively, you can use the <code>peek_i*()</code> functions
 that take no second argument but instead return the read value.
-</p>
 
-<li>To write an integer with a particular endianness to a memory
+<p><li>To write an integer with a particular endianness to a memory
 area, use <code>write_i16_le()</code>,
 <code>write_i16_be</code>, <code>write_i32_le()</code> and
 <code>write_i32_be()</code>. The first argument is a pointer on

docsrc/todo.html

@@ -139,7 +139,7 @@ <h1>To-do list for DeuTex</h1>
 <p><li>Determine why converting Doom graphics to PPM and back does not yield
 the same thing. This also happens with BMP but much less so.
 
-<p><li>Bug: certain flats seem to be extracted with certain pixels set to the
+<p><li>Bug: some flats seem to be extracted with certain pixels set to the
 transparent colour (Doom's <code>CEIL4_1</code>). DeuTex 3.6 for DOS exhibits
 the same problem [1].
 
@@ -158,9 +158,6 @@ <h1>To-do list for DeuTex</h1>
 Bug: *** idinx ***
 </pre>
 
-<p><li>WinTex status: add link to www.doomworld.com/deskdoom/
-([email protected])
-
 <p><li>Why does "<code>deutex -ipf alpha -doom .. -sprites -graphics -patches
 -xtract</code>" trigger <code>"Error: *** Can't open file ./lumps/titlepic.lmp
 ***</code>"&nbsp;?
@@ -171,10 +168,56 @@ <h1>To-do list for DeuTex</h1>
 <p><li>Alpha: extracting levels not possible yet. Some graphics are extracted
 as lumps (<code>MSKUL*</code>, <code>TITLEPIC</code>...).
 
-<p><li>Building seems to be slower than extracting. Perhaps RAWtoPIC could use
-some optimization.
+<p><li>Building seems to be slower than extracting. Perhaps
+<code>RAWtoPIC()</code> could use some optimization.
+
+<p><li>Include the Gimp and PSP palettes in the distribution.
+
+<p><li>Matthew Miller wants to be able to specify the name of the iwad instead
+of just its path (this is how it should have been done from the start, IMHO).
+Possible ways to do that&nbsp;:
+
+  <ul>
+  <li><code>stat()</code> the argument to <code>-doom</code>,
+  <code>-heretic</code>, etc. If it's a file and not a directory, use that.
+
+  <li>Look for a different basename in the iwad directory, depending on the
+  option through which the directory was specified. E.G. if it was set with
+  <code>-doom2</code>, look for <code>doom2.wad</code> first.  And if
+  <code>doom2.wad</code> was not found, emit a warning. <code>-doom</code> and
+  <code>-heretic</code> should look for all basenames because that's what
+  previous versions of DeuTex did.
+
+  <li>Add an option to specify the name of the iwad file, without specifying
+  which iwad it is and let DeuTex guess what needs to be guessed. Apparently,
+  there's already such an option (<code>-main</code>) but it's for DeuSF only.
+  Why&nbsp;?
+
+  </ul>
+
+<p><li>Look into importing sounds as .wav's. What are the highest supported
+sample rates and resolution&nbsp;? Seems to depend on the engine.
+
+<p><li>When saving a picture fails, tell why.
+
+<p><li><code>todo.html</code> grows faster than <code>changes.html</code>. Fix
+that. <code>;-)</code>
+
+<p><li>For people who have old graphics files generated by DeuTex 3 with cyan
+(0, 255, 255) as the transparent colour&nbsp;: it would be nice if DeuTex 4
+could import those files automatically. The way I see it, if no transparent
+pixel has been found in an image so far and if a cyan pixel is found, a warning
+is emitted ("<code>Warning: xxxxxxxx.xxx: assuming the transparent colour is
+cyan.</code>") and the transparent colour for this image is set to cyan. This
+would make for a smooth transition from DeuTex 3 to DeuTex 4. There should be a
+command-line switch to disable that feature.
+
+<p><li>When extracting from the Doom alpha 0.4 iwad, why do I get
+"<code>;TITLEPIC¼-</code>" in <code>wadinfo.txt</code> after
+<code>TEXTURE1</code>&nbsp;?
 
-<p><li>Include the palettes in the distribution.
+<p><li>There are too many warnings for a 25-line display. Keep a copy in
+<code>deutex.log</code>&nbsp;?
 
 </ul>