summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-10-17 22:47:54 +0000
committerKarl Berry <karl@freefriends.org>2013-10-17 22:47:54 +0000
commitee358044cf39c93f63fb7fa13119b3e92eb37f41 (patch)
treec6ecb99864da791dbd491065e6a5be452d0c9e1d /Master
parentc2c168a8341aff3cf9c005cf8d04f58fe8757aca (diff)
pfarrei (17oct13)
git-svn-id: svn://tug.org/texlive/trunk@31934 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/pfarrei/pfarrei.pdfbin499976 -> 500246 bytes
-rwxr-xr-xMaster/texmf-dist/scripts/pfarrei/a5toa4.tlu2
-rwxr-xr-xMaster/texmf-dist/scripts/pfarrei/pfarrei.tlu2
-rw-r--r--Master/texmf-dist/source/latex/pfarrei/README26
-rw-r--r--Master/texmf-dist/source/latex/pfarrei/pfarrei.dtx27
-rw-r--r--Master/texmf-dist/tex/latex/pfarrei/a5toa4.tex4
-rw-r--r--Master/texmf-dist/tex/latex/pfarrei/pfarrei.sty8
7 files changed, 42 insertions, 27 deletions
diff --git a/Master/texmf-dist/doc/latex/pfarrei/pfarrei.pdf b/Master/texmf-dist/doc/latex/pfarrei/pfarrei.pdf
index fe363a60b6a..c14311d9a47 100644
--- a/Master/texmf-dist/doc/latex/pfarrei/pfarrei.pdf
+++ b/Master/texmf-dist/doc/latex/pfarrei/pfarrei.pdf
Binary files differ
diff --git a/Master/texmf-dist/scripts/pfarrei/a5toa4.tlu b/Master/texmf-dist/scripts/pfarrei/a5toa4.tlu
index 436941eda58..900a3b6fc25 100755
--- a/Master/texmf-dist/scripts/pfarrei/a5toa4.tlu
+++ b/Master/texmf-dist/scripts/pfarrei/a5toa4.tlu
@@ -28,7 +28,7 @@
-- The list of files belonging to the work `pfarrei' is given in
-- the file `pfarrei.dtx'.
--
--- $Id: pfarrei.dtx 33 2013-04-08 07:22:56Z mjk $
+-- $Id: pfarrei.dtx 36 2013-10-16 18:54:26Z mjk $
kpse.set_program_name(arg[-1], 'a5toa4')
require('pfarrei.pfarrei')
diff --git a/Master/texmf-dist/scripts/pfarrei/pfarrei.tlu b/Master/texmf-dist/scripts/pfarrei/pfarrei.tlu
index f2756f6f907..d0310cd72d0 100755
--- a/Master/texmf-dist/scripts/pfarrei/pfarrei.tlu
+++ b/Master/texmf-dist/scripts/pfarrei/pfarrei.tlu
@@ -28,7 +28,7 @@
-- The list of files belonging to the work `pfarrei' is given in
-- the file `pfarrei.dtx'.
--
-local version_number = string.sub( '$Revision: 33 $', 12, -2 )
+local version_number = string.sub( '$Revision: 36 $', 12, -2 )
local action_version = ' r' .. version_number .. '\n' .. [[
Copyright (c) 2013 Markus Kohm.
diff --git a/Master/texmf-dist/source/latex/pfarrei/README b/Master/texmf-dist/source/latex/pfarrei/README
index 1260da14c27..267356c6941 100644
--- a/Master/texmf-dist/source/latex/pfarrei/README
+++ b/Master/texmf-dist/source/latex/pfarrei/README
@@ -1,4 +1,4 @@
-$Id: README 31 2013-04-02 09:26:09Z mjk $
+$Id: README 36 2013-10-16 18:54:26Z mjk $
============================================================================
pfarrei - A bundle of executables, LaTeX documents and packages for pastors
----------------------------------------------------------------------------
@@ -23,6 +23,7 @@ Special installation note:
that you have to use tex NOT latex or pdflatex!
The manual may be done using `pdflatex pfarrei.dtx' two
times.
+
After this, you should copy the files like this into a valid
TEXMF tree (aka TDS tree):
a5toa4.tlu --> scripts/pfarrei/a5toa5.tlu
@@ -32,13 +33,28 @@ Special installation note:
pfarrei.pdf --> doc/latex/pfarrei/pfarrei.pdf
README --> source/latex/pfarrei/README
pfarrei.dtx --> source/latex/pfarrei/pfarrei.dtx
+
Users, that do not use Windows, should also copy a5toa4.tlu
to the binary directory of their TeX distribution and rename
- that copy onto a5toa4 (without extension).
- Windows users, at least using TeX Live, should make a copy
- of runscript.exe with the name a5toa4 in the binary
+ that copy into a5toa4 (without extension).
+
+ Windows users using TeX Live, should make a copy
+ of runscript.exe with the name a5toa4.exe in the binary
directory of their TeX distribution.
-
+
+ Windows users using MiKTeX <= 2.9 should remove
+ scripts/pfarrei/a5toa4.tlu and rename
+ scripts/pfarrei/pfarrei.tlu -->
+ scripts/pfarrei/a5toa4.tlu
+ because MiKTeX <= 2.9 uses an outdated texlua, that does not
+ search for modules correctly.
+
+ Wndows users using MiKTeX should also copy
+ ...\MiKTeX\miktex\bin\internal\runtexlua.exe -->
+ ...\MiKTeX\miktex\bin\a5toa4.exe
+ and start the MiKTeX Package Manager to install package
+ miktex-cairo-bin-2.9, if not already installed.
+
Please note, that there's also a TDS distribution of
`pfarrei' that may be installed simply by extraction of
`pfarrei.tds.zip' at a TEXMF tree and additionally copying
diff --git a/Master/texmf-dist/source/latex/pfarrei/pfarrei.dtx b/Master/texmf-dist/source/latex/pfarrei/pfarrei.dtx
index 8c2e2c1375e..17ab1140490 100644
--- a/Master/texmf-dist/source/latex/pfarrei/pfarrei.dtx
+++ b/Master/texmf-dist/source/latex/pfarrei/pfarrei.dtx
@@ -1,4 +1,4 @@
-% \CheckSum{464}
+% \CheckSum{455}
% \iffalse^^A meta-comment
% ======================================================================
% pfarrei.dtx
@@ -72,10 +72,10 @@
\begingroup
\def\revisiondate$#1: #2-#3-#4 #5${%
\gdef\pfarreirevisiondate{#2/#3/#4}%
- }\revisiondate$Date: 2013-04-08 09:22:56 +0200 (Mo, 08. Apr 2013) $
+ }\revisiondate$Date: 2013-10-16 20:54:26 +0200 (Mi, 16. Okt 2013) $
\def\revision$#1: #2 #3${%
\gdef\pfarreirevision{#2}%
- }\revision$Revision: 33 $
+ }\revision$Revision: 36 $
\endgroup
%<*dtx>
\def\LaTeXformat{LaTeX2e}
@@ -86,7 +86,7 @@
\makeatother
\ProvidesFile{pfarrei.dtx}
%</dtx>
-%<package>\ProvidesPackage{pfarrei.sty}
+%<package>\ProvidesPackage{pfarrei}
%<a5toa4>\ProvidesFile{a5toa4.tex}
[\pfarreirevisiondate\space r\pfarreirevision\space LaTeX2e package
(for pastors)]
@@ -209,7 +209,7 @@ the file `pfarrei.dtx'.
}
\ifToplevel{%
- \Msg{+---------------------------------------------------------------}
+ \Msg{+-------------------------------------------------------------------}
\Msg{| To finish the installation copy the files into a TEXMF tree:}
\Msg{| \space\space a5toa4.tlu --> scripts/pfarrei/a5toa5.tlu}
\Msg{| \space\space pfarrei.tlu --> scripts/pfarrei/pfarrei.tlu}
@@ -218,10 +218,13 @@ the file `pfarrei.dtx'.
\Msg{| If you are not using Windows, you should also copy a5toa4.tlu}
\Msg{| to the binary directory of your TeX distribution and rename}
\Msg{| it into a5toa4.}
- \Msg{| If you are using Windows, you make a copy of runscript.exe at}
- \Msg{| the binary directory of your TeX distribution and rename it}
- \Msg{| into a5toa4.}
- \Msg{+---------------------------------------------------------------}
+ \Msg{| If you are using MiKTeX 2.9, you should rename file pfarrei.tlu}
+ \Msg{| into a5toa4.tlu, because the outdated texlua of MiKTeX 2.9 doesn't}
+ \Msg{| search for modules like the current vanilla version of texlua.}
+ \Msg{| If you are using Windows, you should make a copy of runscript.exe}
+ \Msg{| (TeX Live) resp. runtexlua.exe (MiKTeX) at the binary directory}
+ \Msg{| of your TeX distribution and rename it into a5toa4.exe.}
+ \Msg{+-------------------------------------------------------------------}
}
%</insfile>
%<*dtx|doc>
@@ -903,8 +906,6 @@ the file `pfarrei.dtx'.
\splitmaxdepth\dp\strutbox
\splittopskip\topskip
\setbox\z@\vsplit\@tempboxa to \@tempdima
- \showthe\dimexpr\ht\z@+\dp\z@\relax
- \showthe\@tempdima
\usebox\z@
\newpage
\@tempdima\textheight
@@ -1033,7 +1034,7 @@ the file `pfarrei.dtx'.
%<*a5toa4>
% \fi^^A meta-comment
% \begin{macrocode}
--- $Id: pfarrei.dtx 33 2013-04-08 07:22:56Z mjk $
+-- $Id: pfarrei.dtx 36 2013-10-16 18:54:26Z mjk $
kpse.set_program_name(arg[-1], 'a5toa4')
require('pfarrei.pfarrei')
@@ -1048,7 +1049,7 @@ require('pfarrei.pfarrei')
%<*pfarrei>
% \fi^^A meta-comment
% \begin{macrocode}
-local version_number = string.sub( '$Revision: 33 $', 12, -2 )
+local version_number = string.sub( '$Revision: 36 $', 12, -2 )
local action_version = ' r' .. version_number .. '\n' .. [[
Copyright (c) 2013 Markus Kohm.
diff --git a/Master/texmf-dist/tex/latex/pfarrei/a5toa4.tex b/Master/texmf-dist/tex/latex/pfarrei/a5toa4.tex
index feff6e1eb47..e3d4e1ebc1e 100644
--- a/Master/texmf-dist/tex/latex/pfarrei/a5toa4.tex
+++ b/Master/texmf-dist/tex/latex/pfarrei/a5toa4.tex
@@ -29,10 +29,10 @@
\begingroup
\def\revisiondate$#1: #2-#3-#4 #5${%
\gdef\pfarreirevisiondate{#2/#3/#4}%
- }\revisiondate$Date: 2013-04-08 09:22:56 +0200 (Mo, 08. Apr 2013) $
+ }\revisiondate$Date: 2013-10-16 20:54:26 +0200 (Mi, 16. Okt 2013) $
\def\revision$#1: #2 #3${%
\gdef\pfarreirevision{#2}%
- }\revision$Revision: 33 $
+ }\revision$Revision: 36 $
\endgroup
\ProvidesFile{a5toa4.tex}
[\pfarreirevisiondate\space r\pfarreirevision\space LaTeX2e package
diff --git a/Master/texmf-dist/tex/latex/pfarrei/pfarrei.sty b/Master/texmf-dist/tex/latex/pfarrei/pfarrei.sty
index 1bd50ed21d6..baa278e3ccb 100644
--- a/Master/texmf-dist/tex/latex/pfarrei/pfarrei.sty
+++ b/Master/texmf-dist/tex/latex/pfarrei/pfarrei.sty
@@ -29,12 +29,12 @@
\begingroup
\def\revisiondate$#1: #2-#3-#4 #5${%
\gdef\pfarreirevisiondate{#2/#3/#4}%
- }\revisiondate$Date: 2013-04-08 09:22:56 +0200 (Mo, 08. Apr 2013) $
+ }\revisiondate$Date: 2013-10-16 20:54:26 +0200 (Mi, 16. Okt 2013) $
\def\revision$#1: #2 #3${%
\gdef\pfarreirevision{#2}%
- }\revision$Revision: 33 $
+ }\revision$Revision: 36 $
\endgroup
-\ProvidesPackage{pfarrei.sty}
+\ProvidesPackage{pfarrei}
[\pfarreirevisiondate\space r\pfarreirevision\space LaTeX2e package
(for pastors)]
\newcommand*{\ifbooklet}{}
@@ -225,8 +225,6 @@
\splitmaxdepth\dp\strutbox
\splittopskip\topskip
\setbox\z@\vsplit\@tempboxa to \@tempdima
- \showthe\dimexpr\ht\z@+\dp\z@\relax
- \showthe\@tempdima
\usebox\z@
\newpage
\@tempdima\textheight