From 4f8d7fc629e2405894db6ad326fc49d252551177 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20H=C3=BCbinette=20=28Hubbe=29?= <hubbe@hubbe.net>
Date: Sat, 17 Jul 1999 03:20:13 -0700
Subject: [PATCH] pdf version now works better again
Rev: tutorial/.cvsignore:1.18
Rev: tutorial/Makefile:1.40
Rev: tutorial/pdflatex.pike:1.3
---
tutorial/.cvsignore | 6 ++++++
tutorial/.gitignore | 6 ++++++
tutorial/Makefile | 2 +-
tutorial/pdflatex.pike | 21 +++++++++++++--------
4 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/tutorial/.cvsignore b/tutorial/.cvsignore
index 73631fda81..4c34fe0ddc 100644
--- a/tutorial/.cvsignore
+++ b/tutorial/.cvsignore
@@ -8,13 +8,19 @@ Parser.wmml
ProtocolsHTTP.wmml
ProtocolsLysKOM.wmml
___tmp.*
+__tmp.ppm
error.pdf
extra_textflows.mif
gfx
illustration*.*
illustration_cache
+latex_wcache
man
pike.pdf
+test.aux
+test.dvi
+test.log
+test.tex
texput.log
tut*.html
tutorial-foo.wmml
diff --git a/tutorial/.gitignore b/tutorial/.gitignore
index e9b3e1db38..b60197ebaf 100644
--- a/tutorial/.gitignore
+++ b/tutorial/.gitignore
@@ -8,13 +8,19 @@
/ProtocolsHTTP.wmml
/ProtocolsLysKOM.wmml
/___tmp.*
+/__tmp.ppm
/error.pdf
/extra_textflows.mif
/gfx
/illustration*.*
/illustration_cache
+/latex_wcache
/man
/pike.pdf
+/test.aux
+/test.dvi
+/test.log
+/test.tex
/texput.log
/tut*.html
/tutorial-foo.wmml
diff --git a/tutorial/Makefile b/tutorial/Makefile
index fb7798194a..30c37285dc 100644
--- a/tutorial/Makefile
+++ b/tutorial/Makefile
@@ -95,7 +95,7 @@ the_image_module.html: Image.wmml the_image_module.wmml
clean:
-rm -f *.html *.md illustration_cache gfx/* $(MADEFILES)
-rm -f tutorial.dvi tutorial.tex tutorial.aux
- -rm -f tutorial.log tutorial.toc
+ -rm -f tutorial.log tutorial.toc latex_wcache
rebuild:
-rm -f $(MADEFILES)
diff --git a/tutorial/pdflatex.pike b/tutorial/pdflatex.pike
index 9164119292..2bb5566635 100644
--- a/tutorial/pdflatex.pike
+++ b/tutorial/pdflatex.pike
@@ -12,6 +12,14 @@ inherit "latex";
string extention=".pdftex";
+string packages=
+#"\\usepackage{isolatin1}
+\\usepackage{latexsym} % For $\Box$
+\\usepackage{amsmath}
+\\usepackage{longtable}
+\\usepackage[pdftex]{graphicx}
+";
+
string convert_gfx(TAG tag)
{
string file;
@@ -21,7 +29,7 @@ string convert_gfx(TAG tag)
300.0,
tag->data && Sgml.get_text(tag->data));
- if(!file) return "\\{Large Error}\n";
+ if(!file) return "\\{Large Error, no file}\n";
switch( (file/".")[-1] )
{
@@ -32,9 +40,10 @@ string convert_gfx(TAG tag)
return "\\includegraphics{"+file+"}";
default:
- return "\\Huge{error}";
+ return "\\{Huge error, wrong extention}";
case "png":
+ case "jpg":
// return "\\epsfbox{"+file+"}";
return sprintf("\\pdfimageresolution=%d\n\\includegraphics{%s}",
@@ -59,12 +68,8 @@ string package(string x)
\\pdfoutput=1
\\relax
\\documentclass[twoside,a4paper]{book}
-\\usepackage{isolatin1}
-\\usepackage{latexsym} % For $\Box$
-\\usepackage{amsmath}
-\\usepackage{longtable}
-\\usepackage[pdftex]{graphicx}
-\\begin{document}
+"+packages+
+#"\\begin{document}
\\author{wmml2pdflatex}
\\setlength{\\unitlength}{1mm}
--
GitLab