Don't generate UTF-8 into sst.doc.

diff --git a/makefile b/makefile
index cf29f5afcbd7a56d2cb14fd58744139aa84074cc..b2ae6162c271ed1b87c4308844a527bc80e01ee1 100644 (file)
--- a/makefile
+++ b/makefile
@@ -10,7 +10,7 @@ CFLAGS=     -O -g -DSSTDOC='"/usr/share/doc/sst/sst.doc"'
 CFILES= sst.c finish.c reports.c setup.c moving.c battle.c events.c ai.c planets.c io.c
 OFILES= $(CFILES:.c=.o)
 HFILES=sst.h
-DOCS = README sst-doc.xml sst.xml TODO
+DOCS = README sst-doc.xml sst.xml sst-layer.xsl TODO
 
 # sst.doc and sst.6 are included so target system won't need xmlto
 SOURCES= $(CFILES) $(HFILES) $(DOCS) sst.doc sst.6 makehelp.py makefile sst.spec
@@ -26,7 +26,7 @@ sst.6: sst.xml
        xmlto man sst.xml
 
 sst-doc.txt: sst-doc.xml
-       xmlto --skip-validation txt sst-doc.xml
+       xmlto -m sst-layer.xsl --skip-validation txt sst-doc.xml
 sst.doc: sst-doc.txt
        makehelp.py >sst.doc
 

diff --git a/sst.c b/sst.c
index 8d82100865f63fd1a37f9581e18906a7cc703939..c8ac356eda049da1ea740374e472d98172f8773b 100644 (file)
--- a/sst.c
+++ b/sst.c
@@ -480,7 +480,6 @@ int scan(void) {
                        return IHEOL;\r
                }\r
                getline(line, sizeof(line));\r
-               line[strlen(line)-1] = '\0';\r
                linep = line;\r
        }\r
        // Skip leading white space\r