Hello community,
here is the log from the commit of package texlive-specs-r for openSUSE:Factory checked in at 2015-04-25 09:49:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-r (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-r.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-r"
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-r/texlive-specs-r.changes 2015-02-24 13:04:46.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.texlive-specs-r.new/texlive-specs-r.changes 2015-04-25 09:50:35.000000000 +0200
@@ -1,0 +2,72 @@
+Wed Apr 15 13:43:57 UTC 2015 - werner@suse.de
+
+- Handle unkown scripts
+
+-------------------------------------------------------------------
+Tue Apr 14 13:53:08 UTC 2015 - werner@suse.de
+
+- Make sure that tabs are used within <<-EOF...EOF pair
+
+-------------------------------------------------------------------
+Thu Apr 2 12:25:21 UTC 2015 - werner@suse.de
+
+- Package pas-cours: move runfiles from doc to working directory
+
+-------------------------------------------------------------------
+Thu Apr 2 10:33:38 UTC 2015 - werner@suse.de
+
+- Handle rpmlintrc for each meta spec file its self
+
+-------------------------------------------------------------------
+Wed Apr 1 16:47:12 UTC 2015 - werner@suse.de
+
+- The new TeXLive package layout had suppressed the detection of many
+ Provides which is fixed now.
+- The null.tex is now in texlive-knuth-lib, therefore require
+ tex(null.tex) in luatex.requires and tex.requires instead of the
+ gone texlive-misc.
+
+-------------------------------------------------------------------
+Wed Apr 1 07:47:29 UTC 2015 - werner@suse.de
+
+- Add exceltex.requires which now Requires perl(Spreadsheet::ParseExcel)
+ (boo#891617)
+- Patch kpathsea_cnf.dif moved from texlive-specs-m to texlive-specs-l
+
+-------------------------------------------------------------------
+Mon Mar 30 08:39:12 UTC 2015 - werner@suse.de
+
+- Add patch dvips_config.dif (boo#897284)
+- Remove patch pgf_plain.dif as now upstream
+- Remove patch latexdiff_env.dif as the affected file is gone
+- Modified patches
+ luaotfload_varfonts.dif
+ tetex_scripts.dif
+ tex4ht_env.dif
+- Removed files pst-node.moves and pst-plot.moves as now the files
+ are at the correct location
+
+-------------------------------------------------------------------
+Thu Mar 26 14:05:48 UTC 2015 - werner@suse.de
+
+- Update to TeXLive 2014 (timestamp 20140525 revision 34252)
+ * Support DVIPDFMx
+ * [fix] avoid luatex crash under math_mode 'decimal'
+ * luaotfload: Fix incorrect handling of font file formats luaotfload)
+ * Sync with Context beta as of 2014-04-05
+ * pdfTeX: sync with Knuth TeX 3.14159265, e-TeX 2.6
+ * Many more ...
+
+-------------------------------------------------------------------
+Fri Feb 27 12:33:49 UTC 2015 - coolo@suse.com
+
+- patch -p1 from within texmf-dist to avoid patching through symlinks
+ to please new patch
+
+-------------------------------------------------------------------
+Thu Feb 26 13:30:39 UTC 2015 - coolo@suse.com
+
+- avoid bootstrap problems by ignoring built packages for packages
+ required by texlive
+
+-------------------------------------------------------------------
Old:
----
ps2pkm.tar.xz
pst-diffraction.doc.tar.xz
pst-diffraction.tar.xz
pst-electricfield.doc.tar.xz
pst-electricfield.tar.xz
pst-eps.doc.tar.xz
pst-eps.tar.xz
pst-eucl.doc.tar.xz
pst-eucl.tar.xz
New:
----
phonetic.doc.tar.xz
phonetic.tar.xz
phonrule.doc.tar.xz
phonrule.tar.xz
photo.doc.tar.xz
photo.tar.xz
physics.doc.tar.xz
physics.tar.xz
physymb.doc.tar.xz
physymb.tar.xz
pkgloader.doc.tar.xz
pkgloader.tar.xz
placeat.doc.tar.xz
placeat.tar.xz
playfair.doc.tar.xz
playfair.tar.xz
pmxchords.doc.tar.xz
pmxchords.tar.xz
ps2pkm.doc.tar.xz
texlive-specs-r-rpmlintrc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-r.spec ++++++
++++ 6544 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-r/texlive-specs-r.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-r.new/texlive-specs-r.spec
++++++ pict2e.doc.tar.xz ++++++
Files old/doc/latex/pict2e/pict2e.pdf and new/doc/latex/pict2e/pict2e.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pict2e.doc.tlpobj new/tlpkg/tlpobj/pict2e.doc.tlpobj
--- old/tlpkg/tlpobj/pict2e.doc.tlpobj 2013-02-24 04:35:23.000000000 +0100
+++ new/tlpkg/tlpobj/pict2e.doc.tlpobj 2014-01-14 03:31:22.000000000 +0100
@@ -1,9 +1,9 @@
name pict2e.doc
category Package
-revision 29215
+revision 32658
shortdesc doc files of pict2e
relocated 1
-docfiles size=211
+docfiles size=194
RELOC/doc/latex/pict2e/README
RELOC/doc/latex/pict2e/manifest.txt
RELOC/doc/latex/pict2e/p2e-drivers.pdf
++++++ pict2e.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pict2e/pict2e.sty new/tex/latex/pict2e/pict2e.sty
--- old/tex/latex/pict2e/pict2e.sty 2011-04-06 01:28:22.000000000 +0200
+++ new/tex/latex/pict2e/pict2e.sty 2014-01-14 01:01:29.000000000 +0100
@@ -25,7 +25,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{pict2e}
- [2011/04/05 v0.2y Improved picture commands (HjG,RN,JT)]
+ [2014/01/12 v0.2z Improved picture commands (HjG,RN,JT)]
\edef\Gin@codes{%
\catcode`\noexpand\^^A\the\catcode`\^^A\relax
\catcode`\noexpand\"\the\catcode`\"\relax
@@ -662,9 +662,10 @@
\pIIe@addtoGraph\pIIe@curveto@op
\fi
\endgroup}
- \newcommand*\arc{\@ifstar{\@tempswatrue\@arc}{\@tempswafalse\@arc}}
- \newcommand*\@arc[2][0,360]{\@@arc(#1){#2}}
- \def\@@arc(#1,#2)#3{%
+ \newcommand*\pIIearc
+ {\@ifstar{\@tempswatrue\pIIe@arc@}{\@tempswafalse\pIIe@arc@}}
+ \newcommand*\pIIe@arc@[2][0,360]{\pIIe@arc@@(#1){#2}}
+ \def\pIIe@arc@@(#1,#2)#3{%
\if@tempswa
\pIIe@moveto\z@\z@
\pIIe@arc{\z@}{\z@}{#3\unitlength}{#1}{#2}%
@@ -673,6 +674,11 @@
\pIIe@arc[1]{\z@}{\z@}{#3\unitlength}{#1}{#2}%
\pIIe@strokeGraph
\fi}
+ \ifx\undefined\arc
+ \else
+ \PackageWarning{pict2e}{\protect\arc\space redefined}%
+ \fi
+ \let\arc\pIIearc
\let\lp@r( \let\rp@r)
\def\Line(#1,#2)(#3,#4){\polyline(#1,#2)(#3,#4)}
\def\polyline(#1,#2){%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pict2e.tlpobj new/tlpkg/tlpobj/pict2e.tlpobj
--- old/tlpkg/tlpobj/pict2e.tlpobj 2013-02-24 04:35:23.000000000 +0100
+++ new/tlpkg/tlpobj/pict2e.tlpobj 2014-01-14 03:31:22.000000000 +0100
@@ -1,6 +1,6 @@
name pict2e
category Package
-revision 29215
+revision 32658
shortdesc New implementation of picture commands.
relocated 1
longdesc This package was described in the 2nd edition of 'LaTeX: A
@@ -27,6 +27,6 @@
RELOC/tex/latex/pict2e/pict2e.cfg
RELOC/tex/latex/pict2e/pict2e.sty
catalogue-ctan /macros/latex/contrib/pict2e
-catalogue-date 2013-01-08 22:57:06 +0100
+catalogue-date 2014-01-13 11:26:35 +0100
catalogue-license lppl
-catalogue-version 0.2y
+catalogue-version 0.2z
++++++ pkuthss.doc.tar.xz ++++++
++++ 6880 lines of diff (skipped)
++++++ pkuthss.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pkuthss/pkulogo.eps new/tex/latex/pkuthss/pkulogo.eps
--- old/tex/latex/pkuthss/pkulogo.eps 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/pkuthss/pkulogo.eps 2014-04-16 23:44:58.000000000 +0200
@@ -0,0 +1,141 @@
+%!PS-Adobe-2.0 EPSF-2.0
+%%BoundingBox: 0 0 400 400
+%%Pages: 1
+%%Page: 1 1
+
+% Peking University dissertation document class
+%
+% Copyright (c) 2008-2009 solvethis
+% Copyright (c) 2010-2012,2014 Casper Ti. Vector
+%
+% This work may be distributed and/or modified under the conditions of the
+% LaTeX Project Public License, either version 1.3 of this license or (at
+% your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX version
+% 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+% The current maintainer of this work is Casper Ti. Vector.
+%
+% This work consists of the following files:
+% pkuthss.cls
+% pkuthss-gbk.def
+% pkuthss-utf8.def
+% pkuthss-extra.sty
+% pkulogo.eps
+% pkuword.eps
+
+% 设置北大红的色值(http://web5.pku.edu.cn/bs/cjwt/,问题 5)。
+% 要想将颜色改为黑色,只需将下面一行改为“0 setgray”即可。
+0.0 1.0 1.0 0.45 setcmykcolor
+% 设置线的属性。
+1 setlinecap
+1 setlinejoin
+
+% 将坐标原点移到图片的中心。
+200 200 translate
+% 作出外圆。
+newpath
+6 setlinewidth
+0 0 195 0 360 arc
+stroke
+% 作出内圆。
+newpath
+5 setlinewidth
+0 0 143 0 360 arc
+stroke
+
+% 描出“北大”字样。
+newpath
+0 setlinewidth
+-10 101 moveto
+-10 101 -10 38 lineto
+-10 35 -14 29 -19 28 curveto
+-30 28 -60 15 -89 -26 curveto
+-104 -39 -108 -24 -105 -16 curveto
+-76 27 -36 45 -32 45 curveto
+-30 46 -29 47 -29 49 curveto
+-29 49 -29 68 lineto
+-29 69 -30 69 -31 69 curveto
+-38 67 -58 63 -83 42 curveto
+-95 35 -103 49 -94 57 curveto
+-72 74 -53 83 -31 88 curveto
+-30 88 -29 89 -29 90 curveto
+-29 90 -29 102 lineto
+-29 111 -10 111 -10 101 curveto
+10 101 moveto
+10 101 10 38 lineto
+10 35 14 29 19 28 curveto
+30 28 60 15 89 -26 curveto
+104 -39 108 -24 105 -16 curveto
+76 27 36 45 32 45 curveto
+30 46 29 47 29 49 curveto
+29 49 29 68 lineto
+29 69 30 69 31 69 curveto
+38 67 58 63 83 42 curveto
+95 35 103 49 94 57 curveto
+72 74 53 83 31 88 curveto
+30 88 29 89 29 90 curveto
+29 90 29 102 lineto
+29 111 10 111 10 101 curveto
+-11 5 moveto
+-11 4 -11 4 -12 4 curveto
+-33 2 -65 -25 -80 -58 curveto
+-82 -71 -70 -74 -63 -64 curveto
+-45 -32 -27 -17 -12 -15 curveto
+-11 -15 -11 -15 -11 -16 curveto
+-11 -16 -11 -35 lineto
+-11 -38 -11 -38 -13 -40 curveto
+-28 -48 -34 -57 -45 -85 curveto
+-48 -97 -32 -103 -28 -94 curveto
+-15 -44 15 -44 28 -94 curveto
+32 -103 48 -97 45 -85 curveto
+34 -57 28 -48 13 -40 curveto
+11 -38 11 -38 11 -35 curveto
+11 -35 11 -16 lineto
+11 -15 11 -15 12 -15 curveto
+27 -17 45 -32 63 -64 curveto
+70 -74 82 -71 80 -58 curveto
+65 -25 33 2 12 4 curveto
+11 4 11 4 11 5 curveto
+11 5 11 12 lineto
+11 25 -11 25 -11 12 curveto
+-11 12 -11 5 lineto
+133 0 moveto
+0 0 133 0 360 arc
+% 对刚作出的线条执行奇偶相间的填充,使中间空出的“北大”字样就是透明的。
+% 从而,即使页面带背景色,插入这个图片时也会很正常。
+eofill
+
+% 添加文字“PEKING UNIVERSITY 1898”。
+/Times-Bold findfont 40 scalefont setfont
+/offset { dup stringwidth pop 2 div neg 155 moveto show } def
+
+gsave 112 rotate (P) offset grestore
+gsave 98 rotate (E) offset grestore
+gsave 84 rotate (K) offset grestore
+gsave 70 rotate (I) offset grestore
+gsave 56 rotate (N) offset grestore
+gsave 41 rotate (G) offset grestore
+gsave 15 rotate (U) offset grestore
+gsave (N) offset grestore
+gsave -14 rotate (I) offset grestore
+gsave -28 rotate (V) offset grestore
+gsave -42 rotate (E) offset grestore
+gsave -56 rotate (R) offset grestore
+gsave -70 rotate (S) offset grestore
+gsave -84 rotate (I) offset grestore
+gsave -98 rotate (T) offset grestore
+gsave -112 rotate (Y) offset grestore
+
+/onset { dup stringwidth pop 2 div neg -182 moveto show } def
+
+gsave -24 rotate (1) onset grestore
+gsave -8 rotate (8) onset grestore
+gsave 8 rotate (9) onset grestore
+gsave 24 rotate (8) onset grestore
+
+showpage
+%%EOF
Files old/tex/latex/pkuthss/pkulogo.pdf and new/tex/latex/pkuthss/pkulogo.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pkuthss/pkuthss-extra.sty new/tex/latex/pkuthss/pkuthss-extra.sty
--- old/tex/latex/pkuthss/pkuthss-extra.sty 2013-04-09 18:54:44.000000000 +0200
+++ new/tex/latex/pkuthss/pkuthss-extra.sty 2014-04-16 23:44:58.000000000 +0200
@@ -21,10 +21,12 @@
% pkuthss-gbk.def
% pkuthss-utf8.def
% pkuthss-extra.sty
+% pkulogo.eps
+% pkuword.eps
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{pkuthss-extra}
- [2013/04/07 v1.4-rc3 Common extra settings for the pkuthss document class]
+ [2014/04/17 v1.5.2 Common extra settings for the pkuthss document class]
% Check the dependency of pkuthss.
\@ifclassloaded{pkuthss}{}{
@@ -47,10 +49,10 @@
\pkuthssextra@int@boolopt{spacing}{true}
% Whether to use list environments that are tighter than LaTeX defaults.
\pkuthssextra@int@boolopt{tightlist}{true}
+% Whether to let captions use a different font from the main text.
+\pkuthssextra@int@boolopt{caption}{true}
% Add PDF bookmark for table of contents.
\pkuthssextra@int@boolopt{pdftoc}{true}
-% Whether to enable `\Uppercase' (works problematically) in heading marks.
-\pkuthssextra@int@boolopt{uppermark}{false}
% Whether to enable the `\spacialchap' command.
\pkuthssextra@int@boolopt{spechap}{true}
% Whether to automatically set properties for generated PDF from user defined
@@ -85,6 +87,12 @@
\setlist{nolistsep}
\fi
+\ifpkuthssextra@opt@caption
+ % According to common aesthetics of typography, it is nice to make the font of
+ % captions lighter than main text, and tables lighter than captions.
+ \RequirePackage[font = it]{caption}
+\fi
+
\ifpkuthssextra@opt@pdftoc
% Add PDF bookmark for table of contents.
\let\pkuthssextra@tmp@tableofcontents\tableofcontents
@@ -108,33 +116,6 @@
\fi
\AtBeginDocument{
- % `\MakeUppercase' works problematically.
- % eg. it converts `\cite{ctex}' into `\cite{CTEX}'.
- % This option can disable `\MakeUppercase' in left/right heading marks.
- \unless\ifpkuthssextra@opt@uppermark
- % Code modified from part of ctex-book.def in `ctex' package.
- % The main difference is the deletion of calls to `\MakeUppercase' here.
- \if@twoside
- \renewcommand\chaptermark[1]{%
- \markboth{%
- \ifnum\value{secnumdepth}>-1 \if@mainmatter \CTEXthechapter \quad \fi\fi
- #1%
- }{}%
- }
- \renewcommand\sectionmark[1]{%
- \markright{\ifnum\value{secnumdepth}>-1 \CTEXthesection \quad \fi #1}%
- }
- % One side typesetting should also be considered.
- \else
- \renewcommand\chaptermark[1]{%
- \markright{%
- \ifnum\value{secnumdepth}>-1 \if@mainmatter \CTEXthechapter \quad \fi\fi
- #1%
- }%
- }
- \fi
- \fi
-
\ifpkuthssextra@opt@pdfprop
% Automatically generate properties for generated PDF.
% Use English properties to avoid problems with character encodings.
@@ -158,7 +139,7 @@
\else
% Set hyperlink colour to black in order to prevent hyperlinks from being too
% hard-to-recognise in printed thesis.
- \hypersetup{colorlinks = false, pdfborder = {0 0 0}}
+ \hypersetup{hidelinks = true}
\fi
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pkuthss/pkuthss-gbk.def new/tex/latex/pkuthss/pkuthss-gbk.def
--- old/tex/latex/pkuthss/pkuthss-gbk.def 2013-04-09 18:54:44.000000000 +0200
+++ new/tex/latex/pkuthss/pkuthss-gbk.def 2014-04-16 23:44:58.000000000 +0200
@@ -21,9 +21,11 @@
% pkuthss-gbk.def
% pkuthss-utf8.def
% pkuthss-extra.sty
+% pkulogo.eps
+% pkuword.eps
\ProvidesFile{pkuthss-gbk.def}
- [2013/04/07 v1.4-rc3 Labels and captions in GBK encoding
+ [2014/04/17 v1.5.2 Labels and captions in GBK encoding
for the pkuthss document class]
\def\label@ctitle{��Ŀ��}
@@ -32,8 +34,7 @@
\def\label@school{Ժ\hphantom{����}ϵ��}
\def\label@cmajor{ר\hphantom{����}ҵ��}
\def\label@direction{�����}
-\def\label@cmentora{��\hphantom{����}ʦ��}
-\def\label@cmentorb{��ʦ��}
+\def\label@cmentor{��\hphantom{����}ʦ��}
\def\label@ementor{Directed by\ }
\def\label@ckeywords{�ؼ��ʣ�}
\def\label@ekeywords{Keywords:\ }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pkuthss/pkuthss-utf8.def new/tex/latex/pkuthss/pkuthss-utf8.def
--- old/tex/latex/pkuthss/pkuthss-utf8.def 2013-04-09 18:54:44.000000000 +0200
+++ new/tex/latex/pkuthss/pkuthss-utf8.def 2014-04-16 23:44:58.000000000 +0200
@@ -21,9 +21,11 @@
% pkuthss-gbk.def
% pkuthss-utf8.def
% pkuthss-extra.sty
+% pkulogo.eps
+% pkuword.eps
\ProvidesFile{pkuthss-utf8.def}
- [2013/04/07 v1.4-rc3 Labels and captions in UTF-8 encoding
+ [2014/04/17 v1.5.2 Labels and captions in UTF-8 encoding
for the pkuthss document class]
\def\label@ctitle{题目:}
@@ -32,8 +34,7 @@
\def\label@school{院\hphantom{汉字}系:}
\def\label@cmajor{专\hphantom{汉字}业:}
\def\label@direction{研究方向:}
-\def\label@cmentora{导\hphantom{汉字}师:}
-\def\label@cmentorb{导师:}
+\def\label@cmentor{导\hphantom{汉字}师:}
\def\label@ementor{Directed by\ }
\def\label@ckeywords{关键词:}
\def\label@ekeywords{Keywords:\ }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pkuthss/pkuthss.cls new/tex/latex/pkuthss/pkuthss.cls
--- old/tex/latex/pkuthss/pkuthss.cls 2013-04-09 18:54:44.000000000 +0200
+++ new/tex/latex/pkuthss/pkuthss.cls 2014-04-16 23:44:58.000000000 +0200
@@ -3,7 +3,7 @@
% Peking University dissertation document class
%
% Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2013 Casper Ti. Vector
+% Copyright (c) 2010-2014 Casper Ti. Vector
%
% This work may be distributed and/or modified under the conditions of the
% LaTeX Project Public License, either version 1.3 of this license or (at
@@ -21,16 +21,22 @@
% pkuthss-gbk.def
% pkuthss-utf8.def
% pkuthss-extra.sty
+% pkulogo.eps
+% pkuword.eps
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesClass{pkuthss}
- [2013/04/07 v1.4-rc3 Peking University dissertation document class]
+ [2014/04/17 v1.5.2 Peking University dissertation document class]
% Process the encoding options.
\newif\ifpkuthss@opt@gbk \pkuthss@opt@gbktrue
\DeclareOption{GBK}{\pkuthss@opt@gbktrue\PassOptionsToClass{GBK}{ctexbook}}
\DeclareOption{UTF8}%
{\pkuthss@opt@gbkfalse\PassOptionsToClass{UTF8}{ctexbook}}
+% Whether to enable `\Uppercase' (works problematically) in heading marks.
+\newif\ifpkuthss@opt@uppermark \pkuthss@opt@uppermarkfalse
+\DeclareOption{uppermark}{\pkuthss@opt@uppermarktrue}
+\DeclareOption{nouppermark}{\pkuthss@opt@uppermarkfalse}
% Whether to enable the default extra settings.
\newif\ifpkuthss@opt@extra \pkuthss@opt@extratrue
\DeclareOption{extra}{\pkuthss@opt@extratrue}
@@ -47,7 +53,6 @@
\pkuthss@int@extraopt{spacing}
\pkuthss@int@extraopt{tightlist}
\pkuthss@int@extraopt{pdftoc}
-\pkuthss@int@extraopt{uppermark}
\pkuthss@int@extraopt{spechap}
\pkuthss@int@extraopt{pdfprop}
\pkuthss@int@extraopt{colorlinks}
@@ -56,10 +61,10 @@
% Process all class options now.
\ProcessOptions\relax
-% pkuthss is based on ctexbook; We use A4 paper, and `xiao 4' as default font size.
+% pkuthss is based on ctexbook; We use `xiao 4' as default font size.
% CJKfntef provides \CJKunderline used in \maketitle.
% fancyhdr provides utilities for setting headers and footers.
-\LoadClass[hyperref, a4paper, cs4size, fntef, fancyhdr]{ctexbook}[2011/03/11]
+\LoadClass[hyperref, cs4size, fntef, fancyhdr]{ctexbook}[2011/03/11]
% Provide support for `key = val' grammar.
\RequirePackage{keyval}
% Graphics support.
@@ -87,18 +92,53 @@
}
% Set page layout.
-\geometry{height = 240mm, width = 150mm, includeheadfoot, headheight = 1.2em}
-% Set headers and footers.
-\pagestyle{fancy}\fancyhf{}
-\fancyhead[LE]{\small\normalfont\leftmark}
-\fancyhead[RO]{\small\normalfont\rightmark}
-\fancyhead[LO,RE]{\small\normalfont\cuniversity\cthesisname}
-\fancyfoot[RO,LE]{\small\normalfont --~\thepage~--}
-% Set the headers and footers on the first page in every chapter.
-\fancypagestyle{plain}{
- \fancyhf{}\renewcommand{\headrulewidth}{0pt}
- \fancyfoot[RO,LE]{\small\normalfont --~\thepage~--}
+\geometry{
+ a4paper, height = 240mm, width = 150mm, includeheadfoot, headheight = 1.2em
}
+% Internal command to set headers and footers.
+\def\pkuthss@int@setpagestyle{
+ % Set the headers and footers on the first page in every chapter.
+ \fancypagestyle{plain}{
+ \fancyhf{}\renewcommand{\headrulewidth}{0pt}
+ \if@twoside
+ \fancyfoot[RO,LE]{\small\normalfont --~\thepage~--}
+ \else
+ \fancyfoot[C]{\small\normalfont --~\thepage~--}
+ \fi
+ }
+ % Set the headers and footers on other pages.
+ \fancypagestyle{pkuthss}{
+ \fancyhf{}
+ \if@twoside
+ \fancyhead[LE]{\small\normalfont\pkuthss@int@setcase{\leftmark}}
+ \fancyhead[RO]{\small\normalfont\pkuthss@int@setcase{\rightmark}}
+ \fancyhead[LO,RE]{\small\normalfont\cuniversity\cthesisname}
+ \fancyfoot[RO,LE]{\small\normalfont --~\thepage~--}
+ \else
+ \fancyhead[L]{\small\normalfont\pkuthss@int@setcase{\leftmark}}
+ \fancyhead[R]{\small\normalfont\pkuthss@int@setcase{\rightmark}}
+ \fancyfoot[C]{\small\normalfont --~\thepage~--}
+ \fi
+ }
+ \pagestyle{pkuthss}
+}
+% `\MakeUppercase' works problematically.
+% eg. it converts `\cite{ctex}' into `\cite{CTEX}'.
+% This option can disable `\MakeUppercase' in left/right heading marks.
+\ifpkuthss@opt@uppermark
+ \def\pkuthss@int@setcase#1{#1}
+ \pkuthss@int@setpagestyle
+\else
+ % Code copied from fancyhdr's `\nouppercase', with the redefinition of
+ % `\uppercase' dropped to avoid disrupting CJKutf8.
+ % cf. https://code.google.com/p/ctex-kit/issues/detail?id=147.
+ \def\pkuthss@int@setcase#1{%
+ \let\MakeUppercase\relax%
+ \expandafter\let\csname MakeUppercase \endcsname\relax%
+ #1%
+ }
+ \pkuthss@int@setpagestyle
+\fi
% eg. `\pkuthss@int@infoitema{ctitle}' will expand to:
% \def\ctitle#1{\def\@ctitle{#1}}
@@ -168,8 +208,8 @@
% Emblem and inscription of the university, and type of thesis.
{
\zihao{1}%
- \includegraphics[height = 2.4em]{img/pkulogo}\hspace{0.4em}%
- \raisebox{0.4em}{\includegraphics[height = 1.6em]{img/pkuword}}\\[0.8em]
+ \includegraphics[height = 2.4em]{pkulogo}\hspace{0.4em}%
+ \raisebox{0.4em}{\includegraphics[height = 1.6em]{pkuword}}\\[0.8em]
{\bfseries{\cthesisname}}
}
\vfill
@@ -190,12 +230,12 @@
{\label@studentid} &
\pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\kaishu\@studentid} \\
{\label@school} &
- \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\kaishu\@school} \\
+ \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\kaishu\@school} \\
{\label@cmajor} &
- \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\kaishu\@cmajor} \\
+ \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\kaishu\@cmajor} \\
{\label@direction} &
\pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\kaishu\@direction} \\
- {\label@cmentora} &
+ {\label@cmentor} &
\pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\kaishu\@cmentor} \\
\end{tabular}
}
@@ -206,51 +246,33 @@
\end{titlepage}
}
-% Internal environment for typesetting abstracts.
-\newenvironment{pkuthss@int@abstract}{
+% Typesetting the Chinese abstract.
+\newenvironment{cabstract}{
\cleardoublepage
- \pdfbookmark[1]{\pkuthss@tmp@abstractname}{\pkuthss@tmp@abstlabel}
- \chapter*{\zihao{-2}\pkuthss@tmp@title}
- \markboth{\pkuthss@tmp@abstractname}{}
+ \pdfbookmark[1]{\cabstractname}{cabstract}
+ \chapter*{\zihao{-2}\cabstractname}
+ \markboth{\cabstractname}{}
+}{% Keywords at the bottom of the page.
+ \vfill\noindent\textbf{\label@ckeywords}{\@ckeywords}
+}
+
+% Typesetting the English abstract.
+\newenvironment{eabstract}{
+ \cleardoublepage
+ \pdfbookmark[1]{\eabstractname}{eabstract}
+ \chapter*{\zihao{-2}\@etitle}
+ \markboth{\eabstractname}{}
\vspace{-2em}\par
\begin{center}
- \zihao{-3}
- {\pkuthss@tmp@author}\quad{\pkuthss@tmp@major}\\
- {\pkuthss@tmp@label@mentor}{\pkuthss@tmp@mentor}
+ \zihao{-3}
+ {\@eauthor} ({\@emajor})\\
+ {\label@ementor}{\@ementor}
\end{center}
\vspace{1em}\par
- \section*{\zihao{4}\pkuthss@tmp@abstractname}
+ \section*{\zihao{4}\eabstractname}
\vskip 0.5em
}{% Keywords at the bottom of the page.
- \vfill\noindent\textbf{\pkuthss@tmp@label@keywords}{\pkuthss@tmp@keywords}
+ \vfill\noindent\textbf{\label@ekeywords}{\@ekeywords}
}
-% Typesetting the Chinese abstract.
-\newenvironment{cabstract}{
- \def\pkuthss@tmp@abstlabel{cabstract}
- \let\pkuthss@tmp@title\@ctitle
- \let\pkuthss@tmp@author\@cauthor
- \let\pkuthss@tmp@major\@cmajor
- \let\pkuthss@tmp@mentor\@cmentor
- \let\pkuthss@tmp@keywords\@ckeywords
- \let\pkuthss@tmp@label@mentor\label@cmentorb
- \let\pkuthss@tmp@label@keywords\label@ckeywords
- \let\pkuthss@tmp@abstractname\cabstractname
- \begin{pkuthss@int@abstract}
-}{\end{pkuthss@int@abstract}}
-
-% Typesetting the English abstract.
-\newenvironment{eabstract}{
- \def\pkuthss@tmp@abstlabel{eabstract}
- \let\pkuthss@tmp@title\@etitle
- \let\pkuthss@tmp@author\@eauthor
- \let\pkuthss@tmp@major\@emajor
- \let\pkuthss@tmp@mentor\@ementor
- \let\pkuthss@tmp@keywords\@ekeywords
- \let\pkuthss@tmp@label@mentor\label@ementor
- \let\pkuthss@tmp@label@keywords\label@ekeywords
- \let\pkuthss@tmp@abstractname\eabstractname
- \begin{pkuthss@int@abstract}
-}{\end{pkuthss@int@abstract}}
-
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pkuthss/pkuword.eps new/tex/latex/pkuthss/pkuword.eps
--- old/tex/latex/pkuthss/pkuword.eps 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/pkuthss/pkuword.eps 2014-04-16 23:44:58.000000000 +0200
@@ -0,0 +1,268 @@
+%!PS-Adobe-2.0 EPSF-2.0
+%%BoundingBox: 0 0 525 150
+%%Pages: 1
+%%Page: 1 1
+
+% Peking University dissertation document class
+%
+% Copyright (c) 2008-2009 solvethis
+% Copyright (c) 2010-2012,2014 Casper Ti. Vector
+%
+% This work may be distributed and/or modified under the conditions of the
+% LaTeX Project Public License, either version 1.3 of this license or (at
+% your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX version
+% 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+% The current maintainer of this work is Casper Ti. Vector.
+%
+% This work consists of the following files:
+% pkuthss.cls
+% pkuthss-gbk.def
+% pkuthss-utf8.def
+% pkuthss-extra.sty
+% pkulogo.eps
+% pkuword.eps
+
+% 设置北大红的色值(http://web5.pku.edu.cn/bs/cjwt/,问题 5)。
+% 要想将颜色改为黑色,只需将下面一行改为“0 setgray”即可。
+0.0 1.0 1.0 0.45 setcmykcolor
+% 缩放和平移。
+0.702957 0.602957 scale
+-30 -9 translate
+
+% “北”。
+newpath
+74 224 moveto
+85.9 214.1 110.4 207.3 105 187 curveto
+106 176.3 111.5 166.3 108 155 curveto
+112.3 125.8 104.7 99 103 71 curveto
+100.3 59.5 96.9 47.3 91 38 curveto
+81.8 36 87.7 47.3 86 52 curveto
+88.3 56.7 86.2 62 84 66 curveto
+83 66 82 66 81 66 curveto
+70.7 51.3 53.5 42.7 41 31 curveto
+37.6 31.1 33.9 30.3 32 34 curveto
+32.6 40.3 30.8 46.8 32 52 curveto
+30.2 54 31.3 57.3 31 60 curveto
+43.6 65.3 42.7 79.6 47 90 curveto
+59 103.5 50 123.3 47 138 curveto
+54.7 135.5 63.5 135.7 69 128 curveto
+74.1 126.1 81.7 125.9 83 119 curveto
+84.9 118.4 85.8 119.9 87 121 curveto
+87 133.3 87 145.7 87 158 curveto
+86.2 176.4 91.3 203.1 71 215 curveto
+67.6 220.4 61.6 223.4 64 230 curveto
+68.7 231.2 70.2 224.9 74 224 curveto
+85 102 moveto
+87.3 94.7 85.2 86.7 83 80 curveto
+73.4 67.6 58.4 63.9 46 56 curveto
+42.7 55.1 40.4 57.1 40 60 curveto
+46 74 57.7 85.7 63 100 curveto
+65.7 103 69.7 102.6 73 104 curveto
+78.5 106.2 80.1 113.5 85 115 curveto
+88 110.7 83.5 107 85 102 curveto
+eofill
+newpath
+176 176 moveto
+184.2 165.9 175.8 148 187 140 curveto
+192.6 149.1 209.4 149.9 205 164 curveto
+206 165.1 202.5 172.3 208 171 curveto
+206.9 159.6 220 161 226 156 curveto
+231.2 157.2 228.8 148.7 228 146 curveto
+223.7 140 223 131.6 215 128 curveto
+205 124.2 195.7 127.8 187 121 curveto
+187 115 187 109 187 103 curveto
+181.5 99.2 175.8 93.7 175 87 curveto
+188.7 76.3 201.5 91.8 216 91 curveto
+221.9 93 226.5 97.9 234 96 curveto
+235.1 91.6 232.3 91.4 231 88 curveto
+230 76.1 218.3 77.6 211 72 curveto
+200.8 70.8 188.8 71.6 183 62 curveto
+175.5 63.2 167.5 63 162 69 curveto
+150.9 87.6 151.2 111 146 132 curveto
+141.1 158 154 179.1 157 203 curveto
+161.7 194.2 176.5 188.7 176 176 curveto
+closepath
+fill
+
+% “京”。
+newpath
+351 221 moveto
+349.4 215.9 349.3 209.3 343 207 curveto
+332.9 217.2 312.8 180.1 322 206 curveto
+322.3 218.3 314.3 227.2 311 238 curveto
+309.3 244.7 315.9 244.8 320 243 curveto
+329.3 239.7 338.7 234.2 346 228 curveto
+346.6 225.2 350.4 223.8 351 221 curveto
+closepath
+fill
+newpath
+361 183 moveto
+352.3 176.8 341.6 170.9 333 162 curveto
+329.4 152.3 319 150.7 312 145 curveto
+300.2 142.3 291.2 148.7 284 155 curveto
+282.8 159.1 287.7 161.1 290 163 curveto
+303.2 171.4 320.3 170.3 333 180 curveto
+341.8 183.3 351 185.6 361 186 curveto
+361 185 361 184 361 183 curveto
+closepath
+fill
+newpath
+357 135 moveto
+361.8 126.8 349.9 127.4 347 122 curveto
+341.4 114.9 332.9 110.9 329 104 curveto
+327.3 101.3 322.5 100 324 96 curveto
+326.1 92.8 330.4 96.3 333 98 curveto
+337.3 100.7 341.7 97.3 346 97 curveto
+343.8 86.8 332.7 85.7 326 80 curveto
+322.5 79.3 318.3 77.9 317 74 curveto
+312.2 64.9 322.3 60.7 321 52 curveto
+323.8 41 328.2 28 325 17 curveto
+317.4 16.8 319.5 25.8 314 29 curveto
+311.8 32.7 304.6 30.9 306 37 curveto
+309.5 37.7 313.7 39.1 315 43 curveto
+314.3 48.7 316.7 55.6 313 60 curveto
+311.1 60.3 309.6 59.5 308 59 curveto
+293.5 46.9 284.8 31.5 271 20 curveto
+264.2 18.7 260.4 24.7 259 30 curveto
+257.8 32.6 258 35.9 258 39 curveto
+276.8 39.2 288.7 56.3 304 65 curveto
+307.5 64.9 309.3 69 312 71 curveto
+313.3 74.6 309.9 76.3 309 79 curveto
+308.3 85.9 319.3 93.8 311 98 curveto
+306.6 97.1 300.6 97.6 299 92 curveto
+304.1 80.4 294.9 72.3 289 64 curveto
+287.6 63.3 287.4 65.7 286 65 curveto
+277.5 80.5 281 99.7 283 117 curveto
+287.1 115.7 290.3 112.3 294 110 curveto
+309.9 114.8 321.3 130.8 337 136 curveto
+343 134.2 351.6 135.3 357 135 curveto
+closepath
+fill
+newpath
+374 62 moveto
+374 57.7 374 53.3 374 49 curveto
+368.6 46.4 362.1 40.9 357 48 curveto
+351.7 57.8 341.8 69.4 350 81 curveto
+359.3 77.8 371.6 73.3 374 62 curveto
+closepath
+fill
+
+% “大”。
+newpath
+501 224 moveto
+507.6 216 519.8 213 519 202 curveto
+510.5 194.5 518.5 184 516 174 curveto
+513.8 166.3 516.2 156.7 514 149 curveto
+514.3 146.1 517.5 145.7 520 146 curveto
+537.1 151 538.8 182.5 560 171 curveto
+557.7 161.3 549.5 155.7 542 149 curveto
+533.4 140.8 521.6 133.8 514 123 curveto
+512.2 101.2 508.4 78.4 488 66 curveto
+476 57.9 463 52.2 449 49 curveto
+447.3 51.2 438.3 44.3 442 51 curveto
+450.7 56.3 458.9 62.7 468 67 curveto
+482.2 77.4 486.1 93.8 491 109 curveto
+484.7 113.3 478.3 105.7 472 104 curveto
+456.1 97.9 445.1 86.2 430 78 curveto
+424.8 75.9 419.1 72.1 413 75 curveto
+406.8 81.8 408.2 93 408 101 curveto
+411.9 101.9 410.9 97.2 414 96 curveto
+436.6 97.6 452.7 115.2 474 120 curveto
+480.7 125.8 491.4 124.2 496 133 curveto
+500.2 163 498.3 195.4 486 221 curveto
+487.2 223.7 488.1 229.2 493 227 curveto
+495 224.5 497.7 223.5 501 224 curveto
+closepath
+fill
+newpath
+557 86 moveto
+564 76.3 578.2 71.9 574 58 curveto
+568.3 51.9 560.3 51.5 552 52 curveto
+550.3 54.4 550.8 58.5 552 61 curveto
+548.5 71.2 540.4 81.9 545 93 curveto
+548.4 91.3 552.1 86.2 557 86 curveto
+closepath
+fill
+
+% 学。
+newpath
+640 130 moveto
+639.8 124 641.2 115.7 635 114 curveto
+628.1 111.5 630.1 119.8 626 122 curveto
+625.8 131.8 626.8 139.7 624 148 curveto
+634.8 146.6 632.8 135.8 640 130 curveto
+closepath
+fill
+newpath
+733 248 moveto
+738 233.7 720.5 224.5 721 210 curveto
+728.7 202 735.5 214.1 744 213 curveto
+753.3 220.2 762.3 213.3 773 214 curveto
+768.4 191.6 756.7 169.5 737 156 curveto
+736.5 154.6 736.3 153.1 735 152 curveto
+740.1 145.1 758.1 154.4 754 140 curveto
+746.5 116.3 724.8 109.9 705 101 curveto
+715.3 113.3 728.2 123.7 736 138 curveto
+733 143.2 726.9 137.7 723 136 curveto
+703.9 117.4 683.8 101.3 660 94 curveto
+652.2 91.7 644 90.4 635 91 curveto
+635.9 98.4 645.4 97.9 650 103 curveto
+673.8 121.1 701.1 130.5 726 146 curveto
+726.6 147.9 725.1 148.8 724 150 curveto
+716.7 151.2 712 146 706 144 curveto
+705.5 149.3 711 153.3 709 158 curveto
+704 160 699.6 166.5 694 164 curveto
+686.8 160.8 686.1 147.6 677 150 curveto
+677.2 159.5 697.7 166.9 684 176 curveto
+694.5 171.8 700.6 182.7 705 189 curveto
+705.8 191.9 705.5 193 703 195 curveto
+699.4 194.7 696.9 191.6 693 192 curveto
+693.6 196.3 699.8 198.2 699 203 curveto
+694.9 208.7 686.3 203.7 684 212 curveto
+684.1 216.3 689.1 212.2 692 213 curveto
+695.3 212 699.5 214.5 703 216 curveto
+718.6 222.2 724.8 240.5 726 255 curveto
+729.2 254.8 729.6 249.9 733 248 curveto
+748 193 moveto
+743.7 180.6 733.5 168.9 725 160 curveto
+724.5 167.3 722.5 174 719 180 curveto
+710.8 180.5 719.2 163.3 708 168 curveto
+696.3 179.3 716.2 187.4 718 198 curveto
+728 202.3 738 194.7 748 193 curveto
+eofill
+newpath
+640 195 moveto
+643.7 193 646.5 188.9 651 189 curveto
+661.3 177.5 670.8 165.7 671 150 curveto
+667.8 144.8 662.5 140.5 657 139 curveto
+653.4 161.3 643.8 182 627 198 curveto
+625.5 199.7 625.5 203.3 627 205 curveto
+632.2 203.8 635.2 197.3 640 195 curveto
+closepath
+fill
+newpath
+732 82 moveto
+727.7 76.8 729.2 66.5 720 66 curveto
+713.6 65.1 703.7 68.2 702 60 curveto
+702.4 47.8 712 38.2 707 25 curveto
+704 12.5 688.9 12 678 10 curveto
+675.5 16.8 666.3 14.1 663 19 curveto
+675.2 21.9 691.3 19.6 697 34 curveto
+692.9 41.6 697.4 53.6 690 59 curveto
+670.3 53.8 653.1 42.5 636 31 curveto
+631.1 29.7 626.4 25.1 621 28 curveto
+620.2 35.6 610.3 39.5 614 49 curveto
+617.7 54.2 624 53 629 55 curveto
+654.8 67.1 680.6 79.3 709 85 curveto
+711.4 88.3 717 87.2 720 86 curveto
+723.4 86.2 729.3 86.3 732 82 curveto
+closepath
+fill
+
+showpage
+%%EOF
Files old/tex/latex/pkuthss/pkuword.pdf and new/tex/latex/pkuthss/pkuword.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pkuthss.tlpobj new/tlpkg/tlpobj/pkuthss.tlpobj
--- old/tlpkg/tlpobj/pkuthss.tlpobj 2013-04-10 21:08:16.000000000 +0200
+++ new/tlpkg/tlpobj/pkuthss.tlpobj 2014-04-17 03:25:00.000000000 +0200
@@ -1,16 +1,20 @@
name pkuthss
category Package
-revision 29797
+revision 33464
shortdesc LaTeX template for dissertations in Peking University.
relocated 1
longdesc The package provides a simple, clear and flexible LaTeX
longdesc template for dissertations in Peking University.
-runfiles size=7
+runfiles size=13
+ RELOC/tex/latex/pkuthss/pkulogo.eps
+ RELOC/tex/latex/pkuthss/pkulogo.pdf
RELOC/tex/latex/pkuthss/pkuthss-extra.sty
RELOC/tex/latex/pkuthss/pkuthss-gbk.def
RELOC/tex/latex/pkuthss/pkuthss-utf8.def
RELOC/tex/latex/pkuthss/pkuthss.cls
+ RELOC/tex/latex/pkuthss/pkuword.eps
+ RELOC/tex/latex/pkuthss/pkuword.pdf
catalogue-ctan /macros/latex/contrib/pkuthss
-catalogue-date 2013-04-08 10:17:07 +0200
+catalogue-date 2014-04-16 20:04:38 +0200
catalogue-license other-free
-catalogue-version 1.4rc3
+catalogue-version 1.5.2
++++++ plstmary.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/plain/plstmary/README new/doc/plain/plstmary/README
--- old/doc/plain/plstmary/README 2013-05-10 23:47:16.000000000 +0200
+++ new/doc/plain/plstmary/README 2013-07-04 00:51:33.000000000 +0200
@@ -1,27 +1,22 @@
plstmary: St. Mary's Road symbols for plainTeX
----------------------------------------------
-LICENSE:
+LEGAL STUFF:
- All files of the plstmary distribution (listed below) may be
- distributed and/or modified under the conditions of the LaTeX Project
- Public License, either version 1.3c of this license or (at your
- option) any later version. The latest version of this license is in
- http://www.latex-project.org/lppl.txt
- and version 1.3c or later is part of all distributions of LaTeX
- version 2008/12/01 or later.
+ This is public domain software. All files of the plstmary distribution
+ (listed below) may be distributed and/or modified without restriction.
While every effort has been made to make plstmary useful, it comes
with no warranty, expressed or implied.
MANIFEST:
-The distribution consists of the files
+This distribution consists of the files
* stmary.tex Macros for use in plain TeX.
* README What you are reading now.
- * plstmary-doc.pdf Documentation
- * plstmary-doc.tex Documentation source.
+ * plstmary-doc.pdf Documentation.
+ * plstmary-doc.tex Documentation source (tex, etex or pdftex).
DESCRIPTION:
Files old/doc/plain/plstmary/plstmary-doc.pdf and new/doc/plain/plstmary/plstmary-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/plain/plstmary/plstmary-doc.tex new/doc/plain/plstmary/plstmary-doc.tex
--- old/doc/plain/plstmary/plstmary-doc.tex 2013-05-10 23:47:16.000000000 +0200
+++ new/doc/plain/plstmary/plstmary-doc.tex 2013-07-04 00:51:33.000000000 +0200
@@ -3,8 +3,11 @@
\def\cmd#1{{\tt\string#1}}
\font\headfont=cmr12
\font\headsf=cmss12
+\hsize 6.5in \vsize 8.9in \hoffset 0pt \voffset 0pt
-\centerline{\headsf plstmary: \headfont St.\ Mary's Road Font for Plain \TeX}
+\centerline{\headsf
+ plstmary: \headfont St.\ Mary's Road Font for Plain \TeX}
+\centerline{Version: \plstmaryversion}
\medskip
\centerline{Dan Luecking}
\centerline{\tt luecking $\inplus$ uark $\boxdot$ edu}
@@ -13,16 +16,15 @@
\noindent The plstmary package provides plain TeX support for the St.\
Mary's Road symbol font. After inputting the macro file {\tt
stmary.tex}, all the symbols in the tables below become defined. The two
-commands {\cmd\oast} and {\cmd\ocircle} require the AMS
-symbol font {\tt msam}, so {\tt stmary.tex} automatically inputs {\tt
-amssym.tex}. (These symbols are the same as {\cmd\circledast} and
-{\cmd\circledcirc}, defined in {\tt amssym.tex}. The point of
-defining them is to have matching `{\cmd\o}\dots' and
-`{\cmd\varo}\dots' pairs for all circles.)
-
-All the command names are the same as those in the LaTeX package
-{\tt stmaryrd.sty}. More details on the symbols and their usage may be found in
-the documentation of the LaTeX stmaryrd package.
+commands {\cmd\oast} and {\cmd\ocircle} require the AMS symbol font {\tt
+msam}, so {\tt stmary.tex} automatically inputs {\tt amssym.tex}. (These
+symbols are the same as {\cmd\circledast} and {\cmd\circledcirc},
+defined in {\tt amssym.tex}. The point of defining them is to have
+matching `{\cmd\o}\dots' and `{\cmd\varo}\dots' pairs for all circles.)
+
+All the command names are the same as those in the LaTeX package {\tt
+stmaryrd.sty}. More details on the symbols and their usage may be found
+in the documentation of the LaTeX stmaryrd package.
Some command names defined in the {\tt stmary.tex} overwrite command
names in the {\tt amssym.tex}. The original definitions are stored in
@@ -33,19 +35,19 @@
The plstmary package allows minimal size changing. By default it
produces symbols intended for ten point documents. It also supports
-eight, nine, eleven, and twelve point sizes. Use one of the following commands to
-change size:\hfil\break
+eight, nine, eleven, and twelve point sizes. Use one of the following
+commands to change size:\hfil\break
\indent{\cmd\stmaryrdeightpoint},\quad
{\tt\ \string\stmaryrdninepoint},\br
\indent{\cmd\stmaryrdelevenpoint},\quad
{\cmd\stmaryrdtwelvepoint},\br
\indent{\cmd\stmaryrdtenpoint} \ (to restore the default if it has been
changed).\br
-These commands affect only the St.\ Mary Road symbols
-and, for convenience, the AMS fonts. They have no effect on the body
-text font nor on any other mathematical fonts. For changing the sizes of
-standard plain TeX fonts, you must either load a package for that
-purpose, of define your own macros.
+These commands affect only the St.\ Mary Road symbols and, for
+convenience, the AMS fonts. They have no effect on the body text font
+nor on any other mathematical fonts. For changing the sizes of standard
+plain TeX fonts, you must either load a package for that purpose, of
+define your own macros.
In order to get actual error-free output from these commands, one needs
to have the St.\ Mary Road fonts and the AMS fonts installed, but those
@@ -62,11 +64,17 @@
1998 by Taco Hoekwater. All rights are reserved to the respective
authors.
-This plstmary package for plain TeX is hereby placed in the
-public domain. I am indebted to the creators of the fonts and of the
-stmaryrd LaTeX package. The file {\tt stmary.tex} is largely a
-reduction to plain TeX macros and TeX primitives of the code in {\tt
-stmaryrd.sty}.
+This plstmary distribution is placed in the public domain. Do with it as
+you wish.
+
+While every effort has been made to make plstmary useful, it comes with
+no warranty, expressed or implied.
+
+\bigskip
+\leftline{\bf Acknowledgements}
+I am indebted to the creators of the fonts and of the stmaryrd
+LaTeX package. The file {\tt stmary.tex} is largely a reduction to plain
+TeX macros and TeX primitives of the code in {\tt stmaryrd.sty}.
\bigskip
\leftline{\bf Caveats}
@@ -440,8 +448,8 @@
\medskip
\noindent
- 0.5 --- 2013/05/09\quad Size changing for AMS, saving AMS
- definitions.\br
+ 0.5 --- 2013/05/09\quad Autoloading AMS symbols. Size changing for
+ AMS, saving AMS definitions.\br
0.4 --- 2013/04/16\quad Corrected \cmd\lbag, \cmd\Lbag,
\cmd\binampersand{} and \cmd\bindnasrepma\br
0.3 --- 2013/03/28\quad Reorganized internal macros\br
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/plstmary.doc.tlpobj new/tlpkg/tlpobj/plstmary.doc.tlpobj
--- old/tlpkg/tlpobj/plstmary.doc.tlpobj 2013-05-11 01:30:48.000000000 +0200
+++ new/tlpkg/tlpobj/plstmary.doc.tlpobj 2013-07-04 03:19:46.000000000 +0200
@@ -1,9 +1,9 @@
name plstmary.doc
category Package
-revision 30377
+revision 31088
shortdesc doc files of plstmary
relocated 1
-docfiles size=40
+docfiles size=41
RELOC/doc/plain/plstmary/README
RELOC/doc/plain/plstmary/plstmary-doc.pdf
RELOC/doc/plain/plstmary/plstmary-doc.tex
++++++ plstmary.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/plain/plstmary/stmary.tex new/tex/plain/plstmary/stmary.tex
--- old/tex/plain/plstmary/stmary.tex 2013-05-10 23:47:16.000000000 +0200
+++ new/tex/plain/plstmary/stmary.tex 2013-07-04 00:51:33.000000000 +0200
@@ -1,9 +1,16 @@
% Loads stmaryrd symbols for 10pt plain TeX documents.
%
-\def\plstmaryversion{0.5a}%
-\edef\restorestmarycatcodes{%
+\ifx\plstmaryversion\UndEfInEd\else\expandafter\endinput\fi
+\def\plstmaryversion{0.5c}%
+\edef\stmaryrestorecatcodes{%
\catcode`\noexpand\@=\number\catcode`\@\relax
- \catcode`\noexpand\!=\number\catcode`\!\relax}%
+ \catcode`\noexpand\!=\number\catcode`\!\relax
+ \newlinechar=\number\newlinechar\relax
+}%
+% Announce ourself
+\newlinechar`\^^J
+\immediate\write16{%
+plstmary package: plain TeX macros for St. Mary's Road symbol font.^^J}
%
\newfam\stmaryrdfam
%
@@ -249,5 +256,5 @@
\def\longmapsfrom{\longleftarrow\mapsfromchar}%
\def\Longmapsfrom{\Longleftarrow\Mapsfromchar}%
%
-\restorestmarycatcodes
+\stmaryrestorecatcodes
\stmaryrdtenpoint
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/plstmary.tlpobj new/tlpkg/tlpobj/plstmary.tlpobj
--- old/tlpkg/tlpobj/plstmary.tlpobj 2013-05-11 01:30:48.000000000 +0200
+++ new/tlpkg/tlpobj/plstmary.tlpobj 2013-07-04 03:19:46.000000000 +0200
@@ -1,6 +1,6 @@
name plstmary
category Package
-revision 30377
+revision 31088
shortdesc St. Mary's Road font support for plain TeX.
relocated 1
longdesc The package provides commands to produce all the symbols of the
@@ -8,6 +8,6 @@
runfiles size=2
RELOC/tex/plain/plstmary/stmary.tex
catalogue-ctan /macros/plain/contrib/plstmary
-catalogue-date 2013-05-10 10:43:41 +0200
+catalogue-date 2013-07-03 23:04:38 +0200
catalogue-license pd
-catalogue-version 0.5a
+catalogue-version 0.5c
++++++ pmx.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/pmx/README new/texmf-dist/doc/generic/pmx/README
--- old/texmf-dist/doc/generic/pmx/README 2013-04-16 23:26:14.000000000 +0200
+++ new/texmf-dist/doc/generic/pmx/README 2013-12-14 23:55:31.000000000 +0100
@@ -1,4 +1,4 @@
-This is PMX, version 2.7.0 (2013-05-16). PMX provides a preprocessor for MusiXTeX.
+This is PMX, version 2.7.0 (2013-12-14). PMX provides a preprocessor for MusiXTeX.
pmxab builds a TeX input file based on a .pmx input file in a much
simpler language, making most of the layout decisions by itself. It has
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/pmx/pmx2pdf.html new/texmf-dist/doc/generic/pmx/pmx2pdf.html
--- old/texmf-dist/doc/generic/pmx/pmx2pdf.html 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/generic/pmx/pmx2pdf.html 2013-12-12 23:56:27.000000000 +0100
@@ -0,0 +1,181 @@
+Content-type: text/html
+
+<HTML><HEAD><TITLE>Manpage of pmx2pdf</TITLE>
+</HEAD><BODY>
+<H1>pmx2pdf</H1>
+Section: (1)<BR>Updated: 2013-12-11<BR><A HREF="#index">Index</A>
+<A HREF="http://localhost/cgi-bin/man/man2html">Return to Main Contents</A><HR>
+
+<P>
+<A NAME="lbAB"> </A>
+<H2>NAME</H2>
+
+pmx2pdf - This script processes pmx files and then deletes intermediate files
+<P>
+<A NAME="lbAC"> </A>
+<H2>SYNOPSIS</H2>
+
+[ texlua ]
+<B>pmx2pdf</B>
+
+{
+<I>option</I>
+
+|
+<I>jobname</I>
+
+[ .pmx ]
+} ...
+<DL COMPACT>
+<DT>The default effect is to process each file using <DD>
+<DT><B><A HREF="http://localhost/cgi-bin/man/man2html?1+pmxab">pmxab</A></B>(1)
+
+<DD>
+(pre-processing pass)
+<DT><B><A HREF="http://localhost/cgi-bin/man/man2html?1+etex">etex</A></B>(1)
+
+<DD>
+(first pass)
+<DT><B><A HREF="http://localhost/cgi-bin/man/man2html?1+musixflx">musixflx</A></B>(1)
+
+<DD>
+(second pass)
+<DT><B><A HREF="http://localhost/cgi-bin/man/man2html?1+etex">etex</A></B>(1)
+
+<DD>
+(third pass)
+<DT><B><A HREF="http://localhost/cgi-bin/man/man2html?1+dvips">dvips</A></B>(1)
+
+<DD>
+(dvi to Postscript)
+<DT><B><A HREF="http://localhost/cgi-bin/man/man2html?1+ps2pdf">ps2pdf</A></B>(1)
+
+<DD>
+(Postscript to Portable Document Format)
+<DT>followed by removal of intermediate files.<DD>
+<P>
+</DL>
+<A NAME="lbAD"> </A>
+<H2>OPTIONS</H2>
+
+<DL COMPACT>
+<DT><B>-v </B>
+
+<DD>
+output program name and version number, and quit
+<DT><B>-h</B>
+
+<DD>
+output usage summary and quit
+<DT><B>-l </B>
+
+<DD>
+changes the TeX processor to
+<B><A HREF="http://localhost/cgi-bin/man/man2html?1+latex">latex</A></B>(1)
+
+or
+<B><A HREF="http://localhost/cgi-bin/man/man2html?1+pdflatex">pdflatex</A></B>(1)
+
+<DT><B>-p </B>
+
+<DD>
+changes the TeX processor to
+<B><A HREF="http://localhost/cgi-bin/man/man2html?1+pdfetex">pdfetex</A></B>(1)
+
+or
+<B><A HREF="http://localhost/cgi-bin/man/man2html?1+pdflatex">pdflatex</A></B>(1)
+
+(and doesn't run
+<B><A HREF="http://localhost/cgi-bin/man/man2html?1+dvips">dvips</A></B>(1)
+
+and
+<B><A HREF="http://localhost/cgi-bin/man/man2html?1+ps2pdf">ps2pdf</A></B>(1)
+
+or
+<B><A HREF="http://localhost/cgi-bin/man/man2html?1+dvipdfm">dvipdfm</A></B>(1)
+
+)
+<DT><B>-d </B>
+
+<DD>
+changes the dvi processor to
+<B><A HREF="http://localhost/cgi-bin/man/man2html?1+dvipdfm">dvipdfm</A></B>(1)
+
+<DT><B>-s </B>
+
+<DD>
+stops processing at the dvi file
+<DT><B>-t</B>
+
+<DD>
+stops processing at the tex (and midi) files
+<DT><B>-i</B>
+
+<DD>
+retain intermediate files
+<DT><B>-c</B>
+
+<DD>
+preprocess using pmxchords
+<DT><B>-F fmt</B>
+
+<DD>
+use fmt as the TeX processor
+<DT><B>-f</B>
+
+<DD>
+default processing
+<DT>Options affect processing of all succeeding PMX files unless changed by another option.<DD>
+<P>
+</DL>
+<A NAME="lbAE"> </A>
+<H2>SEE ALSO</H2>
+
+<B><A HREF="http://localhost/cgi-bin/man/man2html?1+pmxab">pmxab</A></B>(1)
+
+<B><A HREF="http://localhost/cgi-bin/man/man2html?1+scor2prt">scor2prt</A></B>(1)
+
+<B><A HREF="http://localhost/cgi-bin/man/man2html?1+etex">etex</A></B>(1),
+
+<B><A HREF="http://localhost/cgi-bin/man/man2html?1+latex">latex</A></B>(1),
+
+<B><A HREF="http://localhost/cgi-bin/man/man2html?1+pdfetex">pdfetex</A></B>(1),
+
+<B><A HREF="http://localhost/cgi-bin/man/man2html?1+pdflatex">pdflatex</A></B>(1),
+
+<B><A HREF="http://localhost/cgi-bin/man/man2html?1+musixflx">musixflx</A></B>(1),
+
+<B><A HREF="http://localhost/cgi-bin/man/man2html?1+dvipdfm">dvipdfm</A></B>(1),
+
+<B><A HREF="http://localhost/cgi-bin/man/man2html?1+dvips">dvips</A></B>(1),
+
+<B><A HREF="http://localhost/cgi-bin/man/man2html?1+ps2pdf">ps2pdf</A></B>(1),
+
+<B><A HREF="http://localhost/cgi-bin/man/man2html?1+pmxchords">pmxchords</A></B>(1).
+
+<BR>
+
+pmx270.pdf
+<P>
+<A NAME="lbAF"> </A>
+<H2>AUTHOR </H2>
+
+This manual page was written by Bob Tennent <<A HREF="mailto:rdt@cs.queensu.ca">rdt@cs.queensu.ca</A>>.
+<P>
+
+<HR>
+<A NAME="index"> </A><H2>Index</H2>
+<DL>
+<DT><A HREF="#lbAB">NAME</A><DD>
+<DT><A HREF="#lbAC">SYNOPSIS</A><DD>
+<DT><A HREF="#lbAD">OPTIONS</A><DD>
+<DT><A HREF="#lbAE">SEE ALSO</A><DD>
+<DT><A HREF="#lbAF">AUTHOR </A><DD>
+</DL>
+<HR>
+This document was created by
+<A HREF="http://localhost/cgi-bin/man/man2html">man2html</A>,
+using the manual pages.<BR>
+Time: 22:18:07 GMT, December 11, 2013
+</BODY>
+</HTML>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/pmx/pmxab.html new/texmf-dist/doc/generic/pmx/pmxab.html
--- old/texmf-dist/doc/generic/pmx/pmxab.html 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/generic/pmx/pmxab.html 2013-12-12 23:56:27.000000000 +0100
@@ -0,0 +1,61 @@
+Content-type: text/html
+
+<HTML><HEAD><TITLE>Manpage of pmxab</TITLE>
+</HEAD><BODY>
+<H1>pmxab</H1>
+Section: PMX Manual Page (1)<BR>Updated: 19 Jan 2013<BR><A HREF="#index">Index</A>
+<A HREF="http://localhost/cgi-bin/man/man2html">Return to Main Contents</A><HR>
+
+<A NAME="lbAB"> </A>
+<H2>NAME</H2>
+
+pmxab - a MusiXTeX preprocessor
+<A NAME="lbAC"> </A>
+<H2>SYNOPSIS</H2>
+
+<B>pmxab</B>
+
+basename<I>[.pmx]</I>
+
+<P>
+<A NAME="lbAD"> </A>
+<H2>DESCRIPTION</H2>
+
+pmxab is a preprocessor for MusiXTeX.
+It's usually invoked by a frontend <A HREF="http://localhost/cgi-bin/man/man2html?1+pmx2pdf">pmx2pdf</A>(1).
+To use it to its full benefit you should have installed MusiXTeX Version 1.15
+or higher, and TeX itself.
+The goal of PMX is to faciliate the efficient typesetting of scores and parts
+that have an almost professional appearance. To learn more about typesetting
+with PMX, please read the PMX Manual.
+<P>
+When invoked directly, pmxab produces tex output utilizing the MusiXTeX
+macro set.
+<A NAME="lbAE"> </A>
+<H2>SEE ALSO</H2>
+
+<A HREF="http://localhost/cgi-bin/man/man2html?1+pmx2pdf">pmx2pdf</A>(1), <A HREF="http://localhost/cgi-bin/man/man2html?1+scor2prt">scor2prt</A>(1), <A HREF="http://localhost/cgi-bin/man/man2html?1+musixtex">musixtex</A>(1)
+<A NAME="lbAF"> </A>
+<H2>AUTHORS</H2>
+
+PMX was written by Don Simons <<A HREF="mailto:dsimons@roadrunner.com">dsimons@roadrunner.com</A>>.
+This manual page was written by Roland Stigge <<A HREF="mailto:stigge@antcom.de">stigge@antcom.de</A>> for the Debian
+project and revised by Bob Tennent <<A HREF="mailto:rdt@cs.queensu.ca">rdt@cs.queensu.ca</A>>.
+<P>
+
+<HR>
+<A NAME="index"> </A><H2>Index</H2>
+<DL>
+<DT><A HREF="#lbAB">NAME</A><DD>
+<DT><A HREF="#lbAC">SYNOPSIS</A><DD>
+<DT><A HREF="#lbAD">DESCRIPTION</A><DD>
+<DT><A HREF="#lbAE">SEE ALSO</A><DD>
+<DT><A HREF="#lbAF">AUTHORS</A><DD>
+</DL>
+<HR>
+This document was created by
+<A HREF="http://localhost/cgi-bin/man/man2html">man2html</A>,
+using the manual pages.<BR>
+Time: 21:36:16 GMT, December 11, 2013
+</BODY>
+</HTML>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/pmx/scor2prt.html new/texmf-dist/doc/generic/pmx/scor2prt.html
--- old/texmf-dist/doc/generic/pmx/scor2prt.html 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/generic/pmx/scor2prt.html 2013-12-12 23:56:27.000000000 +0100
@@ -0,0 +1,55 @@
+Content-type: text/html
+
+<HTML><HEAD><TITLE>Manpage of scor2prt</TITLE>
+</HEAD><BODY>
+<H1>scor2prt</H1>
+Section: scor2prt Manual Page (1)<BR>Updated: 5 March 2012<BR><A HREF="#index">Index</A>
+<A HREF="http://localhost/cgi-bin/man/man2html">Return to Main Contents</A><HR>
+
+<A NAME="lbAB"> </A>
+<H2>NAME</H2>
+
+scor2prt - source-parts separation program for pmx, a MusiXTeX preprocessor
+<A NAME="lbAC"> </A>
+<H2>SYNOPSIS</H2>
+
+<B>scor2prt</B>
+
+basename<I>[.pmx]</I>
+
+<A NAME="lbAD"> </A>
+<H2>DESCRIPTION</H2>
+
+scor2prt is part of <A HREF="http://localhost/cgi-bin/man/man2html?1+pmx">pmx</A>(1), a preprocessor for MusiXTeX. It can automatically
+create parts from a score by generating a set of .pmx files, one for each part,
+from a single .pmx file for the score. The appearance of the parts can be
+controlled by special commands in the main file. Read the PMX Manual for more
+information about that.
+<A NAME="lbAE"> </A>
+<H2>SEE ALSO</H2>
+
+<A HREF="http://localhost/cgi-bin/man/man2html?1+pmx">pmx</A>(1), <A HREF="http://localhost/cgi-bin/man/man2html?1+pmxab">pmxab</A>(1), <A HREF="http://localhost/cgi-bin/man/man2html?1+musixtex">musixtex</A>(1), PMX Manual
+<A NAME="lbAF"> </A>
+<H2>AUTHORS</H2>
+
+PMX was written by Don Simons <<A HREF="mailto:dsimons@roadrunner.com">dsimons@roadrunner.com</A>>.
+This manual page was written by Roland Stigge <<A HREF="mailto:stigge@antcom.de">stigge@antcom.de</A>> for the Debian
+project and revised by Bob Tennent <<A HREF="mailto:rdt@cs.queensu.ca">rdt@cs.queensu.ca</A>>.
+<P>
+
+<HR>
+<A NAME="index"> </A><H2>Index</H2>
+<DL>
+<DT><A HREF="#lbAB">NAME</A><DD>
+<DT><A HREF="#lbAC">SYNOPSIS</A><DD>
+<DT><A HREF="#lbAD">DESCRIPTION</A><DD>
+<DT><A HREF="#lbAE">SEE ALSO</A><DD>
+<DT><A HREF="#lbAF">AUTHORS</A><DD>
+</DL>
+<HR>
+This document was created by
+<A HREF="http://localhost/cgi-bin/man/man2html">man2html</A>,
+using the manual pages.<BR>
+Time: 21:36:40 GMT, December 11, 2013
+</BODY>
+</HTML>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/pmx2pdf.1 new/texmf-dist/doc/man/man1/pmx2pdf.1
--- old/texmf-dist/doc/man/man1/pmx2pdf.1 2013-04-16 23:26:14.000000000 +0200
+++ new/texmf-dist/doc/man/man1/pmx2pdf.1 2014-05-04 23:57:33.000000000 +0200
@@ -1,5 +1,5 @@
.\" This manpage is licensed under the GNU Public License
-.TH pmx2pdf 1 2012-05-15 "pmx2pdf script, version 0.2.1" ""
+.TH pmx2pdf 1 2013-12-11 "pmx2pdf script, version 0.3.1" ""
.SH NAME
pmx2pdf \- This script processes pmx files and then deletes intermediate files
@@ -76,6 +76,12 @@
.B -i
retain intermediate files
.TP
+.B -c
+preprocess using pmxchords
+.TP
+.B -F fmt
+use fmt as the TeX processor
+.TP
.B -f
default processing
.TP 0
@@ -91,7 +97,8 @@
.BR musixflx (1),
.BR dvipdfm (1),
.BR dvips (1),
-.BR ps2pdf (1).
+.BR ps2pdf (1),
+.BR pmxchords (1).
.br
pmx270.pdf
Files old/texmf-dist/doc/man/man1/pmx2pdf.man1.pdf and new/texmf-dist/doc/man/man1/pmx2pdf.man1.pdf differ
Files old/texmf-dist/doc/man/man1/pmxab.man1.pdf and new/texmf-dist/doc/man/man1/pmxab.man1.pdf differ
Files old/texmf-dist/doc/man/man1/scor2prt.man1.pdf and new/texmf-dist/doc/man/man1/scor2prt.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pmx.doc.tlpobj new/tlpkg/tlpobj/pmx.doc.tlpobj
--- old/tlpkg/tlpobj/pmx.doc.tlpobj 2013-04-17 03:38:29.000000000 +0200
+++ new/tlpkg/tlpobj/pmx.doc.tlpobj 2014-05-05 00:21:16.000000000 +0200
@@ -1,8 +1,8 @@
name pmx.doc
category Package
-revision 29978
+revision 33826
shortdesc doc files of pmx
-docfiles size=239
+docfiles size=243
texmf-dist/doc/generic/pmx/README
texmf-dist/doc/generic/pmx/examples/barsant.pmx
texmf-dist/doc/generic/pmx/examples/dyntest.pmx
@@ -17,8 +17,11 @@
texmf-dist/doc/generic/pmx/pmx25-27.html
texmf-dist/doc/generic/pmx/pmx270.pdf
texmf-dist/doc/generic/pmx/pmx270.tex
+ texmf-dist/doc/generic/pmx/pmx2pdf.html
+ texmf-dist/doc/generic/pmx/pmxab.html
texmf-dist/doc/generic/pmx/ref270.pdf
texmf-dist/doc/generic/pmx/ref270.tex
+ texmf-dist/doc/generic/pmx/scor2prt.html
texmf-dist/doc/man/man1/pmx2pdf.1
texmf-dist/doc/man/man1/pmx2pdf.man1.pdf
texmf-dist/doc/man/man1/pmxab.1
++++++ pmx.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/pmx/pmx2pdf.lua new/texmf-dist/scripts/pmx/pmx2pdf.lua
--- old/texmf-dist/scripts/pmx/pmx2pdf.lua 2012-11-20 02:02:06.000000000 +0100
+++ new/texmf-dist/scripts/pmx/pmx2pdf.lua 2013-12-14 23:55:31.000000000 +0100
@@ -1,12 +1,12 @@
#!/usr/bin/env texlua
-VERSION = "0.2.1"
+VERSION = "0.3.2"
--[[
pmx2pdf: processes MusiXTeX files using pmxab as a pre-processor
(and deletes intermediate files)
- (c) Copyright 2011-12 Bob Tennent rdt@cs.queensu.ca
+ (c) Copyright 2011-13 Bob Tennent rdt@cs.queensu.ca
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
@@ -28,6 +28,15 @@
ChangeLog:
+ version 0.3.2 2013-12-14 RDT
+ restore the -c option that somehow got dropped
+
+ version 0.3.1 2013-12-11 RDT
+ added -F fmt option
+
+ version 0.3.0 2013-12-10 RDT
+ added -c option to preprocess using pmxchords
+
version 0.2.1 2012-05-15 RDT
renamed to avoid possible name clashes
@@ -48,6 +57,8 @@
print(" -s stop at dvi")
print(" -t stop at tex/mid")
print(" -i retain intermediate files")
+ print(" -c preprocess using pmxchords")
+ print(" -F fmt use fmt as the TeX processor")
print(" -f restore default processing")
end
@@ -62,6 +73,7 @@
end
-- defaults:
+pmxab = "pmxab"
tex = "etex"
musixflx = "musixflx"
dvi = "dvips"
@@ -95,11 +107,16 @@
elseif this_arg == "-s" then
dvi = ""; ps2pdf = ""
elseif this_arg == "-f" then
- tex = "etex"; dvi = "dvips"; ps2pdf = "ps2pdf"; intermediate = 1
+ pmxab = "pmxab"; tex = "etex"; dvi = "dvips"; ps2pdf = "ps2pdf"; intermediate = 1
elseif this_arg == "-t" then
tex = ""; dvi = ""; ps2pdf = ""
elseif this_arg == "-i" then
intermediate = 0
+ elseif this_arg == "-c" then
+ pmxab = "pmxchords"
+ elseif this_arg == "-F" then
+ narg = narg+1
+ tex = arg[narg]
else
filename = this_arg
if filename ~= "" and string.sub(filename, -4, -1) == ".pmx" then
@@ -108,9 +125,9 @@
if not io.open(filename .. ".pmx", "r") then
print("Non-existent file: ", filename .. ".pmx")
else
- print("Processing ".. filename .. ".pmx.")
+ print("Processing ".. filename .. ".pmx" .. " using " .. pmxab .. "." )
os.remove( filename .. ".mx2" )
- os.execute("pmxab" .. " " .. filename )
+ os.execute(pmxab .. " " .. filename )
pmxaerr = io.open("pmxaerr.dat", "r")
if (not pmxaerr) then
print("No log file.")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pmx.tlpobj new/tlpkg/tlpobj/pmx.tlpobj
--- old/tlpkg/tlpobj/pmx.tlpobj 2013-04-17 03:38:30.000000000 +0200
+++ new/tlpkg/tlpobj/pmx.tlpobj 2014-05-05 00:21:17.000000000 +0200
@@ -1,6 +1,6 @@
name pmx
category Package
-revision 29978
+revision 33826
shortdesc Preprocessor for MusiXTeX.
longdesc PMX is a preprocessor for MusiXTeX. It builds the TeX input
longdesc file from a file in a much simpler language, making most of the
@@ -14,6 +14,6 @@
texmf-dist/scripts/pmx/pmx2pdf.lua
texmf-dist/tex/generic/pmx/pmx.tex
catalogue-ctan /support/pmx
-catalogue-date 2013-04-16 18:37:23 +0200
+catalogue-date 2013-12-16 11:52:21 +0100
catalogue-license gpl2
catalogue-version 2.7.0
++++++ poemscol.doc.tar.xz ++++++
Files old/doc/latex/poemscol/poemscol.pdf and new/doc/latex/poemscol/poemscol.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/poemscol.doc.tlpobj new/tlpkg/tlpobj/poemscol.doc.tlpobj
--- old/tlpkg/tlpobj/poemscol.doc.tlpobj 2013-05-28 17:08:10.000000000 +0200
+++ new/tlpkg/tlpobj/poemscol.doc.tlpobj 2013-08-04 03:19:31.000000000 +0200
@@ -1,6 +1,6 @@
name poemscol.doc
category Package
-revision 30706
+revision 31338
shortdesc doc files of poemscol
relocated 1
docfiles size=152
++++++ poemscol.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/poemscol/poemscol.sty new/tex/latex/poemscol/poemscol.sty
--- old/tex/latex/poemscol/poemscol.sty 2013-05-27 03:44:40.000000000 +0200
+++ new/tex/latex/poemscol/poemscol.sty 2013-08-04 00:38:04.000000000 +0200
@@ -22,7 +22,12 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}[1997/12/01]
\ProvidesPackage{poemscol}
- [2013/03/24 v2.62 poemscol file]
+ [2013/08/20 v2.64 poemscol file]
+
+
+
+
+
@@ -137,12 +142,12 @@
\advance\leftmargin\runoverindentvalue}
\item[]}
{\endlist}
-\newenvironment{quotedverse}{%
-\let\\=\@centercr%
-\list{}{\itemsep\z@ \itemindent 0pt\listparindent \itemindent
- \rightmargin 0sp\leftmargin 0sp\advance\leftmargin
- \runoverindentvalue}\item[]}
-{\endlist}
+ \newenvironment{quotedverse}{%
+ \let\\=\@centercr%
+ \list{}{\itemsep\z@ \itemindent -\runoverindentvalue\listparindent \itemindent
+ \rightmargin 0sp\leftmargin 0sp\advance\leftmargin
+ \runoverindentvalue}\item[]}
+ {\endlist}
\newcounter{verselinenumber}
\newcounter{printlineindex}
@@ -721,7 +726,6 @@
}
}
-
\newcommand{\@pagemarktotextnotes}[1]{%
\immediate\write\textnotes{\string\setcounterfrompageref\string{notepageholdertitle\string}%
\string{#1\string}\string\unskip}%
@@ -1568,9 +1572,11 @@
\fi
}
\newcommand{\titletoothernotes}{\string\par
+\ifputpagenumberinnotes%
\string\argpageref\string{\@compoundlabelscratch\string}%
\string\setcounterfrompageref\string{notepageholdertitle\string}%
\string{\@compoundlabelscratch\string}%
+\fi%
\string\textbf\string{\ \the\fulltitleholder\string}}%
\newif\ifemendationssinglepar
\newcommand{\emendation}[2][0]{
@@ -1669,11 +1675,12 @@
\immediate\write\csname #1s\endcsname{\string\if#1stwocol}
\csname
literal#1\endcsname{\begin{multicols}{2}\fi\setlength{\parindent}{-10pt}}%
-\expandafter\newcommand\csname first#1\endcsname{
-\immediate\write\expandafter\csname #1s\endcsname{\titletoothernotes}
-\immediate\write\csname #1s\endcsname{\string\if#1ssinglepar}
-\immediate\write\csname #1s\endcsname{\string\par}
-\immediate\write\csname #1s\endcsname{\string\fi}}
+\expandafter\newcommand\csname first#1\endcsname{%
+\immediate\write\expandafter\csname #1s\endcsname{\titletoothernotes}%
+\immediate\write\csname #1s\endcsname{\string\if#1ssinglepar}%
+\immediate\write\csname #1s\endcsname{\string\par}%
+\immediate\write\csname #1s\endcsname{\string\fi}%
+}
\expandafter\newcommand\csname #1\endcsname[2][0]{%
\setlemmarange{##1}%
\csname ifno#1yet\endcsname%
@@ -1688,7 +1695,7 @@
\fi%
\resetlemmacounters%
}
-\expandafter\newcommand\csname prose#1\endcsname[3][0]{% %
+\expandafter\newcommand\csname prose#1\endcsname[3][0]{%
\unskip\proselinelabel{##2}%
\setproselemmarange{##2}{##1}%
\csname ifno#1yet\endcsname%
@@ -1699,6 +1706,7 @@
\csname literal#1\endcsname{##3}%
\csname if#1ssinglepar\endcsname%
\csname literal#1\endcsname{\par}%
+\unskip%
\fi%
\resetlemmacounters\unskip%
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/poemscol.tlpobj new/tlpkg/tlpobj/poemscol.tlpobj
--- old/tlpkg/tlpobj/poemscol.tlpobj 2013-05-28 17:08:10.000000000 +0200
+++ new/tlpkg/tlpobj/poemscol.tlpobj 2013-08-04 03:19:32.000000000 +0200
@@ -1,6 +1,6 @@
name poemscol
category Package
-revision 30706
+revision 31338
shortdesc Typesetting Critical Editions of Poetry.
relocated 1
longdesc The package offers LaTeX macros for typesetting critical
@@ -14,6 +14,6 @@
runfiles size=23
RELOC/tex/latex/poemscol/poemscol.sty
catalogue-ctan /macros/latex/contrib/poemscol
-catalogue-date 2013-05-25 17:03:59 +0200
+catalogue-date 2013-08-03 08:19:55 +0200
catalogue-license lppl1.2
-catalogue-version 2.62
+catalogue-version 2.64
++++++ poetrytex.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/poetrytex/README new/doc/latex/poetrytex/README
--- old/doc/latex/poetrytex/README 2012-07-27 00:41:42.000000000 +0200
+++ new/doc/latex/poetrytex/README 2013-08-19 01:32:51.000000000 +0200
@@ -8,22 +8,23 @@
## Download
Development of this package occurs primarily on
-[GitHub](https://github.com/SamWhited/poetrytex). Issues and pull requests
-should be submitted there.
+[GitHub](https://github.com/SamWhited/poetrytex).
+[Issues](https://github.com/SamWhited/poetrytex/issues) and
+[pull requests](https://github.com/SamWhited/poetrytex/pulls) should be
+submitted there.
The current release version of PoetryTeX is available from
[CTAN](http://ctan.org/pkg/poetrytex).
## License
-Copyright 2012 Samuel Whited
+Copyright 2012 [Samuel Whited](https://samwhited.com)
-This project may be distributed and/or modified under the
-conditions of the LaTeX Project Public License, either
-version 1.3c of this license or (at your option) any later
-version. The latest version of this license is in:
+This project may be distributed and/or modified under the conditions of the
+LaTeX Project Public License, either version 1.3c of this license or (at your
+option) any later version. The latest version of this license is in:
http://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of
-LaTeX version 2008/05/04 or later.
+and version 1.3c or later is part of all distributions of LaTeX version
+2008/05/04 or later.
Files old/doc/latex/poetrytex/poetrytex.pdf and new/doc/latex/poetrytex/poetrytex.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/poetrytex/poetrytex.top new/doc/latex/poetrytex/poetrytex.top
--- old/doc/latex/poetrytex/poetrytex.top 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/poetrytex/poetrytex.top 2013-08-19 01:32:51.000000000 +0200
@@ -0,0 +1,6 @@
+\contentsline {subsection}{\relax The Sea Bell}{10}{section*.21}
+\contentsline {subsection}{\relax {\itshape Media vita in morte sumus}}{10}{section*.22}
+\contentsline {subsection}{3.\ The Highwayman}{13}{section*.26}
+\contentsline {subsection}{ \unskip iv.\ The Lady of Shalott}{14}{section*.27}
+\contentsline {subsection}{\relax PoET\kern -.1667em\lower .5ex\hbox {E}\kern -.125emX\spacefactor \@m }{15}{section*.29}
+\contentsline {subsection}{\relax The Love Song of J. Alfred Prufrock}{16}{section*.31}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/poetrytex.doc.tlpobj new/tlpkg/tlpobj/poetrytex.doc.tlpobj
--- old/tlpkg/tlpobj/poetrytex.doc.tlpobj 2013-03-12 04:38:51.000000000 +0100
+++ new/tlpkg/tlpobj/poetrytex.doc.tlpobj 2013-08-19 03:18:56.000000000 +0200
@@ -1,9 +1,10 @@
name poetrytex.doc
category Package
-revision 29347
+revision 31463
shortdesc doc files of poetrytex
relocated 1
-docfiles size=67
+docfiles size=71
RELOC/doc/latex/poetrytex/README
RELOC/doc/latex/poetrytex/poetrytex-style.sty
RELOC/doc/latex/poetrytex/poetrytex.pdf
+ RELOC/doc/latex/poetrytex/poetrytex.top
++++++ poetrytex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/poetrytex/poetrytex.sty new/tex/latex/poetrytex/poetrytex.sty
--- old/tex/latex/poetrytex/poetrytex.sty 2013-03-12 00:31:14.000000000 +0100
+++ new/tex/latex/poetrytex/poetrytex.sty 2013-08-19 01:32:51.000000000 +0200
@@ -21,12 +21,16 @@
\NeedsTeXFormat{LaTeX2e}[1994/06/01]
\ProvidesPackage{poetrytex}[2013/02/13]
\RequirePackage{expl3}
+\RequirePackage{tocloft}
\AtEndOfPackage{\RequirePackage{hyperref}}
\DeclareOption{verse}{\usepackage{verse}}
+\DeclareOption{poemsintoc}{\listpoemsintoc}
\DeclareOption{numbertop}{\numbertop}
+\DeclareOption{numbertoc}{\numbertoc}
\DeclareOption{resetnumongroup}{\resetnumongroup}
\DeclareOption{numberpoems}{\numberpoems}
\DeclareOption{usedefaulttitles}{\ptusedefaulttitles}
+\DeclareOption{useincipits}{\ptuseincipits}
\DeclareOption{clearpageafterpoem}{\clearpageafterpoem}
\DeclareOption{clearpageafterpoems}{\clearpageafterpoem}
\DeclareOption*{%
@@ -37,16 +41,21 @@
\newcommand*{\ptauthor}{Author}
\newcommand*{\ptdate}{\today}
\title{%
- \pttitle%
- \ifx\ptsubtitle\@ptundefined\relax\else\\\ptsubtitle\fi%
+ \beforetitle\pttitle\aftertitle%
+ \ifx\ptsubtitle\@ptundefined%
+ \relax%
+ \else%
+ \\*\beforesubtitle\ptsubtitle\aftersubtitle%
+ \fi%
}
-\author{\ptauthor}
-\date{\ptdate}
+\author{\beforeauthor\ptauthor\afterauthor}
+\date{\beforedate\ptdate\afterdate}
\newcommand*{\@ptpoemlabeltext}{poetrytexpoem:}
\newcounter{poemnum}
\newcounter{absolutepoemnum}
\newcounter{untitledpoemnum}
\newcounter{absoluteuntitledpoemnum}
+\newcounter{poemgroupnum}
\newlength{\poemvspace}
\setlength{\poemvspace}{0em}
\newlength{\pttitleleftspace}
@@ -61,27 +70,36 @@
\newcommand*{\ptdefaulttitle}{%
Untitled No. \arabic{absoluteuntitledpoemnum}%
}
+\newcommand*{\ptuseincipits}{\newcommand*{\@ptuseincipits}{}}
\newcommand*{\ptdefaultenv}{verse}
\newcommand*{\pttitleenv}{center}
+\newcommand*{\ptdefaultgroupenv}{center}
+\newcommand*{\grouppagestyle}{empty}
+\newlength{\pregroupvspace}
+\newlength{\postgroupvspace}
+\setlength{\pregroupvspace}{\fill}
+\setlength{\postgroupvspace}{\fill}
\newcommand*{\ptannotationenv}{flushleft}
\newcommand*{\ptdedication}{Renew \textsf{\textbackslash ptdedication}}
\newcommand*{\makededication}[1][flushright]{%
\thispagestyle{empty}
- \vspace*{\fill}
+ \vspace*{\prededicationvspace}
\begin{#1}
- \emph{\ptdedication}
+ \beforededication{\dedicationformat\ptdedication}\afterdedication
\end{#1}
- \vspace*{\fill}
+ \vspace*{\postdedicationvspace}
}
-\newcommand*{\toptitle}{List of Poems}
+\newcommand*{\resetnumon}{}
+\newlistof[\resetnumon]{poem}{top}{\topname}
+\newcommand*{\listofpoems}{\listofpoem}
+\newcommand*{\topname}{List of Poems}
\newcommand*{\topentrytype}{subsection}
+\newcommand*{\toptocentrytype}{section}
+\newcommand*{\listpoemsintoc}{\newcommand*{\@ptlistpoemsintoc}{}}
+\newcommand*{\tocentrytype}{\topentrytype}
\setcounter{secnumdepth}{-1}
\setcounter{tocdepth}{2}
-\renewcommand*{\listtablename}{\toptitle}
-\newcommand{\beforetoc}{}
-\newcommand{\aftertoc}{}
-\newcommand{\beforetop}{}
-\newcommand{\aftertop}{}
+\renewcommand*{\listtablename}{\topname}
\newcommand*{\maketoc}{%
\beforetoc
\tableofcontents
@@ -94,7 +112,7 @@
\newcommand*{\@ptmaketopStar}{%
\cleardoublepage
\beforetop
- \listoftables
+ \listofpoems
\pagestyle{plain}
\aftertop
\clearpage
@@ -103,15 +121,47 @@
\cleardoublepage
\beforetop
\phantomsection
- \addcontentsline{toc}{section}{\toptitle}
- \listoftables
+ \addcontentsline{toc}{\toptocentrytype}{\topname}
+ \listofpoems
\pagestyle{plain}
\aftertop
\clearpage
}
\newcommand*{\numbertop}{\newcommand*{\@ptnumbertop}{}}
+\newcommand*{\numbertoc}{\newcommand*{\@ptnumbertoc}{}}
+\newcommand*{\beforetitle}{}
+\newcommand*{\aftertitle}{}
+\newcommand*{\beforesubtitle}{}
+\newcommand*{\aftersubtitle}{}
+\newcommand*{\beforeauthor}{}
+\newcommand*{\afterauthor}{}
+\newcommand*{\beforedate}{}
+\newcommand*{\afterdate}{}
+\newcommand*{\dedicationformat}{\normalfont\itshape}
+\newlength{\prededicationvspace}
+\newlength{\postdedicationvspace}
+\setlength{\prededicationvspace}{\fill}
+\setlength{\postdedicationvspace}{\fill}
+\newcommand*{\beforededication}{}
+\newcommand*{\afterdedication}{}
+\newcommand{\beforetoc}{}
+\newcommand{\aftertoc}{}
+\newcommand{\beforetop}{}
+\newcommand{\aftertop}{}
+\newcommand*{\beforepoemgroup}{\cleardoublepage}
+\newcommand*{\afterpoemgroup}{\clearpage}
+\newcommand*{\theincipit}{%
+ \csname @poem\arabic{absolutepoemnum} incipit\endcsname%
+}
\newenvironment{poem}[3][\ptdefaultenv]{%
\newcommand*{\@ptwrapenvironment}{#1}
+\newcommand*{\incipit}[1]{%
+ \global\expandafter\def%
+ \csname%
+ @poem\arabic{absolutepoemnum} incipit%
+ \endcsname{##1}%
+ ##1%
+}
\poetryheadings
\addtocounter{poemnum}{1}
\addtocounter{absolutepoemnum}{1}
@@ -121,19 +171,44 @@
\fi
\vspace*{\poemvspace}
\begin{\pttitleenv}
+ \refstepcounter{poem}%
\phantomsection%
- \addcontentsline{lot}{\topentrytype}{%
+ \addcontentsline{top}{\topentrytype}{%
\ifx\@ptnumbertop\@ptundefined%
\relax%
\else%
\toppoemnum%
\fi%
\ifx&%
- \ptdefaulttitle%
+ \ifx\@ptuseincipits\@ptundefined%
+ \ptdefaulttitle%
+ \else%
+ {\incipittopformat \theincipit}%
+ \fi%
\else%
#2%
\fi%
}%
+ \ifx\@ptlistpoemsintoc\@ptundefined%
+ \relax%
+ \else%
+ \addcontentsline{toc}{\tocentrytype}{%
+ \ifx\@ptnumbertoc\@ptundefined%
+ \relax%
+ \else%
+ \tocpoemnum%
+ \fi%
+ \ifx&%
+ \ifx\@ptuseincipits\@ptundefined%
+ \ptdefaulttitle%
+ \else%
+ {\incipittocformat \theincipit}%
+ \fi%
+ \else%
+ #2%
+ \fi%
+ }%
+ \fi%
\hypertarget{\@ptpoemlabeltext\arabic{absolutepoemnum}}{}
{\poemtitleformat%
\ifx\@ptnumberpoems\@ptundefined
@@ -146,14 +221,15 @@
\relax%
\else%
\hspace*{\pttitleleftspace}\ptdefaulttitle%
- \hspace*{\pttitlerightspace}\\%
+ \hspace*{\pttitlerightspace}\\*%
\fi%
\else
- \hspace*{\pttitleleftspace}#2\hspace*{\pttitlerightspace}\\%
+ \hspace*{\pttitleleftspace}#2\hspace*{\pttitlerightspace}\\*%
\fi%
}%
\hspace*{\ptsubtitleleftspace}#3\hspace*{\ptsubtitlerightspace}
\end{\pttitleenv}
+ \nopagebreak
\begin{\@ptwrapenvironment}
\begingroup\setlength{\parskip}{\stanzaparskip}%
}{%
@@ -170,10 +246,14 @@
\markboth{\ |\ \textsc{\pttitle}\hfill }
{\hfill\textsc{\ptgroup}\ |\ }
}
-\newcommand*{\resetnumongroup}{\newcommand*{\@ptresetnumongroup}{}}
+\newcommand*{\resetnumongroup}{%
+ \newcommand*{\@ptresetnumongroup}{}%
+ \renewcommand*{\resetnumon}{poemgroupnum}%
+}
\newcommand*{\numberpoems}{\newcommand*{\@ptnumberpoems}{}}
-\newcommand*{\titlepoemnum}{\arabic{poemnum}\\}
+\newcommand*{\titlepoemnum}{\arabic{poemnum}\\*}
\newcommand*{\toppoemnum}{\arabic{poemnum}.\ }
+\newcommand*{\tocpoemnum}{\toppoemnum}
\newlength{\stanzaparskip}
\setlength{\stanzaparskip}{0.7em}
\newcommand*{\clearpageafterpoem}{\newcommand*{\@ptclearpageafterpoem}{}}
@@ -189,6 +269,8 @@
\newcommand*{\@ptindStar}{\hspace*{\ptgap}}
\newcommand*{\@ptindNoStar}{\hspace{\ptgap}}
\newcommand*{\poemtitleformat}{\normalfont\bfseries\large}
+\newcommand*{\incipittopformat}{\itshape}
+\newcommand*{\incipittocformat}{\incipittopformat}
\newlength{\ptspacergap}
\setlength{\ptspacergap}{4em}
\newcommand*{\ptspacerchar}{\S}
@@ -219,47 +301,34 @@
\fi
}
\newcommand*{\ptgroup}{}
-\newcommand*{\poemgroup}{%
- \@ifstar{%
- \@ptpoemgroupStar
- }{%
- \@ptpoemgroupNoStar
- }
-}
-\newcommand*{\@ptpoemgroupStar}[1]{%
+\newcommand*{\poemgroup}[1]{%
+ \addtocounter{poemgroupnum}{1}
\ifx\@ptresetnumongroup\@ptundefined
\relax
\else
\setcounter{poemnum}{0}
\setcounter{untitledpoemnum}{0}
\fi
- \cleardoublepage
- \vspace*{\fill}
+ \beforepoemgroup
+ \vspace*{\pregroupvspace}
\renewcommand*{\ptgroup}{#1}
- \pagestyle{empty}
- \begin{center}
- \section*{#1}
- \end{center}
- \vspace*{\fill}
- \clearpage
+ \pagestyle{\grouppagestyle}
+ \begin{\ptdefaultgroupenv}
+ \@ifstar{%
+ \@ptpoemgroupStar{#1}
+ }{%
+ \@ptpoemgroupNoStar{#1}
+ }
+ \end{\ptdefaultgroupenv}
+ \vspace*{\postgroupvspace}
+ \afterpoemgroup
+}
+\newcommand*{\@ptpoemgroupStar}[1]{%
+ \section*{#1}
}
\newcommand*{\@ptpoemgroupNoStar}[1]{%
- \ifx\@ptresetnumongroup\@ptundefined
- \relax
- \else
- \setcounter{poemnum}{0}
- \setcounter{untitledpoemnum}{0}
- \fi
- \cleardoublepage
- \vspace*{\fill}
- \renewcommand*{\ptgroup}{#1}
- \pagestyle{empty}
- \begin{center}
- \section{#1}
- \addcontentsline{lot}{section}{#1}
- \end{center}
- \vspace*{\fill}
- \clearpage
+ \section{#1}
+ \addcontentsline{top}{section}{#1}
}
\newenvironment{annotation}[2][\ptannotationenv]{%
\newcommand*{\@ptwrapenvironment}{#1}
@@ -267,6 +336,7 @@
\poetryheadings
\begin{\@ptwrapenvironment}
\subsection{#2}
+ \nopagebreak
}{%
\end{\@ptwrapenvironment}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/poetrytex.tlpobj new/tlpkg/tlpobj/poetrytex.tlpobj
--- old/tlpkg/tlpobj/poetrytex.tlpobj 2013-03-12 04:38:51.000000000 +0100
+++ new/tlpkg/tlpobj/poetrytex.tlpobj 2013-08-19 03:18:56.000000000 +0200
@@ -1,14 +1,14 @@
name poetrytex
category Package
-revision 29347
+revision 31463
shortdesc Typeset anthologies of poetry.
relocated 1
longdesc The package is designed to aid in the management and formatting
longdesc of anthologies of poetry and other writings; it does not
longdesc concern itself with actually typesettinig the verse itself.
-runfiles size=2
+runfiles size=3
RELOC/tex/latex/poetrytex/poetrytex.sty
catalogue-ctan /macros/latex/contrib/poetrytex
-catalogue-date 2013-03-11 00:44:39 +0100
+catalogue-date 2013-08-18 10:44:14 +0200
catalogue-license lppl1.3
-catalogue-version 1.4
+catalogue-version 2.0.0
++++++ polyglossia.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/polyglossia/README new/doc/latex/polyglossia/README
--- old/doc/latex/polyglossia/README 2013-05-29 00:13:58.000000000 +0200
+++ new/doc/latex/polyglossia/README 2014-05-23 00:00:35.000000000 +0200
@@ -1,7 +1,7 @@
¦----------------------------------------------¦
¦ ¦
- ¦ THE POLYGLOSSIA PACKAGE v1.33.3 ¦
+ ¦ THE POLYGLOSSIA PACKAGE v1.33.5 ¦
¦ ¦
¦ Modern multilingual typesetting ¦
¦ with XeLaTeX and LuaLaTeX ¦
Files old/doc/latex/polyglossia/example-arabic.pdf and new/doc/latex/polyglossia/example-arabic.pdf differ
Files old/doc/latex/polyglossia/example-thai.pdf and new/doc/latex/polyglossia/example-thai.pdf differ
Files old/doc/latex/polyglossia/examples.pdf and new/doc/latex/polyglossia/examples.pdf differ
Files old/doc/latex/polyglossia/polyglossia.pdf and new/doc/latex/polyglossia/polyglossia.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/polyglossia/polyglossia.tex new/doc/latex/polyglossia/polyglossia.tex
--- old/doc/latex/polyglossia/polyglossia.tex 2013-05-29 00:13:58.000000000 +0200
+++ new/doc/latex/polyglossia/polyglossia.tex 2014-05-23 00:00:35.000000000 +0200
@@ -67,6 +67,7 @@
% COMMENT THE NEXT LINE TO INCLUDE THE CODE
\AtBeginDocument{\OnlyDescription}
\begin{document}
+\hyphenation{Kha-li-ghi}
\GetFileInfo{polyglossia.sty}
\title{\textcolor{lightblue}{\Huge\fontspec[LetterSpace=40]{GFS Ambrosia} Πολυγλωσσια}
@@ -372,6 +373,15 @@
does not appear to support the script of that language, an error message is
displayed.
+\section{Hyphenation disabling}
+
+In some very specific contexts (such as music score creation), \TeX{} hyphenation
+is something to avoid as it may cause troubles. \pkg{polyglossia} provides two
+functions: \cmd\disablehyphenation and \cmd\enablehyphenation . Note that when
+you select a new language, hyphenation will be in the same state (enabled or
+disabled) as before. When you reenable it, it will take the last selected
+language.
+
\section{Language-specific options and commands}\label{specific}
This section gives a list of all languages for which options and end-user commands are defined.
@@ -477,6 +487,8 @@
\subsection{german}\label{german}
\textbf{Options}:
\begin{itemize}
+ \item\TB{variant} = \textit{german} or austrian.\new{v1.33.4}
+ Setting variant=austrian uses some austrian lexical variants.
\item \TB{spelling} = \textit{new} (= 1996) or old (= 1901):
indicates whether hyphenation patterns for traditional (1901) or reformed
(1996) orthography should be used. The latter is the default.
@@ -506,8 +518,8 @@
\item ¦"<¦ for French left double quotes («)
\item ¦">¦ for French right double quotes (»).
\end{itemize}
- \item\TB{script} = \textit{latin} or fraktur.\new{v1.2.0}
- Setting script=fraktur modifies the captions for typesetting German in Fraktur.
+ \item\TB{script} = \textit{latin} or fraktur.\new{v1.2.0}
+ Setting script=fraktur modifies the captions for typesetting German in Fraktur.
\end{itemize}
\subsection{greek}\label{greek}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/polyglossia.doc.tlpobj new/tlpkg/tlpobj/polyglossia.doc.tlpobj
--- old/tlpkg/tlpobj/polyglossia.doc.tlpobj 2013-05-29 03:54:18.000000000 +0200
+++ new/tlpkg/tlpobj/polyglossia.doc.tlpobj 2014-05-23 01:15:20.000000000 +0200
@@ -1,9 +1,9 @@
name polyglossia.doc
category Package
-revision 30787
+revision 34205
shortdesc doc files of polyglossia
relocated 1
-docfiles size=122
+docfiles size=121
RELOC/doc/latex/polyglossia/README
RELOC/doc/latex/polyglossia/example-arabic.pdf
RELOC/doc/latex/polyglossia/example-arabic.tex
++++++ polyglossia.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/polyglossia/babelsh.def new/tex/latex/polyglossia/babelsh.def
--- old/tex/latex/polyglossia/babelsh.def 2013-05-14 00:15:54.000000000 +0200
+++ new/tex/latex/polyglossia/babelsh.def 2013-06-28 23:56:49.000000000 +0200
@@ -63,6 +63,7 @@
\def\\{\MessageBreak}%
\PackageInfo{polyglossia}{#1}%
\endgroup}
+\fi
%
% ------------------------------------------------------------------------------
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/polyglossia/gloss-breton.ldf new/tex/latex/polyglossia/gloss-breton.ldf
--- old/tex/latex/polyglossia/gloss-breton.ldf 2013-05-14 00:15:54.000000000 +0200
+++ new/tex/latex/polyglossia/gloss-breton.ldf 2014-05-23 00:00:35.000000000 +0200
@@ -7,13 +7,20 @@
fontsetup=true,
}
-\newXeTeXintercharclass\breton@punctthin % ! ? ;
-\newXeTeXintercharclass\breton@punctthick % :
+\ifluatex
+ % TODO
+\else
+ \newXeTeXintercharclass\breton@punctthin % ! ? ;
+ \newXeTeXintercharclass\breton@punctthick % :
+\fi
\def\breton@punctthinspace{{\unskip\thinspace}}
\def\breton@punctthickspace{{\unskip\nobreakspace}}
\def\breton@punctuation{%
+ \ifluatex
+ % TODO
+ \else
\XeTeXinterchartokenstate=1%
\XeTeXcharclass `\! \breton@punctthin
\XeTeXcharclass `\? \breton@punctthin
@@ -21,14 +28,19 @@
\XeTeXcharclass `\: \breton@punctthick
\XeTeXinterchartoks \z@ \breton@punctthin = \breton@punctthinspace
\XeTeXinterchartoks \z@ \breton@punctthick = \breton@punctthickspace
+ \fi
}
\def\nobreton@punctuation{%
+ \ifluatex
+ % TODO
+ \else
\XeTeXcharclass `\! \z@
\XeTeXcharclass `\? \z@
\XeTeXcharclass `\; \z@
\XeTeXcharclass `\: \z@
\XeTeXinterchartokenstate=0%
+ \fi
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/polyglossia/gloss-croatian.ldf new/tex/latex/polyglossia/gloss-croatian.ldf
--- old/tex/latex/polyglossia/gloss-croatian.ldf 2013-05-14 00:15:54.000000000 +0200
+++ new/tex/latex/polyglossia/gloss-croatian.ldf 2014-05-23 00:00:35.000000000 +0200
@@ -16,23 +16,23 @@
\def\contentsname{Sadržaj}%
\def\listfigurename{Popis slika}%
\def\listtablename{Popis tablica}%
- \def\indexname{Indeks}%
+ \def\indexname{Kazalo}%
\def\figurename{Slika}%
\def\tablename{Tablica}%
\def\partname{Dio}%
\def\pagename{Stranica}%
\def\seename{Vidjeti}%
- \def\alsoname{Vidjeti i}%
+ \def\alsoname{Također vidjeti}%
\def\enclname{Prilozi}%
- \def\ccname{Kopije}%
+ \def\ccname{Kopija}%
\def\headtoname{Prima}%
\def\proofname{Dokaz}%
- \def\glossaryname{Kazalo}%
+ \def\glossaryname{Pojmovnik}%
}
\def\datecroatian{%
\def\today{\number\day.~\ifcase\month\or
siječnja\or veljače\or ožujka\or travnja\or svibnja\or
- lipnja\or srpnja\or kolovoza\or rujna\or listopada\or studenog\or
+ lipnja\or srpnja\or kolovoza\or rujna\or listopada\or studenoga\or
prosinca\fi \space \number\year.}}
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/polyglossia/gloss-german.ldf new/tex/latex/polyglossia/gloss-german.ldf
--- old/tex/latex/polyglossia/gloss-german.ldf 2013-05-21 00:03:38.000000000 +0200
+++ new/tex/latex/polyglossia/gloss-german.ldf 2014-05-23 00:00:35.000000000 +0200
@@ -33,6 +33,15 @@
\fi
}
+\newif\if@austrian@locale
+\@austrian@localefalse
+\def\tmp@austrian{austrian}
+\define@key{german}{variant}[german]{%
+ \def\@tmpa{#1}%
+ \ifx\@tmpa\tmp@austrian\@austrian@localetrue\else
+ \@austrian@localefalse%
+ \fi}
+
\newif\if@german@fraktur
\def\tmp@fraktur{fraktur}
\define@key{german}{script}[latin]{%
@@ -125,13 +134,17 @@
}
\def\date@german{%
\def\today{\number\day.%
- \space \ifcase\month%TODO add option for Austrian forms (Jänner etc)
- \or Januar\or Februar\or März\or April\or Mai\or Juni\or%
- Juli\or August\or September\or Oktober\or November\or%
- Dezember\fi
+ \space \ifcase\month%
+ \or\if@austrian@locale Jänner\else Januar\fi\or Februar\or März\or%
+ April\or Mai\or Juni\or Juli\or August\or September\or Oktober\or%
+ November\or Dezember\fi
\space \number\year}%
}
+\def\captions@german@austrian{%
+ \def\enclname{Beilage(n)}%
+}
+
%%Strings for Fraktur contributed by Gerrit
\def\captions@german@fraktur{%
\captions@german%
@@ -143,15 +156,16 @@
\def\date@german@fraktur{%
\def\today{\number\day.%
- \space \ifcase\month%TODO add option for Austrian forms (Jänner etc)
- \or Januar\or Februar\or März\or April\or Mai\or Juni\or%
- Juli\or Auguſt\or September\or Oktober\or November\or%
- Dezember\fi
+ \space \ifcase\month%
+ \or\if@austrian@locale Jänner\else Januar\fi\or Februar\or März\or%
+ April\or Mai\or Juni\or Juli\or Auguſt\or September\or Oktober\or%
+ November\or Dezember\fi
\space \number\year}%
}
\def\captionsgerman{%
\if@german@fraktur\captions@german@fraktur\else\captions@german\fi
+ \if@austrian@locale\captions@german@austrian\fi
}
\def\dategerman{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/polyglossia/gloss-lithuanian.ldf new/tex/latex/polyglossia/gloss-lithuanian.ldf
--- old/tex/latex/polyglossia/gloss-lithuanian.ldf 2013-05-14 00:15:54.000000000 +0200
+++ new/tex/latex/polyglossia/gloss-lithuanian.ldf 2014-05-23 00:00:35.000000000 +0200
@@ -13,7 +13,7 @@
\def\abstractname{Santrauka}%
\def\bibname{Literatūra}%
\def\prefacename{Pratarmė}%
- \def\chaptername{skyrius}%
+ \def\chaptername{Skyrius}%
\def\appendixname{Priedas}%
\def\contentsname{Turinys}%
\def\listfigurename{Iliustracijų sąrašas}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/polyglossia/gloss-polish.ldf new/tex/latex/polyglossia/gloss-polish.ldf
--- old/tex/latex/polyglossia/gloss-polish.ldf 2013-05-14 00:15:54.000000000 +0200
+++ new/tex/latex/polyglossia/gloss-polish.ldf 2014-05-23 00:00:35.000000000 +0200
@@ -15,17 +15,17 @@
\def\appendixname{Dodatek}%
\def\contentsname{Spis treści}%
\def\listfigurename{Spis rysunków}%
- \def\listtablename{Spis tablic}%
+ \def\listtablename{Spis tabel}%
\def\indexname{Indeks}%
\def\figurename{Rysunek}%
- \def\tablename{Tablica}%
+ \def\tablename{Tabela}%
\def\partname{Część}%
\def\enclname{Załącznik}%
\def\ccname{Kopie:}%
\def\headtoname{Do}%
\def\pagename{Strona}%
- \def\seename{Porównaj}%
- \def\alsoname{Porównaj także}%
+ \def\seename{Zobacz}%
+ \def\alsoname{Zobacz też}%
\def\proofname{Dowód}%
\def\glossaryname{Glossary}% <-- Needs translation
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/polyglossia/gloss-russian.ldf new/tex/latex/polyglossia/gloss-russian.ldf
--- old/tex/latex/polyglossia/gloss-russian.ldf 2013-05-14 00:15:54.000000000 +0200
+++ new/tex/latex/polyglossia/gloss-russian.ldf 2014-05-23 00:00:35.000000000 +0200
@@ -22,7 +22,7 @@
\define@key{russian}{numerals}[latin]{%
\ifstrequal{#1}{cyrillic}%
{\cyrillic@numeralstrue}
- {\cyrillic@numeralsfalse}
+ {\cyrillic@numeralsfalse}%
}
\define@boolkey{russian}[russian@]{babelshorthands}[false]{}
@@ -65,7 +65,7 @@
\ifx\tempx@\tempa@\@Acdash\else
\ifx\tempx@\tempb@\@Bcdash\else
\ifx\tempx@\tempc@\@Ccdash\else
- \errmessage{Wrong usage of cdash}\fi\fi\fi}
+ \errmessage{Wrong usage of cdash}\fi\fi\fi}%
\def\@Acdash{\ifdim\lastskip>\z@\unskip\nobreak\hskip.2em\fi
\cyrdash\hskip.2em\ignorespaces}%
\def\@Bcdash{\leavevmode\ifdim\lastskip>\z@\unskip\fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/polyglossia/gloss-turkish.ldf new/tex/latex/polyglossia/gloss-turkish.ldf
--- old/tex/latex/polyglossia/gloss-turkish.ldf 2013-05-14 00:15:54.000000000 +0200
+++ new/tex/latex/polyglossia/gloss-turkish.ldf 2014-05-23 00:00:35.000000000 +0200
@@ -8,26 +8,43 @@
fontsetup=true
}
+% TODO Add \ifluatex branch everywhere
+\ifxetex
\newXeTeXintercharclass\turkish@punctthin % ! :
\newXeTeXintercharclass\turkish@punctthick % =
+\fi
\def\turkish@punctthinspace{{\ifdim\lastskip>\z@\unskip\penalty\@M\thinspace\fi}}
\def\turkish@punctthickspace{{\unskip\nobreakspace}}
\def\turkish@punctuation{%
+ \ifxetex
\XeTeXinterchartokenstate=1%
\XeTeXcharclass `\! \turkish@punctthin
\XeTeXcharclass `\: \turkish@punctthin
\XeTeXcharclass `\= \turkish@punctthick
\XeTeXinterchartoks \z@ \turkish@punctthin = \turkish@punctthinspace
\XeTeXinterchartoks \z@ \turkish@punctthick = \turkish@punctthickspace
+ \fi
}
\def\noturkish@punctuation{%
+ \ifxetex
\XeTeXcharclass `\! \z@
\XeTeXcharclass `\: \z@
\XeTeXcharclass `\= \z@
\XeTeXinterchartokenstate=0%
+ \fi
+}
+
+\def\turkish@casing{%
+ \lccode`\I=`\ı
+ \uccode`\i=`\İ
+}
+
+\def\noturkish@casing{%
+ \lccode`\I=`\i
+ \uccode`\i=`\I
}
\def\captionsturkish{%
@@ -69,14 +86,17 @@
\def\noextras@turkish{%
\noturkish@punctuation%
+ \noturkish@casing%
}
\def\blockextras@turkish{%
\turkish@punctuation%
+ \turkish@casing%
}
\def\inlineextras@turkish{%
\turkish@punctuation%
+ \turkish@casing%
}
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/polyglossia/polyglossia.sty new/tex/latex/polyglossia/polyglossia.sty
--- old/tex/latex/polyglossia/polyglossia.sty 2013-05-29 00:13:58.000000000 +0200
+++ new/tex/latex/polyglossia/polyglossia.sty 2014-05-23 00:00:35.000000000 +0200
@@ -1,5 +1,5 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{polyglossia}[2013/05/28 v1.33.3
+\ProvidesPackage{polyglossia}[2014/05/21 v1.33.5
Babel replacement for XeLaTeX and LuaTeX]
\RequirePackage{etoolbox}
\RequirePackage{makecmds}
@@ -10,6 +10,8 @@
% LuaTeX, but it's not if we run XeTeX, and we need it to know which of
% the two engines it is! Hence we include it here.
\RequirePackage{ifluatex}
+% For symmetry with ifluatex
+\RequirePackage{ifxetex}
% fontspec now uses LaTeX3 packages such as expl3, so we need this:
\ExplSyntaxOn
@@ -211,8 +213,17 @@
\ifcsundef{l@#1}%
{\xpg@nopatterns{\csname xpg@langname@#1\endcsname}%
\expandafter\adddialect\csname l@#1\endcsname\l@nohyphenation\relax}{}%
- \csdef{#1@language}{\language=\csname l@#1\endcsname\ifluatex\directlua{polyglossia.select_language('\luatexluaescapestring{\string#1}', \the\csname l@#1\endcsname)}\fi}%
+ \csdef{#1@language}{%
+ \ifbool{xpg@hyphenation@disabled}{%
+ \xdef\xpg@lastlanguage{\the\csname l@#1\endcsname}%
+ }{%
+ \ifluatex%
+ \xpg@set@language@luatex@ii{#1}%
+ \fi%
+ \language=\csname l@#1\endcsname%
+ }%
}%
+ }%
\define@choicekey+[xpg@setup]{#1}{direction}[\val\nr]{LR,RL}[LR]%
{\ifcase\nr\relax
\togglefalse{#1@RL}%
@@ -646,9 +657,13 @@
\docsvlist{#1}}%
\def\common@language{% FIXME is this really needed???
- \language=\z@
- \lefthyphenmin=\tw@
- \righthyphenmin=\thr@@}
+ \ifbool{xpg@hyphenation@disabled}{%
+ \xdef\xpg@lastlanguage{\z@}%
+ }{%
+ \language=\z@
+ }%
+ \lefthyphenmin=\tw@
+ \righthyphenmin=\thr@@}
\def\noextrascurrent#1{\csuse{noextras@#1}}
@@ -729,7 +744,7 @@
\global\@namedef{lu@texhyphen@loaded@\the\language}{}%
\directlua{polyglossia.select_language('\luatexluaescapestring{\string#1}', \the\csname l@#1\endcsname)}%
\fi %
- \fi %
+ \fi %
\xpg@initial@setup%
\select@@language{#1}%
\ifcsundef{setRL}{}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/polyglossia.tlpobj new/tlpkg/tlpobj/polyglossia.tlpobj
--- old/tlpkg/tlpobj/polyglossia.tlpobj 2013-05-29 03:54:18.000000000 +0200
+++ new/tlpkg/tlpobj/polyglossia.tlpobj 2014-05-23 01:15:20.000000000 +0200
@@ -1,6 +1,6 @@
name polyglossia
category Package
-revision 30787
+revision 34205
shortdesc Modern multilingual typesetting with XeLaTeX.
relocated 1
longdesc This package provides a complete Babel replacement for users of
@@ -113,6 +113,6 @@
RELOC/tex/latex/polyglossia/polyglossia.sty
RELOC/tex/latex/polyglossia/xgreek-fixes.def
catalogue-ctan /macros/latex/contrib/polyglossia
-catalogue-date 2013-05-28 18:20:04 +0200
+catalogue-date 2014-05-22 01:04:51 +0200
catalogue-license lppl1.3
-catalogue-version v1.33.3
+catalogue-version v1.33.5
++++++ polytable.doc.tar.xz ++++++
Files old/doc/latex/polytable/polytable.pdf and new/doc/latex/polytable/polytable.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/polytable.doc.tlpobj new/tlpkg/tlpobj/polytable.doc.tlpobj
--- old/tlpkg/tlpobj/polytable.doc.tlpobj 2010-11-06 04:06:03.000000000 +0100
+++ new/tlpkg/tlpobj/polytable.doc.tlpobj 2013-07-19 03:19:39.000000000 +0200
@@ -1,6 +1,6 @@
name polytable.doc
category Package
-revision 20331
+revision 31235
shortdesc doc files of polytable
relocated 1
docfiles size=72
++++++ polytable.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/polytable/polytable.sty new/tex/latex/polytable/polytable.sty
--- old/tex/latex/polytable/polytable.sty 2006-11-09 14:57:52.000000000 +0100
+++ new/tex/latex/polytable/polytable.sty 2013-07-19 01:30:13.000000000 +0200
@@ -9,14 +9,18 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{polytable}%
- [2005/04/26 v0.8.2 `polytable' package (Andres Loeh)]
+ [2013/07/18 v0.8.5 `polytable' package (Andres Loeh)]
\let\PT@original@And\And
+\let\PT@original@Not\Not
\RequirePackage{lazylist}
\let\PT@And\And
+\let\PT@Not\Not
\def\PT@prelazylist
- {\let\And\PT@And}
+ {\let\And\PT@And
+ \let\Not\PT@Not}
\def\PT@postlazylist
- {\let\And\PT@original@And}
+ {\let\And\PT@original@And
+ \let\Not\PT@original@Not}
\PT@postlazylist
\RequirePackage{array}
\DeclareOption{debug} {\AtEndOfPackage\PT@debug}
@@ -507,7 +511,7 @@
\def\PT@gobblefalse\else\relax\gobbletrue\fi #1#2%
{\fi #1}
\def\PT@ltmax #1#2%
- {\PT@TeXif{\ifdim\csname #1.max\endcsname<\csname #2.max\endcsname}}
+ {\Not{\PT@TeXif{\ifdim\csname #1.max\endcsname>\csname #2.max\endcsname}}}
\def\PT@numbercol #1%
{%\PT@typeout@{numbering #1 as \the\PT@cols}%
\PT@enamedef{#1.num}{\the\PT@cols}%
@@ -639,10 +643,10 @@
\PT@expanded{\def\PT@temp}%
{\csname PT@restore@\romannumeral\PT@temp\endcsname}%
\expandafter\gdef\PT@temp{}% start empty
- % this is: \PT@Execute{\Map{\PT@savecolumn{\PT@temp}}\PT@sortedlist}
+ % this is: \PT@Execute{\Map{\PT@savecolumn{\PT@temp}}{\Reverse\PT@allcols}}
\expandafter\PT@Execute\expandafter{\expandafter
\Map\expandafter{\expandafter\PT@savecolumn
- \expandafter{\PT@temp}}\PT@sortedlist}}
+ \expandafter{\PT@temp}}{\Reverse\PT@allcols}}}
\def\PT@savecolumn#1#2% #1 macro name, #2 column name
{\PT@typeout@{saving column #2 in \string #1 ...}%
\def\PT@temp{#2}%
@@ -739,7 +743,7 @@
{\immediate\write\@auxout{%
\gdef\expandafter\noexpand
\csname PT@restore@\romannumeral\PT@table\endcsname
- {\PT@Execute{\Map{\PT@write@column{#1}}\PT@allcols}}}}%
+ {\PT@Execute{\Map{\PT@write@column{#1}}{\Reverse\PT@allcols}}}}}%
\PT@postlazylist
\fi}
\def\PT@write@column #1#2%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/polytable.tlpobj new/tlpkg/tlpobj/polytable.tlpobj
--- old/tlpkg/tlpobj/polytable.tlpobj 2010-11-06 04:06:03.000000000 +0100
+++ new/tlpkg/tlpobj/polytable.tlpobj 2013-07-19 03:19:39.000000000 +0200
@@ -1,6 +1,6 @@
name polytable
category Package
-revision 20331
+revision 31235
shortdesc Tabular-like environments with named columns.
relocated 1
longdesc This package implements a variant of tabular-like environments
@@ -10,6 +10,6 @@
runfiles size=7
RELOC/tex/latex/polytable/polytable.sty
catalogue-ctan /macros/latex/contrib/polytable
-catalogue-date 2010-11-05 12:43:21 +0100
+catalogue-date 2012-05-31 00:57:47 +0200
catalogue-license lppl
catalogue-version 0.8.2
++++++ powerdot.doc.tar.xz ++++++
++++ 35764 lines of diff (skipped)
++++++ powerdot.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/powerdot/powerdot-aggie.sty new/tex/latex/powerdot/powerdot-aggie.sty
--- old/tex/latex/powerdot/powerdot-aggie.sty 2010-12-04 00:42:48.000000000 +0100
+++ new/tex/latex/powerdot/powerdot-aggie.sty 2014-01-02 23:55:32.000000000 +0100
@@ -1,7 +1,13 @@
%%
%% This is file `powerdot-aggie.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% powerdot.dtx (with options: `pdaggie')
+%%
%% ---------------------------------------------------------------
-%% Copyright (C) 2005-2010 Hendri Adriaens and Christopher Ellison
+%% Copyright (C) 2005-2014 Hendri Adriaens
%% ---------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -12,10 +18,11 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2003/12/01 or later.
%%
-%% This work has the LPPL maintenance status "unmaintained".
+%% This work has the LPPL maintenance status "maintained".
%%
-%% This work consists of all files listed in manifest.txt.
+%% This Current Maintainer of this work is Hendri Adriaens.
%%
+%% This work consists of all files listed in manifest.txt.
%%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{powerdot-aggie}[2005/12/10 v1.3 aggie style (JS,HA)]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/powerdot/powerdot-bframe.sty new/tex/latex/powerdot/powerdot-bframe.sty
--- old/tex/latex/powerdot/powerdot-bframe.sty 2010-12-04 00:42:48.000000000 +0100
+++ new/tex/latex/powerdot/powerdot-bframe.sty 2014-01-02 23:55:32.000000000 +0100
@@ -1,7 +1,13 @@
%%
%% This is file `powerdot-bframe.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% powerdot.dtx (with options: `pdbframe')
+%%
%% ---------------------------------------------------------------
-%% Copyright (C) 2005-2010 Hendri Adriaens and Christopher Ellison
+%% Copyright (C) 2005-2014 Hendri Adriaens
%% ---------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -12,10 +18,11 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2003/12/01 or later.
%%
-%% This work has the LPPL maintenance status "unmaintained".
+%% This work has the LPPL maintenance status "maintained".
%%
-%% This work consists of all files listed in manifest.txt.
+%% This Current Maintainer of this work is Hendri Adriaens.
%%
+%% This work consists of all files listed in manifest.txt.
%%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{powerdot-bframe}[2005/12/10 v1.2 bframe style (PRU,HA)]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/powerdot/powerdot-ciment.sty new/tex/latex/powerdot/powerdot-ciment.sty
--- old/tex/latex/powerdot/powerdot-ciment.sty 2010-12-04 00:42:48.000000000 +0100
+++ new/tex/latex/powerdot/powerdot-ciment.sty 2014-01-02 23:55:32.000000000 +0100
@@ -1,7 +1,13 @@
%%
%% This is file `powerdot-ciment.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% powerdot.dtx (with options: `pdciment')
+%%
%% ---------------------------------------------------------------
-%% Copyright (C) 2005-2010 Hendri Adriaens and Christopher Ellison
+%% Copyright (C) 2005-2014 Hendri Adriaens
%% ---------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -12,10 +18,11 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2003/12/01 or later.
%%
-%% This work has the LPPL maintenance status "unmaintained".
+%% This work has the LPPL maintenance status "maintained".
%%
-%% This work consists of all files listed in manifest.txt.
+%% This Current Maintainer of this work is Hendri Adriaens.
%%
+%% This work consists of all files listed in manifest.txt.
%%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{powerdot-ciment}[2005/12/10 v1.3 ciment style (HA)]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/powerdot/powerdot-default.sty new/tex/latex/powerdot/powerdot-default.sty
--- old/tex/latex/powerdot/powerdot-default.sty 2011-05-18 01:11:24.000000000 +0200
+++ new/tex/latex/powerdot/powerdot-default.sty 2014-01-02 23:55:32.000000000 +0100
@@ -1,7 +1,13 @@
%%
%% This is file `powerdot-default.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% powerdot.dtx (with options: `pddefault')
+%%
%% ---------------------------------------------------------------
-%% Copyright (C) 2005-2011 Hendri Adriaens and Christopher Ellison
+%% Copyright (C) 2005-2014 Hendri Adriaens
%% ---------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -12,13 +18,14 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2003/12/01 or later.
%%
-%% This work has the LPPL maintenance status "unmaintained".
+%% This work has the LPPL maintenance status "maintained".
%%
-%% This work consists of all files listed in manifest.txt.
+%% This Current Maintainer of this work is Hendri Adriaens.
%%
+%% This work consists of all files listed in manifest.txt.
%%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{powerdot-default}[2011/04/25 v1.4g default style (HA)]
+\ProvidesPackage{powerdot-default}[2014/01/01 v1.5 default style (HA)]
\RequirePackage{pifont}
\definecolor{pdcolor1}{rgb}{.17,.31,.44}
\definecolor{pdcolor2}{rgb}{.75,.85,.92}
@@ -100,12 +107,14 @@
}
\pddefinetemplate[basic]{wideslide}{%
textpos={.05\slidewidth,.83\slideheight},
- textwidth=.9\slidewidth}{}
+ textwidth=.9\slidewidth
+}{}
\pddefinetemplate[basic]{slide}{%
ifsetup=landscape,
tocpos={.015\slidewidth,.83\slideheight},
tocwidth=.14\slidewidth,
- tocsecm={\psline[linewidth=.5pt,linecolor=pdcolor1](-.05,-.05)(.143\slidewidth,-.05)}
+ tocsecm={\psline[linewidth=.5pt,linecolor=pdcolor1]%
+ (-.05,-.05)(.143\slidewidth,-.05)}
}{%
\pdifsetup{landscape}{%
\psframe[fillstyle=solid,fillcolor=pdcolor3,linestyle=none,%
@@ -120,12 +129,14 @@
titlewidth=.9\slidewidth,
titlepos={.5\slidewidth,.55\slideheight}
}{}
-\pddefinetemplate[wideslide]{sectionwideslide}{
+\pddefinetemplate[wideslide]{sectionwideslide}{%
titlehook=c,titlefont=\Large\bfseries\centering,
titlewidth=.9\slidewidth,
titlepos={.5\slidewidth,.55\slideheight}
}{}
-\setkeys[pd]{section}{sectemp=sectionslide,widesectemp=sectionwideslide}
+\setkeys[pd]{section}{%
+ sectemp=sectionslide,widesectemp=sectionwideslide
+}
\def\labelitemi{\footnotesize\ding{110}}
\def\labelitemii{\small\ding{117}}
\def\labelitemiii{\tiny\ding{110}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/powerdot/powerdot-elcolors.sty new/tex/latex/powerdot/powerdot-elcolors.sty
--- old/tex/latex/powerdot/powerdot-elcolors.sty 2010-12-04 00:42:48.000000000 +0100
+++ new/tex/latex/powerdot/powerdot-elcolors.sty 2014-01-02 23:55:32.000000000 +0100
@@ -1,7 +1,13 @@
%%
%% This is file `powerdot-elcolors.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% powerdot.dtx (with options: `pdelcolors')
+%%
%% ---------------------------------------------------------------
-%% Copyright (C) 2005-2010 Hendri Adriaens and Christopher Ellison
+%% Copyright (C) 2005-2014 Hendri Adriaens
%% ---------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -12,7 +18,9 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2003/12/01 or later.
%%
-%% This work has the LPPL maintenance status "unmaintained".
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% This Current Maintainer of this work is Hendri Adriaens.
%%
%% This work consists of all files listed in manifest.txt.
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/powerdot/powerdot-fyma.sty new/tex/latex/powerdot/powerdot-fyma.sty
--- old/tex/latex/powerdot/powerdot-fyma.sty 2010-12-04 00:42:48.000000000 +0100
+++ new/tex/latex/powerdot/powerdot-fyma.sty 2014-01-02 23:55:32.000000000 +0100
@@ -1,7 +1,13 @@
%%
%% This is file `powerdot-fyma.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% powerdot.dtx (with options: `pdfyma')
+%%
%% ---------------------------------------------------------------
-%% Copyright (C) 2005-2010 Hendri Adriaens and Christopher Ellison
+%% Copyright (C) 2005-2014 Hendri Adriaens
%% ---------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -12,10 +18,11 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2003/12/01 or later.
%%
-%% This work has the LPPL maintenance status "unmaintained".
+%% This work has the LPPL maintenance status "maintained".
%%
-%% This work consists of all files listed in manifest.txt.
+%% This Current Maintainer of this work is Hendri Adriaens.
%%
+%% This work consists of all files listed in manifest.txt.
%%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{powerdot-fyma}[2005/12/10 v1.3 fyma style (SA,HA)]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/powerdot/powerdot-horatio.sty new/tex/latex/powerdot/powerdot-horatio.sty
--- old/tex/latex/powerdot/powerdot-horatio.sty 2010-12-04 00:42:48.000000000 +0100
+++ new/tex/latex/powerdot/powerdot-horatio.sty 2014-01-02 23:55:32.000000000 +0100
@@ -1,7 +1,13 @@
%%
%% This is file `powerdot-horatio.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% powerdot.dtx (with options: `pdhoratio')
+%%
%% ---------------------------------------------------------------
-%% Copyright (C) 2005-2010 Hendri Adriaens and Christopher Ellison
+%% Copyright (C) 2005-2014 Hendri Adriaens
%% ---------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -12,7 +18,9 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2003/12/01 or later.
%%
-%% This work has the LPPL maintenance status "unmaintained".
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% This Current Maintainer of this work is Hendri Adriaens.
%%
%% This work consists of all files listed in manifest.txt.
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/powerdot/powerdot-husky.sty new/tex/latex/powerdot/powerdot-husky.sty
--- old/tex/latex/powerdot/powerdot-husky.sty 2010-12-04 00:42:48.000000000 +0100
+++ new/tex/latex/powerdot/powerdot-husky.sty 2014-01-02 23:55:32.000000000 +0100
@@ -1,7 +1,13 @@
%%
%% This is file `powerdot-husky.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% powerdot.dtx (with options: `pdhusky')
+%%
%% ---------------------------------------------------------------
-%% Copyright (C) 2005-2010 Hendri Adriaens and Christopher Ellison
+%% Copyright (C) 2005-2014 Hendri Adriaens
%% ---------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -12,7 +18,9 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2003/12/01 or later.
%%
-%% This work has the LPPL maintenance status "unmaintained".
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% This Current Maintainer of this work is Hendri Adriaens.
%%
%% This work consists of all files listed in manifest.txt.
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/powerdot/powerdot-ikeda.sty new/tex/latex/powerdot/powerdot-ikeda.sty
--- old/tex/latex/powerdot/powerdot-ikeda.sty 2010-12-04 00:42:48.000000000 +0100
+++ new/tex/latex/powerdot/powerdot-ikeda.sty 2014-01-02 23:55:32.000000000 +0100
@@ -1,7 +1,13 @@
%%
%% This is file `powerdot-ikeda.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% powerdot.dtx (with options: `pdikeda')
+%%
%% ---------------------------------------------------------------
-%% Copyright (C) 2005-2010 Hendri Adriaens and Christopher Ellison
+%% Copyright (C) 2005-2014 Hendri Adriaens
%% ---------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -12,7 +18,9 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2003/12/01 or later.
%%
-%% This work has the LPPL maintenance status "unmaintained".
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% This Current Maintainer of this work is Hendri Adriaens.
%%
%% This work consists of all files listed in manifest.txt.
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/powerdot/powerdot-jefka.sty new/tex/latex/powerdot/powerdot-jefka.sty
--- old/tex/latex/powerdot/powerdot-jefka.sty 2010-12-04 00:42:48.000000000 +0100
+++ new/tex/latex/powerdot/powerdot-jefka.sty 2014-01-02 23:55:32.000000000 +0100
@@ -1,7 +1,13 @@
%%
%% This is file `powerdot-jefka.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% powerdot.dtx (with options: `pdjefka')
+%%
%% ---------------------------------------------------------------
-%% Copyright (C) 2005-2010 Hendri Adriaens and Christopher Ellison
+%% Copyright (C) 2005-2014 Hendri Adriaens
%% ---------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -12,10 +18,11 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2003/12/01 or later.
%%
-%% This work has the LPPL maintenance status "unmaintained".
+%% This work has the LPPL maintenance status "maintained".
%%
-%% This work consists of all files listed in manifest.txt.
+%% This Current Maintainer of this work is Hendri Adriaens.
%%
+%% This work consists of all files listed in manifest.txt.
%%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{powerdot-jefka}[2005/12/10 v1.1 jefka style (CE,HA)]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/powerdot/powerdot-klope.sty new/tex/latex/powerdot/powerdot-klope.sty
--- old/tex/latex/powerdot/powerdot-klope.sty 2010-12-04 00:42:48.000000000 +0100
+++ new/tex/latex/powerdot/powerdot-klope.sty 2014-01-02 23:55:32.000000000 +0100
@@ -1,7 +1,13 @@
%%
%% This is file `powerdot-klope.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% powerdot.dtx (with options: `pdklope')
+%%
%% ---------------------------------------------------------------
-%% Copyright (C) 2005-2010 Hendri Adriaens and Christopher Ellison
+%% Copyright (C) 2005-2014 Hendri Adriaens
%% ---------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -12,10 +18,11 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2003/12/01 or later.
%%
-%% This work has the LPPL maintenance status "unmaintained".
+%% This work has the LPPL maintenance status "maintained".
%%
-%% This work consists of all files listed in manifest.txt.
+%% This Current Maintainer of this work is Hendri Adriaens.
%%
+%% This work consists of all files listed in manifest.txt.
%%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{powerdot-klope}[2005/12/10 v1.1 klope style (CE,HA)]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/powerdot/powerdot-paintings.sty new/tex/latex/powerdot/powerdot-paintings.sty
--- old/tex/latex/powerdot/powerdot-paintings.sty 2010-12-04 00:42:48.000000000 +0100
+++ new/tex/latex/powerdot/powerdot-paintings.sty 2014-01-02 23:55:32.000000000 +0100
@@ -1,7 +1,13 @@
%%
%% This is file `powerdot-paintings.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% powerdot.dtx (with options: `pdpaintings')
+%%
%% ---------------------------------------------------------------
-%% Copyright (C) 2005-2010 Hendri Adriaens and Christopher Ellison
+%% Copyright (C) 2005-2014 Hendri Adriaens
%% ---------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -12,7 +18,9 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2003/12/01 or later.
%%
-%% This work has the LPPL maintenance status "unmaintained".
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% This Current Maintainer of this work is Hendri Adriaens.
%%
%% This work consists of all files listed in manifest.txt.
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/powerdot/powerdot-pazik.sty new/tex/latex/powerdot/powerdot-pazik.sty
--- old/tex/latex/powerdot/powerdot-pazik.sty 2010-12-04 00:42:48.000000000 +0100
+++ new/tex/latex/powerdot/powerdot-pazik.sty 2014-01-02 23:55:32.000000000 +0100
@@ -1,7 +1,13 @@
%%
%% This is file `powerdot-pazik.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% powerdot.dtx (with options: `pdpazik')
+%%
%% ---------------------------------------------------------------
-%% Copyright (C) 2005-2010 Hendri Adriaens and Christopher Ellison
+%% Copyright (C) 2005-2014 Hendri Adriaens
%% ---------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -12,10 +18,11 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2003/12/01 or later.
%%
-%% This work has the LPPL maintenance status "unmaintained".
+%% This work has the LPPL maintenance status "maintained".
%%
-%% This work consists of all files listed in manifest.txt.
+%% This Current Maintainer of this work is Hendri Adriaens.
%%
+%% This work consists of all files listed in manifest.txt.
%%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{powerdot-pazik}[2005/12/10 v1.1 pazik style (CE,HA)]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/powerdot/powerdot-sailor.sty new/tex/latex/powerdot/powerdot-sailor.sty
--- old/tex/latex/powerdot/powerdot-sailor.sty 2010-12-04 00:42:48.000000000 +0100
+++ new/tex/latex/powerdot/powerdot-sailor.sty 2014-01-02 23:55:32.000000000 +0100
@@ -1,7 +1,13 @@
%%
%% This is file `powerdot-sailor.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% powerdot.dtx (with options: `pdsailor')
+%%
%% ---------------------------------------------------------------
-%% Copyright (C) 2005-2010 Hendri Adriaens and Christopher Ellison
+%% Copyright (C) 2005-2014 Hendri Adriaens
%% ---------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -12,7 +18,9 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2003/12/01 or later.
%%
-%% This work has the LPPL maintenance status "unmaintained".
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% This Current Maintainer of this work is Hendri Adriaens.
%%
%% This work consists of all files listed in manifest.txt.
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/powerdot/powerdot-simple.sty new/tex/latex/powerdot/powerdot-simple.sty
--- old/tex/latex/powerdot/powerdot-simple.sty 2010-12-04 00:42:48.000000000 +0100
+++ new/tex/latex/powerdot/powerdot-simple.sty 2014-01-02 23:55:32.000000000 +0100
@@ -1,7 +1,13 @@
%%
%% This is file `powerdot-simple.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% powerdot.dtx (with options: `pdsimple')
+%%
%% ---------------------------------------------------------------
-%% Copyright (C) 2005-2010 Hendri Adriaens and Christopher Ellison
+%% Copyright (C) 2005-2014 Hendri Adriaens
%% ---------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -12,7 +18,9 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2003/12/01 or later.
%%
-%% This work has the LPPL maintenance status "unmaintained".
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% This Current Maintainer of this work is Hendri Adriaens.
%%
%% This work consists of all files listed in manifest.txt.
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/powerdot/powerdot-tiger.sty new/tex/latex/powerdot/powerdot-tiger.sty
--- old/tex/latex/powerdot/powerdot-tiger.sty 2012-03-15 22:09:08.000000000 +0100
+++ new/tex/latex/powerdot/powerdot-tiger.sty 1970-01-01 01:00:00.000000000 +0100
@@ -1,214 +0,0 @@
-%%
-%% This is file `powerdot-tiger.sty',
-
-%% ---------------------------------------------------------------
-%% Copyright (C) Clemson University
-%% ---------------------------------------------------------------
-%%
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
-%% of this license or (at your option) any later version.
-%% The latest version of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
-%%
-\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{powerdot-tiger}[2006/05/23 v1.0 tiger style (HA)]
-\RequirePackage{pst-grad}
-\definecolor{fymahltcolor}{rgb}{1,0,0}
-\pddefinepalettes{orange}{
- \definecolor{pdcolor1}{rgb}{.23,.09,.41} %{.8,.23,.24} %text
- \definecolor{pdcolor2}{rgb}{.95,.53,.13} %lines
- \definecolor{pdcolor3}{rgb}{1,.92,.87} %background
- \definecolor{fymahltcolor}{rgb}{.23,.25,.5}%toc color
-}{blue}{
- \definecolor{pdcolor1}{rgb}{.14,.34,.55}
- \definecolor{pdcolor2}{rgb}{.24,.45,.7}
- \definecolor{pdcolor3}{rgb}{.88,.95,1}
-}{green}{
- \definecolor{pdcolor1}{rgb}{.1,.45,.3}
- \definecolor{pdcolor2}{rgb}{.24,.7,.45}
- \definecolor{pdcolor3}{rgb}{.88,1,.9}
-}{gray}{
- \definecolor{pdcolor1}{gray}{0.25}
- \definecolor{pdcolor2}{gray}{0.55}
- \definecolor{pdcolor3}{gray}{0.85}
-}{brown}{
- \definecolor{pdcolor1}{rgb}{.52,.32,.12}
- \definecolor{pdcolor2}{rgb}{.7,.45,.24}
- \definecolor{pdcolor3}{rgb}{.97,.92,.92}
-}
-\pddefinetemplate{basic}{
- titlefont=\large\bfseries\raggedright,
- clockpos={.96\slidewidth,.97\slideheight},clockcolor=pdcolor1,
- tocslidesep=.6ex,
- toctcolor=pdcolor1,
- tochlcolor=pdcolor1,
- tochltcolor=fymahltcolor,
- ifsetup=portrait,
- textheight=.67\slideheight,
- titlepos={.06\slidewidth,.9\slideheight},
- titlewidth=.75\slidewidth,
- textpos={.09\slidewidth,.83\slideheight},
- textwidth=.85\slidewidth,
- tocsecsep=.6ex,
- stochook=tr,stocpos={.48\slidewidth,.12\slideheight},
- stocfont=\tiny\raggedleft,
- ntochook=tl,ntocpos={.52\slidewidth,.12\slideheight},
- lfpos={.06\slidewidth,.045\slideheight},
- rfpos={.94\slidewidth,.045\slideheight},
- ifsetup=landscape,
- titlepos={.205\slidewidth,.9\slideheight},
- titlewidth=.75\slidewidth,
- textheight=.72\slideheight,
- textpos={.23\slidewidth,.82\slideheight},
- textwidth=.72\slidewidth,
- lfpos={.04\slidewidth,.03\slideheight},
- rfpos={.96\slidewidth,.03\slideheight},
- tocpos={.04\slidewidth,.82\slideheight},
- tocwidth=.14\slidewidth,
- tocsecm={\psline[linewidth=.5pt,linecolor=pdcolor1]%
- (-.05,-.05)(.143\slidewidth,-.05)}
-}{{%
- \psset{linewidth=.8pt,linecolor=pdcolor2}%
- \pdifsetup{landscape}{%
- \psframe[linestyle=none,fillstyle=gradient,gradbegin=pdcolor3,%
- gradend=white,gradmidpoint=0,dimen=outer]%
- (.03\slidewidth,.97\slideheight)(.97\slidewidth,.055\slideheight)%
- \psline
- (.02\slidewidth,.055\slideheight)(.98\slidewidth,.055\slideheight)%
- \psline
- (.03\slidewidth,.07\slideheight)(.03\slidewidth,.045\slideheight)%
- \psline
- (.97\slidewidth,.07\slideheight)(.97\slidewidth,.045\slideheight)%
- }{%
- \psframe[linestyle=none,fillstyle=gradient,gradbegin=white,%
- gradend=pdcolor3,gradmidpoint=.85,dimen=outer]%
- (.03\slidewidth,.97\slideheight)(.97\slidewidth,.03\slideheight)%
- \psline
- (.02\slidewidth,.03\slideheight)(.98\slidewidth,.03\slideheight)%
- \psline
- (.03\slidewidth,.045\slideheight)(.03\slidewidth,.02\slideheight)%
- \psline
- (.97\slidewidth,.045\slideheight)(.97\slidewidth,.02\slideheight)%
- }%
- \psline
- (.02\slidewidth,.97\slideheight)(.98\slidewidth,.97\slideheight)%
- \psline
- (.03\slidewidth,.98\slideheight)(.03\slidewidth,.955\slideheight)%
- \psline
- (.97\slidewidth,.98\slideheight)(.97\slidewidth,.955\slideheight)%
-}}
-\pddefinetemplate[basic]{titleslide}{
- texthook=t,textpos={.5\slidewidth,.7\slideheight},
- textwidth=.9\slidewidth,textfont=\centering,
- textheight=.6\slideheight,
- titlefont=\large\bfseries\centering,tocpos,ntocpos,stocpos
-}{}
-\pddefinetemplate[basic]{slide}{}{%
- \pdifsetup{landscape}{%
- \psframe[fillstyle=gradient,gradbegin=pdcolor3,gradend=white,%
- gradmidpoint=1,linestyle=none,dimen=outer,linewidth=.8pt]%
- (.03\slidewidth,.97\slideheight)(.195\slidewidth,.055\slideheight)%
- }{}%
-}
-\pddefinetemplate[basic]{wideslide}{
- ifsetup=landscape,tocpos,
- titlepos={.055\slidewidth,.9\slideheight},
- titlewidth=.75\slidewidth,
- textpos={.07\slidewidth,.83\slideheight},
- textwidth=.83\slidewidth
-}{}
-\pddefinetemplate[slide]{sectionslide}{
- titlehook=c,titlefont=\Large\bfseries\centering,
- ifsetup=landscape,
- titlepos={.59\slidewidth,.525\slideheight},
- titlewidth=.5\slidewidth,
- ifsetup=portrait,
- titlepos={.5\slidewidth,.525\slideheight},
- titlewidth=.68\slidewidth
-}{{%
- \psset{linewidth=.8pt,linecolor=pdcolor2}%
- \pdifsetup{landscape}{%
- \psframe[fillstyle=solid,fillcolor=white,linestyle=none,dimen=outer]%
- (.34\slidewidth,.65\slideheight)(.84\slidewidth,.4\slideheight)%
- \psline
- (.33\slidewidth,.65\slideheight)(.85\slidewidth,.65\slideheight)%
- \psline
- (.33\slidewidth,.4\slideheight)(.85\slidewidth,.4\slideheight)%
- \psline
- (.34\slidewidth,.635\slideheight)(.34\slidewidth,.66\slideheight)%
- \psline
- (.34\slidewidth,.39\slideheight)(.34\slidewidth,.415\slideheight)%
- }{%
- \psframe[fillstyle=solid,fillcolor=white,linestyle=none,dimen=outer]%
- (.16\slidewidth,.65\slideheight)(.84\slidewidth,.4\slideheight)%
- \psline
- (.15\slidewidth,.65\slideheight)(.85\slidewidth,.65\slideheight)%
- \psline
- (.15\slidewidth,.4\slideheight)(.85\slidewidth,.4\slideheight)%
- \psline
- (.16\slidewidth,.635\slideheight)(.16\slidewidth,.66\slideheight)%
- \psline
- (.16\slidewidth,.39\slideheight)(.16\slidewidth,.415\slideheight)%
- }%
- \psline
- (.84\slidewidth,.635\slideheight)(.84\slidewidth,.66\slideheight)%
- \psline
- (.84\slidewidth,.39\slideheight)(.84\slidewidth,.415\slideheight)%
-}}
-\pddefinetemplate[wideslide]{sectionwideslide}{%
- titlehook=c,titlefont=\Large\bfseries\centering,
- titlepos={.5\slidewidth,.525\slideheight},
- titlewidth=.68\slidewidth
-}{{%
- \psset{linewidth=.8pt,linecolor=pdcolor2}%
- \psframe[fillstyle=solid,fillcolor=white,linestyle=none,dimen=outer]%
- (.16\slidewidth,.65\slideheight)(.84\slidewidth,.4\slideheight)%
- \psline
- (.15\slidewidth,.65\slideheight)(.85\slidewidth,.65\slideheight)%
- \psline
- (.15\slidewidth,.4\slideheight)(.85\slidewidth,.4\slideheight)%
- \psline
- (.16\slidewidth,.635\slideheight)(.16\slidewidth,.66\slideheight)%
- \psline
- (.16\slidewidth,.39\slideheight)(.16\slidewidth,.415\slideheight)%
- \psline
- (.84\slidewidth,.635\slideheight)(.84\slidewidth,.66\slideheight)%
- \psline
- (.84\slidewidth,.39\slideheight)(.84\slidewidth,.415\slideheight)%
-}}
-\def\pd@slidetitle#1{%
- \settowidth\@tempdima{#1}%
- \ifdim\@tempdima>\pd@@titlewidth\@tempdima\pd@@titlewidth\fi
- \psline[linewidth=.8pt,linecolor=pdcolor1](0,-.15cm)(\@tempdima,-.15cm)%
- \parbox[b]\pd@@titlewidth{#1}%
-}
-\def\pd@tochighlight#1{%
- \begin{minipage}[b]\pd@@tocwidth
- \pd@usedtocfont\color\pd@@tochltcolor#1%
- \end{minipage}%
-}
-\setkeys[pd]{section}{sectemp=sectionslide,widesectemp=sectionwideslide}
-\pdifsetup{landscape}{\def\pd@tocslide#1{{\tiny\ensuremath\bullet} #1}}{}
-\def\labelitemi{\includegraphics[scale=.02]{pawtraceorange}}
-\def\labelitemii{\includegraphics[scale=.02]{pawtracep}}
-\def\labelitemiii{\includegraphics[scale=.02]{pawmkorange}}
-\def\labelitemiv{\includegraphics[scale=.02]{pawmkpurple}}
-\pdsetup{list={labelsep=1em,leftmargin=*,itemsep=0pt,topsep=5pt,parsep=0pt}}
-\def\rmdefault{phv}
-\def\sfdefault{phv}
-\def\Hv@scale{.86}
-
-\pdsetup{lf={Style Experiment},
- rf={Tool06},
- palette=orange,
- logopos={4.5mm,.95\slideheight},%
- logocmd={\includegraphics[width=0.25\slidewidth]{clemson}}}
-
-
-\endinput
-%%
-%% End of file `powerdot-tiger.sty'.
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/powerdot/powerdot-tycja.sty new/tex/latex/powerdot/powerdot-tycja.sty
--- old/tex/latex/powerdot/powerdot-tycja.sty 2010-12-04 00:42:48.000000000 +0100
+++ new/tex/latex/powerdot/powerdot-tycja.sty 2014-01-02 23:55:32.000000000 +0100
@@ -1,7 +1,13 @@
%%
%% This is file `powerdot-tycja.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% powerdot.dtx (with options: `pdtycja')
+%%
%% ---------------------------------------------------------------
-%% Copyright (C) 2005-2010 Hendri Adriaens and Christopher Ellison
+%% Copyright (C) 2005-2014 Hendri Adriaens
%% ---------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -12,7 +18,9 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2003/12/01 or later.
%%
-%% This work has the LPPL maintenance status "unmaintained".
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% This Current Maintainer of this work is Hendri Adriaens.
%%
%% This work consists of all files listed in manifest.txt.
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/powerdot/powerdot-upen.sty new/tex/latex/powerdot/powerdot-upen.sty
--- old/tex/latex/powerdot/powerdot-upen.sty 2010-12-04 00:42:48.000000000 +0100
+++ new/tex/latex/powerdot/powerdot-upen.sty 2014-01-02 23:55:32.000000000 +0100
@@ -1,7 +1,13 @@
%%
%% This is file `powerdot-upen.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% powerdot.dtx (with options: `pdupen')
+%%
%% ---------------------------------------------------------------
-%% Copyright (C) 2005-2010 Hendri Adriaens and Christopher Ellison
+%% Copyright (C) 2005-2014 Hendri Adriaens
%% ---------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -12,7 +18,9 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2003/12/01 or later.
%%
-%% This work has the LPPL maintenance status "unmaintained".
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% This Current Maintainer of this work is Hendri Adriaens.
%%
%% This work consists of all files listed in manifest.txt.
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/powerdot/powerdot.cls new/tex/latex/powerdot/powerdot.cls
--- old/tex/latex/powerdot/powerdot.cls 2012-03-15 22:09:08.000000000 +0100
+++ new/tex/latex/powerdot/powerdot.cls 2014-01-02 23:55:32.000000000 +0100
@@ -1,12 +1,15 @@
%%
%% This is file `powerdot.cls',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% powerdot.dtx (with options: `powerdot')
%%
%% ---------------------------------------------------------------
-%% Copyright (C) 2005-2011 Hendri Adriaens and Christopher Ellison
+%% Copyright (C) 2005-2014 Hendri Adriaens
%% ---------------------------------------------------------------
%%
-%% Version 1.4i prepared by Herbert Voss
-%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
%% of this license or (at your option) any later version.
@@ -15,10 +18,15 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2003/12/01 or later.
%%
-%% This work has the LPPL maintenance status "unmaintained".
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% This Current Maintainer of this work is Hendri Adriaens.
+%%
+%% This work consists of all files listed in manifest.txt.
%%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesClass{powerdot}[2012/03/13 v1.4i powerdot presentation class (HA,CE,hv)]
+\ProvidesClass{powerdot}
+ [2014/01/01 v1.5 powerdot presentation class (HA)]
\newif\ifpd@overlay
\newif\ifpd@section
\newif\ifpd@ifsetup
@@ -139,7 +147,6 @@
\let\newcommand\def
\input{size\pd@@size.clo}
\let\newcommand\pd@tempa
-\let\Gm@showparams\@empty
\ifnum\pd@mode=2
\RequirePackage[margin=2cm,includefoot]{geometry}
\else
@@ -150,63 +157,61 @@
\ifxetex
\RequirePackage[setpagesize=false,pdfstartview=Fit,
pageanchor=false,bookmarks=false]{hyperref}[2009/12/14]
-\def\pd@pdftrans{%
- \@expandtwoargs\in@{,\pd@@trans,}{%
- ,Split,Blinds,Box,Wipe,Dissolve,Glitter,%
- Replace,Fly,Push,Cover,Uncover,Fade,}%
- \ifin@\else
- \pd@warn{Transition `\pd@@trans' might not be understood by
- your ps to pdf converter}%
- \fi
- \special{pdf:put @thispage %
- <>>>%
- }%
-}
-
-\def\pd@pdbookmark#1#2#3#4{%
- \pdfstringdef\pd@tempa{#4}%
- \special{pdf:outline
- \pd@pdb@@kmark{#1}%
- <<%
- /Title(\pd@tempa)%
- /A<<%
- /S/GoTo
- /D(slide.#3)%
+ \def\pd@pdftrans{%
+ \@expandtwoargs\in@{,\pd@@trans,}{%
+ ,Split,Blinds,Box,Wipe,Dissolve,Glitter,%
+ Replace,Fly,Push,Cover,Uncover,Fade,}%
+ \ifin@\else
+ \pd@warn{Transition `\pd@@trans' might not be understood by
+ your ps to pdf converter}%
+ \fi
+ \special{pdf:put @thispage %
+ <>>>%
+ }%
+ }
+ \def\pd@pdbookmark#1#2#3#4{%
+ \pdfstringdef\pd@tempa{#4}%
+ \special{pdf:outline
+ \pd@pdb@@kmark{#1}%
+ <<%
+ /Title(\pd@tempa)%
+ /A<<%
+ /S/GoTo
+ /D(slide.#3)%
+ >>%
>>%
- >>%
- }%
-}
+ }%
+ }
\else
- \RequirePackage[setpagesize=false,dvips,
- pdfstartview=Fit,
+ \RequirePackage[setpagesize=false,dvips,pdfstartview=Fit,%
pageanchor=false,bookmarks=false]{hyperref}
\fi
\AtBeginDocument{\def\@pdfborder{0 0 0}}
\RequirePackage{graphicx}
-\RequirePackage{pstricks}[2004/05/12]
+\RequirePackage[overlays]{pstricks}[2004/05/12]
\RequirePackage{xcolor}[2004/05/09]
\RequirePackage{enumitem}[2007/03/12]
-%% Fix for latest enumitem %%% 20110915 hv -------------------------------
\let\orig@enumerate\enumerate
\def\enumerate{\@ifnextchar[\enumerate@i{\enumerate@i[]}}
\def\enumerate@i[#1]{\@ifnextchar[{\enumerate@ii[#1]}{\enumerate@ii[#1][]}}
\def\enumerate@ii[#1][#2]{%
- \ifx\relax#1\relax\else\setkeys{enumitem}{#1}\fi%
- \orig@enumerate[#2]}
+ \ifx\relax#1\relax\else\setkeys{enumitem}{#1}\fi
+ \orig@enumerate[#2]%
+}
\let\orig@itemize\itemize
\def\itemize{\@ifnextchar[\itemize@i{\itemize@i[]}}
\def\itemize@i[#1]{\@ifnextchar[{\itemize@ii[#1]}{\itemize@ii[#1][]}}
\def\itemize@ii[#1][#2]{%
- \ifx\relax#1\relax\else\setkeys{enumitem}{#1}\fi%
- \orig@itemize[#2]}
-%
+ \ifx\relax#1\relax\else\setkeys{enumitem}{#1}\fi
+ \orig@itemize[#2]%
+}
\let\orig@description\description
\def\description{\@ifnextchar[\description@i{\description@i[]}}
\def\description@i[#1]{\@ifnextchar[{\description@ii[#1]}{\description@ii[#1][]}}
\def\description@ii[#1][#2]{%
- \ifx\relax#1\relax\else\setkeys{enumitem}{#1}\fi%
- \orig@description[#2]}
-%% -------------------------------------------------------------------------
+ \ifx\relax#1\relax\else\setkeys{enumitem}{#1}\fi
+ \orig@description[#2]%
+}
\RequirePackage{verbatim}
\ifnum\pd@mode<2
\pagestyle{empty}
@@ -238,10 +243,6 @@
^^Jletter^^J\@percentchar\@percentchar EndPaperSize
}}
\or\relax
-% \AtBeginDvi{\special{!%
-% \@percentchar\@percentchar BeginPaperSize: special
-% ^^Jletter^^J\@percentchar\@percentchar EndPaperSize
-% }}
\fi
\fi
\ifcase\pd@paper\def\@pdfpagescrop{0 0 594 842}\fi
@@ -383,9 +384,12 @@
\pd@pdifsetup\pd@@ifsetup{present,print,handout}%
\pd@pdifs@tup\pd@@ifsetup\pd@ifsetuptrue\pd@ifsetupfalse
}
-\define@choicekey*[pd]{template}{tocorient}[\pd@tempa\pd@tocorient]{v,h}{}
-\define@choicekey*[pd]{template}{stocorient}[\pd@tempa\pd@stocorient]{v,h}{}
-\define@choicekey*[pd]{template}{ntocorient}[\pd@tempa\pd@ntocorient]{v,h}{}
+\define@choicekey*[pd]{template}{tocorient}[\pd@tempa\pd@tocorient]{%
+ v,h}{}
+\define@choicekey*[pd]{template}{stocorient}[\pd@tempa\pd@stocorient]{%
+ v,h}{}
+\define@choicekey*[pd]{template}{ntocorient}[\pd@tempa\pd@ntocorient]{%
+ v,h}{}
\setkeys[pd]{template}{%
ifsetup,%
titlehook=Bl,titlepos=,titlewidth=\slidewidth,%
@@ -572,32 +576,36 @@
\stepcounter{slide}\newpage
\ifpd@overlay\addtocounter{slide}\m@ne\fi
\edef\@currentlabel{\the\c@slide}%
- \pst@Verb{InitOL /TheOL (0) def}%
- \pst@Verb{(0) BOL}%
+ \pst@Verb{tx@ovlDict begin InitOL /TheOL (0) def end}%
+ \pst@Verb{tx@ovlDict begin (0) BOL end}%
\@nameuse{pd@template@\@currenvir @options}%
\@nameuse{pd@template@\@currenvir @bg}%
\ifpd@@randomdots
- \ifpd@overlay\else\ifnum\pd@nocolors>\z@
- \let\pd@randim\@empty
- \let\pd@ranpos\@empty
- \let\pd@rancol\@empty
- \setrannum\pd@tempcnta\pd@@dmindots\pd@@dmaxdots
- \edef\pd@nodots{\the\pd@tempcnta}%
- \pd@tempcnta\z@
- \@whilesw\ifnum\pd@tempcnta<\pd@nodots\fi{%
- \advance\pd@tempcnta\@ne
- \setrandim\@tempdima\pd@@dminsize\pd@@dmaxsize
- \XKV@addtolist@x\pd@randim{\the\@tempdima}%
- \setrandim\@tempdima\pd@@dminwidth\pd@@dmaxwidth
- \setrandim\@tempdimb\pd@@dminheight\pd@@dmaxheight
- \XKV@addtolist@x\pd@ranpos{\the\@tempdima,\the\@tempdimb}%
- \setrannum\@tempcntb1\pd@nocolors
- \XKV@addtolist@x\pd@rancol{\the\@tempcntb}%
- }%
- \let\pd@trandim\pd@randim
- \let\pd@tranpos\pd@ranpos
- \let\pd@trancol\pd@rancol
- \else\let\pd@nodots\z@\fi\fi
+ \ifpd@overlay\else
+ \ifnum\pd@nocolors>\z@
+ \let\pd@randim\@empty
+ \let\pd@ranpos\@empty
+ \let\pd@rancol\@empty
+ \setrannum\pd@tempcnta\pd@@dmindots\pd@@dmaxdots
+ \edef\pd@nodots{\the\pd@tempcnta}%
+ \pd@tempcnta\z@
+ \@whilesw\ifnum\pd@tempcnta<\pd@nodots\fi{%
+ \advance\pd@tempcnta\@ne
+ \setrandim\@tempdima\pd@@dminsize\pd@@dmaxsize
+ \XKV@addtolist@x\pd@randim{\the\@tempdima}%
+ \setrandim\@tempdima\pd@@dminwidth\pd@@dmaxwidth
+ \setrandim\@tempdimb\pd@@dminheight\pd@@dmaxheight
+ \XKV@addtolist@x\pd@ranpos{\the\@tempdima,\the\@tempdimb}%
+ \setrannum\@tempcntb1\pd@nocolors
+ \XKV@addtolist@x\pd@rancol{\the\@tempcntb}%
+ }%
+ \let\pd@trandim\pd@randim
+ \let\pd@tranpos\pd@ranpos
+ \let\pd@trancol\pd@rancol
+ \else
+ \let\pd@nodots\z@
+ \fi
+ \fi
\@tempcnta\z@
\@whilesw\ifnum\@tempcnta<\pd@nodots\fi{%
\advance\@tempcnta\@ne
@@ -631,21 +639,23 @@
\fi
\fi
\ifpd@@clock
- \ifnum\c@slide=\@ne\ifpd@overlay\else
- \rput(0,-1){%
- \TextField[%
- format=\pd@startclock\pd@@clockformat\pd@@clockrefresh,%
- name=pdstartclock,bordercolor={},backgroundcolor={},%
- height=0bp,width=0bp]{}%
- }%
- \fi\fi
+ \ifnum\c@slide=\@ne
+ \ifpd@overlay\else
+ \rput(0,-1){%
+ \TextField[%
+ format=\pd@startclock\pd@@clockformat\pd@@clockrefresh,%
+ name=pdstartclock,bordercolor={},backgroundcolor={},%
+ height=0bp,width=0bp]{}%
+ }%
+ \fi
+ \fi
\def\pd@tempa##1,##2,##3\@nil{##1 ##2 ##3}%
\extractcolorspec\pd@@clockcolor\pd@tempb
\expandafter\convertcolorspec\pd@tempb{rgb}\pd@tempb
\edef\pd@tempa{\expandafter\pd@tempa\pd@tempb\@nil}%
\ifx\pd@@clockpos\@empty\else
\rput[\pd@@clockhook](\pd@@clockpos){%
- \TextField[name=pdclock.time,bordercolor={},%
+ \TextField[name=pdclock.time,bordercolor={},%
rotation={\ifnum\pd@orient=\z@ 90\else 0\fi},%
backgroundcolor={},align=\pd@@clockalign,color=\pd@tempa,%
charsize=\pd@@clockcharsize,width=\pd@@clockwidth,%
@@ -746,7 +756,6 @@
\pd@@textfont
\let\color\pd@tempa
}
-%
\def\pd@notet{0}
\pddefinetemplate{note}{%
titlepos={.04\slidewidth,.92\slideheight},%
@@ -840,13 +849,13 @@
\@ifundefined{pd@be@#1}0{\csname pd@be@#1\endcsname}%
}
\ifxetex\else
-\def\pd@pdbookmark#1#2#3#4{%
- \pdfstringdef\pd@tempa{#4}%
- \pdfmark{pdfmark=/OUT,%
- Count={\pd@pdb@@kmark{#1}},Dest={slide.#3},%
- View={/XYZ null null null},Title={\pd@tempa}%
- }%
-}
+ \def\pd@pdbookmark#1#2#3#4{%
+ \pdfstringdef\pd@tempa{#4}%
+ \pdfmark{pdfmark=/OUT,%
+ Count={\pd@pdb@@kmark{#1}},Dest={slide.#3},%
+ View={/XYZ null null null},Title={\pd@tempa}%
+ }%
+ }
\fi
\def\pdcontentsline#1#2#3{%
\ifnum\@tempcnta>\z@
@@ -1100,12 +1109,12 @@
\else
\ifcase#1\relax
\long\def\pd@tempa##1{%
- \pst@Verb{(1) BOL}%
+ \pst@Verb{tx@ovlDict begin (1) BOL end}%
\stepcounter{pd@onslidedepth}%
##1%
\addtocounter{pd@onslidedepth}\m@ne
\ifnum\c@pd@onslidedepth=\z@\ifnum\pd@currentstate=\z@
- \pst@Verb{(0) BOL}%
+ \pst@Verb{tx@ovlDict begin (0) BOL end}%
\fi\fi
}%
\or
@@ -1173,15 +1182,15 @@
\pd@closeitem
\ifx\pd@@type\pd@currenttype\else
\ifnum\pd@@type=\z@
- \pst@Verb{(1) BOL}%
+ \pst@Verb{tx@ovlDict begin (1) BOL end}%
\else
- \pst@Verb{(0) BOL}%
+ \pst@Verb{tx@ovlDict begin (0) BOL end}%
\normalcolor
\fi
\global\let\pd@currenttype\pd@@type
\fi
\ifnum\pd@currentstate=\z@
- \normalcolor\pst@Verb{(0) BOL}%
+ \normalcolor\pst@Verb{tx@ovlDict begin (0) BOL end}%
\pd@hide{#2}%
\else
\color\pd@@iacolor
@@ -1214,7 +1223,7 @@
\pd@testdisp1{#1}%
\if@tempswa\else
\ifnum\pd@@type=\z@
- \pst@Verb{(1) BOL}%
+ \pst@Verb{tx@ovlDict begin (1) BOL end}%
\else
\color\pd@@iacolor
\fi
@@ -1240,21 +1249,21 @@
\define@cmdkey{enumitem}[pd@@]{type}{}
\setkeys{enumitem}{type=0}
\ifxetex\else
-\def\pd@pdftrans{%
- \@expandtwoargs\in@{,\pd@@trans,}{%
- ,Split,Blinds,Box,Wipe,Dissolve,Glitter,%
- Replace,Fly,Push,Cover,Uncover,Fade,}%
- \ifin@\else
- \pd@warn{Transition `\pd@@trans' might not be understood by
- your ps to pdf converter}%
- \fi
- \pdfmark{%
- pdfmark=/PUT,%
- Raw={\string{ThisPage\string}%
- <> >>%
+ \def\pd@pdftrans{%
+ \@expandtwoargs\in@{,\pd@@trans,}{%
+ ,Split,Blinds,Box,Wipe,Dissolve,Glitter,%
+ Replace,Fly,Push,Cover,Uncover,Fade,}%
+ \ifin@\else
+ \pd@warn{Transition `\pd@@trans' might not be understood by
+ your ps to pdf converter}%
+ \fi
+ \pdfmark{%
+ pdfmark=/PUT,%
+ Raw={\string{ThisPage\string}%
+ <> >>%
+ }%
}%
- }%
-}
+ }
\fi
\define@cmdkeys[pd]{twocolumn}[pd@@]{%
lineheight,lfrheight,rfrheight,lcolwidth,rcolwidth,%
@@ -1549,8 +1558,9 @@
}
\fi
\def\@nameedef#1{\expandafter\edef\csname#1\endcsname}
-\def\pd@namelet#1#2{\expandafter\let\csname#1\expandafter\endcsname\csname#2\endcsname}
-%
+\def\pd@namelet#1#2{%
+ \expandafter\let\csname#1\expandafter\endcsname\csname#2\endcsname
+}
\def\pd@pop#1#2{%
\@expandtwoargs\in@{,}{#1}%
\ifin@\expandafter\pd@p@p#1\@nil#2#1\else\let#2#1\let#1\@empty\fi
@@ -1596,14 +1606,18 @@
r r moveto r r neg L r neg r neg L r neg r L
closepath stroke }%
}
-\IfFileExists{powerdot-\pd@@style.sty}
- {\RequirePackage{powerdot-\pd@@style}}
- {\pd@error{unknown style `\pd@@style'}}
+\IfFileExists{powerdot-\pd@@style.sty}{
+ \RequirePackage{powerdot-\pd@@style}
+}{
+ \pd@error{unknown style `\pd@@style'}
+}
\ifx\titleslide\@undefined
- \pd@error{`titleslide' environment not defined by style `\pd@@style'}
+ \pd@error{`titleslide' environment
+ not defined by style `\pd@@style'}
\fi
\ifx\slide\@undefined
- \pd@error{`slide' environment not defined by style `\pd@@style'}
+ \pd@error{`slide' environment not
+ defined by style `\pd@@style'}
\fi
\ifx\pd@title\@undefined\let\pd@title\@firstofone\fi
\ifx\pd@slidetitle\@undefined\let\pd@slidetitle\@firstofone\fi
@@ -1623,7 +1637,7 @@
\hskip\@tempdima
\begin{minipage}[b]\@tempdimb
\pd@usedtocfont\color\pd@@tochltcolor#1%
- \end{minipage}%3
+ \end{minipage}%
}%
}
\fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/powerdot.tlpobj new/tlpkg/tlpobj/powerdot.tlpobj
--- old/tlpkg/tlpobj/powerdot.tlpobj 2012-03-16 04:30:12.000000000 +0100
+++ new/tlpkg/tlpobj/powerdot.tlpobj 2014-01-03 03:23:38.000000000 +0100
@@ -1,6 +1,6 @@
name powerdot
category Package
-revision 25656
+revision 32549
shortdesc A presentation class.
relocated 1
longdesc Powerdot is a presentation class for LaTeX that allows for the
@@ -10,7 +10,7 @@
longdesc a handout mode. To view a presentation, DVI, PS or PDF output
longdesc can be used. A powerful template system is available to easily
longdesc develop new styles. A LyX layout file is provided.
-runfiles size=50
+runfiles size=49
RELOC/tex/latex/powerdot/powerdot-aggie.sty
RELOC/tex/latex/powerdot/powerdot-bframe.sty
RELOC/tex/latex/powerdot/powerdot-ciment.sty
@@ -27,11 +27,10 @@
RELOC/tex/latex/powerdot/powerdot-pazik.sty
RELOC/tex/latex/powerdot/powerdot-sailor.sty
RELOC/tex/latex/powerdot/powerdot-simple.sty
- RELOC/tex/latex/powerdot/powerdot-tiger.sty
RELOC/tex/latex/powerdot/powerdot-tycja.sty
RELOC/tex/latex/powerdot/powerdot-upen.sty
RELOC/tex/latex/powerdot/powerdot.cls
catalogue-ctan /macros/latex/contrib/powerdot
-catalogue-date 2012-03-13 22:44:46 +0100
+catalogue-date 2014-01-02 07:32:11 +0100
catalogue-license lppl1.3
-catalogue-version 1.4i
+catalogue-version 1.5
++++++ prerex.doc.tar.xz ++++++
++++ 6161 lines of diff (skipped)
++++++ prerex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/prerex/prerex.sty new/tex/latex/prerex/prerex.sty
--- old/tex/latex/prerex/prerex.sty 2012-08-23 01:07:19.000000000 +0200
+++ new/tex/latex/prerex/prerex.sty 2014-04-23 00:24:54.000000000 +0200
@@ -1,6 +1,6 @@
%% This is file 'prerex.sty'
%%
-%% Copyright (C) 2006-12 R. D. Tennent, rdt@cs.queensu.ca
+%% Copyright (C) 2006-14 R. D. Tennent, rdt@cs.queensu.ca
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -11,6 +11,11 @@
%% version 2003/12/01 or later.
%%
%% This work has the LPPL maintenance status "author-maintained".
+%%
+\NeedsTeXFormat{LaTeX2e}[1995/12/01]
+\ProvidesPackage{prerex}[2014/03/22 v6.6.0 LaTeX style for prerequisite charts, pgf version]
+%
+% Changelog is at the end of the file.
%
% Instructions supported inside \begin{chart} ... \end{chart}:
%
@@ -22,7 +27,7 @@
% dotted arrow: \coreq x0,y0,x1,y1: \coreqc x0,y0,x1,y1;curvature:
% dashed arrow: \recomm x0,y0,x1,y1: \recommc x0,y0,x1,y1;curvature:
%
-% \text x,y: {line of text}
+% \text x,y: {lines of text}
%
% \grid coordinate grid background
%
@@ -36,201 +41,19 @@
% \boldbox in-line bold course box
% \dottedbox in-line dotted course box
%
-% The following defaults are defined in prerex.sty (but may be re-defined by the user):
-%
-% \newcommand{\DefaultCurvature}{20}
-%
-% where the argument should be in the range 0-100; 0 means no curvature.
-%
-% \newcommand{\CourseURL}[3]{file:#3.html}
-%
-% where the arguments supplied at the call are the x and y coordinates
-% and the course code.
-%
-% \newcommand{\background}{yellow!15}
-%
-% \setlength{\unit}{5.7816pt} length of a coordinate unit; gives 10 pixels per unit at 125dpi
-% \newcommand{\dpi}{125}
-% \newcommand\PixelsPerUnit{10}
-% \setcounter{diagheight}{75} but reduced to 65 in landscape mode
-% \newcommand{\solidwidth}{0.5pt}
-% \newcommand{\dottedwidth}{0.8pt}
-% \newcommand{\dashedwidth}{0.5pt}
-% \newcommand{\boldwidth}{1.0pt}
-% \newcommand{\smallersize}{\relsize{-2}}
-% \newcommand{\baselineAdj}{-0.5ex}
-%
-% The nominal diagram width is 10 + (\textwidth divided by \unit).
-%
-\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{prerex}[2012/06/28 v6.3.4 LaTeX style for prerequisite charts, pgf version]
-
-% Changelog:
-%
-% Version 6.3.4
-%
-% Timetable and course code in bold for required boxes.
-%
-% Version 6.3.3
-%
-% Remove background colour from standalone boxes.
-% \smallersize increased to \relsize{-2}.
-%
-% Version 6.3.2
-%
-% Use pgf layers to keep grid below arrows below boxes (thanks to Ryan Kavanagh).
-% Add struts to stand-alone \...box commands.
-%
-% Version 6.3
-%
-% Allow "opt" course boxes (with dotted outlines).
-%
-% Version 6.2
-%
-% Allow for multi-line "timetable" arguments by using nested tabular environments.
-%
-% Version 6.1.0
-%
-% Added commands to specify background color of non-mini course boxes.
-%
-% Version 6.0.6
-%
-% Provide \textbullet at mid-point of edges when grid is on.
-%
-% Version 6.0.5
-%
-% Changed TARGET attribute in AREA outputs to "new".
-% New configuration command \baselineAdj.
-%
-% Version 6.0.4
-%
-% Added missing initializations of @dy to curved... macros.
-%
-% Version 6.0.3
-%
-% Added required ALT tag to AREA outputs.
-%
-% Version 6.0
-% Version 5.7
-%
-% added implementation details to documentation
-% generated script now only crops the chart image
-%
-% Version 5.6
-% Version 5.5
-%
-% version increased to keep pace with previewer/vprerex
-%
-% Version 5.4
-%
-% code clean-up
-%
-% Version 5.3
-%
-% produces an image-generating script in \jobname.sh
-%
-% Version 5.2
-%
-% use \grid and \foreach (tikz) instead of \multido
-% half-course boxes now have a minimum height (5 units) to improve uniformity
-%
-% Version 5.1
-%
-% generates image-map data in \jobname_n.html for nth chart when n>1
-%
-% Version 5.0
-%
-% also generates \jobname.html with image-map data for all node URLs
-% new configuration commands \dpi and \PixelsPerUnit
-% default \unit length adjusted to give 10 pixels per coordinate unit at 125 dpi
-%
-% Version 4.4
-%
-% increase ysep parameter to 1.8pt to separate course-code or text and arrow tails for minis
-% and text boxes
-%
-% Version 4.3
-%
-% introduce \smallersize configuration command
-%
-% Version 4.2
-%
-% using tinting with xcolor package to ease background-color changes
-%
-% Version 4.1
-%
-% Version 4.0
-%
-% Implement the \text command to place a line of text (centered at the coordinates) in a chart
-%
-% Version 3.8.1:
-%
-% adjust arraystretch factors to work with long-ascender fonts such as Futura
-% adjust inner sep parameters to work with oblique/italic fonts
-% remove workaround for pgf-1.10 bug described at
-% http://sourceforge.net/forum/forum.php?thread_id=1621660&forum_id=477363
-% require version 1.18 (or later) of pgf
-%
-% Version 3.8:
-%
-% require version 1.10 (or later) of pgf
-%
-% Version 3.7:
-%
-% anchor nodes must be non-null for latex/dvips
-%
-% Version 3.6:
-%
-% first pgf-based version
-%
-% Version 3.5:
-% Version 3.4:
-%
-% introduce arrow borders to improve the appearance of crossing arrows
-% change default widths to artifacts created when arrow borders
-% occlude box boundaries
-%
-% Version 3.3:
-%
-% arrows (as well as course boxes and minis) are hyperlinked with coordinate URIs
-%
-% Version 3.2:
-%
-% Version 3.1:
-%
-% Version 3.0:
-%
-% "anchor" hyperlinks are added to coordinate grid to allow computation of
-% chart coordinates at mouse clicks
-%
-% Version 2.0:
-%
-% CourseURL now takes 3 arguments
-% box/mini coordinates displayed in (some) PDF viewers when grid on
-%
-% Version 1.0.2:
-%
-% using \relsize{-3} rather than \scriptsize
-% using \textsf in \lightbox and \boldbox
-%
-% Version 1.0.1:
-%
-% using \RequirePackage rather than \usepackage (suggested by Herbert Voss)
+% The nominal diagram width is (\textwidth divided by \unit) + 10
%
\newlength{\unit}
-
\setlength{\unit}{5.7816pt} % 10 pixels per unit at 125dpi; 1pt = (1/72.27) in.
\newcommand{\PixelsPerUnit}{10}
\newcommand{\dpi}{125}
\RequirePackage{relsize}
\RequirePackage{calc}
-\RequirePackage{pgf}[2007/06/12]
-\RequirePackage{tikz}\usetikzlibrary{arrows}
-\RequirePackage{ifthen}
+\RequirePackage{pgf}[2013/12/18]
+\RequirePackage{tikz}\usetikzlibrary{arrows.meta}
\RequirePackage{textcomp}
-\RequirePackage{zref-savepos}
\PassOptionsToPackage{urlcolor=black,colorlinks,raiselinks}{hyperref}
\RequirePackage{hyperref}
@@ -240,16 +63,20 @@
\definecolor{verylight}{gray}{0.85}
\definecolor{white}{rgb}{1.0,1.0,1.0} % not transparent, hides grid
+\newcommand{\DefaultCurvature}{20}
+% where the argument should be in the range 0-100; 0 means no curvature.
+
+\newcommand{\CourseURL}[3]{#3.html}
+% where the arguments supplied at the call are the x and y coordinates
+% and the course code.
-\newcommand{\DefaultCurvature}{20} % 0 for no curvature
-\newcommand{\CourseURL}[3]{file:#3.html}
\newcommand{\background}{yellow!15}
\newcommand{\solidwidth}{0.5pt}
\newcommand{\boldwidth}{1.0pt}
\newcommand{\dottedwidth}{0.8pt}
\newcommand{\dashedwidth}{0.5pt}
-\newcommand{\smallersize}{\relsize{-2}}
+\newcommand{\smallersize}{\relsize{-3}}
\newcommand{\baselineAdj}{-0.5ex}
\newcounter{@myangle}
@@ -272,63 +99,39 @@
\setcounter{diagheight}{65}
\fi
-\newcounter{chart} % in case there is more than one chart in the document
-\newcounter{xNW}\newcounter{yNW} % coordinates of NW corner of a node
-\newcounter{xSE}\newcounter{ySE} % coordinates of SE corner of a node
-
\def\@unitmult{\unit * 5} % used for the grid and as the minimum height of half-course boxes
-\def\@outputImapData#1,#2:#3#4#5{%
-% #1,#2 coordinates
-% #3 URL
-% #4 horizontal delta
-% #5 vertical delta
-%
-\setcounter{xNW}{\dpi * \ratio{\zposx{gridOrigin_\thechart}sp}{1in}}% # of pixels from left edge to origin
-\addtocounter{xNW}{(#1-#4)*\PixelsPerUnit}% add # pixels from origin to node (-#4 units)
-\setcounter{xSE}{\dpi * \ratio{\zposx{gridOrigin_\thechart}sp}{1in}}%
-\addtocounter{xSE}{(#1+#4)*\PixelsPerUnit}% add # pixels from origin to node (+#4 units)
-
-\setcounter{yNW}{ \dpi * \ratio{\paperheight}{1in}} % # of pixels for the whole page
-\addtocounter{yNW}{ 0 - \dpi * \ratio{\zposy{gridOrigin_\thechart}sp}{1in}} % subtract # pixels from bottom edge to origin
-\addtocounter{yNW}{0 - (#2 - #5) * \PixelsPerUnit } % subtract # of pixels from origin to node (-#5)
-\setcounter{ySE}{ \dpi * \ratio{\paperheight}{1in}}
-\addtocounter{ySE}{0 - \dpi * \ratio{\zposy{gridOrigin_\thechart}sp}{1in}}
-\addtocounter{ySE}{0 - (#2 + #5) * \PixelsPerUnit } % subtract # of pixels from origin to node (+#5)
-
-\immediate\write\@imapfile{<area shape=rect coords="\thexNW,\theyNW,\thexSE,\theySE" href="\CourseURL{#1}{#2}{#3}" target="new" alt="#3">}%
-}
-
\pgfsetlayers{}
+
\def\solidarrow{%
\tikz[x=\unit,y=\unit,baseline=\baselineAdj]
-\draw[-latex',line width =\solidwidth] (0,0) -- (4,0);
+\draw[-{Latex[length=4pt]},line width =\solidwidth] (0,0) -- (4,0);
}
\def\dottedarrow{%
\tikz[x=\unit,y=\unit,baseline=\baselineAdj]
-\draw[loosely dotted,line width=\dottedwidth,-latex'] (0,0) -- (4,0);
+\draw[-{Latex[length=4pt]},loosely dotted,line width=\dottedwidth] (0,0) -- (4,0);
}
\def\dashedarrow{%
\tikz[x=\unit,y=\unit,baseline=\baselineAdj]
-\draw[dashed,line width=\dashedwidth,-latex'] (0,0) -- (4,0);
+\draw[-{Latex[length=4pt]},dashed,line width=\dashedwidth] (0,0) -- (4,0);
}
\def\lightbox{%
\tikz[thin,baseline=\baselineAdj]\node[draw,rounded corners=2pt,inner xsep=1.8pt]
-{\rule[-2pt]{0pt}{4pt}\textsf{light}};
+{\rule[-2pt]{0pt}{4pt}light};
}
\def\boldbox{%
\tikz[baseline=\baselineAdj]\node[draw,line width=\boldwidth,rounded corners=2pt,inner xsep=1.8pt]
-{\rule[-2pt]{0pt}{4pt}\textsf{\textbf{bold}}};
+{\rule[-2pt]{0pt}{4pt}\bfseries bold};
}
\def\dottedbox{%
\tikz[baseline=\baselineAdj]\node[draw,dotted,line width=\boldwidth,rounded corners=2pt,inner xsep=1.8pt]
-{\rule[-2pt]{0pt}{4pt}\textsf{dotted}};
+{\rule[-2pt]{0pt}{4pt}dotted};
}
\pgfdeclarelayer{arrows}
@@ -338,8 +141,8 @@
\def\@halfcourse#1,#2:#3#4#5{%
\begin{pgfonlayer}{courses}%
-\node[draw,thin,fill=\background,rounded corners=2pt,inner ysep=0.5pt,minimum height=\@unitmult](x#1y#2) at (#1,#2)%
-{\fontfamily{\sfdefault}\selectfont
+\node[draw,thin,fill=\background,minimum height=\@unitmult](x#1y#2) at (#1,#2)%
+{
\renewcommand{\arraystretch}{0.8}%
\href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
{\smallersize#3}%
@@ -348,14 +151,13 @@
\\ #4%
\end{tabular}}%
};%
-\@outputImapData#1,#2:{#3}{4}{2}%
\end{pgfonlayer}%
}
\def\@halfcoursec#1,#2:#3#4#5#6{%
\begin{pgfonlayer}{courses}%
-\node[draw,thin,fill=#6,rounded corners=2pt,inner ysep=0.5pt,minimum height=\@unitmult](x#1y#2) at (#1,#2)%
-{\fontfamily{\sfdefault}\selectfont
+\node[draw,thin,fill=#6,minimum height=\@unitmult](x#1y#2) at (#1,#2)%
+{
\renewcommand{\arraystretch}{0.8}%
\href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
{\smallersize\selectfont{#3}}%
@@ -364,47 +166,44 @@
\\ #4%
\end{tabular}}%
};%
-\@outputImapData#1,#2:{#3}{4}{2}%
\end{pgfonlayer}%
}
\def\@reqhalfcourse#1,#2:#3#4#5{%
\begin{pgfonlayer}{courses}%
-\node[draw,line width=\boldwidth,fill=\background,rounded corners=2pt,inner ysep=0.5pt,minimum height=\@unitmult](x#1y#2) at (#1,#2)%
-{\fontfamily{\sfdefault}\fontseries{\bfdefault}\selectfont
+\node[draw,line width=\boldwidth,fill=\background,minimum height=\@unitmult](x#1y#2) at (#1,#2)%
+{
\renewcommand{\arraystretch}{0.8}%
\href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
-{\smallersize\fontseries{\bfdefault}\selectfont#3}%
+{\smallersize\bfseries#3}%
\,\hfill\,%
-{\smallersize\fontseries{\bfdefault}\selectfont\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
+{\smallersize\bfseries\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
\\ #4%
\end{tabular}%
}};%
-\@outputImapData#1,#2:{#3}{4}{2}%
\end{pgfonlayer}%
}
\def\@reqhalfcoursec#1,#2:#3#4#5#6{%
\begin{pgfonlayer}{courses}%
-\node[draw,line width=\boldwidth,fill=#6,rounded corners=2pt,inner ysep=0.5pt,minimum height=\@unitmult](x#1y#2) at (#1,#2)%
-{\fontfamily{\sfdefault}\fontseries{\bfdefault}\selectfont
+\node[draw,line width=\boldwidth,fill=#6,minimum height=\@unitmult](x#1y#2) at (#1,#2)%
+{
\renewcommand{\arraystretch}{0.8}%
\href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
-{\smallersize\fontseries{\bfdefault}\selectfont#3}%
+{\smallersize\bfseries#3}%
\,\hfill\,%
-{\smallersize\fontseries{\bfdefault}\selectfont\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
+{\smallersize\bfseries\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
\\ #4%
\end{tabular}%
}};%
-\@outputImapData#1,#2:{#3}{4}{2}%
\end{pgfonlayer}%
}
\def\@opthalfcourse#1,#2:#3#4#5{%
\begin{pgfonlayer}{courses}%
-\node[draw,dotted,line width=\boldwidth,fill=\background,rounded corners=2pt,inner ysep=0.5pt,minimum height=\@unitmult](x#1y#2) at (#1,#2)%
-{\fontfamily{\sfdefault}\selectfont
+\node[draw,dotted,line width=\boldwidth,fill=\background,minimum height=\@unitmult](x#1y#2) at (#1,#2)%
+{
\renewcommand{\arraystretch}{0.8}%
\href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
{\smallersize#3}%
@@ -413,14 +212,13 @@
\\ #4%
\end{tabular}}%
};%
-\@outputImapData#1,#2:{#3}{4}{2}%
\end{pgfonlayer}%
}
\def\@opthalfcoursec#1,#2:#3#4#5#6{%
\begin{pgfonlayer}{courses}%
-\node[draw,dotted,line width=\boldwidth,fill=#6,rounded corners=2pt,inner ysep=0.5pt,minimum height=\@unitmult](x#1y#2) at (#1,#2)%
-{\fontfamily{\sfdefault}\selectfont
+\node[draw,dotted,line width=\boldwidth,fill=#6,minimum height=\@unitmult](x#1y#2) at (#1,#2)%
+{
\renewcommand{\arraystretch}{0.8}%
\href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
{\smallersize#3}%
@@ -429,14 +227,13 @@
\\ #4%
\end{tabular}}%
};%
-\@outputImapData#1,#2:{#3}{4}{2}%
\end{pgfonlayer}%
}
\def\@fullcourse#1,#2:#3#4#5{%
\begin{pgfonlayer}{courses}%
-\node[draw,thin,fill=\background,rounded corners=2pt,inner ysep=0.5pt](x#1y#2) at (#1,#2)%
-{\fontfamily{\sfdefault}\selectfont
+\node[draw,thin,fill=\background](x#1y#2) at (#1,#2)%
+{
\renewcommand{\arraystretch}{1.7}%
\href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
{\smallersize#3}%
@@ -445,14 +242,13 @@
\\ #4%
\end{tabular}}%
};%
-\@outputImapData#1,#2:{#3}{4}{5}%
\end{pgfonlayer}%
}
\def\@fullcoursec#1,#2:#3#4#5#6{%
\begin{pgfonlayer}{courses}%
-\node[draw,thin,fill=#6,rounded corners=2pt,inner ysep=0.5pt](x#1y#2) at (#1,#2)%
-{\fontfamily{\sfdefault}\selectfont
+\node[draw,thin,fill=#6](x#1y#2) at (#1,#2)%
+{
\renewcommand{\arraystretch}{1.7}%
\href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
{\smallersize#3}%
@@ -462,45 +258,42 @@
\end{tabular}}%
};%
\end{pgfonlayer}%
-\@outputImapData#1,#2:{#3}{4}{5}%
}
\def\@reqfullcourse#1,#2:#3#4#5{%
\begin{pgfonlayer}{courses}%
-\node[draw,line width=\boldwidth,fill=\background,rounded corners=2pt,inner ysep=0.5pt](x#1y#2) at (#1,#2)%
-{\fontfamily{\sfdefault}\fontseries{\bfdefault}\selectfont
+\node[draw,line width=\boldwidth,fill=\background](x#1y#2) at (#1,#2)%
+{
\renewcommand{\arraystretch}{1.7}%
\href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
-{\smallersize\fontseries{\bfdefault}\selectfont#3}%
+{\smallersize\bfseries#3}%
\,\hfill\,%
-{\smallersize\fontseries{\bfdefault}\selectfont\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
+{\smallersize\bfseries\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
\\ #4%
\end{tabular}}%
};%
-\@outputImapData#1,#2:{#3}{4}{5}%
\end{pgfonlayer}%
}
\def\@reqfullcoursec#1,#2:#3#4#5#6{%
\begin{pgfonlayer}{courses}%
-\node[draw,line width=\boldwidth,fill=#6,rounded corners=2pt,inner ysep=0.5pt](x#1y#2) at (#1,#2)%
-{\fontfamily{\sfdefault}\fontseries{\bfdefault}\selectfont
+\node[draw,line width=\boldwidth,fill=#6](x#1y#2) at (#1,#2)%
+{
\renewcommand{\arraystretch}{1.7}%
\href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
-{\smallersize\fontseries{\bfdefault}\selectfont#3}%
+{\smallersize\bfseries#3}%
\,\hfill\,%
-{\smallersize\fontseries{\bfdefault}\selectfont\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
+{\smallersize\bfseries\renewcommand{\arraystretch}{0.5}\begin{tabular}[t]{@{}r@{}}#5\end{tabular}}%
\\ #4%
\end{tabular}}%
};%
-\@outputImapData#1,#2:{#3}{4}{5}%
\end{pgfonlayer}%
}
\def\@fullcoursec#1,#2:#3#4#5#6{%
\begin{pgfonlayer}{courses}%
-\node[draw,thin,fill=#6,rounded corners=2pt,inner ysep=0.5pt](x#1y#2) at (#1,#2)%
-{\fontfamily{\sfdefault}\selectfont
+\node[draw,thin,fill=#6](x#1y#2) at (#1,#2)%
+{
\renewcommand{\arraystretch}{1.7}%
\href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
{\smallersize#3}%
@@ -509,14 +302,13 @@
\\ #4%
\end{tabular}}%
};%
-\@outputImapData#1,#2:{#3}{4}{5}%
\end{pgfonlayer}%
}
\def\@optfullcourse#1,#2:#3#4#5{%
\begin{pgfonlayer}{courses}%
-\node[draw,dotted,line width=\boldwidth,fill=\background,rounded corners=2pt,inner ysep=0.5pt](x#1y#2) at (#1,#2)%
-{\fontfamily{\sfdefault}\selectfont
+\node[draw,dotted,line width=\boldwidth,fill=\background](x#1y#2) at (#1,#2)%
+{
\renewcommand{\arraystretch}{1.7}%
\href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
{\smallersize#3}%
@@ -525,15 +317,14 @@
\\ #4%
\end{tabular}}%
};%
-\@outputImapData#1,#2:{#3}{4}{5}%
\end{pgfonlayer}%
}
\def\@optfullcoursec#1,#2:#3#4#5#6{%
\begin{pgfonlayer}{courses}%
-\node[draw,dotted,line width=\boldwidth,fill=#6,rounded corners=2pt,inner ysep=0.5pt](x#1y#2) at (#1,#2)%
-{\fontfamily{\sfdefault}\selectfont
+\node[draw,dotted,line width=\boldwidth,fill=#6](x#1y#2) at (#1,#2)%
+{
\renewcommand{\arraystretch}{1.7}%
\href{\CourseURL{#1}{#2}{#3}}{\begin{tabular}{@{\hspace{1pt}}c@{\hspace{1pt}}}%
{\smallersize#3}%
@@ -542,24 +333,22 @@
\\ #4%
\end{tabular}}%
};%
-\@outputImapData#1,#2:{#3}{4}{5}%
\end{pgfonlayer}%
}
\def\@mini#1,#2:#3{%
\begin{pgfonlayer}{courses}%
\ifgridon
- \node[fill=white,draw=white,inner ysep=1.8pt](x#1y#2) at (#1,#2)%
- {\fontfamily{\sfdefault}\selectfont
+ \node[fill=white,draw=white](x#1y#2) at (#1,#2)%
+ {
\href{\CourseURL{#1}{#2}{#3}}{%
- {\smallersize#3}}};%
+ {\smallersize\mdseries#3}}};%
\else
- \node[fill=none,draw=none,inner ysep=1.8pt](x#1y#2) at (#1,#2)%
- {\fontfamily{\sfdefault}\selectfont
+ \node[fill=none,draw=none](x#1y#2) at (#1,#2)%
+ {
\href{\CourseURL{#1}{#2}{#3}}{%
- {\smallersize#3}}};%
+ {\smallersize\mdseries#3}}};%
\fi
-\@outputImapData#1,#2:{#3}{2}{1}%
\end{pgfonlayer}%
}
@@ -567,10 +356,10 @@
% include coordinates if grid on, but don't hyperlink if grid off
\begin{pgfonlayer}{courses}%
\ifgridon
- \node[fill=white,draw=white,inner ysep=1.8pt](x#1y#2) at (#1,#2)%
-{\href{coord: #1,#2}{\mbox{#3}}};%
+ \node[fill=white,draw=white](x#1y#2) at (#1,#2)%
+{\href{coord: #1,#2}{\sffamily\mdseries\renewcommand{\arraystretch}{0.5}\begin{tabular}[b]{@{}c@{}}#3\\[-0.4ex]\end{tabular}}};%
\else
- \node[fill=none,draw=none,inner ysep=1.8pt](x#1y#2) at (#1,#2){\mbox{#3}};%
+ \node[fill=none,draw=none](x#1y#2) at (#1,#2){\sffamily\mdseries\renewcommand{\arraystretch}{0.5}\begin{tabular}[b]{@{}c@{}}#3\\[-0.4ex]\end{tabular}};%
\fi
\end{pgfonlayer}%
}
@@ -643,11 +432,10 @@
\def\@straight#1,#2,#3,#4:{%
\begin{pgfonlayer}{arrows}
\draw[draw=white,line width=1.5pt](x#1y#2) -- (x#3y#4) ;
- \draw[-latex',draw=white,very thin](x#1y#2) -- (x#3y#4) ;
\ifgridon
- \draw[line width=\solidwidth](x#1y#2) -- node[anchor=mid] {\href{coord: #1,#2,#3,#4}{\textbullet}} (x#3y#4);
+ \draw[->,line width=\solidwidth](x#1y#2) -- node[anchor=mid] {\href{coord: #1,#2,#3,#4}{\textbullet}} (x#3y#4);
\else
- \draw[line width=\solidwidth](x#1y#2) -- (x#3y#4) ;
+ \draw[->,line width=\solidwidth](x#1y#2) -- (x#3y#4) ;
\fi
\end{pgfonlayer}
}
@@ -666,11 +454,10 @@
\setcounter{@inangle}{180 - \the@myangle}
\begin{pgfonlayer}{arrows}
\draw[draw=white,line width=1.5pt](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ;
- \draw[-latex',draw=white,very thin](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ;
\ifgridon
- \draw[line width=\solidwidth](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] node[anchor=mid] {\href{coord: #1,#2,#3,#4}{\textbullet}} (x#3y#4) ;
+ \draw[->,line width=\solidwidth](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] node[anchor=mid] {\href{coord: #1,#2,#3,#4}{\textbullet}} (x#3y#4) ;
\else
- \draw[line width=\solidwidth](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ;
+ \draw[->,line width=\solidwidth](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ;
\fi
\end{pgfonlayer}
}
@@ -678,11 +465,10 @@
\def\@straightDashed#1,#2,#3,#4:{%
\begin{pgfonlayer}{arrows}
\draw[draw=white,line width=1.5pt] (x#1y#2) -- (x#3y#4);
-\draw[-latex',draw=white,very thin] (x#1y#2) -- (x#3y#4);
\ifgridon
- \draw[dashed,line width=\dashedwidth] (x#1y#2) -- node[anchor=mid] {\href{coord: #1,#2,#3,#4}{\textbullet}} (x#3y#4) ;
+ \draw[->,dashed,line width=\dashedwidth] (x#1y#2) -- node[anchor=mid] {\href{coord: #1,#2,#3,#4}{\textbullet}} (x#3y#4) ;
\else
- \draw[dashed,line width=\dashedwidth] (x#1y#2) -- (x#3y#4);
+ \draw[->,dashed,line width=\dashedwidth] (x#1y#2) -- (x#3y#4);
\fi
\end{pgfonlayer}
}
@@ -700,11 +486,10 @@
\setcounter{@inangle}{180 - \the@myangle}
\begin{pgfonlayer}{arrows}
\draw[draw=white,line width=1.5pt](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ;
- \draw[-latex',draw=white,very thin](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ;
\ifgridon
- \draw[dashed,line width=\dashedwidth](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] node[anchor=mid] {\href{coord: #1,#2,#3,#4}{\textbullet}} (x#3y#4);
+ \draw[->,dashed,line width=\dashedwidth](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] node[anchor=mid] {\href{coord: #1,#2,#3,#4}{\textbullet}} (x#3y#4);
\else
- \draw[dashed,line width=\dashedwidth](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4);
+ \draw[->,dashed,line width=\dashedwidth](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4);
\fi
\end{pgfonlayer}
}
@@ -712,11 +497,10 @@
\def\@straightDotted#1,#2,#3,#4:{%
\begin{pgfonlayer}{arrows}
\draw[draw=white,line width=1.5pt] (x#1y#2) -- (x#3y#4);
- \draw[-latex',draw=white,very thin] (x#1y#2) -- (x#3y#4);
\ifgridon
- \draw[loosely dotted,line width=\dottedwidth] (x#1y#2) -- node[anchor=mid] {\href{coord: #1,#2,#3,#4}{\textbullet}} (x#3y#4) ;
+ \draw[->,loosely dotted,line width=\dottedwidth] (x#1y#2) -- node[anchor=mid] {\href{coord: #1,#2,#3,#4}{\textbullet}} (x#3y#4) ;
\else
- \draw[loosely dotted,line width=\dottedwidth] (x#1y#2) -- (x#3y#4);
+ \draw[->,loosely dotted,line width=\dottedwidth] (x#1y#2) -- (x#3y#4);
\fi
\end{pgfonlayer}
}
@@ -734,11 +518,10 @@
\setcounter{@inangle}{180 - \the@myangle}
\begin{pgfonlayer}{arrows}
\draw[draw=white,line width=1.5pt](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ;
- \draw[-latex',draw=white,very thin](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ;
\ifgridon
- \draw[loosely dotted,line width=\dottedwidth](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] node[anchor=mid] {\href{coord: #1,#2,#3,#4}{\textbullet}} (x#3y#4) ;
+ \draw[->,loosely dotted,line width=\dottedwidth](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] node[anchor=mid] {\href{coord: #1,#2,#3,#4}{\textbullet}} (x#3y#4) ;
\else
- \draw[loosely dotted,line width=\dottedwidth](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ;
+ \draw[->,loosely dotted,line width=\dottedwidth](x#1y#2) to[out=\the@myangle,in=\the@inangle,relative] (x#3y#4) ;
\fi
\end{pgfonlayer}
}
@@ -753,16 +536,16 @@
\draw[line width=0.4pt,draw=somewhatlight] (0,0) grid [step=5] (\value{@gridright},\value{@gridtop});
\foreach \i in {0,10,...,\value{@gridright}}
- \node at (\i,-4){\mbox{\textsf{\small \i}}};
+ \node at (\i,-4){\small \i};
\foreach \i in {0,10,...,\value{@gridtop}}
- \node at (-5,\i){\mbox{\textsf{\small \i}}};
+ \node at (-5,\i){\small \i};
\foreach \i in {0,10,...,\value{@gridright}}
- \node at (\i,\value{@gridtop}+4){\mbox{\textsf{\small \i}}};
+ \node at (\i,\value{@gridtop}+4){\small \i};
\foreach \i in {0,10,...,\value{@gridtop}}
- \node at (\value{@gridright}+5,\i){\mbox{\textsf{\small \i}}};
+ \node at (\value{@gridright}+5,\i){\small \i};
% anchors are to allow computation of coordinates from mouse clicks in kpdf/okular:
% latex/dvips requires non-null href box
@@ -782,16 +565,6 @@
\newenvironment{chart}
{ \setcounter{@diagwidth}{10 + 1 * \ratio{\textwidth}{\unit}}
- \newwrite\@imapfile % image-map data
- \newwrite\@scriptfile % shell script to generate image file
- \ifthenelse{\value{chart} = 0}
- { \immediate\openout\@imapfile=\jobname.map
- \immediate\write\@imapfile{<map name="\jobname">}
- }
- { \immediate\openout\@imapfile=\jobname_\thechart.map
- \immediate\write\@imapfile{<map name="\jobname_\thechart">}
- }
-
\let\halfcourse=\@halfcourse
\let\halfcoursec=\@halfcoursec
\let\reqhalfcourse=\@reqhalfcourse
@@ -813,46 +586,200 @@
\let\recomm=\@recomm
\let\recommc=\@recommc
\let\grid=\@grid
- \begin{tikzpicture}[x=\unit,y=\unit]
- \tikzstyle{every rectangle node}=[inner xsep=1.8pt]
+ \begin{tikzpicture}[x=\unit,y=\unit,>={Latex[length=4pt,fill=black]}]
+ \tikzstyle{every rectangle node}=[inner xsep=1.8pt,rounded corners=2pt,inner ysep=0.5pt]
\setcounter{@gridwidth}{(\the@diagwidth-5) / 10}
\setcounter{@gridright}{10 * \value{@gridwidth}}
\setcounter{@gridheight}{\thediagheight / 10}
\setcounter{@gridtop}{10 * \value{@gridheight} }
\useasboundingbox (0,-2) rectangle (\value{@gridright},\value{@gridtop});
- node at (0,0) {\kern1sp\zsavepos{gridOrigin_\thechart}};
- % access absolute page coordinates of the origin using \zposx and \zposy
}
{
\end{tikzpicture}
- \write\@imapfile{</map>}
- \closeout\@imapfile
- \zsavepos{EndOfChart_\thechart} % determine cropping coordinates
- \ifdim\paperwidth<\paperheight
- % portrait mode
- \setcounter{xSE}{\dpi * \ratio{\zposx{EndOfChart_\thechart}sp}{1in}}%
- \setcounter{ySE}{ \dpi * \ratio{\paperheight}{1in}}
- \addtocounter{ySE}{0 - \dpi * \ratio{\zposy{EndOfChart_\thechart}sp}{1in}}
- \addtocounter{ySE}{0 + 2 * \PixelsPerUnit } % bottom margin
- \else
- % landscape mode
- \setcounter{xSE}{ \dpi * \ratio{\paperwidth}{1in}}
- \addtocounter{xSE}{0 - \dpi * \ratio{\zposx{EndOfChart_\thechart}sp}{1in}}%
- \addtocounter{xSE}{0 + 2 * \PixelsPerUnit } % bottom margin
- \setcounter{ySE}{ \dpi * \ratio{\paperheight}{1in}}
- \addtocounter{ySE}{ 0 - \dpi * \ratio{\zposy{EndOfChart_\thechart}sp}{1in}}
- \fi
- \edef\HasH{\expandafter\@gobble\string\#}
- \ifthenelse{\value{chart} = 0}
- { % generate a script to crop a chart image
- \immediate\openout\@scriptfile=\jobname.sh
- \immediate\write\@scriptfile{\HasH!/bin/sh}
- % defer remaining output till cropping coordinates are available
- \write\@scriptfile{mogrify -crop \thexSE x\theySE +0+0 \jobname.png}
- \write\@scriptfile{exit 0}
- \closeout\@scriptfile
- }
- { % more than one chart; unlikely a script would be usable
- }
- \stepcounter{chart}
}
+%
+% Changelog:
+%
+% Version 6.6.0
+%
+% remove code to generate \jobname.map and \jobname.sh files
+%
+% Version 6.5.1
+%
+% undid generation of \jobname.dat file: SVG images (with clickable links)
+% can be generated by latest versions of pdf2svg (0.2.3) or dvisvgm (1.5.3)
+%
+% Version 6.5.0
+%
+% pdflatex processing now generates an auxiliary file \jobname.dat of link data
+% for use with a SVG image
+%
+% Version 6.4.1
+%
+% Set length=4pt for arrow tips in tikzpicture options.
+% Remove dependence on the ifthen package.
+% Generate map and cropping script only for pdf output.
+%
+% Version 6.4.0
+%
+% Revise arrows for tikz version 3.0.0
+%
+% Version 6.3.6
+%
+% Allow line breaks in \text boxes.
+%
+% Version 6.3.5
+%
+% Fix font usage to work with mweights.sty.
+%
+% Version 6.3.4
+%
+% Timetable and course code in bold for required boxes.
+%
+% Version 6.3.3
+%
+% Remove background colour from standalone boxes.
+% \smallersize increased to \relsize{-2}.
+%
+% Version 6.3.2
+%
+% Use pgf layers to keep grid below arrows below boxes (thanks to Ryan Kavanagh).
+% Add struts to stand-alone \...box commands.
+%
+% Version 6.3
+%
+% Allow "opt" course boxes (with dotted outlines).
+%
+% Version 6.2
+%
+% Allow for multi-line "timetable" arguments by using nested tabular environments.
+%
+% Version 6.1.0
+%
+% Added commands to specify background color of non-mini course boxes.
+%
+% Version 6.0.6
+%
+% Provide \textbullet at mid-point of edges when grid is on.
+%
+% Version 6.0.5
+%
+% Changed TARGET attribute in AREA outputs to "new".
+% New configuration command \baselineAdj.
+%
+% Version 6.0.4
+%
+% Added missing initializations of @dy to curved... macros.
+%
+% Version 6.0.3
+%
+% Added required ALT tag to AREA outputs.
+%
+% Version 6.0
+% Version 5.7
+%
+% added implementation details to documentation
+% generated script now only crops the chart image
+%
+% Version 5.6
+% Version 5.5
+%
+% version increased to keep pace with previewer/vprerex
+%
+% Version 5.4
+%
+% code clean-up
+%
+% Version 5.3
+%
+% produces an image-generating script in \jobname.sh
+%
+% Version 5.2
+%
+% use \grid and \foreach (tikz) instead of \multido
+% half-course boxes now have a minimum height (5 units) to improve uniformity
+%
+% Version 5.1
+%
+% generates image-map data in \jobname_n.html for nth chart when n>1
+%
+% Version 5.0
+%
+% also generates \jobname.html with image-map data for all node URLs
+% new configuration commands \dpi and \PixelsPerUnit
+% default \unit length adjusted to give 10 pixels per coordinate unit at 125 dpi
+%
+% Version 4.4
+%
+% increase ysep parameter to 1.8pt to separate course-code or text and arrow tails for minis
+% and text boxes
+%
+% Version 4.3
+%
+% introduce \smallersize configuration command
+%
+% Version 4.2
+%
+% using tinting with xcolor package to ease background-color changes
+%
+% Version 4.1
+%
+% Version 4.0
+%
+% Implement the \text command to place a line of text (centered at the coordinates) in a chart
+%
+% Version 3.8.1:
+%
+% adjust arraystretch factors to work with long-ascender fonts such as Futura
+% adjust inner sep parameters to work with oblique/italic fonts
+% remove workaround for pgf-1.10 bug described at
+% http://sourceforge.net/forum/forum.php?thread_id=1621660&forum_id=477363
+% require version 1.18 (or later) of pgf
+%
+% Version 3.8:
+%
+% require version 1.10 (or later) of pgf
+%
+% Version 3.7:
+%
+% anchor nodes must be non-null for latex/dvips
+%
+% Version 3.6:
+%
+% first pgf-based version
+%
+% Version 3.5:
+% Version 3.4:
+%
+% introduce arrow borders to improve the appearance of crossing arrows
+% change default widths to artifacts created when arrow borders
+% occlude box boundaries
+%
+% Version 3.3:
+%
+% arrows (as well as course boxes and minis) are hyperlinked with coordinate URIs
+%
+% Version 3.2:
+%
+% Version 3.1:
+%
+% Version 3.0:
+%
+% "anchor" hyperlinks are added to coordinate grid to allow computation of
+% chart coordinates at mouse clicks
+%
+% Version 2.0:
+%
+% CourseURL now takes 3 arguments
+% box/mini coordinates displayed in (some) PDF viewers when grid on
+%
+% Version 1.0.2:
+%
+% using \relsize{-3} rather than \scriptsize
+% using \textsf in \lightbox and \boldbox
+%
+% Version 1.0.1:
+%
+% using \RequirePackage rather than \usepackage (suggested by Herbert Voss)
+%
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/prerex.tlpobj new/tlpkg/tlpobj/prerex.tlpobj
--- old/tlpkg/tlpobj/prerex.tlpobj 2012-08-23 04:33:44.000000000 +0200
+++ new/tlpkg/tlpobj/prerex.tlpobj 2014-04-24 03:24:24.000000000 +0200
@@ -1,19 +1,18 @@
name prerex
category Package
-revision 27495
+revision 33642
shortdesc Interactive editor and macro support for prerequisite charts.
relocated 1
longdesc This package consists of prerex.sty, a LaTeX package for
longdesc producing charts of course nodes linked by arrows representing
longdesc pre- and co-requisites, and prerex, an interactive program for
longdesc creating and editing chart descriptions. The implementation of
-longdesc prerex.sty is built on PGF, so that it may be used equally
-longdesc happily with latex or pdflatex; prerex itself is written in C.
-longdesc The package includes source code for a previewer application, a
+longdesc prerex.sty uses PGF, so that it may be used equally happily
+longdesc with latex or pdflatex; prerex itself is written in C. The
+longdesc package includes source code for a previewer application, a
longdesc lightweight Qt-4 and poppler-based prerex-enabled PDF viewer.
-runfiles size=7
+runfiles size=6
RELOC/tex/latex/prerex/prerex.sty
catalogue-ctan /graphics/prerex
-catalogue-date 2012-08-22 19:18:22 +0200
+catalogue-date 2014-04-23 07:43:02 +0200
catalogue-license gpl
-catalogue-version 6.5.2
++++++ preview.doc.tar.xz ++++++
++++++ preview.tar.xz ++++++
++++++ progressbar.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/progressbar/README new/doc/latex/progressbar/README
--- old/doc/latex/progressbar/README 2013-01-07 00:58:34.000000000 +0100
+++ new/doc/latex/progressbar/README 2014-05-04 23:43:59.000000000 +0200
@@ -9,13 +9,14 @@
Changelog
=========
+2014/05/04 v.1.0b~4: version control for kvoptions updated (for unknown reason required version didn't exist)
2013/01/06 v.1.0b~3: replaced \progressbar@LoadFile@IfExist with \RequirePackage
2012/02/18 v.1.0b~2: added version control for kvoptions
2010/10/02 v1.0b: first release - all basic functionality
License
=======
-Copyright 2012 Marcel Jira
+Copyright 2010-2014 Marcel Jira
This work may be distributed and/or modified under the conditions of the LaTeX
Project Public License, either version 1.3c of this license or (at your option)
Files old/doc/latex/progressbar/progressbar.pdf and new/doc/latex/progressbar/progressbar.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/progressbar/progressbar.tex new/doc/latex/progressbar/progressbar.tex
--- old/doc/latex/progressbar/progressbar.tex 2013-01-07 00:58:34.000000000 +0100
+++ new/doc/latex/progressbar/progressbar.tex 2014-05-04 23:43:59.000000000 +0200
@@ -1,5 +1,5 @@
%% progressbar.tex
-%% Copyright 2010-2013 Marcel Jira
+%% Copyright 2010-2014 Marcel Jira
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -224,6 +224,8 @@
\section{Changelog}
\begin{tabbing}
+\texttt{2014/05/04 v.1.0b\~{}4} \= version control for kvoptions updated (for unknown\\ \>
+reason required version didn't exist)\\
\texttt{2013/01/06 v.1.0b\~{}3} \= replaced \lstinline+\progressbar@LoadFile@IfExist+ with\\ \> \lstinline+\RequirePackage+\\
\texttt{2012/02/18 v.1.0b\~{}2} \> added version control for kvoptions\\
\texttt{2010/10/02 v1.0b} \> first release - all basic functionality
@@ -237,4 +239,4 @@
\section{Contact}
If you have any question concerning \texttt{progressbar} or if you miss a feature, please write me a mail: \href{mailto:mails4me@gmx.at}{\texttt{mails4me@gmx.at}}.
-\end{document}
\ No newline at end of file
+\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/progressbar.doc.tlpobj new/tlpkg/tlpobj/progressbar.doc.tlpobj
--- old/tlpkg/tlpobj/progressbar.doc.tlpobj 2013-01-07 04:35:01.000000000 +0100
+++ new/tlpkg/tlpobj/progressbar.doc.tlpobj 2014-05-05 00:21:17.000000000 +0200
@@ -1,9 +1,9 @@
name progressbar.doc
category Package
-revision 28753
+revision 33822
shortdesc doc files of progressbar
relocated 1
-docfiles size=97
+docfiles size=31
RELOC/doc/latex/progressbar/README
RELOC/doc/latex/progressbar/progressbar.pdf
RELOC/doc/latex/progressbar/progressbar.tex
++++++ progressbar.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/progressbar/progressbar.sty new/tex/latex/progressbar/progressbar.sty
--- old/tex/latex/progressbar/progressbar.sty 2013-01-07 00:58:34.000000000 +0100
+++ new/tex/latex/progressbar/progressbar.sty 2014-05-04 23:43:59.000000000 +0200
@@ -21,11 +21,11 @@
%
\NeedsTeXFormat{LaTeX2e}%
%
-\ProvidesPackage{progressbar}[2013/01/06 v1.0b~3: progressbar]%
+\ProvidesPackage{progressbar}[2014/05/04 v1.0b~4: progressbar]%
%
\RequirePackage{calc}%
\RequirePackage{tikz}%
-\RequirePackage{kvoptions}[2011/08/03]%
+\RequirePackage{kvoptions}[2011/06/30]%
\RequirePackage{kvsetkeys}%
%
% Define lengths for later use
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/progressbar.tlpobj new/tlpkg/tlpobj/progressbar.tlpobj
--- old/tlpkg/tlpobj/progressbar.tlpobj 2013-01-07 04:35:01.000000000 +0100
+++ new/tlpkg/tlpobj/progressbar.tlpobj 2014-05-05 00:21:17.000000000 +0200
@@ -1,6 +1,6 @@
name progressbar
category Package
-revision 28753
+revision 33822
shortdesc Visualize shares of total amounts in the form of a (progress-)bar.
relocated 1
longdesc This package allows you to easily visualize shares of total
@@ -12,6 +12,6 @@
runfiles size=2
RELOC/tex/latex/progressbar/progressbar.sty
catalogue-ctan /macros/latex/contrib/progressbar
-catalogue-date 2013-01-06 18:12:17 +0100
+catalogue-date 2014-05-04 11:26:45 +0200
catalogue-license lppl
-catalogue-version v1.0b~3
+catalogue-version v1.0b~4
++++++ prosper.doc.tar.xz ++++++
++++ 2124 lines of diff (skipped)
++++++ prosper.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/prosper.tlpobj new/tlpkg/tlpobj/prosper.tlpobj
--- old/tlpkg/tlpobj/prosper.tlpobj 2010-06-10 18:42:07.000000000 +0200
+++ new/tlpkg/tlpobj/prosper.tlpobj 2014-02-24 03:21:25.000000000 +0100
@@ -1,6 +1,6 @@
name prosper
category Package
-revision 15878
+revision 33033
shortdesc LaTeX class for high quality slides.
relocated 1
longdesc Prosper is a LaTeX class for writing transparencies. It is
@@ -70,6 +70,6 @@
RELOC/tex/latex/prosper/yellow-bullet-on-blue.ps
RELOC/tex/latex/prosper/yellow-bullet-on-white.ps
catalogue-ctan /macros/latex/contrib/prosper
-catalogue-date 2010-05-17 14:53:01 +0200
+catalogue-date 2012-02-25 10:31:12 +0100
catalogue-license lppl1.2
catalogue-version 1.0h
++++++ psnfss.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/psnfss/00readme.txt new/doc/latex/psnfss/00readme.txt
--- old/doc/latex/psnfss/00readme.txt 2006-01-09 01:49:07.000000000 +0100
+++ new/doc/latex/psnfss/00readme.txt 2014-05-10 00:39:48.000000000 +0200
@@ -3,7 +3,7 @@
------------------------------------------------------------
2004-09-15
Walter Schmidt
-
+
Contents
--------
@@ -90,7 +90,7 @@
Installing the PSNFSS macro packages
------------------------------------
-Copy the files
+Copy the files
00readme.txt
changes.txt
@@ -138,9 +138,9 @@
-------------------------
The "Base 35" fonts
- Free substitutes for the commercial PostScript Base fonts
+ Free substitutes for the commercial PostScript Base fonts
are available from the CTAN directory fonts/urw/base35.
-
+
Adobe Utopia
Bitstream Charter
The Type1 font files can be obtained for free from various
@@ -159,11 +159,11 @@
Free substitutes for the commercial Palatino SC/OsF fonts
are available from CTAN:fonts/fpl
-Pazo
+Pazo
The Type1 fonts can be obtained from the CTAN directory
fonts/mathpazo. Notice that PSNFSS 9 needs version 1.003
(2002-05-17) of the Pazo fonts.
-
+
Computer Modern
RSFS (Ralph Smith's Formal Script)
Euler Math
@@ -218,7 +218,7 @@
accessible. This is performed using the reencoding file
8r.enc
-
+
which distributed with PSNFSS. Consult the documentation of
your TeX system, where to store this file!
@@ -247,7 +247,7 @@
test1.tex
test2.tex
test3.tex
- mathtest.tex
+ mathtest.tex
pitest.tex
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/psnfss/changes.txt new/doc/latex/psnfss/changes.txt
--- old/doc/latex/psnfss/changes.txt 2006-08-27 20:14:13.000000000 +0200
+++ new/doc/latex/psnfss/changes.txt 2014-05-10 00:39:48.000000000 +0200
@@ -1,213 +1,213 @@
2005-04-12 PSNFSS 9.2a
- fix for psnfss/3773, affecting only helvet.sty:
+ fix for psnfss/3773, affecting only helvet.sty:
the package can now be loaded before \documentclass
-
+
2004-10-18
* freenfss.zip: fixed a major bug in the Charter font metrics
(will I ever get them right?)
-
+
2004-09-15 PSNFSS 9.2
* Charter: improved kerning data (once again...)
-
+
* Palatino: additional font families pplx and pplj with real
smallcaps and oldstyle figures and improved kerning tables;
- the free FPL fonts can be used as a substitute for te required
+ the free FPL fonts can be used as a substitute for te required
Palatino SC/OsF fonts
-
+
* mathpazo, mathptmx: beside \upDelta and \upOmega also the
other upright uppercase Greek letters are explicitly accessible.
-
- * documentation psnfss2e.tex(.pdf) updated
-
+
+ * documentation psnfss2e.tex(.pdf) updated
+
* font map files: new file fpls.map for the FPL fonts.
-
+
* minor changes to mathtest.tex
-
+
(* lw35nfss.zip is unchanged)
2004-01-26 PSNFSS 9.1b
* freenfss.zip with fixed VFs and metrics for the Bitstream
Charter fonts: New kerning pairs Y-g and Y-s; corrected
- \fontdimen1 of the italic shapes; improved italic Euro symbols
-
+ \fontdimen1 of the italic shapes; improved italic Euro symbols
+
* helvet.sty: Fixed implementation of the key-value interface.
-
+
* Warning messages added to obsolete packages.
-
+
2003-11-17 PSNFSS 9.1
* Updated VFs for all Adobe text font families, except Utopia:
Added \texteuro, fixed zdot and \textasteriskcentered.
-
+
* Courier: normal asterisk (*) is now vertically centered.
-
- * New VFs for Bitstream Charter with revised kerning data and
- faked \texteuro. In particular, the overly tight kerning
+
+ * New VFs for Bitstream Charter with revised kerning data and
+ faked \texteuro. In particular, the overly tight kerning
between L and quoteright has been abolished.
* The Pazo doublestroke font is now assigned the encoding U,
rather than T1 and OT1. The files t1fplmbb.fd and ot1fplm.fd
are replaced by ufplmbb.fd.
-
- * The Utopia fonts are no longer regarded as "required"; the
+
+ * The Utopia fonts are no longer regarded as "required"; the
package utopia.sty is marked as "obsolete".
-
+
* Documentation psnfss2e.* updated accordingly.
* Test files enhanced to test the Euro symbols and the Pazo
doublestroke font, while Utopia is omitted now.
-
-
+
+
2003-03-02 PSNFSS 9.0c
* mathptmx,sty, mathpazo.sty: \upOmega and \UpDelta are of
type \mathord now, to make sure that they are always upright
-
+
* pifont.sty: \Pifill and \dingfill should no longer fail at
the beginning or end of a paragraph. (Bug fix suggested by FMi.)
-
+
* mathptm(x).sty: \jmath, \coprod, and \amalg will now generate
error messages rather than print black squares. (Suggested by
FMi.)
-
+
* Small changes to the documentation psnfss2e.*.
-
+
* Enhanced test0.tex to test also the math alphabets.
-
+
* 8r.enc: version 2.0, comprising all of the Mac Roman
character set, too.
-
+
* The *.map files and the file 8r.enc have been moved out of the
ZIP archives, since their final location in the texmf tree may
vary wrt/ changes in the TDS specs.
-
+
2002-09-08 PSNFSS 9.0a
* Fixed TFM and VF files for mathpazo. The size of certain
symbols was wrong, because of a bug in the fontinst program.
-
+
* psfonts.dtx: Changed definition of \hbar in mathpazo.sty
to improve spacing.
-
+
* Fixed identification strings in 8rpcr.fd and t1put.fd.
-
+
* Fixed comments in 8r.enc.
-
+
* Removed one unneeded file from lw35nfss.zip.
-
+
2002-07-04
* Improved installation instructions (file 00readme.txt)
-
+
2002-05-17 Pazo fonts v1.003
* Changed the positioning of the double stroke in X and Z in
Pazo Math Blackboard Bold (suggested by Marco Kuhlmann).
The font metrics are unchanged.
-
+
2002-04-24 PSNFSS-9.0
- * mathptmx.sty: Improved \hbar. Added missing redefinitions
+ * mathptmx.sty: Improved \hbar. Added missing redefinitions
of \defaultscriptratio and \defaultscriptscriptratio.
-
+
* psnfss2e.pdf: All fonts are embedded now.
-
+
2002-04-10 PSNFSS-9.0 pre-release
* 8r.enc: The TeXBase1Encoding includes the Euro symbol in
slot 128 now. Thus, future fonts that provide the Euro, can
be supported. This does, however, NOT affect the present
- Base35, Charter and Utopia fonts.
+ Base35, Charter and Utopia fonts.
* mathpazo.sty: The undocumented macro ppljeuro is no longer
- provided.
-
+ provided.
+
* freenfss.zip: The VFs and TFMs are to be used with version
1.002 of the Pazo fonts now.
-
+
* Palatino text fonts: The textcompanion fonts of the
Palatino family provide the Euro symbol \texteuro as well as
the Omega \textohm now. The letters are actually taken from
- the Pazo fonts.
-
- * Documentation psnfss2e.tex updated and slightly improved.
+ the Pazo fonts.
+
+ * Documentation psnfss2e.tex updated and slightly improved.
2002-02-28 Pazo fonts v1.002
* Added all the remaining uppercase latin letters and digit
"one" to Pazo Math Blackboard Bold.
-
+
* Re-designed \Phi to make it better proportioned
-
+
* Re-designed \varsigma to give it a more recognisable shape
(suggested by Pablo Rodriguez). Re-designed \xi and \zeta to
match the new \varsigma.
-
+
2001-06-04 PSNFSS-v8.2
-
+
* mathpazo.sty: Changed behavior of the options sc and osf.
\jmath and \imath changed back to type 'mathord', as in normal
LaTeX.
-
+
* mathptm.sty: Revoked the changes re. AMS fonts, since the
package is only provided for use with legacy douments, anyway.
-
+
* Many changes to the documentation (psnfss2e.*).
-
+
* test1.tex, test2.tex, test3.tex: Fixed typo.
-
+
2001/05/27 PSNFSS-v8.2beta
- * mathpazo.sty:
+ * mathpazo.sty:
An improved version of this package is now part of the PSNFSS
distribution.
-
+
* freenfss.zip:
Added TFM, VF and FD files for the Pazo fonts.
* mathptmx.sty
New option: [slantedGreek]
-
+
* The AMS fonts are scaled properly now, when used together
with the packages mathptm, mathptmx, mathpple or mathpazo.
Specifying the [psamsfonts] option for the packages amsfonts or
amssymb may be needed wrt/ the Euler Fraktur fonts, but will not
affect the scaling of the others.
-
+
* ot1*.fd:
additional font shape substitition bx/ui -> b/it
-
+
* fixed TFM file zptmcm7y.tfm so as to raise the subscripts
generated by mathptmx (pr/3279)
-
+
* fixed FD files for Adobe Courier so as to disable hyphenation
(I wonder why this bug was never noticed...)
-
+
* test files completely revised
-
+
2000-01-12 PSNFSS-v8.1
-
- * support for commercial fonts is no longer part of the basic
+
+ * support for commercial fonts is no longer part of the basic
PSNFSS distribution.
* new, enhanced user documentation
-
+
* freenfss.zip:
new file, containing metrics, vf's, fd's and map files for
Bitstream Charter and Adobe Utopia
-
- * lw35nfss.zip:
+
+ * lw35nfss.zip:
removed tfm's and vf's for `raw' fonts and the duplicate
psyr.tfm; removed tfm's and vf's for Helvetica Light, which
isn't free; removed the related entries from the .fd files, too;
added the fd/tfm/vf files of the mathpple collection.
- * metrics (general):
+ * metrics (general):
removed the checksums, which are useless anyway; added missing
macron accent to all sc fonts; removed 1-1 kern pair from
Palatino.
@@ -216,27 +216,27 @@
fonts plus mathpple.map to one single psnfss.map; removed
duplicate entries; the map file will unpack to dvips/psnfss/
now.
-
+
* 8r.enc: the file is now distributed as part of lw35nfss.zip
and will unpack to the directory dvips/psnfss/.
- * psfonts.dtx:
+ * psfonts.dtx:
added courier.sty, which was previously not generated from a
.dtx source; added charter.sty and utopia.sty, which were
previously generated from dtx's of their own; added
mathpple.sty.
-
- * mathptm.sty, mathptmx.sty:
+
+ * mathptm.sty, mathptmx.sty:
fixed problems in conjunction with latexsym.sty and amssymb.sty
(pr/2910, pr/2762) as FMi had suggested; fixed the weird warning
message with \boldmath (pr/2994); made \hbar work with Times;
fixed \big & friends for font sizes <> 10pt;
-
+
* mathpple.sty:
- this package is now part of the PSNFSS distribution;
+ this package is now part of the PSNFSS distribution;
slightly enlarged font sizes for super- and subscripts in math;
\Re, \Im, \infty taken from Euler now.
* helvet.sty: new option for scaling Helvetica
-
+
%% finis
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/psnfss/manifest.txt new/doc/latex/psnfss/manifest.txt
--- old/doc/latex/psnfss/manifest.txt 2006-01-09 01:49:07.000000000 +0100
+++ new/doc/latex/psnfss/manifest.txt 2014-05-10 00:39:48.000000000 +0200
@@ -1,5 +1,5 @@
The following files constitute the PSNFSS bundle and must be
-distributed as a whole.
+distributed as a whole.
This restriction does NOT affect 8r.enc, which is originally
distributed from http://tug.org/fontname/8r.enc and is
included here for the sake of completeness only.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/psnfss/test/mathtest.tex new/doc/latex/psnfss/test/mathtest.tex
--- old/doc/latex/psnfss/test/mathtest.tex 2006-08-27 20:14:13.000000000 +0200
+++ new/doc/latex/psnfss/test/mathtest.tex 2014-05-10 00:39:48.000000000 +0200
@@ -22,13 +22,13 @@
confused with ordinary \emph{Text Italic} -- notice the different spacing\,!
\verb|\mathbf| produces bold roman letters: $ \mathbf{abcABC} $.
If you wish to embolden complete formulas,
-use the \verb|\boldmath| command \emph{before} going into math mode.
-This changes the default math fonts to bold.
-
+use the \verb|\boldmath| command \emph{before} going into math mode.
+This changes the default math fonts to bold.
+
\begin{tabular}{ll}
\texttt{normal} & $ x = 2\pi \Rightarrow x \simeq 6.28 $\\
\texttt{mathbf} & $\mathbf{x} = 2\pi \Rightarrow \mathbf{x} \simeq 6.28 $\\
-\texttt{boldmath} & {\boldmath $x = \mathbf{2}\pi \Rightarrow x
+\texttt{boldmath} & {\boldmath $x = \mathbf{2}\pi \Rightarrow x
\simeq{\mathbf{6.28}} $}\\
\end{tabular}
\smallskip
@@ -42,25 +42,25 @@
There is a calligraphic alphabet \verb|\mathcal| for upper case letters
$ \mathcal{ABCDE}\dots $, and there are letters for number sets: $\mathbb{A\dots Z} $,
which are produced using \verb|\mathbb|.
-
+
\begin{equation}
\sigma(t)=\frac{1}{\sqrt{2\pi}}
- \int^t_0 e^{-x^2/2} dx
+ \int^t_0 e^{-x^2/2} dx
\end{equation}
\begin{equation}
\prod_{j\geq 0}
- \left(\sum_{k\geq 0}a_{jk} z^k\right)
+ \left(\sum_{k\geq 0}a_{jk} z^k\right)
= \sum_{k\geq 0} z^n
\left( \sum_{{k_0,k_1,\ldots\geq 0}
\atop{k_0+k_1+\ldots=n} }
- a{_0k_0}a_{1k_1}\ldots \right)
+ a{_0k_0}a_{1k_1}\ldots \right)
\end{equation}
\begin{equation}
\pi(n) = \sum_{m=2}^{n}
\left\lfloor \left(\sum_{k=1}^{m-1}
- \lfloor(m/k)/\lceil m/k\rceil
+ \lfloor(m/k)/\lceil m/k\rceil
\rfloor \right)^{-1}
\right\rfloor
\end{equation}
@@ -78,7 +78,7 @@
\nearrow\raise5pt\hbox{$\mu^+ + \nu_{\mu}$}\\
\rightarrow \pi^+ +\pi^0 \\[5pt]
\rightarrow \kappa^+ +\pi^0 \\
-\searrow\lower5pt\hbox{$\mathrm{e}^+
+\searrow\lower5pt\hbox{$\mathrm{e}^+
+\nu_{\scriptstyle\mathrm{e}}$}
\end{array}
\]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/psnfss/test/pitest.tex new/doc/latex/psnfss/test/pitest.tex
--- old/doc/latex/psnfss/test/pitest.tex 2006-08-27 20:14:13.000000000 +0200
+++ new/doc/latex/psnfss/test/pitest.tex 2014-05-10 00:39:48.000000000 +0200
@@ -34,14 +34,14 @@
\end{Pilist}
\begin{Piautolist}{pzd}{'254}
-\item text inside list,
+\item text inside list,
\begin{Piautolist}{psy}{'141}
- \item text inside list,
- \item text inside list,
+ \item text inside list,
+ \item text inside list,
\begin{enumerate}
- \item text inside list,
+ \item text inside list,
\begin{Piautolist}{pzd}{'56}
- \item text inside list,\label{pilabel}
+ \item text inside list,\label{pilabel}
\item text inside list,
\end{Piautolist}
\item text inside list,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/psnfss/test/test0.tex new/doc/latex/psnfss/test/test0.tex
--- old/doc/latex/psnfss/test/test0.tex 2006-08-27 20:14:13.000000000 +0200
+++ new/doc/latex/psnfss/test/test0.tex 2014-05-10 00:39:48.000000000 +0200
@@ -98,7 +98,7 @@
\hline
\end{tabular}\end{quote}
{This costs `\pounds' 45 to do; {\sffamily this costs \pounds 45 to do;
-\em this costs \pounds 45 in sans italic to do;}
+\em this costs \pounds 45 in sans italic to do;}
\scshape this costs ``\pounds'' 45 to do; \em this costs \pounds 45 to do
\bfseries this costs \pounds 45 to do for a f\'ee. And so on.}
{\itshape Let's try USD in italic, too: \$ 45.}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/psnfss/test/test1.tex new/doc/latex/psnfss/test/test1.tex
--- old/doc/latex/psnfss/test/test1.tex 2006-08-27 20:14:13.000000000 +0200
+++ new/doc/latex/psnfss/test/test1.tex 2014-05-10 00:39:48.000000000 +0200
@@ -15,7 +15,7 @@
\maketitle
\def\Try#1#2{%
{\fontfamily{#1}\selectfont
-This is typeset in #2 (#1):
+This is typeset in #2 (#1):
\begin{quote}
\raggedright
A regular f\'ee costs 123\,\texteuro.\\
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/psnfss/test/test2.tex new/doc/latex/psnfss/test/test2.tex
--- old/doc/latex/psnfss/test/test2.tex 2006-08-27 20:14:13.000000000 +0200
+++ new/doc/latex/psnfss/test/test2.tex 2014-05-10 00:39:48.000000000 +0200
@@ -15,7 +15,7 @@
\maketitle
\def\Try#1#2{%
{\fontfamily{#1}\selectfont
-This is typeset in #2 (#1):
+This is typeset in #2 (#1):
\begin{quote}
\raggedright
A regular f\'ee costs 123\,\texteuro.\\
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/psnfss/test/test3.tex new/doc/latex/psnfss/test/test3.tex
--- old/doc/latex/psnfss/test/test3.tex 2006-08-27 20:14:13.000000000 +0200
+++ new/doc/latex/psnfss/test/test3.tex 2014-05-10 00:39:48.000000000 +0200
@@ -14,7 +14,7 @@
\maketitle
\def\Try#1#2{%
\fontfamily{#1}\selectfont
-This is typeset in #2 (#1):
+This is typeset in #2 (#1):
\begin{quote}
\raggedright
A regular f\'ee costs 123\,\texteuro.\\
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/psnfss.doc.tlpobj new/tlpkg/tlpobj/psnfss.doc.tlpobj
--- old/tlpkg/tlpobj/psnfss.doc.tlpobj 2011-08-04 04:20:01.000000000 +0200
+++ new/tlpkg/tlpobj/psnfss.doc.tlpobj 2014-05-10 01:28:24.000000000 +0200
@@ -1,6 +1,6 @@
name psnfss.doc
category Package
-revision 23394
+revision 33946
shortdesc doc files of psnfss
relocated 1
docfiles size=130
++++++ psnfss.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/map/dvips/psnfss/psnfss.map new/fonts/map/dvips/psnfss/psnfss.map
--- old/fonts/map/dvips/psnfss/psnfss.map 2006-01-10 00:35:02.000000000 +0100
+++ new/fonts/map/dvips/psnfss/psnfss.map 2014-05-10 00:39:48.000000000 +0200
@@ -2,47 +2,47 @@
%
eurmo10 EURM10 " .167 SlantFont" 0
1.96 2011-12-10 - added \pstThreeDPrism
1.95 2011-08-10 - fix bug with setting drawstyle for htlatex
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-3dplot/README new/doc/generic/pst-3dplot/README
--- old/doc/generic/pst-3dplot/README 2007-08-20 02:09:19.000000000 +0200
+++ new/doc/generic/pst-3dplot/README 2014-02-02 00:14:20.000000000 +0100
@@ -1,8 +1,8 @@
%% Package `pst-3dplot.tex'
%%
-%% Herbert Voss <voss _at_ pstricks.de> (Germany)
+%% Herbert Voss
%%
-%% 2004-12-04
+%% 2014-02-01
%%
PSTricks offers excellent macros to insert more or less complex
@@ -25,7 +25,7 @@
pst-3dplot uses the extended version of the keyval package. So
be sure that you
- have installed xkeyval with the special pst-xkey
- (CTAN: tex-archive/macros/latex/contrib/xkeyval/)
+ (CTAN: /macros/latex/contrib/xkeyval/)
- do not load another package after pst-3dplot, which loads
the old keyval.sty or pst-key.tex
Files old/doc/generic/pst-3dplot/more_docs/tb72voss3d.pdf and new/doc/generic/pst-3dplot/more_docs/tb72voss3d.pdf differ
Files old/doc/generic/pst-3dplot/pst-3dplot-doc.pdf and new/doc/generic/pst-3dplot/pst-3dplot-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-3dplot/pst-3dplot-doc.tex new/doc/generic/pst-3dplot/pst-3dplot-doc.tex
--- old/doc/generic/pst-3dplot/pst-3dplot-doc.tex 2012-07-29 19:07:14.000000000 +0200
+++ new/doc/generic/pst-3dplot/pst-3dplot-doc.tex 2014-02-02 00:14:20.000000000 +0100
@@ -1,6 +1,6 @@
\input{pst-3dplot-doc.dat}
-%% $Id: pst-3dplot-doc.tex 467 2011-03-01 21:04:36Z herbert $
+%% $Id: pst-3dplot-doc.tex 882 2014-02-01 13:12:37Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
headexclude,footexclude,oneside,dvipsnames,svgnames]{pst-doc}
\listfiles
@@ -516,6 +516,10 @@
\end{pspicture}
\end{LTXexample}
+
+
+
+
With \Lkeyword{coorType}=2 the y--z-axes are orthogonal and the angle between x- and y-axis
is always 135 degrees and the x-axis is shortened by a factor of $1/\sqrt{2}$.
The angle \Lkeyword{Alpha} is only valid for placing the ticks, if any. The angle \Lkeyword{Beta} is not valid.
@@ -551,6 +555,37 @@
\end{pspicture}
\end{LTXexample}
+With \Lkeyword{coorType}=5 the y--z-axes are orthogonal and the angle between x- and y-axis
+is variable but should be 30 or 45 degrees and the x-axis is shortened by a factor of $0.5$.
+The angle \Lkeyword{Beta} is not valid.
+
+\xLkeyval{yz}\xLkeyword{coorType}
+\begin{LTXexample}[width=9.75cm]
+\psset{coorType=5,Alpha=30,
+ IIIDxTicksPlane=yz}
+\begin{pspicture}(-2,-2)(3,3)
+\pstThreeDCoor[IIIDticks,zMax=3]%
+\end{pspicture}
+\end{LTXexample}
+
+%\setIIIDplotDefaults
+\psset{unit=1cm}
+\xLkeyword{coorType}
+\begin{LTXexample}[width=9cm]
+\psset{coorType=6}
+\begin{pspicture}(-3,-2)(6,6)
+\psset{IIIDxTicksPlane=xz,IIIDyTicksPlane=yz}
+\pstThreeDCoor[xMin=0,xMax=5,yMin=0,yMax=5,
+ zMin=0,zMax=5,IIIDticks,spotX=180,
+ IIIDlabels=false,linecolor=red]%
+\multido{\iA=1+1}{4}{\footnotesize%
+ \pstThreeDPut(\iA,-0.3,0.1){\iA}%
+ \pstThreeDPut(-0.3,\iA,0.1){\iA}%
+ \pstThreeDPut(0,-0.3,\iA){\iA}}
+\end{pspicture}
+\end{LTXexample}
+
+
\clearpage
\section{Rotation}
Files old/doc/generic/pst-3dplot/tb72voss3d.pdf and new/doc/generic/pst-3dplot/tb72voss3d.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-3dplot.doc.tlpobj new/tlpkg/tlpobj/pst-3dplot.doc.tlpobj
--- old/tlpkg/tlpobj/pst-3dplot.doc.tlpobj 2012-07-30 04:42:18.000000000 +0200
+++ new/tlpkg/tlpobj/pst-3dplot.doc.tlpobj 2014-03-28 03:23:28.000000000 +0100
@@ -1,13 +1,13 @@
name pst-3dplot.doc
category Package
-revision 27233
+revision 33302
shortdesc doc files of pst-3dplot
relocated 1
-docfiles size=889
+docfiles size=890
RELOC/doc/generic/pst-3dplot/Changes
RELOC/doc/generic/pst-3dplot/README
- RELOC/doc/generic/pst-3dplot/more_docs/tb72voss3d.pdf
RELOC/doc/generic/pst-3dplot/pst-3dplot-doc.bib
RELOC/doc/generic/pst-3dplot/pst-3dplot-doc.dat
RELOC/doc/generic/pst-3dplot/pst-3dplot-doc.pdf
RELOC/doc/generic/pst-3dplot/pst-3dplot-doc.tex
+ RELOC/doc/generic/pst-3dplot/tb72voss3d.pdf
++++++ pst-3dplot.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dvips/pst-3dplot/pst-3dplot.pro new/dvips/pst-3dplot/pst-3dplot.pro
--- old/dvips/pst-3dplot/pst-3dplot.pro 2012-07-29 19:07:14.000000000 +0200
+++ new/dvips/pst-3dplot/pst-3dplot.pro 2014-02-02 00:14:20.000000000 +0100
@@ -1,4 +1,4 @@
-%% $Id: pst-3dplot.pro 467 2011-03-01 21:04:36Z herbert $
+%% $Id: pst-3dplot.pro 882 2014-02-01 13:12:37Z herbert $
%%
%% This is file `pst-3dplot.pro',
%%
@@ -16,7 +16,7 @@
%% `pst-3dplot' is a PSTricks package to draw 3d curves and graphical objects
%%
%%
-%% version 0.31 / 2010-02-20 Herbert Voss <hvoss _at_ tug.org>
+%% version 0.32 / 2014-02-01 Herbert Voss <hvoss _at_ tug.org>
%% with contributions of Darrell Lamm http://de.wikipedia.org/wiki/Strichcode#DataMatrix}.
-It is used for the german post company DHL.
+It is a 2D matrix-style barcode that can encode full 256 character extended-ASCII.
+Also known as: Data Matrix ECC 200.
+Variants:
+\begin{description}
+\item[GS1] DataMatrix is a variant of Data Matrix that should be used when encoding data that is in
+GS1 Application Identifier standard format.
+ \item[HIBC] Data Matrix is a variant of Data Matrix that should be used when encoding
+ HIBC formatted data.
+\end{description}
+
+Standards: ISO/IEC 16022, ANSI/AIM BC11 ISS.
+
+Data and Options
+
+\begin{itemize}
+\item The data field can contain any extended ASCII data.
+\item When the parse option is specified, any instances of \verb|^NNN| in the data field
+are replaced with their equivalent ASCII value, useful for specifying unprintable characters.
+\item When the parsefnc option is specified, non-data function characters can be specified by \verb|^FNC1|.
+\item The columns and rows options are used to specify the size of the symbol, either square or rectangular, one of:
+ Square: 10x10, 12x12, 14x14, 16x16, 18x18, 20x20, 22x22, 24x24, 26x26, 32x32, 36x36, 40x40,
+ 44x44, 48x48, 52x52, 64x64, 72x72, 80x80, 88x88, 96x96, 104x104, 120x120, 132x132, 144x144
+ Rectangular: 8x18, 8x32, 12x26, 12x36, 16x36, 16x48
+\item If the columns and rows are unspecified, the encoder will default to creating a (non-rectangular)
+symbol that is the minimum size to represent the given data.
+\item The raw option denotes that the data field is providing the input as a pre-encoded codewords in \verb|^NNN|
+format, suitable for direct low-level encoding.
+\item The encoding option specifies how the data is to be encoded. Possible values are:
+\begin{itemize}
+\item encoding=ascii - Extended ASCII data (default).
+\item encoding=c40 - Optimized encoding for upper-case alphanumeric data. Can also encode extended ASCII
+data but incurs extra codeword overhead.
+\item encoding=text - Optimized encoding for lower-case alphanumeric data. Can also encode
+extended ASCII data but incurs extra codeword overhead.
+\item encoding=x12 - Optimized encoding restricted to upper-case alphanumeric data plus the characters \verb|\r * >| and space.
+\item encoding=raw - Same as the raw option.
+\end{itemize}
+\item The prefix option allows adding a special codeword to the symbol prior to the data. Possible values are:
+\begin{itemize}
+\item prefix=MAC5 - Prefixes the data with the 05 Macro codeword.
+\item prefix=MAC6 - Prefixes the data with the 06 Macro codeword.
+\item prefix=PROG - Prefixes the data with the reader programming codeword. May require encoding=c40, depending on the reader.
+\item prefix=FNC1 - Prefixes the data with the FNC1 codeword.
+\end{itemize}
+\end{itemize}
+
+
\begin{description}
\item[Characters] extended ASCII
@@ -726,6 +800,15 @@
\end{pspicture}
\end{LTXexample}
+
+\begin{LTXexample}[pos=l,width=1.6in,wide]
+\begin{pspicture}(1in,1in)
+\psbarcode{^098^099^100^142^164^186^101^102^103^104^105}{raw}{datamatrix}
+\end{pspicture}
+\end{LTXexample}
+
+
+
\subsection{2D Maxi code}
For a documentation see \url{http://www.logicalconcepts.eu/wDeutsch/autoid/barcodetypen/index.html?navid=21}.
MaxiCode is a fixed-sized two-dimensional symbology created by the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-barcode.doc.tlpobj new/tlpkg/tlpobj/pst-barcode.doc.tlpobj
--- old/tlpkg/tlpobj/pst-barcode.doc.tlpobj 2012-11-17 04:36:28.000000000 +0100
+++ new/tlpkg/tlpobj/pst-barcode.doc.tlpobj 2013-10-27 03:22:04.000000000 +0100
@@ -1,9 +1,9 @@
name pst-barcode.doc
category Package
-revision 28278
+revision 32004
shortdesc doc files of pst-barcode
relocated 1
-docfiles size=79
+docfiles size=88
RELOC/doc/generic/pst-barcode/Changes
RELOC/doc/generic/pst-barcode/README
RELOC/doc/generic/pst-barcode/pst-barcode-doc.bib
++++++ pst-barcode.tar.xz ++++++
++++ 23983 lines of diff (skipped)
++++++ pst-circ.doc.tar.xz ++++++
++++ 3060 lines of diff (skipped)
++++++ pst-circ.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pst-circ/pst-circ.tex new/tex/generic/pst-circ/pst-circ.tex
--- old/tex/generic/pst-circ/pst-circ.tex 2013-05-18 00:25:16.000000000 +0200
+++ new/tex/generic/pst-circ/pst-circ.tex 2014-05-20 00:07:51.000000000 +0200
@@ -1,4 +1,4 @@
-%% $Id: pst-circ.tex 780 2013-05-15 06:35:30Z herbert $
+%% $Id: pst-circ.tex 915 2014-05-18 17:23:55Z herbert $
%% This is file `pst-circ.tex'
%%
%% IMPORTANT NOTICE:
@@ -26,8 +26,8 @@
\ifx\PSTXKeyLoaded\endinput \else\input pst-xkey \fi
\ifx\PSTMultidoLoaded\endinput\else\input multido.tex\fi
%
-\def\fileversion{2.03}
-\def\filedate{2013/05/15}
+\def\fileversion{2.09}
+\def\filedate{2014/05/18}
\message{`pst-circ' v\fileversion (hv)}
%
\edef\PstAtCode{\the\catcode`\@}
@@ -85,12 +85,16 @@
\def\pst@tripole@style@french{french}
%
\define@boolkey[psset]{pst-circ}[Pst@]{intensity}[true]{}
+\define@boolkey[psset]{pst-circ}[Pst@]{mathlabel}[true]{}
+\define@key[psset]{pst-circ}{labelstyle}[]{\def\pst@labelstyle{#1}}
\define@key[psset]{pst-circ}{intensitylabel}[]{\def\psk@I@label{#1}}
\define@key[psset]{pst-circ}{intensitylabelcolor}[black]{\def\psk@I@labelcolor{#1}}
\define@key[psset]{pst-circ}{intensitylabeloffset}[0.5]{\def\psk@I@label@offset{#1}}
\define@key[psset]{pst-circ}{intensitycolor}[black]{\def\psk@I@color{#1}}
\define@key[psset]{pst-circ}{intensitywidth}[\pslinewidth]{\def\psk@I@width{#1}}
\define@boolkey[psset]{pst-circ}[Pst@]{tension}[true]{}
+\define@key[psset]{pst-circ}{tensionstyle}[line]{\expandafter\psk@tension@style@@#1\@nil}
+\def\psk@tension@style@@#1#2\@nil{\ifx#1p \def\psk@tension@style{1}\else\def\psk@tension@style{0}\fi}
\define@key[psset]{pst-circ}{tensionlabel}[]{\def\psk@tension@label{#1}}
\define@key[psset]{pst-circ}{tensionlabelcolor}[black]{\def\psk@tension@labelcolor{#1}}
\define@key[psset]{pst-circ}{tensionoffset}[1]{\def\psk@tension@offset{#1}}
@@ -558,10 +562,6 @@
\define@key[psset]{pst-circ}{pinlplabel}[]{\def\psk@pinlplabel{#1}}
\define@key[psset]{pst-circ}{pinlpnumber}[]{\def\psk@pinlpnumber{#1}}
-
-
-
-
\define@key[psset]{pst-circ}{pintllabel}[]{\def\psk@pintllabel{#1}}
\define@key[psset]{pst-circ}{pintlnumber}[]{\def\psk@pintlnumber{#1}}
\define@key[psset]{pst-circ}{pintclabel}[]{\def\psk@pintclabel{#1}}
@@ -822,10 +822,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
\psset[pst-circ]{%
- labelInside=0,circedge=\pcangle,
+ labelstyle=,mathlabel=false,labelInside=0,circedge=\pcangle,
intensity=false,intensitylabel={},
intensitylabeloffset=0.5,
intensitycolor=black,intensitylabelcolor=black,intensitywidth=\pslinewidth,
+ tensionstyle=line,
tension=false,tensionlabel={},tensionoffset=1,tensionlabeloffset=1.2,
tensioncolor=black,tensionlabelcolor=black,tensionwidth=\pslinewidth,
labeloffset=0.7,labelangle=0,dipoleconvention=receptor,directconvention=true,dipolestyle=normal
@@ -930,7 +931,6 @@
\expandafter\def\csname pst@#2\endcsname[##1](##2)(##3)##4{{%
\pst@draw@dipole{#1,##1}{##2}{##3}{##4}{\@nameuse{pst@draw@#2}}}\ignorespaces}%
%
- %
\@namedef{pst@multidipole@#2}{\@ifnextchar[{\@nameuse{pst@multidipole@#2@}}{\@nameuse{pst@multidipole@#2@}[]}}
\expandafter\def\csname pst@multidipole@#2@\endcsname[##1]##2{%
\expandafter\def\csname pst@tmp@\number\pst@count@iii\endcsname{##2}%
@@ -948,9 +948,7 @@
{\noexpand\csname pst@tmp@\number\pst@count@iii\endcsname}
}%
\pst@multidipole@%
-}
- }%
-\ignorespaces}%
+}}\ignorespaces}%
%
\newCircDipole{RFLine}
\newCircDipole{resistor}
@@ -1045,6 +1043,17 @@
\ignorespaces%
}
%
+\def\pst@draw@battery{%
+ \psline[arrows=-,linewidth=1.5\pslinewidth](-0.10,-0.5)(-0.10,0.5)
+ \psline[arrows=-,linewidth=3\pslinewidth](0.10,-0.25)(0.10,0.25)
+ \pnode(-0.1,0){dipole@1}
+ \pnode(0.1,0){dipole@2}
+ \ifPst@variable%
+ \psline{->}(-0.75,-0.5)(0.75,0.5)%
+ \fi
+ }
+%
+%
\newif\ifPst@temp
\def\transistor{\def\pst@par{}\pst@object{transistor}}
\def\transistor@i(#1){%
@@ -1052,7 +1061,8 @@
\pst@killglue
\begingroup
\use@par%
- \@ifnextchar({\transistor@iii(#1)}{\Pst@tempfalse\transistor@ii(#1)}}
+ \@ifnextchar(% do we have more coordinates?
+ {\transistor@iii(#1)}{\Pst@tempfalse\transistor@ii(#1)}}
%
\def\transistor@ii(#1)#2#3{% with one node, the base
\pst@killglue%
@@ -1067,7 +1077,12 @@
YB basesep \Pst@TRot\space sin mul add){TBaseNode}% base node
\fi%
% \psdot(#1)%
- \rput[c]{\Pst@TRot}(TBaseNode){%(#1){%
+ \rput[c]{\Pst@TRot}(!
+ \pst@tempA /YB exch \pst@number\psyunit div def
+ /XB exch \pst@number\psxunit div def
+ /basesep \Pst@basesep\space \pst@number\psxunit div def
+ XB basesep \Pst@TRot\space cos mul add
+ YB basesep \Pst@TRot\space sin mul add){%(#1){%
\ifPst@transistorcircle\pscircle(0.3,0){0.7}\fi%
\ifx\psk@Ttype\pst@Ttype@FET\relax%
\ifPst@FETmemory% atosch
@@ -1090,8 +1105,9 @@
\ifPst@transistorinvert\pnode(0.65,0.5){#2}\else\pnode(0.65,0.5){#3}\fi%
\ifPst@transistorinvert\pnode(0.65,-0.5){#3}\else\pnode(0.65,-0.5){#2}\fi%
\else%
- \ifPst@transistorinvert\pnode(0.5,0.5){#2}\else\pnode(0.5,0.5){#3}\fi%
- \ifPst@transistorinvert\pnode(0.5,-0.5){#3}\else\pnode(0.5,-0.5){#2}\fi%
+ \ifPst@transistorinvert\pnode(0.5,0.5){#2}\pnode(0.5,-0.5){#3}%
+ \else \pnode(0.5,0.5){#3}\pnode(0.5,-0.5){#2}%
+ \fi%
\fi%
\fi%
\ifx\psk@Ttype\pst@Ttype@FET\relax%
@@ -1145,7 +1161,7 @@
/YBase Y1 basesep \Pst@TRot\space sin mul add def
XBase YBase ){@@base}% base node
%
- \Pst@temptrue%
+ \global\Pst@temptrue%
\transistor@ii(@@base){@@emitter}{@@collector}%
%
\if\psk@labeltransistoribase\@empty\else\psset{transistoribase=true}\fi%
@@ -1162,7 +1178,11 @@
\fi%
\bgroup%
\psset{style=collectorOpt}%
- \ifPst@transistorinvert\pscirc@edge(#3)(@@emitter)\else\pscirc@edge(#3)(@@collector)\fi%
+ \ifPst@transistorinvert
+ \pscirc@edge(#3)(@@emitter)
+ \else
+ \pscirc@edge(#3)(@@collector)
+ \fi%
\egroup%
\ncput[npos=2]{\pnode{\ifPst@transistorinvert @@emitter\else @@collector\fi}}%
\ifPst@transistoriemitter% emitter current?
@@ -1408,7 +1428,6 @@
% The logical circuits part
%
\def\logic{\@ifnextchar[{\pst@draw@logic}{\pst@draw@logic[]}}
-%
\def\ground{\@ifnextchar[{\pst@ground}{\pst@ground[]}}
\def\pst@ground[#1]{%
\@ifnextchar({\pst@groundi[#1]{0}}{\pst@groundi[#1]}%
@@ -1590,7 +1609,7 @@
\pcline[arrows=-,linestyle=none,fillstyle=none,offset=\psk@parallel@arm](dipole@@1)(dipole@@2)
\ncput[npos=0]{\pnode{dipole@@@1}}
\ncput[npos=1]{\pnode{dipole@@@2}}
- \ncput[nrot=:U]{#5}
+ \ncput[nrot=:U]{\ifPst@mathlabel$\pst@labelstyle#5$\else\pst@labelstyle#5\fi}
\pcline[arrows=-](dipole@@1)(dipole@@@1)
\pcline[arrows=-](dipole@@@1)(dipole@1)
\pcline[arrows=-](dipole@2)(dipole@@@2)
@@ -1600,13 +1619,13 @@
\pscircle*(dipole@@2){2\pslinewidth}
\fi
\pcline[arrows=-,linestyle=none,fillstyle=none,offset=\psk@label@offset](dipole@@@1)(dipole@@@2)
- \ncput[nrot=\psk@label@angle]{#4}
+ \ncput[nrot=\psk@label@angle]{\ifPst@mathlabel$\pst@labelstyle#4$\else\pst@labelstyle#4\fi}
\pst@intensity{dipole@@@1}{dipole@@@2}
\pst@tension{dipole@@@1}{dipole@@@2}
\else
- \ncput[nrot=:U]{#5}
+ \ncput[nrot=:U]{\ifPst@mathlabel$\pst@labelstyle#5$\else\pst@labelstyle#5\fi}
\pcline[arrowscale=1,arrows=-,linestyle=none,fillstyle=none,offset=\psk@label@offset](#2)(#3)
- \ncput[nrot=\psk@label@angle]{#4}
+ \ncput[nrot=\psk@label@angle]{\ifPst@mathlabel$\pst@labelstyle#4$\else\pst@labelstyle#4\fi}
%%%%%
\ifPst@inputarrow
\ifx\psk@Dinput\pst@Dinput@right
@@ -1639,7 +1658,7 @@
\else
\pcline[arrows=-,linestyle=none,fillstyle=none](dipole@2)(#2)
\ncput[nrot=:U]{%
- \psline[linecolor=\psk@I@color,linewidth=\psk@I@width]{<-}(-.1,0)(.1,0)}
+ \psline[linecolor=\psk@I@color,linewidth=\psk@I@width,arrowinset=0]{<-}(-.1,0)(.1,0)}
\pcline[arrows=-,linestyle=none,fillstyle=none,offset=\psk@I@label@offset](dipole@2)(#2)
\ncput[nrot=\psk@label@angle]{\csname\psk@I@labelcolor\endcsname\psk@I@label}
\fi
@@ -1648,33 +1667,45 @@
%
\def\pst@tension#1#2{%
\ifPst@tension
- \pcline[arrows=-,linestyle=none,fillstyle=none,%
- offset=\psk@tension@offset](#1)(dipole@1)
+ \pcline[arrows=-,linestyle=none,fillstyle=none,offset=\psk@tension@offset](#1)(dipole@1)
\ncput[npos=.5]{\pnode{tension@1}}
- \pcline[arrows=-,linestyle=none,fillstyle=none,
- offset=-\psk@tension@offset](#2)(dipole@2)
+ \pcline[arrows=-,linestyle=none,fillstyle=none,offset=-\psk@tension@offset](#2)(dipole@2)
\ncput[npos=.5]{\pnode{tension@2}}
\ifPst@directconvention
\ifPst@Dconvention
- \pcline[linecolor=\psk@tension@color,
- linewidth=\psk@tension@width,arrowinset=0]{<-}(tension@1)(tension@2)
+ \ifnum\psk@tension@style=1
+ \pcline[linestyle=none](tension@1)(tension@2)
+ \ncput[npos=0.25]{$-$}\ncput[npos=0.75]{$+$}%
+ \else
+ \pcline[linecolor=\psk@tension@color,linewidth=\psk@tension@width,arrowinset=0]{<-}(tension@1)(tension@2)
+ \fi
\else
- \pcline[linecolor=\psk@tension@color,
- linewidth=\psk@tension@width,arrowinset=0]{->}(tension@1)(tension@2)
+ \ifnum\psk@tension@style=1
+ \pcline[linestyle=none](tension@1)(tension@2)
+ \ncput[npos=0.25]{$+$}\ncput[npos=0.75]{$-$}%
+ \else
+ \pcline[linecolor=\psk@tension@color,linewidth=\psk@tension@width,arrowinset=0]{->}(tension@1)(tension@2)
+ \fi
\fi
\else
\ifPst@Dconvention
- \pcline[linecolor=\psk@tension@color,
- linewidth=\psk@tension@width,arrowinset=0]{->}(tension@1)(tension@2)
+ \ifnum\psk@tension@style=1
+ \pcline[linestyle=none](tension@1)(tension@2)
+ \ncput[npos=0.25]{$-$}\ncput[npos=0.75]{$+$}%
+ \else
+ \pcline[linecolor=\psk@tension@color,linewidth=\psk@tension@width,arrowinset=0]{->}(tension@1)(tension@2)
+ \fi
\else
- \pcline[linecolor=\psk@tension@color,
- linewidth=\psk@tension@width,arrowinset=0]{<-}(tension@1)(tension@2)
+ \ifnum\psk@tension@style=1
+ \pcline[linestyle=none](tension@1)(tension@2)
+ \ncput[npos=0.25]{$+$}\ncput[npos=0.75]{$-$}%
+ \else
+ \pcline[linecolor=\psk@tension@color,linewidth=\psk@tension@width,arrowinset=0]{<-}(tension@1)(tension@2)
+ \fi
\fi
\fi
- \pcline[arrows=-,linestyle=none,fillstyle=none,%
- offset=\psk@tension@label@offset](dipole@1)(dipole@2)
- \ncput[nrot=\psk@label@angle]{%
- \csname\psk@tension@labelcolor\endcsname\psk@tension@label}
+ \pcline[arrows=-,linestyle=none,fillstyle=none,offset=\psk@tension@label@offset](dipole@1)(dipole@2)
+ \ncput[nrot=\psk@label@angle]{\csname\psk@tension@labelcolor\endcsname\psk@tension@label}
\fi
}
%
@@ -1761,30 +1792,30 @@
\psframe[linewidth=1.5\pslinewidth](-1,-0.75)(1,0.75)
\pspolygon(-0.4,-0.2)(-0.4,0.2)(-0.05,0)
\else
- \pspolygon[arrows=-](-1,-0.75)(-1,0.75)(1,0)(-1,-0.75)
+% USUAL AOP
+ \pspolygon[arrows=-,linewidth=1.5\pslinewidth](-1,-1)(-1,1)(1,0)(-1,-1)
+ %\pspolygon[arrows=-](-1,-0.75)(-1,0.75)(1,0)(-1,-0.75)
+
+% Supply pins Position
\ifPst@OApower
- \psline{-o}(0,0.375)(0,0.75)\uput[90](0,0.75){$+$}
- \psline{-o}(0,-0.375)(0,-0.75)\uput[-90](0,-0.75){$-$}
+ \psline{-}(0,0.5)(0,0.75)%\uput[90](0,1){$+$}
+ %\psline{-o}(0,0.375)(0,0.75)\uput[90](0,0.75){$+$}
+ \psline{-}(0,-0.5)(0,-0.75)%\uput[-90](0,-1){$-$}
+ %\psline{-o}(0,-0.375)(0,-0.75)\uput[-90](0,-0.75){$-$}
\fi
\fi
- \pnode(-1,0.25){\ifPst@OAinvert Minus@\else Plus@\fi}
- \pnode(-1,-0.25){\ifPst@OAinvert Plus@\else Minus@\fi}
+% Input Pins Position
+ \pnode(-1,0.5){\ifPst@OAinvert Minus@\else Plus@\fi}
+ \pnode(-1,-0.5){\ifPst@OAinvert Plus@\else Minus@\fi}
\pnode(1,0){S@}
- \uput{0.1}[0](-1,0.25){\ifPst@OAinvert$-$\else$+$\fi}
- \uput{0.1}[0](-1,-0.25){\ifPst@OAinvert$+$\else$-$\fi}
+% + and - Position
+ \uput{0.1}[0](-1,0.5){\ifPst@OAinvert$-$\else$+$\fi}
+ %\uput{0.1}[0](-1,0.25){\ifPst@OAinvert$-$\else$+$\fi}
+ \uput{0.1}[0](-1,-0.5){\ifPst@OAinvert$+$\else$-$\fi}
+ %\uput{0.1}[0](-1,-0.25){\ifPst@OAinvert$+$\else$-$\fi}
\ifPst@OAperfect\rput(0.25,0){$\infty$}\fi%
}
%
-\def\pst@draw@battery{%
- \psline[arrows=-,linewidth=1.5\pslinewidth](-0.10,-0.5)(-0.10,0.5)
- \psline[arrows=-,linewidth=3\pslinewidth](0.10,-0.25)(0.10,0.25)
- \pnode(-0.1,0){dipole@1}
- \pnode(0.1,0){dipole@2}
- \ifPst@variable%
- \psline{->}(-0.75,-0.5)(0.75,0.5)%
- \fi
- }
-%
\def\pst@draw@coil{%
\ifx\psk@Dstyle\pst@Dstyle@curved
\pscurve[arrows=-](-0.7,0)(-0.6,0.3)(-0.35,0)(-0.4,-0.2)
@@ -2090,7 +2121,7 @@
\psframe[linewidth=2\pslinewidth](0,0)(\psk@logic@width,\psk@logic@height)%
}
\pst@getcoor{#2}\pst@tempa
- \ifPst@logicChangeLR\def\logic@LR{true}\else\def\logic@LR{false}\fi%
+ \ifPst@logicChangeLR\def\logic@LR{true}\else\def\logic@LR{false}\fi
\pstVerb{
/YA \pst@tempa exch pop \pst@number\psyunit div def
/YB YA \psk@logic@height\space add def
@@ -2125,7 +2156,7 @@
\fi
\rput[b](!%
/dx XB XA sub 2 div def
- XA dx add YA 0.1 add){\psk@logic@labelstyle #3}
+ XA dx add YA 0.1 add){\if$\psk@logic@labelstyle$\else\psk@logic@labelstyle#3\fi}
\else
\ifx\psk@logic@type\pst@logic@type@D%---------------- D -----------------
\pnode(! XA YA dy 2 div add){#3C}
@@ -2151,7 +2182,7 @@
\fi
\rput[b](!%
/dx XB XA sub 2 div def
- XA dx add YA 0.1 add){\psk@logic@labelstyle #3}
+ XA dx add YA 0.1 add){\if$\psk@logic@labelstyle$\else\psk@logic@labelstyle#3\fi}
\else
\ifx\psk@logic@type\pst@logic@type@JK%---------------- JK -----------------
\multido{\n=1+1}{\psk@logic@JInput}{%
@@ -2205,13 +2236,9 @@
\fi
\rput[b](!%
/dx XB XA sub 2 div def
- XA dx add YA 0.1 add){\psk@logic@labelstyle #3}
+ XA dx add YA 0.1 add){\if$\psk@logic@labelstyle$\else\psk@logic@labelstyle#3\fi}
\else%---------------- default AND/NAND/OR/NOR/NOT/EXOR/ENOR -----------------
- \ifx\psk@logic@type\pst@logic@type@not
- \def\@nMax{1}
- \else
- \def\@nMax{\psk@logic@nInput}
- \fi
+ \ifx\psk@logic@type\pst@logic@type@not \def\@nMax{1}\else \def\@nMax{\psk@logic@nInput}\fi
\multido{\n=1+1}{\@nMax}{%
\pnode(!%
/Step dy \psk@logic@nInput\space div def
@@ -2222,10 +2249,8 @@
/YC \pst@tempc exch pop \pst@number\psyunit div def
/XC \pst@tempc pop \pst@number\psxunit div def
XC \psk@logic@wireLength\space \logic@LR {add}{sub} ifelse YC){temp#3\n}
- \psline(#3\n)(temp#3\n)% input
- \ifPst@logicShowDot
- \qdisk(temp#3\n){3pt}
- \fi
+ \expandafter\psline\expandafter(#3\n)(temp#3\n)% input
+ \ifPst@logicShowDot \qdisk(temp#3\n){3pt}\fi
\ifPst@logicShowNode
\uput[\ifPst@logicChangeLR 180\else 0\fi](#3\n){\psk@logic@nodestyle\n}
\fi
@@ -2288,10 +2313,10 @@
\fi
\rput(!%
/dx XB XA sub \psk@logic@symbolpos\space mul def
- XA dx add YB 0.3 sub){\psk@logic@symbolstyle\textbf{\logic@type}}
+ XA dx add YB 0.3 sub){\if$\psk@logic@symbolstyle$\else\psk@logic@symbolstyle\textbf{\logic@type}\fi}
\rput[b](!%
/dx XB XA sub 2 div def
- XA dx add YA 0.1 add){\psk@logic@labelstyle #3}
+ XA dx add YA 0.1 add){\if$\psk@logic@labelstyle$\else\psk@logic@labelstyle#3\fi}
\fi
\fi
\fi% end of no special RS/JK/D
@@ -2700,8 +2725,6 @@
%
\def\mixer{\pst@object{mixer}}
\def\mixer@i(#1)(#2)(#3)#4#5{%
- \addbefore@par{dimen=middle}%
- \begin@ClosedObj
\pst@getcoor{#1}\pst@tempa
\pst@getcoor{#2}\pst@tempb
\pst@getcoor{#3}\pst@tempc
@@ -2715,7 +2738,16 @@
/XC X1 X2 add 2 div def
/YC Y2 def
XC YC){C@}
+ \begingroup
+ \use@keep@par
+ \ifx\psk@tripole@style\pst@tripole@style@top
+ \addbefore@par{labeloffset=-0.9,dimen=middle}%
+ \else
+ \addbefore@par{labeloffset=0.9,dimen=middle}%
+ \fi
+ \use@par
\rput(C@){\pst@draw@mixer{#3}{#4}{#5}}
+ \endgroup
\ifx\psk@Tinput\pst@Tinput@left%
\ifPst@inputarrow
\ncangle[arrows=->,arrowinset=0,arm=0.5,angleB=180]{#1}{Tport@left}
@@ -2733,17 +2765,16 @@
\fi
\pcline[linestyle=none](#1)(#2)% for the endarrows
\pcline[linestyle=none](#2)(#3)% for the endarrows
- \end@ClosedObj
\ignorespaces%
}
\def\pst@draw@mixer#1#2#3{%
\pscircle[#3,linewidth=1.5\pslinewidth](0,0){0.5}
+ \let\psk@fillstyle\psfs@none
\psline[linewidth=1.5\pslinewidth](-0.3535,-0.3535)(0.3535,0.3535)
\psline[linewidth=1.5\pslinewidth](-0.3535,0.3535)(0.3535,-0.3535)
- \pnode(-0.5,0){Tport@left}%
- \pnode(0.5,0){Tport@right}%
+ \pnodes(-0.5,0){Tport@left}(0.5,0){Tport@right}
+ \pcline[linestyle=none,offset=\psk@label@offset](Tport@left)(Tport@right)\ncput{#2}
\ifx\psk@tripole@style\pst@tripole@style@top%
- \rput[t](0,-0.6){#2}
\pnode(0,0.5){Tport@center}
\ifPst@inputarrow
\ncangle[arrows=->,arrowinset=0,arm=0.5,angleB=90]{#1}{Tport@center}
@@ -2751,7 +2782,6 @@
\ncangle[arrows=-,arm=0.5,angleB=90]{#1}{Tport@center}
\fi
\else
- \rput[b](0,0.6){#2}
\pnode(0,-0.5){Tport@center}
\ifPst@inputarrow
\ncangle[arrows=->,arrowinset=0,arm=0.5,angleB=-90]{#1}{Tport@center}
@@ -5174,6 +5204,167 @@
\fi
}}
%
+% PHOTOVOLTAIC CELL
+%
+% \cell
+%
+\def\cell{\@ifnextchar[{\pst@cell}{\pst@cell[]}}
+\def\pst@cell[#1](#2)(#3)#4{{%
+ \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@cell}
+% \pst@getcoor{#2}\pst@tempa
+% \pst@getcoor{#3}\pst@tempb
+ \ignorespaces}
+%
+\def\pst@draw@cell{{%
+ \pscircle(0.1,0){0.5}
+ \psline[linewidth=2.5\pslinewidth](-0.1,-0.2)(-0.1, 0.2)
+ \psline[linewidth=2\pslinewidth](0.1,-0.4)(0.1, 0.4)
+ \psline[arrows=->](0.9,1)(0.5,0.6)
+ \psline[arrows=->](0.6,1)(0.2,0.6)
+ \wire(-0.6,0)(-0.1,0)
+ \wire(0.6,0)(0.1,0)
+ \pnode(-0.6,0){dipole@1}
+ \pnode(0.6,0){dipole@2}%
+}\ignorespaces}%
+%
+% \splitter
+%
+\def\splitter{\pst@object{splitter}}
+\def\splitter@i(#1)(#2)(#3)#4#5{%
+ \pst@getcoor{#1}\pst@tempa
+ \pst@getcoor{#2}\pst@tempb
+ \pst@getcoor{#3}\pst@tempc
+ \pnode(!%
+ \pst@tempa /Y1 exch \pst@number\psyunit div def
+ /X1 exch \pst@number\psxunit div def
+ \pst@tempb /Y2 exch \pst@number\psyunit div def
+ /X2 exch \pst@number\psxunit div def
+ \pst@tempc /Y3 exch \pst@number\psyunit div def
+ /X3 exch \pst@number\psxunit div def
+ /XC X1 X2 add 2 div def
+ /YC Y2 def
+ XC YC){C@}
+ \begingroup
+ \use@keep@par
+ \ifx\psk@tripole@style\pst@tripole@style@top
+ \addbefore@par{labeloffset=-0.9,dimen=middle}%
+ \else
+ \addbefore@par{labeloffset=0.9,dimen=middle}%
+ \fi
+ \use@par
+ \rput(C@){\pst@draw@splitter{#3}{#4}{#5}}
+ \ifx\psk@Tinput\pst@Tinput@left%
+ \ifPst@inputarrow
+ \ncangle[arrows=->,arrowinset=0,arm=0.5,angleB=180]{#1}{Tport@left}
+ \else
+ \ncangle[arrows=-,arm=0.5,angleB=0]{#1}{Tport@left}
+ \fi
+ \ncangle[arrows=-, arm=0.5,angleB=0]{#2}{Tport@right}
+ \else
+ \ifPst@inputarrow
+ \ncangle[arrows=->,arrowinset=0,arm=0.5,angleB=0]{#2}{Tport@right}
+ \else
+ \ncangle[arrows=-,arm=0.5,angleB=180]{Tport@right}{#2}
+ \fi
+ \ncangle[arrows=-,arm=0.5,angleB=180]{#1}{Tport@left}
+ \fi
+ \endgroup
+ \pcline[linestyle=none](#1)(#2)% for the endarrows
+ \pcline[linestyle=none](#2)(#3)% for the endarrows
+ \ignorespaces%
+}
+\def\pst@draw@splitter#1#2#3{%
+ \psframe[linewidth=1.5\pslinewidth](-0.5,-0.5)(0.5,0.5)
+ \let\psk@fillstyle\psfs@none
+ %% Diagonal line within the square
+ \ifx\psk@Tinput\pst@Tinput@left%
+ \ifx\psk@tripole@style\pst@tripole@style@top%
+ \psline[linewidth=1.5\pslinewidth](-0.5,0.5)(0.5,-0.5)
+ \else
+ \psline[linewidth=1.5\pslinewidth](-0.5,-0.5)(0.5,0.5)
+ \fi
+ \else
+ \ifx\psk@tripole@style\pst@tripole@style@top%
+ \psline[linewidth=1.5\pslinewidth](-0.5,-0.5)(0.5,0.5)
+ \else
+ \psline[linewidth=1.5\pslinewidth](-0.5,0.5)(0.5,-0.5)
+ \fi
+ \fi
+ \pnodes(-0.5,0){Tport@left}(0.5,0){Tport@right}%
+ \pcline[offset=\psk@label@offset,linestyle=none](Tport@left)(Tport@right)\ncput{#2}%
+ \ifx\psk@tripole@style\pst@tripole@style@top%
+ \pnode(0,0.5){Tport@center}
+ \ncangle[arrows=-,arm=0.5,angleB=90]{#1}{Tport@center}
+ \else
+ \pnode(0,-0.5){Tport@center}
+ \ncangle[arrows=-,arm=0.5,angleB=270]{#1}{Tport@center}
+ \fi%
+}
+%
+%%% Attenuator %%%
+%
+\newCircDipole{attenuator}
+\def\pst@draw@attenuator{%
+ \pnode(-0.433,0){dipole@1}
+ \pnode(0.433,0){dipole@2}
+ \psline[fillstyle=none, arrowinset=0](-0.5,0)(0.5,0)
+ \ifx\psk@Dinput\pst@Dinput@right
+ \psline[linewidth=1.5\pslinewidth,fillstyle=none](-0.10825,0.433)(0.10825,0.2165)(-0.10825,0)(0.10825,-0.2165)(-0.10825,-0.433)
+ \else
+ \psline[linewidth=1.5\pslinewidth, fillstyle=none](0.10825,0.433)(-0.10825,0.2165)(0.10825,0)(-0.10825,-0.2165)(0.10825,-0.433)
+ \fi
+}
+%
+% THIS CAN BE SET AS AN OPTION OF THE OSCILLATOR...
+% IT'S UP TO YOU...
+%
+%%% Modulator
+%
+\newCircDipole{modulator}
+\def\pst@draw@modulator{%
+ \pnode(-0.5,0){dipole@1}
+ \pnode(0.5,0){dipole@2}
+ \pscircle[linewidth=1.5\pslinewidth](0,0){0.5}
+ \ifx\psk@Dinput\pst@Dinput@right
+ \psline[linewidth=1.5\pslinewidth]{cc-cc}(-0.3,-0.1)(0,0.2)(0,-0.1)(0.3,-0.1)
+ \else
+ \psline[linewidth=1.5\pslinewidth]{cc-cc}(-0.3,-0.1)(0,-0.1)(0,0.2)(0.3,-0.1)
+ \fi
+}
+%
+%%% Plug %%%
+%
+\def\plug{\@ifnextchar[{\pst@plug}{\pst@plug[]}}
+\def\pst@plug[#1]{%
+ \@ifnextchar({\pst@plugi[#1]{0}}{\pst@plugi[#1]}%
+}
+\def\pst@plugi[#1]#2(#3){{%
+ \psset{#1}%
+ \rput{#2}(#3){%
+ \psline[linewidth=1.5\pslinewidth](0,0)(0,-0.3)(1.2,-0.3)(1.5,0)(1.2,0.3)(0,0.3)(0,0)
+ }}%
+ \ignorespaces%
+}
+%
+% \ampsinu
+%
+% THIS CAN ALSO BE SET AS AN OPTION FOR THE AMPLIFIER...
+% IT'S UP TO YOU
+\newCircDipole{ampsinu}
+\def\pst@draw@ampsinu{%
+ \pnode(-0.433,0){dipole@1}
+ \pnode(0.433,0){dipole@2}
+ \ifx\psk@Dinput\pst@Dinput@right
+ \pstriangle[gangle=90,linewidth=1.5\pslinewidth](0.433,0)(1,0.866)
+ \pscurve[fillstyle=none,linewidth=1\pslinewidth](0.071625,-0.20)(0.025,-0.125)(0.061625,-0.05)%
+ (0.15,0.025)(0.238375,0.1)(0.275,0.175)(0.238375,0.25)
+ \else
+ \pstriangle[gangle=-90,linewidth=1.5\pslinewidth](-0.433,0)(1,0.866)
+ \pscurve[fillstyle=none,linewidth=1\pslinewidth](-0.071625,-0.20)(-0.025,-0.125)(-0.061625,-0.05)%
+ (-0.15,0.025)(-0.238375,0.1)(-0.275,0.175)(-0.238375,0.25)
+ \fi
+}
+%
\catcode`\@=\PstAtCode\relax
%
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-circ.tlpobj new/tlpkg/tlpobj/pst-circ.tlpobj
--- old/tlpkg/tlpobj/pst-circ.tlpobj 2013-05-18 03:42:41.000000000 +0200
+++ new/tlpkg/tlpobj/pst-circ.tlpobj 2014-05-21 00:37:23.000000000 +0200
@@ -1,6 +1,6 @@
name pst-circ
category Package
-revision 30527
+revision 34127
shortdesc PSTricks package for drawing electric circuits.
relocated 1
longdesc The package is built using PSTricks and in particular pst-node.
@@ -10,11 +10,11 @@
longdesc representation of circuits, as far as possible, so as to
longdesc relieve the user of purely graphical considerations when
longdesc expressing a circuit.
-runfiles size=51
+runfiles size=52
RELOC/dvips/pst-circ/pst-circ.pro
RELOC/tex/generic/pst-circ/pst-circ.tex
RELOC/tex/latex/pst-circ/pst-circ.sty
catalogue-ctan /graphics/pstricks/contrib/pst-circ
-catalogue-date 2013-05-17 14:10:30 +0200
+catalogue-date 2014-05-18 22:26:36 +0200
catalogue-license lppl
-catalogue-version 2.03
+catalogue-version 2.09
++++++ texlive-specs-r-rpmlintrc ++++++
addFilter(".*dangling-symlink.*/fonts/.*")
addFilter(".*dangling-symlink.*/zypper\.py.*")
addFilter(".*description-shorter-than-summary.*")
addFilter(".*devel-file-in-non-devel-package.*/doc/.*")
addFilter(".*files-duplicate.*")
addFilter(".*E:.*files-duplicated-waste.*")
addFilter(".*spelling-error.*")
addFilter(".*zero-length.*")
addFilter(".*E:.*summary-too-long.*")
addFilter(".*incorrect-fsf-address.*")
addFilter(".*hidden-file-or-dir.*/\.tex.*")
addFilter(".*wrong-script-end-of-line-encoding.*")
addFilter(".*script-without-shebang.*/doc/.*")
addFilter(".*wrong-script-interpreter.*/doc/.*")
addFilter(".*non-executable-script.*/doc/.*")