summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Strzelczyk <piotr@eps.gda.pl>2009-11-03 23:47:01 +0000
committerPiotr Strzelczyk <piotr@eps.gda.pl>2009-11-03 23:47:01 +0000
commitb78b90dcd5137249aa21c8b69cd8a22e9fb2eedd (patch)
treed24d32ccecee19529a65ca0e9bc53bc03038c0b5
parentcd78bcb5c22a9d89e8c35e3db01c0270b87a6b88 (diff)
font generation fixes
git-svn-id: svn://tug.org/texlive/trunk@15935 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/bin/win32/dviout.bat8
-rw-r--r--Master/tlpkg/dviout/dviout.par2
-rw-r--r--Master/tlpkg/dviout/gen_pk8
-rwxr-xr-xMaster/tlpkg/dviout/install.par2
4 files changed, 12 insertions, 8 deletions
diff --git a/Master/bin/win32/dviout.bat b/Master/bin/win32/dviout.bat
index 8a9105ac97e..f950efc9677 100755
--- a/Master/bin/win32/dviout.bat
+++ b/Master/bin/win32/dviout.bat
@@ -8,9 +8,9 @@ rem Make environment changes local
rem Disable delayed expansion (makes processing bang ! char easier)
setlocal enableextensions disabledelayedexpansion
-rem Get TL installation root (w/o trailing backslash)
-set tlroot=%~dp0:
-set tlroot=%tlroot:\bin\win32\:=%
+rem Get TL installation root (short name w/o trailing backslash)
+set tlroot=%~sf0:
+set tlroot=%tlroot:\bin\win32\dviout.bat:=%
if not exist "%tlroot%\bin\win32\kpsewhich.exe" goto :no_tl
rem Make sure our bin dir is the first one on the path
path %tlroot%\bin\win32;%path%
@@ -41,7 +41,7 @@ set GS_LIB=%tlroot%\tlpkg\tlgs\fonts;%tlroot%\tlpkg\tlgs\lib;%tlroot%\tlpkg\tlgs
path %tlroot%\tlpkg\tlgs\bin;%path%
rem Assemble dviout command
-set cmdstr="%tlroot%\tlpkg\dviout\dviout.exe" -NULL -TEXROOT="%tfmpath%"
+set cmdstr="%tlroot%\tlpkg\dviout\dviout.exe" -NULL -dpi=600 -gen="%tlroot%\tlpkg\dviout\gen_pk" -TEXROOT="%tfmpath%"
set cmdstr=%cmdstr% -TEXPK="^r\pk\\^s.^dpk;^r\tfm\\^s^tfm;^r\vf\\^s.vf;^r\ovf\\^s.ovf;^r\tfm\\^s.tfm"
rem Start dviout
start "" %cmdstr% %*
diff --git a/Master/tlpkg/dviout/dviout.par b/Master/tlpkg/dviout/dviout.par
deleted file mode 100644
index ac1b1aea29a..00000000000
--- a/Master/tlpkg/dviout/dviout.par
+++ /dev/null
@@ -1,2 +0,0 @@
-dpi=600
-gen="`mktexpk.exe --mfmode / --dpi ^d --bdpi ^D --mag ^M ^s"
diff --git a/Master/tlpkg/dviout/gen_pk b/Master/tlpkg/dviout/gen_pk
new file mode 100644
index 00000000000..2357e63c5d2
--- /dev/null
+++ b/Master/tlpkg/dviout/gen_pk
@@ -0,0 +1,8 @@
+%1st
+setlocal
+for %%I in (mktexpk.exe) do set "MKTEXPK_EXE=%%~$PATH:I"
+if not defined MKTEXPK_EXE exit 1
+%2nd
+"%MKTEXPK_EXE%" --mfmode / --dpi ^d --bdpi ^D --mag ^M "^s"
+%3rd
+del %0 & exit %errorlevel%
diff --git a/Master/tlpkg/dviout/install.par b/Master/tlpkg/dviout/install.par
deleted file mode 100755
index c490b99bd8b..00000000000
--- a/Master/tlpkg/dviout/install.par
+++ /dev/null
@@ -1,2 +0,0 @@
-dpi=600
-gen="`mktexpk --mfmode / --dpi ^d --bdpi ^D --mag ^M ^s"