Hello community,
here is the log from the commit of package texlive-specs-t for openSUSE:Factory checked in at 2015-04-25 09:51:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-t (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-t.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-t"
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-t/texlive-specs-t.changes 2015-02-24 13:05:30.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.texlive-specs-t.new/texlive-specs-t.changes 2015-04-25 09:54:16.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:
----
seetexk.tar.xz
sepfootnotes.doc.tar.xz
sepfootnotes.tar.xz
sepnum.doc.tar.xz
sepnum.tar.xz
seqsplit.doc.tar.xz
seqsplit.tar.xz
serbian-apostrophe.doc.tar.xz
serbian-apostrophe.tar.xz
serbian-date-lat.doc.tar.xz
serbian-date-lat.tar.xz
serbian-def-cyr.doc.tar.xz
serbian-def-cyr.tar.xz
serbian-lig.doc.tar.xz
serbian-lig.tar.xz
setdeck.doc.tar.xz
setdeck.tar.xz
New:
----
randbild.doc.tar.xz
randbild.tar.xz
randomwalk.doc.tar.xz
randomwalk.tar.xz
randtext.doc.tar.xz
randtext.tar.xz
refenums.doc.tar.xz
refenums.tar.xz
reflectgraphics.doc.tar.xz
reflectgraphics.tar.xz
repere.doc.tar.xz
repere.tar.xz
repltext.doc.tar.xz
repltext.tar.xz
ribbonproofs.doc.tar.xz
ribbonproofs.tar.xz
rubik.doc.tar.xz
rubik.tar.xz
rulercompass.doc.tar.xz
rulercompass.tar.xz
scanpages.doc.tar.xz
scanpages.tar.xz
schule.doc.tar.xz
schule.tar.xz
seealso.doc.tar.xz
seealso.tar.xz
seetexk.doc.tar.xz
texlive-specs-t-rpmlintrc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-t.spec ++++++
++++ 6297 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-t/texlive-specs-t.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-t.new/texlive-specs-t.spec
++++++ resphilosophica.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/resphilosophica/Makefile new/doc/latex/resphilosophica/Makefile
--- old/doc/latex/resphilosophica/Makefile 2012-09-19 01:50:27.000000000 +0200
+++ new/doc/latex/resphilosophica/Makefile 2013-12-13 23:07:13.000000000 +0100
@@ -3,7 +3,7 @@
#
# This file is in public domain
#
-# $Id: Makefile,v 1.6 2012-09-11 22:34:31 boris Exp $
+# $Id: Makefile,v 1.7 2013-12-08 03:38:39 boris Exp $
#
PACKAGE=resphilosophica
@@ -46,7 +46,7 @@
*.cfg *.glo *.idx *.toc \
*.ilg *.ind *.out *.lof \
*.lot *.bbl *.blg *.gls \
- *.dvi *.ps *.hd *.rpi
+ *.dvi *.ps *.hd *.rpi *.notes
distclean: clean
$(RM) $(PDF)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/resphilosophica/README new/doc/latex/resphilosophica/README
--- old/doc/latex/resphilosophica/README 2013-01-12 00:58:24.000000000 +0100
+++ new/doc/latex/resphilosophica/README 2014-02-06 00:35:41.000000000 +0100
@@ -7,7 +7,33 @@
Changes
+
+ version 1.19 More editorial commands
+ Bibliography style changes
+
+ version 1.18: Formatting changes
+ Bug fixes
+
+ version 1.17: Formatting changes
+ Added layering of editorial comments
+ New bibliography entry 'inloosecollection'
+
+ version 1.16: Formatting changes
+ New commands for typesetter change marks
+ Deleted mtshadow option
+ New environment for bibliography notes
+
+ version 1.15: New command: \suppresscomma
+
+ version 1.14: Bug fix
+
+ version 1.13: New command: \titlenote
+ New options: preprint and forthcoming
+
+ version 1.12: Bibliography changes
+
version 1.11: Automatic doi generation
Bibliography formatting changes
- version 1.10: Bibliography formatting changes
\ No newline at end of file
+ version 1.10: Bibliography formatting changes
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/resphilosophica/resphilosophica.bib new/doc/latex/resphilosophica/resphilosophica.bib
--- old/doc/latex/resphilosophica/resphilosophica.bib 2012-09-22 00:43:12.000000000 +0200
+++ new/doc/latex/resphilosophica/resphilosophica.bib 2013-12-13 23:07:13.000000000 +0100
@@ -47,3 +47,4 @@
note = {\url{http://www.tug.org/TUGboat/tb29-1/tb91pearls.pdf}}
}
+
Files old/doc/latex/resphilosophica/resphilosophica.pdf and new/doc/latex/resphilosophica/resphilosophica.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/resphilosophica/rpsample.bib new/doc/latex/resphilosophica/rpsample.bib
--- old/doc/latex/resphilosophica/rpsample.bib 2013-01-12 00:58:24.000000000 +0100
+++ new/doc/latex/resphilosophica/rpsample.bib 2013-12-13 23:07:13.000000000 +0100
@@ -69,3 +69,64 @@
keywords = {bayesian, computational, neural-implementation,
probabilistic-inference, probabilistic-reasoning},
}
+
+@inloosecollection{faga06a,
+ author = {Fagan, Andrew},
+ title = {Human Rights},
+ booktitle = {Internet Encyclopedia of Philosophy},
+ year = {2006},
+ bdsk-url-1 = {http://www.iep.utm.edu/h/hum-rts.htm},
+ owner = {Andrew},
+ timestamp = {2013.07.05},
+ url = {http://www.iep.utm.edu/h/hum-rts.htm},
+}
+
+@ARTICLE{bochnga,
+ author = {Bourget, David and David J. Chalmers},
+ title = {What Do Philosophers Believe?},
+ journal = {Philosophical Studies},
+ year = {Forthcoming},
+ pages = {(in press)},
+ date-modified = {2013-07-11 22:10:39 +0000},
+ owner = {Andrew},
+ timestamp = {2013.07.11}
+}
+
+@book{aqui51a,
+ Address = {Turin},
+ Author = {Aquinas},
+ Date-Added = {2013-07-11 22:09:46 +0000},
+ Date-Modified = {2013-07-15 03:00:18 +0000},
+ Edition = {5th},
+ Publisher = {Marietti},
+ Title = {Super Evangelium S. Matthaei lectura, Reportatio Leodegarii Bissuntini},
+ Titlenote = {Edited by R. Cai},
+ Year = {1951}}
+
+
+
+@Incollection{Mapas12,
+ author = {J. Mapas},
+ title = {Donald Davidson},
+ booktitle = {The Stanford Encyclopedia of Philosophy},
+ year = 2012,
+ edition = {Winter 2012},
+ editor = {Edward N. Zalta},
+ URL = {http://plato.stanford.edu/archives/win2012/entries/davidson/}
+}
+
+@incollection{ande97a,
+ Address = {Macon, GA},
+ Author = {Anderson, Thomas C.},
+ Booktitle = {Concluding Unscientific Postscript to \enquote{Philosophical Fragments,\suppresscomma}},
+ Date-Modified = {2013-09-04 21:27:17 +0000},
+ Editor = {Robert Perkins},
+ Owner = {Andrew},
+ Pages = {187--204},
+ Publisher = {Mercer University Press},
+ Series = {International Kierkegaard Commentary},
+ Timestamp = {2013.09.04},
+ Title = {Kierkegaard and Approximation Knowledge},
+ Volume = {12},
+ Year = {1997}}
+
Files old/doc/latex/resphilosophica/rpsample.pdf and new/doc/latex/resphilosophica/rpsample.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/resphilosophica/rpsample.tex new/doc/latex/resphilosophica/rpsample.tex
--- old/doc/latex/resphilosophica/rpsample.tex 2013-01-12 00:58:24.000000000 +0100
+++ new/doc/latex/resphilosophica/rpsample.tex 2014-02-06 00:35:41.000000000 +0100
@@ -1,13 +1,20 @@
%\documentclass[screen]{resphilosophica}
-%\documentclass[manuscript]{resphilosophica}
-\documentclass{resphilosophica}
+\documentclass[manuscript]{resphilosophica}
+%\documentclass[preprint]{resphilosophica}
+%\documentclass[forthcoming]{resphilosophica}
+%\documentclass{resphilosophica}
\usepackage{kantlipsum}
-\title[A Sample Paper: A Template]{A Sample Paper:\\ A Template}
+\title[A Sample Paper: A Template]{A Sample Paper:\\ A
+ Template}
+\titlenote{This is the first titlenote}
+\titlenote{This is the second titlenote}
\volumenumber{90}
\issuenumber{1--2}
-\publicationyear{2013}
-\publicationmonth{January--February}
+\publicationyear{2012}
+\publicationmonth[Jan--Feb]{January--February}
\papernumber{2}
+\onlinedate{January 1 2013}
+%\doinumber{}
\author{Boris Veytsman}
\address{Computational Materials Science Center, MS 6A2\\
George Mason University\\
@@ -25,6 +32,10 @@
Germany}
\thanks{The work on this package was supported by Sant Lois University}
+\TCSelect{0,1}
+\TCSelect[cyan]{blueline}
+\ECSelect{0,1}
+
\begin{document}
%
% Paper information
@@ -35,7 +46,8 @@
% Abstract must PRECEDE \maketitle
\begin{abstract}
- The things in themselves are what first give rise to reason, as is
+ The things in \TC{themselves are what first
+ (see \url{http://www.tug.org})} give rise to reason, as is
proven in the ontological manuals. By virtue of natural reason, let
us suppose that the transcen- dental unity of apperception abstracts
from all content of knowledge; in view of these considerations, the
@@ -46,6 +58,9 @@
\end{abstract}
\maketitle
+\kant[4]
+
+\setcounter{footnote}{0}
\section{Introduction}
\label{sec:intro}
@@ -55,9 +70,10 @@
The reader should be careful to observe that the objects in
space and time are the clue to the discovery of, certainly,
our a priori knowledge, by means of analytic unity. Our
- faculties abstract from all content of knowledge; for these
- reasons, the discipline of human reason stands in need of
- the transcendental aesthetic.
+ faculties abstract \TC[blueline]{from all content of knowledge; for these
+ reasons, the discipline of
+ \href{http://en.wikipedia.org/wiki/Human}{human} reason stands} in
+ need of the transcendental aesthetic.
\em \citep{Gregorio:Kantlipsum}
\EditorialComment{Is this quotation necessary?}
\end{quotation}
@@ -74,8 +90,10 @@
of, in accordance with the principles of the employment of the
paralogisms, time. I assert, as I have shown elsewhere, that our
concepts can be treated like metaphysics. See also \citep{Landau5},
- \citep{Hoff10}, \citep{Rao07:BeliefPropagation} and
- \citep{Knuth94:TheTeXbook}.}
+ \citep{Hoff10}, \citep{Rao07:BeliefPropagation}, \citep{faga06a},
+ \citep{bochnga}, \citep{aqui51a}, \citep{Mapas12}, \citep{ande97a},
+ and \citep{Knuth94:TheTeXbook}.}\EditorialComment[1]{Are all quotes
+ here relevant?}
\section{Discussion}
\label{sec:discussion}
@@ -101,9 +119,9 @@
is that, then, the transcendental aesthetic, in reference to ends,
would thereby be made to contradict the Transcendental Deduction.
The architectonic of practical reason has nothing to do with our
- ideas; however, time can never furnish a true and demonstrated
+ ideas; \TC[1]{however, time can never furnish a true and demonstrated
science, because, like the Ideal, it depends on hypothetical
- principles. Space has nothing to do with the Antinomies, because of
+ principles.} Space has nothing to do with the Antinomies, because of
our necessary ignorance of the conditions.}
@@ -126,11 +144,15 @@
\kant[17-20]
\kant*[21]\footnote{As is shown in the writings of Hume, it remains a
- mystery why our judgements exclude the possibility of the
- transcendental aesthetic.}
-
+ mystery why our judgements exclude the possibility of the
+ transcendental aesthetic.}
+\begin{notes}{Bibliography notes}
+ \kant[4-8]
+\end{notes}
+
+
\bibliography{rpsample}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/resphilosophica.doc.tlpobj new/tlpkg/tlpobj/resphilosophica.doc.tlpobj
--- old/tlpkg/tlpobj/resphilosophica.doc.tlpobj 2013-01-12 04:43:46.000000000 +0100
+++ new/tlpkg/tlpobj/resphilosophica.doc.tlpobj 2014-02-06 03:22:40.000000000 +0100
@@ -1,9 +1,9 @@
name resphilosophica.doc
category Package
-revision 28799
+revision 32874
shortdesc doc files of resphilosophica
relocated 1
-docfiles size=125
+docfiles size=134
RELOC/doc/latex/resphilosophica/Makefile
RELOC/doc/latex/resphilosophica/README
RELOC/doc/latex/resphilosophica/resphilosophica.bib
++++++ resphilosophica.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibtex/bst/resphilosophica/resphilosophica.bst new/bibtex/bst/resphilosophica/resphilosophica.bst
--- old/bibtex/bst/resphilosophica/resphilosophica.bst 2013-01-12 00:58:24.000000000 +0100
+++ new/bibtex/bst/resphilosophica/resphilosophica.bst 2014-02-06 00:35:41.000000000 +0100
@@ -91,7 +91,7 @@
FUNCTION {output.nonnull}
{ 's :=
output.state mid.sentence =
- { ", " * write$ }
+ { "\checkcomma{} " * write$ }
{ output.state after.block =
{ add.period$ write$
newline$
@@ -858,7 +858,7 @@
}
{ t #1 #1 substring$
duplicate$ "-" =
- swap$ duplicate$ "," =
+ swap$ duplicate$ "\checkcomma{}" =
swap$ "+" =
or or
{ #1 'multiresult := }
@@ -945,7 +945,7 @@
* *
pages empty$
'skip$
- { ", " * format.pages * }
+ { "\checkcomma{} " * format.pages * }
if$
}
if$
@@ -959,12 +959,17 @@
FUNCTION {format.in.ed.booktitle}
{ format.booktitle duplicate$ empty$ 'skip$
{
+ format.edition duplicate$ empty$ 'pop$
+ {
+ "\checkcomma{} " swap$ * *
+ }
+ if$
editor "editor" format.names.ed duplicate$ empty$ 'pop$
{
bbl.edby
" " * swap$ *
swap$
- "," *
+ "\checkcomma{}" *
" " * swap$
* }
if$
@@ -1061,7 +1066,7 @@
emphasize
"journal" output.check
add.blank
- format.vol.num.pages output
+ format.vol.num.pages output
}
{ format.article.crossref output.nonnull
format.pages output
@@ -1087,14 +1092,19 @@
format.date "year" output.check
date.block
format.btitle "title" output.check
+ edition empty$
+ 'skip$
+ {new.sentence
+ format.edition output}
+ if$
crossref missing$
{ new.sentence
format.bvolume output
new.block
format.number.series output
titlenote empty$
- 'skip$
- { new.sentence
+ 'skip$
+ { new.sentence
titlenote output }
if$
new.sentence
@@ -1106,7 +1116,6 @@
}
if$
new.sentence
- format.edition output
new.block
format.note output
fin.entry
@@ -1147,6 +1156,11 @@
format.date "year" output.check
date.block
format.btitle "title" output.check
+ edition empty$
+ 'skip$
+ {new.sentence
+ format.edition output}
+ if$
crossref missing$
{
new.sentence
@@ -1168,7 +1182,6 @@
format.book.crossref output.nonnull
}
if$
- format.edition output
new.block
format.note output
fin.entry
@@ -1186,17 +1199,22 @@
{ format.in.ed.booktitle "booktitle" output.check
format.bvolume output
format.number.series output
- format.chapter.pages output
titlenote empty$
'skip$
{ new.sentence
- titlenote output }
+ titlenote output }
if$
+ format.chapter.pages output
new.sentence
format.publisher.address output
- format.edition output
}
{ format.incoll.inproc.crossref output.nonnull
+ format.bvolume output
+ titlenote empty$
+ 'skip$
+ { new.sentence
+ titlenote output }
+ if$
format.chapter.pages output
}
if$
@@ -1204,13 +1222,14 @@
format.note output
fin.entry
}
-FUNCTION {inproceedings}
+
+FUNCTION {inloosecollection}
{ output.bibitem
format.authors "author" output.check
author format.key output
format.date "year" output.check
date.block
- format.title "title" output.check
+ format.btitle "title" output.check
new.block
crossref missing$
{ format.in.ed.booktitle "booktitle" output.check
@@ -1219,8 +1238,41 @@
titlenote empty$
'skip$
{ new.sentence
- titlenote output }
+ titlenote output }
+ if$
+ format.chapter.pages output
+ new.sentence
+ format.publisher.address output
+ }
+ { format.incoll.inproc.crossref output.nonnull
+ format.bvolume output
+ titlenote empty$
+ 'skip$
+ { new.sentence
+ titlenote output }
if$
+ format.chapter.pages output
+ }
+ if$
+ new.block
+ format.note output
+ fin.entry
+}
+
+
+
+FUNCTION {inproceedings}
+{ output.bibitem
+ format.authors "author" output.check
+ author format.key output
+ format.date "year" output.check
+ date.block
+ format.title "title" output.check
+ new.block
+ crossref missing$
+ { format.in.ed.booktitle "booktitle" output.check
+ format.bvolume output
+ format.number.series output
format.pages output
new.sentence
publisher empty$
@@ -1246,6 +1298,11 @@
format.date "year" output.check
date.block
format.btitle "title" output.check
+ edition empty$
+ 'skip$
+ {new.sentence
+ format.edition output}
+ if$
titlenote empty$
'skip$
{ new.sentence
@@ -1254,7 +1311,6 @@
organization address new.block.checkb
organization "organization" bibinfo.check output
address "address" bibinfo.check output
- format.edition output
new.block
format.note output
fin.entry
@@ -1678,10 +1734,17 @@
write$ newline$
"\providecommand{\url}[1]{\texttt{#1}}"
write$ newline$
- "\providecommand{\urlprefix}{URL:~}"
+ "\providecommand{\urlprefix}{}"
write$ newline$
"\providecommand{\doi}[1]{\url{http://dx.doi.org/#1}}"
- write$ newline$}
+ write$ newline$
+ "\makeatletter\newif\if@suppresscomma\@suppresscommafalse"
+ write$ newline$
+ "\newcommand\suppresscomma{\global\@suppresscommatrue}"
+ write$ newline$
+ "\newcommand\checkcomma{\if@suppresscomma\else,\fi\global\@suppresscommafalse}\makeatother"
+ write$ newline$
+}
EXECUTE {begin.bib}
EXECUTE {init.state.consts}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/resphilosophica/resphilosophica.cls new/tex/latex/resphilosophica/resphilosophica.cls
--- old/tex/latex/resphilosophica/resphilosophica.cls 2013-01-12 00:58:24.000000000 +0100
+++ new/tex/latex/resphilosophica/resphilosophica.cls 2014-02-06 00:35:41.000000000 +0100
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{resphilosophica}
-[2013/01/08 v1.11 Typesetting articles for Res Philosophica]
+[2013/12/23 v1.19 Typesetting articles for Res Philosophica]
\RequirePackage{xkeyval}
\newif\ifRESP@fontauto
\RESP@fontautotrue
@@ -30,8 +30,6 @@
\RESP@rpfontautotrue
\newif\ifRESP@lsabon
\RESP@lsabonfalse
-\newif\ifRESP@mtshadow
-\RESP@mtshadowfalse
\define@choicekey*+{resphilosophica.cls}{bodyfont}[\val\nr]{auto,
sabon, lsabon, cm}[auto]{%
\ifcase\nr\relax
@@ -48,22 +46,6 @@
\fi}{%
\PackageWarning{resphilosophica}{The option bodyfont must be auto,
sabon or cm. Using auto}\RESP@fontautotrue}
-\define@choicekey*+{resphilosophica.cls}{rpfont}[\val\nr]{auto,
- imprint, imprintshadow, cm}[auto]{%
- \ifcase\nr\relax
- \RESP@rpfontautotrue
- \or
- \RESP@rpfontautofalse
- \RESP@mtshadowtrue
- \or
- \RESP@rpfontautofalse
- \RESP@mtshadowtrue
- \or
- \RESP@rpfontautofalse
- \RESP@mtshadowfalse
- \fi}{%
- \PackageWarning{resphilosophica}{The option rpfont must be auto,
- imprintshadow or cm. Using auto}\RESP@rpfontautotrue}
\define@boolkey+{resphilosophica.cls}[RESP@]{natbib}[tue]{}{%
\PackageWarning{resphilosophica}{The option natbib must be
yes or no. Using yes}}
@@ -82,28 +64,32 @@
\newif\ifRESP@screen
\RESP@screenfalse
\DeclareOptionX{screen}{\RESP@screentrue}
+\newif\ifRESP@preprint
+\RESP@preprintfalse
+\DeclareOptionX{preprint}{\RESP@preprinttrue}
+\newif\ifRESP@forthcoming
+\RESP@forthcomingfalse
+\DeclareOptionX{forthcoming}{\RESP@forthcomingtrue}
\DeclareOptionX{*}{\PassOptionsToClass{\CurrentOption}{amsart}}
\ProcessOptionsX
\LoadClass[noamsfonts]{amsart}
-\RequirePackage{microtype, fancyhdr, xcolor, lastpage}
+\RequirePackage{microtype, fancyhdr, xcolor, lastpage, collect}
\RequirePackage[bottom,multiple]{footmisc}
\RequirePackage[hyperfootnotes=false]{hyperref}
\urlstyle{rm}
\ifRESP@manuscript\hypersetup{colorlinks,allcolors=blue}\else
\ifRESP@screen\hypersetup{colorlinks,allcolors=blue}\else
- \hypersetup{hidelinks}\fi\fi
+ \ifRESP@preprint\hypersetup{colorlinks,allcolors=blue}\else
+ \ifRESP@forthcoming\hypersetup{colorlinks,allcolors=blue}\else
+ \hypersetup{hidelinks}\fi\fi\fi\fi
\ifRESP@fontauto
\IfFileExists{t1lsb.fd}{\RESP@lsabontrue}{\RESP@lsabonfalse}\fi
\ifRESP@lsabon
\RequirePackage[mdugm]{mathdesign}
\RequirePackage[rmdefault]{lsabon}
\renewcommand\scdefault{sc}
+ \renewcommand{\bfdefault}{b}
\fi
-\ifRESP@rpfontauto
- \IfFileExists{t1miih.fd}{\RESP@mtshadowtrue}{\RESP@mtshadowfalse}\fi
-\ifRESP@mtshadow
- \def\rpdefault{miih}\else
- \def\rpdefault{\rmdefault}\fi
\def\AddtoEndMatter#1{\g@addto@macro\enddoc@text{#1}}
\ifRESP@natbib
\RequirePackage[round]{natbib}
@@ -129,7 +115,11 @@
\renewcommand{\headrulewidth}{0pt}
\renewcommand{\footrulewidth}{0pt}
\setlength{\footskip}{20pt}
-\ifRESP@manuscript
+\newif\ifRESP@printlinecount
+\RESP@printlinecountfalse
+\ifRESP@manuscript\RESP@printlinecounttrue\fi
+\ifRESP@preprint\RESP@printlinecounttrue\fi
+\ifRESP@printlinecount
\newsavebox{\RESP@linecount}
\savebox{\RESP@linecount}[4em][t]{\parbox[t]{4em}{%
\@tempcnta\@ne\relax
@@ -141,37 +131,74 @@
\fancyfoot{}
\fancyhead[LE]{\footnotesize\thepage\qquad\itshape\shortauthors}
\fancyhead[RO]{\footnotesize\textit{\shorttitle}\qquad\thepage}
-\ifRESP@manuscript
+\ifRESP@printlinecount
\fancyhead[LE]{\begin{picture}(0,0)%
\put(-26,-22){\usebox{\RESP@linecount}}%
\end{picture}\footnotesize\thepage\qquad\itshape\shortauthors}
\fancyhead[LO]{\begin{picture}(0,0)%
\put(-21,-22){\usebox{\RESP@linecount}}%
\end{picture}}
- \fancyfoot[C]{\scriptsize\color{red}Author's Proof}
+\fi
+\ifRESP@manuscript
+ \fancyfoot[C]{\scriptsize\color{red}Author's Proof}%
+\fi
+\ifRESP@preprint
+ \fancyfoot[C]{\scriptsize\color{red}Author's Pre-Print}%
\fi
\fancypagestyle{firstpage}{%
\fancyhf{}%
- \ifRESP@manuscript
+ \ifRESP@printlinecount
\lhead{\begin{picture}(0,0)%
\put(-26,-20){\usebox{\RESP@linecount}}%
\end{picture}}
\fi
- \cfoot{\footnotesize{\fontfamily{\rpdefault}\selectfont Res Philosophica,}
- \itshape Vol.~\currentvolume, No.~\currentissue,
- \currentmonth~\currentyear, pp.~\start@page--\end@page
+ \ifRESP@preprint
+ \cfoot{\footnotesize Res Philosophica, \itshape
+ Vol.~\currentvolume, No.~\currentissue,
+ \currentmonth~\currentyear
+ \ifx\@doinumber\@empty\else\\%
+ \doi{\@doinumber}\fi
+ \\
+ \@copyrightnote}%
+ \chead{\scriptsize\color{red}Author's Pre-print. Forthcoming in
+ Res Philosophica. Pagination may change. Published version will
+ be available at \url{http://pdcnet.org/resphilosophica/}}
+ \else
+ \ifRESP@forthcoming
+ \cfoot{\footnotesize Res
+ Philosophica\itshape
+ \ifx\currentvolume\@empty\else, %
+ Vol.~\currentvolume\fi
+ \ifx\currentissue\@empty\else, No.~\currentissue\fi
+ \ifx\currentmonth\@empty
+ \ifx\currentyear\@empty\else, \currentyear\fi
+ \else,
+ \currentmonth~\currentyear
+ \fi
\ifx\@doinumber\@empty\else\\%
\doi{\@doinumber}\fi
\\
- \@copyrightnote}}
+ \@copyrightnote}%
+ \lhead{\raisebox{1.5\bigskipamount}[\z@][\z@]{\parbox{\textwidth}{\raggedright\footnotesize Published Online First: \@onlinedate}}}
+ \else
+ \cfoot{\footnotesize Res Philosophica, \itshape
+ \itshape Vol.~\currentvolume, No.~\currentissue,
+ \currentmonth~\currentyear, pp.~\start@page--\end@page
+ \ifx\@doinumber\@empty\else\\%
+ \doi{\@doinumber}\fi
+ \\
+ \@copyrightnote}%
+ \fi\fi}
\def\volumenumber#1{\def\currentvolume{#1}}
-\volumenumber{00}
+\volumenumber{}
\def\issuenumber#1{\def\currentissue{#1}}
-\issuenumber{0--0}
+\issuenumber{}
\def\publicationyear#1{\def\currentyear{#1}}
-\publicationyear{2090}
-\def\publicationmonth#1{\def\currentmonth{#1}}
-\publicationmonth{January--February}
+\publicationyear{}
+\newcommand\publicationmonth[2][]{\gdef\currentmonth{#2}%
+ \gdef\abbrevcurrentmonth{#1}%
+ \ifx\abbrevcurrentmonth\@empty\gdef\abbrevcurrentmonth{#2}\fi}
+\publicationmonth{}
\def\papernumber#1{\def\currentpaper{#1}}
\papernumber{0000}
\def\doinumber#1{\gdef\@doinumber{#1}}
@@ -215,7 +242,11 @@
\ifx\@setabstract\relax\@setabstracta\fi%
}
\def\copyrightyear#1{\def\@copyrightyear{#1}}
-\copyrightyear{}
+\ifRESP@forthcoming
+ \copyrightyear{\the\year}\else
+ \copyrightyear{}\fi
+\def\onlinedate#1{\gdef\@onlinedate{#1}}
+\onlinedate{\hspace*{5em}}
\newlength\RESP@bulletboxwidth
\settowidth\RESP@bulletboxwidth{\quad\textbullet\quad}
\def\copyrightnote#1{\def\@copyrightnote{#1}}
@@ -224,7 +255,7 @@
\shortauthors\cleaders\hbox{\quad\textbullet\quad}\hskip\RESP@bulletboxwidth
\textcopyright~%
\ifx\@empty\@copyrightyear\currentyear\else\@copyrightyear\fi~%
- {\normalfont\fontfamily{\rpdefault}\selectfont Res~Philosophica}}
+ {\upshape Res~Philosophica}}%
\renewcommand{\author}[2][]{%
\ifx\@empty\addresses
\gdef\addresses{\author{#2}}%
@@ -246,10 +277,15 @@
}
\edef\author{\@nx\@dblarg
\@xp\@nx\csname\string\author\endcsname}
+\def\@titlenotes{}%
+\def\titlenote#1{%
+ \ifx\@empty\@titlenotes\gdef\@titlenotes{\footnote{#1}}%
+ \else\g@addto@macro\@titlenotes{\footnote{#1}}\fi}
\def\@settitle{\begin{center}%
\baselineskip20\p@\relax
\LARGE\scshape
- \@title
+ \renewcommand\thefootnote{\@fnsymbol\c@footnote}%
+ \@title\@titlenotes
\hypersetup{pdftitle=\@title}%
\end{center}%
}
@@ -288,7 +324,7 @@
\@tempa
\endgroup
\c@footnote\z@
- \@cleartopmattertags
+ \everypar{\setbox\z@\lastbox\everypar{}}%
}
\def\@maketitle{%
\normalfont\normalsize
@@ -357,8 +393,16 @@
\do\commby \do\@commby
\do\dedicatory \do\@dedicatory \do\thanks
\do\keywords \do\@keywords \do\subjclass \do\@subjclass
- \def\sf@size{7pt}%
+ \def\sf@size{7}%
}
+\definecollection{notes}
+\newenvironment{notes}[1]{%
+ \@nameuse{collect}{notes}{}{}%
+ \makeatletter
+ \par\addpenalty\@secpenalty\addvspace{\bigskipamount}%
+ \noindent \Small #1:\par\nobreak\vskip\medskipamount\@afterheading
+ \makeatother
+}{\@nameuse{endcollect}\AddtoEndMatter{\includecollection{notes}}}
\newif\if@enddoc
\@enddocfalse
\def\enddoc@text{%
@@ -434,9 +478,27 @@
{-1em}%
{\normalfont\normalsize\bfseries}}
\@mparswitchfalse
-\def\EditorialComment#1{\ifRESP@manuscript\bgroup
+\newcommand\EditorialComment[2][0]{%
+ \expandafter\ifx\csname EditorialComment@#1\endcsname\relax
+ \else\bgroup
\marginparwidth=200pt\marginpar{\color{red}%
- \raggedright#1}\egroup\fi}
+ \raggedright#2}\egroup\fi}
+\def\ECSelect#1{\ifRESP@manuscript
+ \@for\EC@level:=#1\do{%
+ \expandafter\gdef\csname
+ EditorialComment@\EC@level\endcsname{\EditorialComment}}%
+ \fi}
+\newcommand\TC[2][0]{%
+ \expandafter\ifx\csname TC@highlight@#1\endcsname\relax#2\else
+ \csname TC@highlight@#1\endcsname{#2}\fi}
+\newcommand\TCSelect[2][magenta]{\ifRESP@manuscript
+ \@for\TC@level:=#2\do{\expandafter
+ \gdef\csname TC@highlight@\TC@level\endcsname##1{\bgroup
+ \Hy@colorlinksfalse
+ \def\Hy@colorlink####1{\begingroup}%
+ \def\Hy@endcolorlink{\endgroup}%
+ \color{#1}##1\egroup}}%
+ \fi}
\def\doi#1{\url{http://dx.doi.org/#1}}
\def\@makefntext{\noindent\@makefnmark
\if@enddoc\else
@@ -453,7 +515,7 @@
\protected@edef\@currentlabel{%
\csname p@footnote\endcsname\@thefnmark}%
\@makefntext{%
- \rule\z@\footnotesep\ignorespaces#1\unskip\strut\par}}}
+ \,\rule\z@\footnotesep\ignorespaces#1\unskip\strut\par}}}
\raggedbottom\normalsize\normalfont
\endinput
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/resphilosophica.tlpobj new/tlpkg/tlpobj/resphilosophica.tlpobj
--- old/tlpkg/tlpobj/resphilosophica.tlpobj 2013-01-12 04:43:46.000000000 +0100
+++ new/tlpkg/tlpobj/resphilosophica.tlpobj 2014-02-06 03:22:40.000000000 +0100
@@ -1,15 +1,15 @@
name resphilosophica
category Package
-revision 28799
+revision 32874
shortdesc Typeset articles for the journal Res Philosophica.
relocated 1
longdesc Th bundle provides a class for typesetting articles for the
longdesc journal Res Philosophica. Development was commissioned by Saint
longdesc Louis University.
-runfiles size=13
+runfiles size=14
RELOC/bibtex/bst/resphilosophica/resphilosophica.bst
RELOC/tex/latex/resphilosophica/resphilosophica.cls
catalogue-ctan /macros/latex/contrib/resphilosophica
-catalogue-date 2013-01-10 19:11:35 +0100
+catalogue-date 2014-02-05 19:42:21 +0100
catalogue-license lppl1.3
-catalogue-version 1.11
+catalogue-version 1.19
++++++ rsfso.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/rsfso/README new/doc/fonts/rsfso/README
--- old/doc/fonts/rsfso/README 2011-02-18 01:02:27.000000000 +0100
+++ new/doc/fonts/rsfso/README 2013-11-04 00:43:25.000000000 +0100
@@ -1,5 +1,7 @@
This material is subject to the LaTeX Project Public License. See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html for the details of that license.
+Version 1.01, 2013-11-02
+
IMPORTANT: Before installing this package, the rsfs package with PostScript fonts must be installed (it is part of TeXLive), and rsfs.map must be enabled.
This is a variant of the rsfs script font package and will not function in its absence. It allows the use of the rsfs fonts as the bases for virtual fonts which render the rsfs glyphs with a much smaller slant, so they appear stylistically close to the script font mh2scr in the Adobe Mathematical Pi collection.
@@ -14,6 +16,12 @@
is to redefine \mathcal to invoke the appropriate size of rsfso scaled by the factor .9.
+The effect of
+
+\usepackage[scr]{rsfso}
+
+is to redefine \mathscr rather than \mathcal to invoke the appropriate size of rsfso.
+
The virtual fonts rsfso10, rsfso7 and rsfso5 were produced using fontinst from the raw text fonts rrsfso10, rrsfso7 and rrsfso5, with adjustments to the font metrics in accordance with my tastes in side-bearings, accent placement and subscript position.
Michael Sharpe
Files old/doc/fonts/rsfso/rsfso-doc.pdf and new/doc/fonts/rsfso/rsfso-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/rsfso/rsfso-doc.tex new/doc/fonts/rsfso/rsfso-doc.tex
--- old/doc/fonts/rsfso/rsfso-doc.tex 2011-02-18 01:02:27.000000000 +0100
+++ new/doc/fonts/rsfso/rsfso-doc.tex 2013-11-04 00:43:25.000000000 +0100
@@ -31,7 +31,7 @@
$\mathscr{\hat{A}}\mathscr{\hat{F}}_i\mathscr{\bar{M}}^2_k$
-The {\tt rsfso} package has just one option: {\tt [scaled=1.1]} expands the size by a factor of 1.1, allowing you to match the size of the \verb|\mathcal| output to your math font.
+The {\tt rsfso} package has two options: {\tt scr} causes a redefinition of \verb|\mathscr| rather than \verb|\mathcal|, and {\tt [scaled=1.1]} expands the size by a factor of 1.1, allowing you to match the size of the \verb|\mathcal| (or \verb|\mathscr|) output to your math font.
The virtual font production and their metric adjustments were carried out using the author's freely available OS X program {\tt TeXFontUtility} which serves, among other functions, as a visual front-end to some {\tt fontinst} manipulations.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/rsfso.doc.tlpobj new/tlpkg/tlpobj/rsfso.doc.tlpobj
--- old/tlpkg/tlpobj/rsfso.doc.tlpobj 2011-08-09 04:25:10.000000000 +0200
+++ new/tlpkg/tlpobj/rsfso.doc.tlpobj 2013-11-04 03:25:00.000000000 +0100
@@ -1,6 +1,6 @@
name rsfso.doc
category Package
-revision 23462
+revision 32051
shortdesc doc files of rsfso
relocated 1
docfiles size=38
++++++ rsfso.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/public/rsfso/rsfso.sty new/tex/latex/public/rsfso/rsfso.sty
--- old/tex/latex/public/rsfso/rsfso.sty 2011-02-18 01:02:27.000000000 +0100
+++ new/tex/latex/public/rsfso/rsfso.sty 1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{rsfso}[2011/02/13 v1 U/rsfso]
-\RequirePackage{xkeyval}%
-\define@key{rsfso.sty}{scaled}[1.0]{%
-\expandafter\def\csname rsfso@scale\endcsname {#1}}%
-\ExecuteOptionsX{scaled}%
-\ProcessOptionsX\relax%
-\DeclareMathAlphabet{\mathcal}{U}{rsfso}{m}{n}
-\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/public/rsfso/ursfso.fd new/tex/latex/public/rsfso/ursfso.fd
--- old/tex/latex/public/rsfso/ursfso.fd 2011-02-18 01:02:27.000000000 +0100
+++ new/tex/latex/public/rsfso/ursfso.fd 1970-01-01 01:00:00.000000000 +0100
@@ -1,22 +0,0 @@
-%Filename: ursfso.fd
-%Created by: tex ursfso-drv
-%Created using fontinst v1.933
-
-%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
-
-\ProvidesFile{ursfso.fd}
- [2011/02/13 Fontinst v1.933 font definitions for U/rsfso.]
-
-
-\expandafter\ifx\csname rsfso@scale\endcsname\relax
-\let\rsfso@@scale\@empty\else\edef\rsfso@@scale{s*[\csname rsfso@scale\endcsname]}\fi
-\DeclareFontFamily{U}{rsfso}{\skewchar \font =45}
-
-\DeclareFontShape{U}{rsfso}{m}{n}{
- <-6> \rsfso@@scale rsfso5
- <6-8> \rsfso@@scale rsfso7
- <8-> \rsfso@@scale rsfso10
-}{}
-
-
-\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/rsfso/rsfso.sty new/tex/latex/rsfso/rsfso.sty
--- old/tex/latex/rsfso/rsfso.sty 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/rsfso/rsfso.sty 2013-11-04 00:43:25.000000000 +0100
@@ -0,0 +1,14 @@
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{rsfso}[2013/11/02 v1.01 U/rsfso (Michael Sharpe)]
+\RequirePackage{xkeyval}%
+\define@key{rsfso}{scaled}[1.0]{%
+\expandafter\def\csname rsfso@scale\endcsname {#1}}%
+\define@boolkey{rsfso}[rsfso@]{scr}[true]{}
+\ExecuteOptionsX<rsfso>{scaled,scr=false}%
+\ProcessOptionsX<rsfso>\relax%
+\ifrsfso@scr%
+ \DeclareMathAlphabet{\mathscr}{U}{rsfso}{m}{n}
+\else%
+ \DeclareMathAlphabet{\mathcal}{U}{rsfso}{m}{n}
+\fi
+\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/rsfso/ursfso.fd new/tex/latex/rsfso/ursfso.fd
--- old/tex/latex/rsfso/ursfso.fd 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/rsfso/ursfso.fd 2013-11-04 00:43:25.000000000 +0100
@@ -0,0 +1,22 @@
+%Filename: ursfso.fd
+%Created by: tex ursfso-drv
+%Created using fontinst v1.933
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{ursfso.fd}
+ [2011/02/13 Fontinst v1.933 font definitions for U/rsfso.]
+
+
+\expandafter\ifx\csname rsfso@scale\endcsname\relax
+\let\rsfso@@scale\@empty\else\edef\rsfso@@scale{s*[\csname rsfso@scale\endcsname]}\fi
+\DeclareFontFamily{U}{rsfso}{\skewchar \font =45}
+
+\DeclareFontShape{U}{rsfso}{m}{n}{
+ <-6> \rsfso@@scale rsfso5
+ <6-8> \rsfso@@scale rsfso7
+ <8-> \rsfso@@scale rsfso10
+}{}
+
+
+\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/rsfso.tlpobj new/tlpkg/tlpobj/rsfso.tlpobj
--- old/tlpkg/tlpobj/rsfso.tlpobj 2011-08-09 04:25:10.000000000 +0200
+++ new/tlpkg/tlpobj/rsfso.tlpobj 2013-11-04 03:25:01.000000000 +0100
@@ -1,6 +1,6 @@
name rsfso
category Package
-revision 23462
+revision 32051
shortdesc A mathematical calligraphic font based on rsfs.
relocated 1
longdesc The package provides virtual fonts and LaTeX support files for
@@ -20,9 +20,9 @@
RELOC/fonts/vf/public/rsfso/rsfso10.vf
RELOC/fonts/vf/public/rsfso/rsfso5.vf
RELOC/fonts/vf/public/rsfso/rsfso7.vf
- RELOC/tex/latex/public/rsfso/rsfso.sty
- RELOC/tex/latex/public/rsfso/ursfso.fd
+ RELOC/tex/latex/rsfso/rsfso.sty
+ RELOC/tex/latex/rsfso/ursfso.fd
catalogue-ctan /fonts/rsfso
-catalogue-date 2011-02-18 16:44:14 +0100
+catalogue-date 2013-11-03 08:42:21 +0100
catalogue-license lppl
-catalogue-version 1
+catalogue-version 1.01
++++++ russ.doc.tar.xz ++++++
++++++ russ.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/russ.tlpobj new/tlpkg/tlpobj/russ.tlpobj
--- old/tlpkg/tlpobj/russ.tlpobj 2012-01-27 04:29:26.000000000 +0100
+++ new/tlpkg/tlpobj/russ.tlpobj 2014-04-18 03:41:36.000000000 +0200
@@ -12,5 +12,5 @@
runfiles size=50
RELOC/tex/latex/russ/russ.sty
catalogue-ctan /macros/latex/contrib/russ
-catalogue-date 2012-01-25 23:56:43 +0100
+catalogue-date 2014-02-26 23:03:13 +0100
catalogue-license lppl
++++++ ryethesis.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ryethesis/Makefile new/doc/latex/ryethesis/Makefile
--- old/doc/latex/ryethesis/Makefile 2011-02-06 17:41:21.000000000 +0100
+++ new/doc/latex/ryethesis/Makefile 2014-04-23 23:38:00.000000000 +0200
@@ -2,7 +2,7 @@
SHELL=/bin/sh
-VERSION=1.31
+VERSION=$(shell grep changes ryethesis.dtx | perl -wlne 'print $$1 if /v([0-9]+\.[0-9]+)/' | sort -n | tail -1)
LATEX=pdflatex
@@ -10,7 +10,7 @@
BIBFILES=ryesample.bib
FIGS=figure1.pdf
FILES=README ryethesis.ins ryethesis.dtx ryethesis.pdf ryesample.pdf Makefile
-EXTRACLEAN=*.aux *.lof *.lot *.loa *.log *.bbl *.blg *.ind *.ilg *.toc *.idx *.gls *.glo *.out *~ *.nls *.nlo *.ist *.toa *.glg *.acn *.acr *.alg *.fdb_latexmk *.synctex.gz *.dvi auto
+EXTRACLEAN=*.aux *.lof *.lot *.loa *.log *.bbl *.blg *.ind *.ilg *.toc *.idx *.gls *.glo *.out *~ *.nls *.nlo *.ist *.toa *.glg *.acn *.acr *.alg *.fdb_latexmk *.synctex.gz *.dvi auto ryethesis-*.zip
TEXMFFLAGS=-file-line-error -halt-on-error #-interaction=batchmode
@@ -69,5 +69,5 @@
@$(LATEX) $(TEXMFFLAGS) ryethesis.ins || ( cat ryethesis.log; exit 1 )
ryethesis-$(VERSION).zip: ${FILES} ${TEXFILES} ${BIBFILES} ${FIGS}
- zip $@ $^
+ @rm -f ryethesis-*.zip; rm -rf ./ryethesis; mkdir ryethesis; cp $^ ryethesis; zip $@ ryethesis/*; rm -rf ./ryethesis;
Files old/doc/latex/ryethesis/ryesample.pdf and new/doc/latex/ryethesis/ryesample.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ryethesis/ryesample.tex new/doc/latex/ryethesis/ryesample.tex
--- old/doc/latex/ryethesis/ryesample.tex 2011-02-06 17:41:21.000000000 +0100
+++ new/doc/latex/ryethesis/ryesample.tex 2014-05-10 00:02:42.000000000 +0200
@@ -1,4 +1,7 @@
\documentclass[final,los,index,glossary,loa]{ryethesis}
+\usepackage{amsmath}
+\usepackage{amsfonts}
+\usepackage{amsthm}
%
% Note that this usage example is not an introduction to using LaTeX. You are highly recommended to check out Leslie Lamport's "LaTeX: A Document Preparation System". Please read through this file to get started using the ryethesis document class, including all comments!
%
@@ -6,7 +9,8 @@
% distribution is the easiest way to get up and running with TeX. See http://tug.org/texlive
% Available options to ryethesis class:
-% draft - Produce a one-sided, double-spaced draft.
+% draft - Produce a one-sided, double-spaced draft (figures replaced by placeholders).
+% review - Produce a one-sided, 1.5-spaced version for review by examiners.
% final (default) - Produce a two-sided, 1.5-spaced final version
% lof (default) | nolof - Enable | disable a list of figures
% lop | nolop (default) - Enable | disable a list of plates
@@ -47,6 +51,7 @@
% If you wish to include pictures, I recommend the graphics package. This is not
% loaded by the ryethesis class.
+\usepackage{color}
\usepackage{graphicx}
% Add any other packages you wish to load here in the preamble.
@@ -54,7 +59,7 @@
% This sample uses a modified version of the Chicago Manual of Style bibtex style,
% which requires the inclusion of chicago.sty.
-\usepackage{chicago}
+%\usepackage{chicago}
% In the pre-amble, define some of necessary information for the document frontmatter.
@@ -70,7 +75,7 @@
% have a slightly different title page.
% \thesis - (default) Specify that the document type is a thesis
% \dissertation - Specify that this is a dissertation.
-% \project - Specify that this is a project (e.g. MEng project)
+% \MRP - Specify that this is a masters research project (e.g. MEng project)
% Specify the type of degree (e.g. Masters of Applied Science, Doctor of Philosophy). Do not use
% abbreviations.
@@ -240,7 +245,7 @@
Phasellus et imperdiet justo. Pellentesque nec suscipit tortor. Aliquam ut nibh ac velit auctor congue quis at urna. Nulla convallis enim et nunc commodo varius. Sed elementum turpis ac purus sodales non luctus lacus dignissim. Cras id lorem id purus pulvinar convallis ac pulvinar elit. Morbi mattis, neque at condimentum lacinia, ipsum risus rutrum leo, non dignissim arcu eros a neque. Proin adipiscing, metus sed pulvinar suscipit, eros eros cursus velit, vel placerat turpis orci nec orci. Phasellus in dolor felis, id ultricies erat. Maecenas sollicitudin ultricies molestie.
\subsection{Vivamus}
-Vivamus dictum ligula vitae ante ornare hendrerit. Quisque ac dolor nibh, eu ornare sem. Cras sit amet neque odio. Nulla bibendum bibendum turpis at congue. Nunc ultricies scelerisque sem, ut dapibus tellus dignissim sollicitudin. Curabitur sed sapien nibh, nec consectetur ante. Aliquam erat volutpat. Fusce tempor orci in ante venenatis nec pharetra diam aliquet. Nullam pretium elementum mauris, non commodo metus eleifend vel. Cras vel ante dolor. Suspendisse potenti. Quisque vel odio eget lorem posuere ultrices. Duis et volutpat diam. In sit amet pulvinar lacus. Vestibulum lacinia, turpis ut interdum venenatis, lorem sem eleifend diam, in hendrerit nisi tellus in lorem.
+\textcolor{red}{Vivamus dictum ligula vitae ante ornare hendrerit.} Quisque ac dolor nibh, eu ornare sem. Cras sit amet neque odio. Nulla bibendum bibendum turpis at congue. Nunc ultricies scelerisque sem, ut dapibus tellus dignissim sollicitudin. Curabitur sed sapien nibh, nec consectetur ante. Aliquam erat volutpat. Fusce tempor orci in ante venenatis nec pharetra diam aliquet. Nullam pretium elementum mauris, non commodo metus eleifend vel. Cras vel ante dolor. Suspendisse potenti. Quisque vel odio eget lorem posuere ultrices. Duis et volutpat diam. In sit amet pulvinar lacus. Vestibulum lacinia, turpis ut interdum venenatis, lorem sem eleifend diam, in hendrerit nisi tellus in lorem.
}
\typeout{**************************************************************************}
Files old/doc/latex/ryethesis/ryethesis.pdf and new/doc/latex/ryethesis/ryethesis.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ryethesis.doc.tlpobj new/tlpkg/tlpobj/ryethesis.doc.tlpobj
--- old/tlpkg/tlpobj/ryethesis.doc.tlpobj 2011-02-07 04:13:56.000000000 +0100
+++ new/tlpkg/tlpobj/ryethesis.doc.tlpobj 2014-05-10 01:28:24.000000000 +0200
@@ -1,9 +1,9 @@
name ryethesis.doc
category Package
-revision 21316
+revision 33945
shortdesc doc files of ryethesis
relocated 1
-docfiles size=122
+docfiles size=123
RELOC/doc/latex/ryethesis/Makefile
RELOC/doc/latex/ryethesis/README
RELOC/doc/latex/ryethesis/figure1.pdf
++++++ ryethesis.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ryethesis/ryethesis.cls new/tex/latex/ryethesis/ryethesis.cls
--- old/tex/latex/ryethesis/ryethesis.cls 2011-02-06 17:41:21.000000000 +0100
+++ new/tex/latex/ryethesis/ryethesis.cls 2014-05-10 00:02:42.000000000 +0200
@@ -22,7 +22,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{ryethesis}
- [2010/06/18 v1.3 Ryerson University thesis class definition]
+ [2014/05/09 v1.36 Ryerson University thesis class definition]
\RequirePackage{ifthen}
\RequirePackage{fancyhdr}
@@ -50,6 +50,13 @@
\setboolean{@ryedraft}{true}
}
+\DeclareOption{review}{
+ \typeout{Ryerson-Thesis Class Option: `review'}
+ \ExecuteOptions{10pt,oneside}
+ \PassOptionsToClass{final,oneside}{book}
+ \setboolean{@ryedraft}{false}
+}
+
\DeclareOption{final}{
\typeout{Ryerson-Thesis Class Option: `final'}
\ExecuteOptions{10pt,twoside}
@@ -182,7 +189,7 @@
\pagenumbering{roman}
\pagestyle{plain}
\maketitle
- \ryethesis@insertdeclaration
+ \ryethesis@insertdeclaration
\ryethesis@insertabstract
\ryethesis@insertacknowledgements
\ryethesis@insertdedication
@@ -255,7 +262,7 @@
\newcommand{\documenttype}[1]{\ifx\empty#1\else\gdef\ryethesis@documentType{#1}\fi}
\newcommand{\thesis}{\documenttype{thesis}}
\newcommand{\dissertation}{\documenttype{dissertation}}
-\newcommand{\project}{\documenttype{project}}
+\newcommand{\project}{\documenttype{MRP}}
\newcommand{\degreeName}[1]{\gdef\ryethesis@degree{#1}\if@ryehyperref\hypersetup{pdfsubject={#1}}\fi}
\newcommand{\degreeYear}[1]{\gdef\ryethesis@degreeYear{#1}}
@@ -308,28 +315,36 @@
}
-\newcommand{\declaration}{% Author declaration and release per SGS policy Sept. 2009.
+\newcommand{\declaration}{%
\begin{flushleft}
- I hereby declare that I am the sole author of this \ryethesis@documentType{}.\\
+ \textbf{AUTHOR'S DECLARATION FOR ELECTRONIC SUBMISSION OF A \MakeUppercase{\ryethesis@documentType{}}}\\
+ \vspace{\baselineskip}
+ I hereby declare that I am the sole author of this
+ \ryethesis@documentType{}. This is a true copy of the thesis,
+ including any required final revisions, as accepted by my
+ examiners.\\
+ \vspace{\baselineskip}
+ I authorize Ryerson University to lend this
+ \ryethesis@documentType{} to other institutions or individuals for
+ the purpose of scholarly research.\\
\vspace{\baselineskip}
- I authorize Ryerson University to lend this \ryethesis@documentType{} to other institutions or individuals for the purpose of scholarly research.\\
- \vspace{0.75in}
- \hrule
- \vspace{0.75in}
I further authorize Ryerson University to reproduce this \ryethesis@documentType{} by photocopying or by other means, in total or in part, at the request of other institutions or individuals for the purpose of scholarly research.\\
\vspace{0.75in}
- \hrule
+ I understand that my dissertation may be made electronically available to the public.
\end{flushleft}
}
\newcommand{\ryethesis@insertdeclaration}{%
\ifthenelse{\boolean{@ryedraft}}
{}
-{\ryethesis@clearpage\declaration}
+{
+\ryethesis@clearpage\phantomsection\label{declaration}\addcontentsline{toc}{section}{\textit{\mdseries{}Declaration}}\declaration
+}
}
\newcommand{\abstract}[1]{\ifx\empty#1\else\gdef\ryethesis@theabstract{\begin{center}\section*{Abstract}\end{center}#1}\fi}
\newcommand{\ryethesis@insertabstract}{%
\ryethesis@clearpage
+\phantomsection\label{abstract}\addcontentsline{toc}{section}{\textit{\mdseries{}Abstract}}
\begin{spacing}{2}
\begin{center}
\normalsize
@@ -350,6 +365,7 @@
\newcommand{\ryethesis@insertacknowledgements}{%
\ifx\empty\ryethesis@theacknowledgements\else{
\ryethesis@clearpage
+\phantomsection\label{acknowledgements}\addcontentsline{toc}{section}{\textit{\mdseries{}Acknowledgements}}
\begin{center}
\section*{Acknowledgements}
\end{center}
@@ -362,6 +378,7 @@
\newcommand{\ryethesis@insertdedication}{%
\ifx\empty\ryethesis@thededication\else{
\ryethesis@clearpage
+\phantomsection\label{dedication}\addcontentsline{toc}{section}{\textit{\mdseries{}Dedication}}
\begin{center}
\section*{Dedication}
\end{center}
@@ -393,25 +410,29 @@
}
\newcommand{\ryethesis@insertlot}{
-\ifthenelse{\boolean{@ryelistoftables}}{\ryethesis@clearpage\listoftables}{}
+\ifthenelse{\boolean{@ryelistoftables}}{\ryethesis@clearpage\phantomsection\label{listoftab}\addcontentsline{toc}{section}{\textit{\mdseries{}List
+ of Tables}}\listoftables}{}
}
\ifthenelse{\boolean{@ryelistofplates}}
{\RequirePackage{float}\newfloat{plate}{h}{lop}}{}
\newcommand{\ryethesis@insertlop}{
-\ifthenelse{\boolean{@ryelistofplates}}{\ryethesis@clearpage\listof{plate}{List of Plates}}{}
+\ifthenelse{\boolean{@ryelistofplates}}{\ryethesis@clearpage\phantomsection\label{listofplates}\addcontentsline{toc}{section}{\textit{\mdseries{}List
+ of Plates}}\listof{plate}{List of Plates}}{}
}
\newcommand{\ryethesis@insertlof}{
-\ifthenelse{\boolean{@ryelistoftables}}{\ryethesis@clearpage\listoffigures}{}
+\ifthenelse{\boolean{@ryelistoftables}}{\ryethesis@clearpage\phantomsection\label{listoffig}\addcontentsline{toc}{section}{\textit{\mdseries{}List
+ of Figures}}\listoffigures}{}
}
\ifthenelse{\boolean{@ryelistofillustrations}}
{\RequirePackage{float}\newfloat{illustration}{h}{loi}}{}
\newcommand{\ryethesis@insertloi}{
-\ifthenelse{\boolean{@ryelistofillustrations}}{\ryethesis@clearpage\listof{illustration}{List of Illustrations}}{}
+\ifthenelse{\boolean{@ryelistofillustrations}}{\ryethesis@clearpage\phantomsection\label{listofillustrations}\addcontentsline{toc}{section}{\textit{\mdseries{}List
+ of Illustrations}}\listof{illustration}{List of Illustrations}}{}
}
\ifthenelse{\boolean{@ryelistofappendices}}
@@ -422,7 +443,8 @@
{}
\newcommand{\ryethesis@insertloa}{%
-\ifthenelse{\boolean{@ryelistofappendices}}{\ryethesis@clearpage\listofappendices}{}
+\ifthenelse{\boolean{@ryelistofappendices}}{\ryethesis@clearpage\phantomsection\label{listofapp}\addcontentsline{toc}{section}
+ {\textit{\mdseries{}List of Appendices}}\listofappendices}{}
}
\renewcommand{\appendix}[1]{\ifx\empty#1\else\gdef\ryethesis@theappendices{#1}\fi}
@@ -430,7 +452,6 @@
\newcommand{\ryethesis@insertappendix}{%
\ifx\empty\ryethesis@theappendices\else{
\ryethesis@clearpage
-\renewcommand{\thechapter}{\Alph{chapter}}
\renewcommand{\chaptername}{Appendix}
\setcounter{chapter}{0}
\ryethesis@theappendices
@@ -450,7 +471,12 @@
\ifthenelse{\boolean{@ryeindex}}
{
-\RequirePackage{makeidx}\makeindex
+\providecommand*\see[2]{\emph{\seename} #1}
+\providecommand*\seealso[2]{\emph{\alsoname} #1}
+\providecommand\printindex{\@input@{\jobname.ind}}
+\providecommand\seename{see}
+\providecommand*\alsoname{see also}
+\makeindex
\RequirePackage{multicol}
\renewenvironment{theindex}
{\begin{multicols}{2}[\@makeschapterhead{\indexname}\addcontentsline{toc}{chapter}{\indexname}%
@@ -509,6 +535,20 @@
\newcommand{\usereferences}{\renewcommand{\bibname}{References}}
\newcommand{\useendnotes}{\renewcommand{\bibname}{End Notes}}
+
+\AtEndOfClass{
+\ifthenelse{\boolean{@ryedraft}}
+{% Draft mode uses double spacing
+\doublespacing}
+{% Final mode uses 1.5 spacing as specified in SGS policy Sept. 2009.
+\onehalfspacing}
+\usereferences
+
+}
+\RequirePackage{etoolbox}
+\AfterEndPreamble{
+
+
\newcommand{\Saved@addtocontents}{}
\let\Saved@addtocontents\addtocontents
\def\addtocontents#1#2{%
@@ -520,16 +560,6 @@
{\Saved@addtocontents{#1}{#2}}
\fi}
-
-\AtEndOfClass{
-\ifthenelse{\boolean{@ryedraft}}
-{% Draft mode uses double spacing
-\doublespacing}
-{% Final mode uses 1.5 spacing as specified in SGS policy Sept. 2009.
-\onehalfspacing}
-\usereferences
-}
-\AtBeginDocument{
\frontmatter\mainmatter
}
\AtEndDocument{\backmatter}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ryethesis.tlpobj new/tlpkg/tlpobj/ryethesis.tlpobj
--- old/tlpkg/tlpobj/ryethesis.tlpobj 2011-02-07 04:13:56.000000000 +0100
+++ new/tlpkg/tlpobj/ryethesis.tlpobj 2014-05-10 01:28:25.000000000 +0200
@@ -1,6 +1,6 @@
name ryethesis
category Package
-revision 21316
+revision 33945
shortdesc Class for Ryerson Unversity Graduate School requirements.
relocated 1
longdesc The class offers support for formatting a thesis, dissertation
@@ -9,6 +9,6 @@
runfiles size=5
RELOC/tex/latex/ryethesis/ryethesis.cls
catalogue-ctan /macros/latex/contrib/ryethesis
-catalogue-date 2011-02-05 10:59:30 +0100
+catalogue-date 2014-05-09 11:52:57 +0200
catalogue-license lppl1.3
-catalogue-version 1.3
+catalogue-version 1.36
++++++ sa-tikz.doc.tar.xz ++++++
++++ 2114 lines of diff (skipped)
++++++ sa-tikz.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/sa-tikz/sa-tikz.sty new/tex/latex/sa-tikz/sa-tikz.sty
--- old/tex/latex/sa-tikz/sa-tikz.sty 2013-01-04 00:31:37.000000000 +0100
+++ new/tex/latex/sa-tikz/sa-tikz.sty 2014-01-29 23:38:00.000000000 +0100
@@ -1,31 +1,50 @@
% * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
%
-% Sa-TikZ package v0.5 * * (C) Claudio Fiandrino 2012
+% Sa-TikZ package v0.7a * * (C) Claudio Fiandrino 2012-2014
%
% * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{sa-tikz}[2013/1/3 v0.5 Switching architectures design library.]
+\ProvidesPackage{sa-tikz}[2014/1/29 v0.7a Switching architectures design library.]
\RequirePackage{tikz}
-\usetikzlibrary{calc,positioning,decorations.pathreplacing}
+\usetikzlibrary{backgrounds,calc,positioning,decorations.pathreplacing}
% * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
% UTILITY
% * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
% PGFMATHISODD: 1 = true, 0 = false
+% from TikZ 3.0.0
+% Test for checking whether \pgfmathisodd is defined or not
+% for compatibility with TikZ 2.10
%
-% #1: number to be checked
-% #2: output macro
+\@ifundefined{pgfmathisodd}{
+\pgfmathdeclarefunction{isodd}{1}{%
+ \begingroup
+ \pgfmathsetcount\c@pgfmath@counta{abs(int(#1))}%
+ \ifodd\c@pgfmath@counta
+ \def\pgfmathresult{1}%
+ \else
+ \def\pgfmathresult{0}%
+ \fi
+ \pgfmath@smuggleone\pgfmathresult
+ \endgroup}
+}{}
+
+% PGFMATHOMEGAROTATION:
+%
+% #1: number to be rotated
+% #2: numbers of bits
+% #3: output macro
%
-% example:
-%% \pgfmathisodd{32}{output}
-%% \ifnum\output=1
-%% \node{\output};
-%% \fi
-\newcommand*{\pgfmathisodd}[2]{
- \pgfmathparse{mod(#1,2)}
- \pgfmathtruncatemacro\res\pgfmathresult
- \global\expandafter\edef\csname #2\endcsname{\res}
+\newcommand*{\pgfmathomegarotation}[3]{
+ \pgfmathisodd{#1}
+ \ifnum\pgfmathresult=1
+ \pgfmathparse{#1/2 + 2^#2}
+ \else
+ \pgfmathparse{#1/2}
+ \fi
+ \pgfmathtruncatemacro\res\pgfmathresult
+ \global\expandafter\edef\csname #3\endcsname{\res}
}
% * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -38,80 +57,71 @@
% N is the key representing the number of inputs x number of modules first stage
\pgfkeys{/tikz/.cd,%
- N/.initial=10,%
- N/.get=\N,%
N/.store in=\N,%
+ N=10,%
}%
% N label
\pgfkeys{/tikz/.cd,%
- N label/.initial=N,%
N label/.store in=\Nlabel,%
- N label/.get=\Nlabel,%
+ N label=N,%
}%
% r1 is the number of modules first stage
% m1 is the number of inputs first stage per module
\pgfkeys{/tikz/.cd,%
- r1/.initial=5,%
r1/.store in=\rone,%
- r1/.get=\rone,%
+ r1=5,%
}%
% r1 label
\pgfkeys{/tikz/.cd,%
- r1 label/.initial={r\ensuremath{_1}},%
r1 label/.store in=\ronelabel,%
- r1 label/.get=\ronelabel,%
+ r1 label={r\ensuremath{_1}},%
}%
% m1 label
-\pgfkeys{/tikz/.cd,
- m1 label/.initial={m\ensuremath{_1}},%
+\pgfkeys{/tikz/.cd,%
m1 label/.store in=\monelabel,%
- m1 label/.get=\monelabel,%
+ m1 label={m\ensuremath{_1}},%
}%
% r2 label
\pgfkeys{/tikz/.cd,%
- r2 label/.initial={r\ensuremath{_2}},%
r2 label/.store in=\rtwolabel,%
- r2 label/.get=\rtwolabel,%
+ r2 label={r\ensuremath{_2}},%
}%
% M is the key representing the number of inputs x number of modules last stage
\pgfkeys{/tikz/.cd,%
- M/.initial=10,%
- M/.get=\M,%
M/.store in=\M,%
+ M=10,%
}%
% M label
\pgfkeys{/tikz/.cd,%
- M label/.initial=M,%
M label/.store in=\Mlabel,%
- M label/.get=\Mlabel,%
+ M label=M,%
}%
% r3 is the number of modules last stage
% m3 is the number of inputs last stage per module
-\pgfmathtruncatemacro\rthree{5}%
-\pgfkeys{/tikz/.cd, r3/.initial=5}%
-\pgfkeys{/tikz/.cd, r3/.store in=\rthree}%
+\pgfkeys{/tikz/.cd,%
+ r3/.store in=\rthree,%
+ r3=5
+}%
% r3 label
\pgfkeys{/tikz/.cd,%
- r3 label/.initial={r\ensuremath{_3}},%
r3 label/.store in=\rthreelabel,%
- r3 label/.get=\rthreelabel,%
+ r3 label={r\ensuremath{_3}},%
}%
% m3 label
-\pgfkeys{/tikz/.cd,
- m3 label/.initial={m\ensuremath{_3}},%
+\pgfkeys{/tikz/.cd,
m3 label/.store in=\mthreelabel,%
- m3 label/.get=\mthreelabel,%
+ m3 label={m\ensuremath{_3}},%
}%
% * * * * * * * * * * * * * * * * * *
@@ -120,9 +130,8 @@
% P is the number of input/output ports
\pgfkeys{/tikz/.cd,%
- P/.initial=8,%
- P/.get=\P,%
P/.store in=\P,%
+ P=8,%
}%
% * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -131,27 +140,23 @@
% module customization
\pgfkeys{/tikz/.cd,%
- module size/.initial={1cm},%
- module size/.get=\modulesize,%
module size/.store in=\modulesize,%
+ module size={1cm},%
}%
\pgfkeys{/tikz/.cd,%
- module ysep/.initial={1.5},%
- module ysep/.get=\moduleysep,%
module ysep/.store in=\moduleysep,%
+ module ysep={1.5},
}%
\pgfkeys{/tikz/.cd,%
- module xsep/.initial={3},%
- module xsep/.get=\modulexsep,%
module xsep/.store in=\modulexsep,%
+ module xsep={3},%
}%
\pgfkeys{/tikz/.cd,%
- module font/.initial=\normalfont,%
- module font/.get=\modulefont,%
module font/.store in=\modulefont,%
+ module font={\normalfont},%
}%
\tikzset{module/.style={%
@@ -167,9 +172,8 @@
}
\pgfkeys{/tikz/.cd,%
- module label opacity/.initial={1},%
- module label opacity/.get=\modulelabelopacity,%
module label opacity/.store in=\modulelabelopacity,%
+ module label opacity={1},%
}%
\tikzset{module opacity/.style={
@@ -178,9 +182,8 @@
}
\pgfkeys{/tikz/.cd,%
- pin length factor/.initial={1},%
- pin length factor/.get=\pinlength,%
pin length factor/.store in=\pinlength,%
+ pin length factor={1},%
}%
% setting labels in math mode
@@ -893,9 +896,9 @@
\pgfmathtruncatemacro\startingpoint{1+((\t-1)*\applicationon)}
\pgfmathtruncatemacro\endingpoint{(\startingpoint+\applicationon)-1}
\foreach \startmodule in {\startingpoint,...,\endingpoint}{
- \pgfmathisodd{\startmodule}{initmodule}
+ \pgfmathisodd{\startmodule}
\ifnum\t=1
- \ifnum\initmodule=1
+ \ifnum\pgfmathresult=1
% if odd
\pgfmathtruncatemacro\endmodulei{int((\startmodule+1)/2)}
\pgfmathtruncatemacro\endmoduleii{int((\startmodule+1+\applicationon)/2)}
@@ -910,7 +913,7 @@
\fi
\fi
\ifnum\t=2
- \ifnum\initmodule=1
+ \ifnum\pgfmathresult=1
% if odd
\pgfmathtruncatemacro\endmodulei{int((\startmodule+1)/2+(\applicationon/2))}
\pgfmathtruncatemacro\endmoduleii{int((\startmodule+1+\applicationon)/2+(\applicationon/2))}
@@ -925,7 +928,7 @@
\fi
\fi
\ifnum\t>2
- \ifnum\initmodule=1
+ \ifnum\pgfmathresult=1
% if odd
\pgfmathtruncatemacro\endmodulei{int((\startmodule+1)/2+(\applicationon/2)+((\applicationon/2)*(\t-2)))}
\pgfmathtruncatemacro\endmoduleii{int((\startmodule+1+\applicationon)/2+(\applicationon/2)+((\applicationon/2)*(\t-2)))}
@@ -953,9 +956,9 @@
\pgfmathtruncatemacro\startingpoint{1+((\t-1)*\applicationon)}
\pgfmathtruncatemacro\endingpoint{(\startingpoint+\applicationon)-1}
\foreach \startmodule in {\startingpoint,...,\endingpoint}{
- \pgfmathisodd{\startmodule}{initmodule}
+ \pgfmathisodd{\startmodule}
\ifnum\t=1
- \ifnum\initmodule=1
+ \ifnum\pgfmathresult=1
% if odd
\pgfmathtruncatemacro\endmodulei{int((\startmodule+1)/2)}
\pgfmathtruncatemacro\endmoduleii{int((\startmodule+1+\applicationon)/2)}
@@ -970,7 +973,7 @@
\fi
\fi
\ifnum\t=2
- \ifnum\initmodule=1
+ \ifnum\pgfmathresult=1
% if odd
\pgfmathtruncatemacro\endmodulei{int((\startmodule+1)/2+(\applicationon/2))}
\pgfmathtruncatemacro\endmoduleii{int((\startmodule+1+\applicationon)/2+(\applicationon/2))}
@@ -985,7 +988,7 @@
\fi
\fi
\ifnum\t>2
- \ifnum\initmodule=1
+ \ifnum\pgfmathresult=1
% if odd
\pgfmathtruncatemacro\endmodulei{int((\startmodule+1)/2+(\applicationon/2)+((\applicationon/2)*(\t-2)))}
\pgfmathtruncatemacro\endmoduleii{int((\startmodule+1+\applicationon)/2+(\applicationon/2)+((\applicationon/2)*(\t-2)))}
@@ -1017,8 +1020,8 @@
% Drawing
\foreach \startmodule in {1,...,\r}{
- \pgfmathisodd{\startmodule}{initmodule}
- \ifnum\initmodule=1
+ \pgfmathisodd{\startmodule}
+ \ifnum\pgfmathresult=1
% if odd
\pgfmathtruncatemacro\endmodule{int(\startmodule+1)}
\draw(r\middlestage-\startmodule-output-1)--(r\middlestagei-\startmodule-input-1);
@@ -1039,5 +1042,205 @@
}
}
+% BANYAN NETWORKS
+
+% BANYAN-OMEGA (thanks to João Gabriel Reis)
+
+\tikzset{banyan omega/.code={
+ % Number of ports per module
+ \pgfmathtruncatemacro{\m}{2}
+
+ % Number of modules in each stage
+ \pgfmathtruncatemacro{\r}{\P/\m}
+
+ % Number of stages
+ \pgfmathtruncatemacro{\stages}{round(log2(\P))}
+
+ % Modules for all stages
+ \foreach \s [evaluate=\s as \numstage using int(\s-1)] in {0,...,\stages}{
+ \ifnum\s=0
+ % Invisible modules
+ \foreach \i in {1,...,\r}{
+ \path let \n2={-\i*\moduleysep} in
+ node[rectangle,minimum height=\modulesize,#1,module opacity,xshift=\modulesize/2,yshift=1cm]
+ (r\s-\i) at +(-0.6*\modulexsep,\n2) {};
+
+ % Invisible modules outputs
+ \pgfmathsetmacro\rintervalspace{1/(\m+1)}
+ \foreach \routput[evaluate=\routput as \rinterval using \rintervalspace*\routput] in {1,...,\m}
+ \draw ($(r\s-\i.north east)!\rinterval!(r\s-\i.south east)+(0.5*0.3*\pinlength,0)$) node[coordinate] (r\s-\i-front output-\routput) {} --
+ ($(r\s-\i.north east)!\rinterval!(r\s-\i.south east)$)node[coordinate](r\s-\i-output-\routput) {};
+ \foreach \routput[evaluate=\routput as \rinterval using \rintervalspace*\routput] in {1,...,\m}
+ \draw ($(r\s-\i.north east)!\rinterval!(r\s-\i.south east)-(0.5*0.3*\pinlength,0)$) node[circle,draw,scale=0.1] (r\s-\i-front input-\routput) {} --
+ ($(r\s-\i.north east)!\rinterval!(r\s-\i.south east)$)node[coordinate](r\s-\i-input-\routput) {};
+ }
+ \fi
+ \ifnum\s=\stages
+ % Final Module
+ \foreach \i in {1,...,\r}{
+ \path let \n1 = {int(0-\i)}, \n2={0-\i*\moduleysep} in node[module,#1,module opacity,yshift=1cm] (r\s-\i) at
+ +(\numstage*0.6*\modulexsep,\n2) {\pgfmathparse{int(multiply(\n1,-1))}\pgfmathresult};
+
+ % Final module inputs
+ \pgfmathsetmacro\roneintervalspace{1/(\m+1)}
+ \foreach \roneinput[evaluate=\roneinput as \roneinterval using \roneintervalspace*\roneinput] in {1,...,\m}
+ \draw ($(r\s-\i.north west)!\roneinterval!(r\s-\i.south west)-(0.5*0.3*\pinlength,0)$) node[coordinate](r\s-\i-front input-\roneinput) {} --
+ ($(r\s-\i.north west)!\roneinterval!(r\s-\i.south west)$)node[circle,draw,scale=0.1] (r\s-\i-input-\roneinput) {};
+
+ % Final module outputs
+ \pgfmathsetmacro\rintervalspace{1/(\m+1)}
+ \foreach \routput[evaluate=\routput as \rinterval using \rintervalspace*\routput] in {1,...,\m}
+ \draw ($(r\s-\i.north east)!\rinterval!(r\s-\i.south east)+(0.5*0.3*\pinlength,0)$) node[coordinate](r\s-\i-front output-\routput) {} --
+ ($(r\s-\i.north east)!\rinterval!(r\s-\i.south east)$)node[circle,draw,scale=0.1] (r\s-\i-output-\routput) {};
+ }
+ \fi
+
+ \pgfmathparse{and(\s>0,\s<\stages)}
+ \let\cond\pgfmathresult
+ \ifnum\cond=1
+ % Intermediate modules
+ \foreach \i in {1,...,\r}{
+ \path let \n1 = {int(0-\i)}, \n2={0-\i*\moduleysep} in node[module,#1,module opacity,yshift=1cm]
+ (r\s-\i) at +(\numstage*0.6*\modulexsep,\n2) {\pgfmathparse{int(multiply(\n1,-1))}\pgfmathresult};
+
+ % Intermediate modules inputs
+ \pgfmathsetmacro\roneintervalspace{1/(\m+1)}
+ \foreach \roneinput[evaluate=\roneinput as \roneinterval using \roneintervalspace*\roneinput] in {1,...,\m}
+ \draw ($(r\s-\i.north west)!\roneinterval!(r\s-\i.south west)-(0.5*0.3*\pinlength,0)$) node[coordinate](r\s-\i-front input-\roneinput) {} --
+ ($(r\s-\i.north west)!\roneinterval!(r\s-\i.south west)$)node[circle,draw,scale=0.1] (r\s-\i-input-\roneinput) {};
+
+ % Intermediate modules outputs
+ \pgfmathsetmacro\rintervalspace{1/(\m+1)}
+ \foreach \routput[evaluate=\routput as \rinterval using \rintervalspace*\routput] in {1,...,\m}
+ \draw ($(r\s-\i.north east)!\rinterval!(r\s-\i.south east)+(0.5*0.3*\pinlength,0)$) node[coordinate](r\s-\i-front output-\routput) {} --
+ ($(r\s-\i.north east)!\rinterval!(r\s-\i.south east)$)node[circle,draw,scale=0.1] (r\s-\i-output-\routput) {};
+ }
+ \fi
+ }
+
+ % Test if connections should be removed
+ \ifconnectiondisabled
+ \relax
+ \else
+ % Connections
+ \foreach \stg[evaluate=\stg as \prevstg using int(\stg - 1)] in {1,...,\stages}{
+ \foreach \startmod in {1,...,\r}{
+ \pgfmathomegarotation{2*(\startmod - 1)}{\stages - 1}{address}
+ \pgfmathtruncatemacro\endmodi{\address/2 + 1}
+ \pgfmathtruncatemacro\endmodii{\endmodi + \r/2}
+ \pgfmathtruncatemacro\cond{mod(\startmod,2)}
+ \ifnum\cond=0
+ \draw(r\stg-\startmod-front input-1)--(r\prevstg-\endmodi-front output-2);
+ \draw(r\stg-\startmod-front input-2)--(r\prevstg-\endmodii-front output-2);
+ \else
+ \draw(r\stg-\startmod-front input-1)--(r\prevstg-\endmodi-front output-1);
+ \draw(r\stg-\startmod-front input-2)--(r\prevstg-\endmodii-front output-1);
+ \fi
+ }
+ }
+ \fi
+}
+}
+
+% BANYAN-FLIP
+
+\tikzset{banyan flip/.code={
+ % Number of ports per module
+ \pgfmathtruncatemacro{\m}{2}
+
+ % Number of modules in each stage
+ \pgfmathtruncatemacro{\r}{\P/\m}
+
+ % Number of stages
+ \pgfmathtruncatemacro{\stages}{round(log2(\P))}
+
+ % Modules for all stages
+ \foreach \s [evaluate=\s as \numstage using int(\s-1)] in {0,...,\stages}{
+ \ifnum\s=0
+ % Final Module
+ \foreach \i in {1,...,\r}{
+ \path let \n1 = {int(0-\i)}, \n2={0-\i*\moduleysep} in node[module,#1,module opacity,yshift=1cm] (r\s-\i) at
+ +(\numstage*0.6*\modulexsep,\n2) {\pgfmathparse{int(multiply(\n1,-1))}\pgfmathresult};
+
+ % Final module inputs
+ \pgfmathsetmacro\roneintervalspace{1/(\m+1)}
+ \foreach \roneinput[evaluate=\roneinput as \roneinterval using \roneintervalspace*\roneinput] in {1,...,\m}
+ \draw ($(r\s-\i.north west)!\roneinterval!(r\s-\i.south west)-(0.5*0.3*\pinlength,0)$) node[coordinate](r\s-\i-front input-\roneinput) {} --
+ ($(r\s-\i.north west)!\roneinterval!(r\s-\i.south west)$) node[circle,draw,scale=0.1] (r\s-\i-input-\roneinput) {};
+
+ % Final module outputs
+ \pgfmathsetmacro\rintervalspace{1/(\m+1)}
+ \foreach \routput[evaluate=\routput as \rinterval using \rintervalspace*\routput] in {1,...,\m}
+ \draw ($(r\s-\i.north east)!\rinterval!(r\s-\i.south east)+(0.5*0.3*\pinlength,0)$) node[coordinate](r\s-\i-front output-\routput) {} --
+ ($(r\s-\i.north east)!\rinterval!(r\s-\i.south east)$) node[circle,draw,scale=0.1] (r\s-\i-output-\routput) {};
+ }
+ \fi
+ \ifnum\s=\stages
+ % Invisible modules
+ \foreach \i in {1,...,\r}{
+ \path let \n2={-\i*\moduleysep} in
+ node[rectangle,minimum height=\modulesize,#1,module opacity,xshift=\modulesize/2,yshift=1cm]
+ (r\s-\i) at +(\numstage*0.415*\modulexsep,\n2) {};
+
+ % Invisible modules outputs
+ \pgfmathsetmacro\rintervalspace{1/(\m+1)}
+ \foreach \roneinput[evaluate=\roneinput as \rinterval using \rintervalspace*\roneinput] in {1,...,\m}
+ \draw ($(r\s-\i.north west)!\rinterval!(r\s-\i.south west)$)node [coordinate](r\s-\i-input-\roneinput) {} --
+ ($(r\s-\i.north west)!\rinterval!(r\s-\i.south west)-(0.5*0.3*\pinlength,0)$)
+ node [coordinate] (r\s-\i-front input-\roneinput) {};
+ \foreach \roneinput[evaluate=\roneinput as \rinterval using \rintervalspace*\roneinput] in {1,...,\m}
+ \draw ($(r\s-\i.north west)!\rinterval!(r\s-\i.south west)$)node [coordinate](r\s-\i-input-\roneinput) {} --
+ ($(r\s-\i.north west)!\rinterval!(r\s-\i.south west)+(0.5*0.3*\pinlength,0)$)
+ node [circle,draw,scale=0.1] (r\s-\i-front output-\roneinput) {};
+ }
+ \fi
+ \pgfmathparse{and(\s>0,\s<\stages)}
+ \let\cond\pgfmathresult
+ \ifnum\cond=1
+ % Intermediate modules
+ \foreach \i in {1,...,\r}{
+ \path let \n1 = {int(0-\i)}, \n2={0-\i*\moduleysep} in node[module,#1,module opacity,yshift=1cm]
+ (r\s-\i) at +(\numstage*0.6*\modulexsep,\n2) {\pgfmathparse{int(multiply(\n1,-1))}\pgfmathresult};
+
+ % Intermediate modules inputs
+ \pgfmathsetmacro\roneintervalspace{1/(\m+1)}
+ \foreach \roneinput[evaluate=\roneinput as \roneinterval using \roneintervalspace*\roneinput] in {1,...,\m}
+ \draw ($(r\s-\i.north west)!\roneinterval!(r\s-\i.south west)-(0.5*0.3*\pinlength,0)$) node[coordinate](r\s-\i-front input-\roneinput) {} --
+ ($(r\s-\i.north west)!\roneinterval!(r\s-\i.south west)$) node[circle,draw,scale=0.1] (r\s-\i-input-\roneinput) {};
+
+ % Intermediate modules outputs
+ \pgfmathsetmacro\rintervalspace{1/(\m+1)}
+ \foreach\routput[evaluate=\routput as \rinterval using \rintervalspace*\routput] in {1,...,\m}
+ \draw ($(r\s-\i.north east)!\rinterval!(r\s-\i.south east)+(0.5*0.3*\pinlength,0)$) node[coordinate](r\s-\i-front output-\routput) {} --
+ ($(r\s-\i.north east)!\rinterval!(r\s-\i.south east)$) node[circle,draw,scale=0.1] (r\s-\i-output-\routput) {};
+ }
+ \fi
+ }
+
+ % Test if connections should be removed
+ \ifconnectiondisabled
+ \relax
+ \else
+ % Connections
+ \foreach \stg[evaluate=\stg as \prevstg using int(\stg - 1)] in {1,...,\stages}{
+ \foreach \startmod in {1,...,\r}{
+ \pgfmathomegarotation{2*(\startmod - 1)}{\stages - 1}{address}
+ \pgfmathtruncatemacro\endmodi{\address/2 + 1}
+ \pgfmathtruncatemacro\endmodii{\endmodi + \r/2}
+ \pgfmathtruncatemacro\cond{mod(\startmod,2)}
+ \ifnum\cond=0
+ \draw(r\stg-\startmod-front input-1)--(r\prevstg-\endmodi-front output-2);
+ \draw(r\stg-\startmod-front input-2)--(r\prevstg-\endmodii-front output-2);
+ \else
+ \draw(r\stg-\startmod-front input-1)--(r\prevstg-\endmodi-front output-1);
+ \draw(r\stg-\startmod-front input-2)--(r\prevstg-\endmodii-front output-1);
+ \fi
+ }
+ }
+ \fi
+}
+}
+
+
-\endinput
+\endinput
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/sa-tikz/tikzlibraryswitching-architectures.code.tex new/tex/latex/sa-tikz/tikzlibraryswitching-architectures.code.tex
--- old/tex/latex/sa-tikz/tikzlibraryswitching-architectures.code.tex 2013-01-04 00:31:37.000000000 +0100
+++ new/tex/latex/sa-tikz/tikzlibraryswitching-architectures.code.tex 2014-01-29 23:38:00.000000000 +0100
@@ -1,6 +1,6 @@
% * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
%
-% Sa-TikZ package v0.5 * * (C) Claudio Fiandrino 2012
+% Sa-TikZ package v0.7a * * (C) Claudio Fiandrino 2012-2014
%
% * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -15,19 +15,38 @@
% * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
% PGFMATHISODD: 1 = true, 0 = false
+% from TikZ 3.0.0
+% Test for checking whether \pgfmathisodd is defined or not
+% for compatibility with TikZ 2.10
%
-% #1: number to be checked
-% #2: output macro
+\@ifundefined{pgfmathisodd}{
+\pgfmathdeclarefunction{isodd}{1}{%
+ \begingroup
+ \pgfmathsetcount\c@pgfmath@counta{abs(int(#1))}%
+ \ifodd\c@pgfmath@counta
+ \def\pgfmathresult{1}%
+ \else
+ \def\pgfmathresult{0}%
+ \fi
+ \pgfmath@smuggleone\pgfmathresult
+ \endgroup}
+}{}
+
+% PGFMATHOMEGAROTATION:
+%
+% #1: number to be rotated
+% #2: numbers of bits
+% #3: output macro
%
-% example:
-%% \pgfmathisodd{32}{output}
-%% \ifnum\output=1
-%% \node{\output};
-%% \fi
-\newcommand*{\pgfmathisodd}[2]{
- \pgfmathparse{mod(#1,2)}
- \pgfmathtruncatemacro\res\pgfmathresult
- \global\expandafter\edef\csname #2\endcsname{\res}
+\newcommand*{\pgfmathomegarotation}[3]{
+ \pgfmathisodd{#1}
+ \ifnum\pgfmathresult=1
+ \pgfmathparse{#1/2 + 2^#2}
+ \else
+ \pgfmathparse{#1/2}
+ \fi
+ \pgfmathtruncatemacro\res\pgfmathresult
+ \global\expandafter\edef\csname #3\endcsname{\res}
}
% * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -40,80 +59,71 @@
% N is the key representing the number of inputs x number of modules first stage
\pgfkeys{/tikz/.cd,%
- N/.initial=10,%
- N/.get=\N,%
N/.store in=\N,%
+ N=10,%
}%
% N label
\pgfkeys{/tikz/.cd,%
- N label/.initial=N,%
N label/.store in=\Nlabel,%
- N label/.get=\Nlabel,%
+ N label=N,%
}%
% r1 is the number of modules first stage
% m1 is the number of inputs first stage per module
\pgfkeys{/tikz/.cd,%
- r1/.initial=5,%
r1/.store in=\rone,%
- r1/.get=\rone,%
+ r1=5,%
}%
% r1 label
\pgfkeys{/tikz/.cd,%
- r1 label/.initial={r\ensuremath{_1}},%
r1 label/.store in=\ronelabel,%
- r1 label/.get=\ronelabel,%
+ r1 label={r\ensuremath{_1}},%
}%
% m1 label
-\pgfkeys{/tikz/.cd,
- m1 label/.initial={m\ensuremath{_1}},%
+\pgfkeys{/tikz/.cd,%
m1 label/.store in=\monelabel,%
- m1 label/.get=\monelabel,%
+ m1 label={m\ensuremath{_1}},%
}%
% r2 label
\pgfkeys{/tikz/.cd,%
- r2 label/.initial={r\ensuremath{_2}},%
r2 label/.store in=\rtwolabel,%
- r2 label/.get=\rtwolabel,%
+ r2 label={r\ensuremath{_2}},%
}%
% M is the key representing the number of inputs x number of modules last stage
\pgfkeys{/tikz/.cd,%
- M/.initial=10,%
- M/.get=\M,%
M/.store in=\M,%
+ M=10,%
}%
% M label
\pgfkeys{/tikz/.cd,%
- M label/.initial=M,%
M label/.store in=\Mlabel,%
- M label/.get=\Mlabel,%
+ M label=M,%
}%
% r3 is the number of modules last stage
% m3 is the number of inputs last stage per module
-\pgfmathtruncatemacro\rthree{5}%
-\pgfkeys{/tikz/.cd, r3/.initial=5}%
-\pgfkeys{/tikz/.cd, r3/.store in=\rthree}%
+\pgfkeys{/tikz/.cd,%
+ r3/.store in=\rthree,%
+ r3=5
+}%
% r3 label
\pgfkeys{/tikz/.cd,%
- r3 label/.initial={r\ensuremath{_3}},%
r3 label/.store in=\rthreelabel,%
- r3 label/.get=\rthreelabel,%
+ r3 label={r\ensuremath{_3}},%
}%
% m3 label
-\pgfkeys{/tikz/.cd,
- m3 label/.initial={m\ensuremath{_3}},%
+\pgfkeys{/tikz/.cd,
m3 label/.store in=\mthreelabel,%
- m3 label/.get=\mthreelabel,%
+ m3 label={m\ensuremath{_3}},%
}%
% * * * * * * * * * * * * * * * * * *
@@ -122,9 +132,8 @@
% P is the number of input/output ports
\pgfkeys{/tikz/.cd,%
- P/.initial=8,%
- P/.get=\P,%
P/.store in=\P,%
+ P=8,%
}%
% * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -133,27 +142,23 @@
% module customization
\pgfkeys{/tikz/.cd,%
- module size/.initial={1cm},%
- module size/.get=\modulesize,%
module size/.store in=\modulesize,%
+ module size={1cm},%
}%
\pgfkeys{/tikz/.cd,%
- module ysep/.initial={1.5},%
- module ysep/.get=\moduleysep,%
module ysep/.store in=\moduleysep,%
+ module ysep={1.5},
}%
\pgfkeys{/tikz/.cd,%
- module xsep/.initial={3},%
- module xsep/.get=\modulexsep,%
module xsep/.store in=\modulexsep,%
+ module xsep={3},%
}%
\pgfkeys{/tikz/.cd,%
- module font/.initial=\normalfont,%
- module font/.get=\modulefont,%
module font/.store in=\modulefont,%
+ module font={\normalfont},%
}%
\tikzset{module/.style={%
@@ -169,9 +174,8 @@
}
\pgfkeys{/tikz/.cd,%
- module label opacity/.initial={1},%
- module label opacity/.get=\modulelabelopacity,%
module label opacity/.store in=\modulelabelopacity,%
+ module label opacity={1},%
}%
\tikzset{module opacity/.style={
@@ -180,9 +184,8 @@
}
\pgfkeys{/tikz/.cd,%
- pin length factor/.initial={1},%
- pin length factor/.get=\pinlength,%
pin length factor/.store in=\pinlength,%
+ pin length factor={1},%
}%
% setting labels in math mode
@@ -895,9 +898,9 @@
\pgfmathtruncatemacro\startingpoint{1+((\t-1)*\applicationon)}
\pgfmathtruncatemacro\endingpoint{(\startingpoint+\applicationon)-1}
\foreach \startmodule in {\startingpoint,...,\endingpoint}{
- \pgfmathisodd{\startmodule}{initmodule}
+ \pgfmathisodd{\startmodule}
\ifnum\t=1
- \ifnum\initmodule=1
+ \ifnum\pgfmathresult=1
% if odd
\pgfmathtruncatemacro\endmodulei{int((\startmodule+1)/2)}
\pgfmathtruncatemacro\endmoduleii{int((\startmodule+1+\applicationon)/2)}
@@ -912,7 +915,7 @@
\fi
\fi
\ifnum\t=2
- \ifnum\initmodule=1
+ \ifnum\pgfmathresult=1
% if odd
\pgfmathtruncatemacro\endmodulei{int((\startmodule+1)/2+(\applicationon/2))}
\pgfmathtruncatemacro\endmoduleii{int((\startmodule+1+\applicationon)/2+(\applicationon/2))}
@@ -927,7 +930,7 @@
\fi
\fi
\ifnum\t>2
- \ifnum\initmodule=1
+ \ifnum\pgfmathresult=1
% if odd
\pgfmathtruncatemacro\endmodulei{int((\startmodule+1)/2+(\applicationon/2)+((\applicationon/2)*(\t-2)))}
\pgfmathtruncatemacro\endmoduleii{int((\startmodule+1+\applicationon)/2+(\applicationon/2)+((\applicationon/2)*(\t-2)))}
@@ -955,9 +958,9 @@
\pgfmathtruncatemacro\startingpoint{1+((\t-1)*\applicationon)}
\pgfmathtruncatemacro\endingpoint{(\startingpoint+\applicationon)-1}
\foreach \startmodule in {\startingpoint,...,\endingpoint}{
- \pgfmathisodd{\startmodule}{initmodule}
+ \pgfmathisodd{\startmodule}
\ifnum\t=1
- \ifnum\initmodule=1
+ \ifnum\pgfmathresult=1
% if odd
\pgfmathtruncatemacro\endmodulei{int((\startmodule+1)/2)}
\pgfmathtruncatemacro\endmoduleii{int((\startmodule+1+\applicationon)/2)}
@@ -972,7 +975,7 @@
\fi
\fi
\ifnum\t=2
- \ifnum\initmodule=1
+ \ifnum\pgfmathresult=1
% if odd
\pgfmathtruncatemacro\endmodulei{int((\startmodule+1)/2+(\applicationon/2))}
\pgfmathtruncatemacro\endmoduleii{int((\startmodule+1+\applicationon)/2+(\applicationon/2))}
@@ -987,7 +990,7 @@
\fi
\fi
\ifnum\t>2
- \ifnum\initmodule=1
+ \ifnum\pgfmathresult=1
% if odd
\pgfmathtruncatemacro\endmodulei{int((\startmodule+1)/2+(\applicationon/2)+((\applicationon/2)*(\t-2)))}
\pgfmathtruncatemacro\endmoduleii{int((\startmodule+1+\applicationon)/2+(\applicationon/2)+((\applicationon/2)*(\t-2)))}
@@ -1019,8 +1022,8 @@
% Drawing
\foreach \startmodule in {1,...,\r}{
- \pgfmathisodd{\startmodule}{initmodule}
- \ifnum\initmodule=1
+ \pgfmathisodd{\startmodule}
+ \ifnum\pgfmathresult=1
% if odd
\pgfmathtruncatemacro\endmodule{int(\startmodule+1)}
\draw(r\middlestage-\startmodule-output-1)--(r\middlestagei-\startmodule-input-1);
@@ -1041,5 +1044,205 @@
}
}
+% BANYAN NETWORKS
+
+% BANYAN-OMEGA (thanks to João Gabriel Reis)
+
+\tikzset{banyan omega/.code={
+ % Number of ports per module
+ \pgfmathtruncatemacro{\m}{2}
+
+ % Number of modules in each stage
+ \pgfmathtruncatemacro{\r}{\P/\m}
+
+ % Number of stages
+ \pgfmathtruncatemacro{\stages}{round(log2(\P))}
+
+ % Modules for all stages
+ \foreach \s [evaluate=\s as \numstage using int(\s-1)] in {0,...,\stages}{
+ \ifnum\s=0
+ % Invisible modules
+ \foreach \i in {1,...,\r}{
+ \path let \n2={-\i*\moduleysep} in
+ node[rectangle,minimum height=\modulesize,#1,module opacity,xshift=\modulesize/2,yshift=1cm]
+ (r\s-\i) at +(-0.6*\modulexsep,\n2) {};
+
+ % Invisible modules outputs
+ \pgfmathsetmacro\rintervalspace{1/(\m+1)}
+ \foreach \routput[evaluate=\routput as \rinterval using \rintervalspace*\routput] in {1,...,\m}
+ \draw ($(r\s-\i.north east)!\rinterval!(r\s-\i.south east)+(0.5*0.3*\pinlength,0)$) node[coordinate] (r\s-\i-front output-\routput) {} --
+ ($(r\s-\i.north east)!\rinterval!(r\s-\i.south east)$)node[coordinate](r\s-\i-output-\routput) {};
+ \foreach \routput[evaluate=\routput as \rinterval using \rintervalspace*\routput] in {1,...,\m}
+ \draw ($(r\s-\i.north east)!\rinterval!(r\s-\i.south east)-(0.5*0.3*\pinlength,0)$) node[circle,draw,scale=0.1] (r\s-\i-front input-\routput) {} --
+ ($(r\s-\i.north east)!\rinterval!(r\s-\i.south east)$)node[coordinate](r\s-\i-input-\routput) {};
+ }
+ \fi
+ \ifnum\s=\stages
+ % Final Module
+ \foreach \i in {1,...,\r}{
+ \path let \n1 = {int(0-\i)}, \n2={0-\i*\moduleysep} in node[module,#1,module opacity,yshift=1cm] (r\s-\i) at
+ +(\numstage*0.6*\modulexsep,\n2) {\pgfmathparse{int(multiply(\n1,-1))}\pgfmathresult};
+
+ % Final module inputs
+ \pgfmathsetmacro\roneintervalspace{1/(\m+1)}
+ \foreach \roneinput[evaluate=\roneinput as \roneinterval using \roneintervalspace*\roneinput] in {1,...,\m}
+ \draw ($(r\s-\i.north west)!\roneinterval!(r\s-\i.south west)-(0.5*0.3*\pinlength,0)$) node[coordinate](r\s-\i-front input-\roneinput) {} --
+ ($(r\s-\i.north west)!\roneinterval!(r\s-\i.south west)$)node[circle,draw,scale=0.1] (r\s-\i-input-\roneinput) {};
+
+ % Final module outputs
+ \pgfmathsetmacro\rintervalspace{1/(\m+1)}
+ \foreach \routput[evaluate=\routput as \rinterval using \rintervalspace*\routput] in {1,...,\m}
+ \draw ($(r\s-\i.north east)!\rinterval!(r\s-\i.south east)+(0.5*0.3*\pinlength,0)$) node[coordinate](r\s-\i-front output-\routput) {} --
+ ($(r\s-\i.north east)!\rinterval!(r\s-\i.south east)$)node[circle,draw,scale=0.1] (r\s-\i-output-\routput) {};
+ }
+ \fi
+
+ \pgfmathparse{and(\s>0,\s<\stages)}
+ \let\cond\pgfmathresult
+ \ifnum\cond=1
+ % Intermediate modules
+ \foreach \i in {1,...,\r}{
+ \path let \n1 = {int(0-\i)}, \n2={0-\i*\moduleysep} in node[module,#1,module opacity,yshift=1cm]
+ (r\s-\i) at +(\numstage*0.6*\modulexsep,\n2) {\pgfmathparse{int(multiply(\n1,-1))}\pgfmathresult};
+
+ % Intermediate modules inputs
+ \pgfmathsetmacro\roneintervalspace{1/(\m+1)}
+ \foreach \roneinput[evaluate=\roneinput as \roneinterval using \roneintervalspace*\roneinput] in {1,...,\m}
+ \draw ($(r\s-\i.north west)!\roneinterval!(r\s-\i.south west)-(0.5*0.3*\pinlength,0)$) node[coordinate](r\s-\i-front input-\roneinput) {} --
+ ($(r\s-\i.north west)!\roneinterval!(r\s-\i.south west)$)node[circle,draw,scale=0.1] (r\s-\i-input-\roneinput) {};
+
+ % Intermediate modules outputs
+ \pgfmathsetmacro\rintervalspace{1/(\m+1)}
+ \foreach \routput[evaluate=\routput as \rinterval using \rintervalspace*\routput] in {1,...,\m}
+ \draw ($(r\s-\i.north east)!\rinterval!(r\s-\i.south east)+(0.5*0.3*\pinlength,0)$) node[coordinate](r\s-\i-front output-\routput) {} --
+ ($(r\s-\i.north east)!\rinterval!(r\s-\i.south east)$)node[circle,draw,scale=0.1] (r\s-\i-output-\routput) {};
+ }
+ \fi
+ }
+
+ % Test if connections should be removed
+ \ifconnectiondisabled
+ \relax
+ \else
+ % Connections
+ \foreach \stg[evaluate=\stg as \prevstg using int(\stg - 1)] in {1,...,\stages}{
+ \foreach \startmod in {1,...,\r}{
+ \pgfmathomegarotation{2*(\startmod - 1)}{\stages - 1}{address}
+ \pgfmathtruncatemacro\endmodi{\address/2 + 1}
+ \pgfmathtruncatemacro\endmodii{\endmodi + \r/2}
+ \pgfmathtruncatemacro\cond{mod(\startmod,2)}
+ \ifnum\cond=0
+ \draw(r\stg-\startmod-front input-1)--(r\prevstg-\endmodi-front output-2);
+ \draw(r\stg-\startmod-front input-2)--(r\prevstg-\endmodii-front output-2);
+ \else
+ \draw(r\stg-\startmod-front input-1)--(r\prevstg-\endmodi-front output-1);
+ \draw(r\stg-\startmod-front input-2)--(r\prevstg-\endmodii-front output-1);
+ \fi
+ }
+ }
+ \fi
+}
+}
+
+% BANYAN-FLIP
+
+\tikzset{banyan flip/.code={
+ % Number of ports per module
+ \pgfmathtruncatemacro{\m}{2}
+
+ % Number of modules in each stage
+ \pgfmathtruncatemacro{\r}{\P/\m}
+
+ % Number of stages
+ \pgfmathtruncatemacro{\stages}{round(log2(\P))}
+
+ % Modules for all stages
+ \foreach \s [evaluate=\s as \numstage using int(\s-1)] in {0,...,\stages}{
+ \ifnum\s=0
+ % Final Module
+ \foreach \i in {1,...,\r}{
+ \path let \n1 = {int(0-\i)}, \n2={0-\i*\moduleysep} in node[module,#1,module opacity,yshift=1cm] (r\s-\i) at
+ +(\numstage*0.6*\modulexsep,\n2) {\pgfmathparse{int(multiply(\n1,-1))}\pgfmathresult};
+
+ % Final module inputs
+ \pgfmathsetmacro\roneintervalspace{1/(\m+1)}
+ \foreach \roneinput[evaluate=\roneinput as \roneinterval using \roneintervalspace*\roneinput] in {1,...,\m}
+ \draw ($(r\s-\i.north west)!\roneinterval!(r\s-\i.south west)-(0.5*0.3*\pinlength,0)$) node[coordinate](r\s-\i-front input-\roneinput) {} --
+ ($(r\s-\i.north west)!\roneinterval!(r\s-\i.south west)$) node[circle,draw,scale=0.1] (r\s-\i-input-\roneinput) {};
+
+ % Final module outputs
+ \pgfmathsetmacro\rintervalspace{1/(\m+1)}
+ \foreach \routput[evaluate=\routput as \rinterval using \rintervalspace*\routput] in {1,...,\m}
+ \draw ($(r\s-\i.north east)!\rinterval!(r\s-\i.south east)+(0.5*0.3*\pinlength,0)$) node[coordinate](r\s-\i-front output-\routput) {} --
+ ($(r\s-\i.north east)!\rinterval!(r\s-\i.south east)$) node[circle,draw,scale=0.1] (r\s-\i-output-\routput) {};
+ }
+ \fi
+ \ifnum\s=\stages
+ % Invisible modules
+ \foreach \i in {1,...,\r}{
+ \path let \n2={-\i*\moduleysep} in
+ node[rectangle,minimum height=\modulesize,#1,module opacity,xshift=\modulesize/2,yshift=1cm]
+ (r\s-\i) at +(\numstage*0.415*\modulexsep,\n2) {};
+
+ % Invisible modules outputs
+ \pgfmathsetmacro\rintervalspace{1/(\m+1)}
+ \foreach \roneinput[evaluate=\roneinput as \rinterval using \rintervalspace*\roneinput] in {1,...,\m}
+ \draw ($(r\s-\i.north west)!\rinterval!(r\s-\i.south west)$)node [coordinate](r\s-\i-input-\roneinput) {} --
+ ($(r\s-\i.north west)!\rinterval!(r\s-\i.south west)-(0.5*0.3*\pinlength,0)$)
+ node [coordinate] (r\s-\i-front input-\roneinput) {};
+ \foreach \roneinput[evaluate=\roneinput as \rinterval using \rintervalspace*\roneinput] in {1,...,\m}
+ \draw ($(r\s-\i.north west)!\rinterval!(r\s-\i.south west)$)node [coordinate](r\s-\i-input-\roneinput) {} --
+ ($(r\s-\i.north west)!\rinterval!(r\s-\i.south west)+(0.5*0.3*\pinlength,0)$)
+ node [circle,draw,scale=0.1] (r\s-\i-front output-\roneinput) {};
+ }
+ \fi
+ \pgfmathparse{and(\s>0,\s<\stages)}
+ \let\cond\pgfmathresult
+ \ifnum\cond=1
+ % Intermediate modules
+ \foreach \i in {1,...,\r}{
+ \path let \n1 = {int(0-\i)}, \n2={0-\i*\moduleysep} in node[module,#1,module opacity,yshift=1cm]
+ (r\s-\i) at +(\numstage*0.6*\modulexsep,\n2) {\pgfmathparse{int(multiply(\n1,-1))}\pgfmathresult};
+
+ % Intermediate modules inputs
+ \pgfmathsetmacro\roneintervalspace{1/(\m+1)}
+ \foreach \roneinput[evaluate=\roneinput as \roneinterval using \roneintervalspace*\roneinput] in {1,...,\m}
+ \draw ($(r\s-\i.north west)!\roneinterval!(r\s-\i.south west)-(0.5*0.3*\pinlength,0)$) node[coordinate](r\s-\i-front input-\roneinput) {} --
+ ($(r\s-\i.north west)!\roneinterval!(r\s-\i.south west)$) node[circle,draw,scale=0.1] (r\s-\i-input-\roneinput) {};
+
+ % Intermediate modules outputs
+ \pgfmathsetmacro\rintervalspace{1/(\m+1)}
+ \foreach\routput[evaluate=\routput as \rinterval using \rintervalspace*\routput] in {1,...,\m}
+ \draw ($(r\s-\i.north east)!\rinterval!(r\s-\i.south east)+(0.5*0.3*\pinlength,0)$) node[coordinate](r\s-\i-front output-\routput) {} --
+ ($(r\s-\i.north east)!\rinterval!(r\s-\i.south east)$) node[circle,draw,scale=0.1] (r\s-\i-output-\routput) {};
+ }
+ \fi
+ }
+
+ % Test if connections should be removed
+ \ifconnectiondisabled
+ \relax
+ \else
+ % Connections
+ \foreach \stg[evaluate=\stg as \prevstg using int(\stg - 1)] in {1,...,\stages}{
+ \foreach \startmod in {1,...,\r}{
+ \pgfmathomegarotation{2*(\startmod - 1)}{\stages - 1}{address}
+ \pgfmathtruncatemacro\endmodi{\address/2 + 1}
+ \pgfmathtruncatemacro\endmodii{\endmodi + \r/2}
+ \pgfmathtruncatemacro\cond{mod(\startmod,2)}
+ \ifnum\cond=0
+ \draw(r\stg-\startmod-front input-1)--(r\prevstg-\endmodi-front output-2);
+ \draw(r\stg-\startmod-front input-2)--(r\prevstg-\endmodii-front output-2);
+ \else
+ \draw(r\stg-\startmod-front input-1)--(r\prevstg-\endmodi-front output-1);
+ \draw(r\stg-\startmod-front input-2)--(r\prevstg-\endmodii-front output-1);
+ \fi
+ }
+ }
+ \fi
+}
+}
+
+
-\endinput
+\endinput
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sa-tikz.tlpobj new/tlpkg/tlpobj/sa-tikz.tlpobj
--- old/tlpkg/tlpobj/sa-tikz.tlpobj 2013-01-04 04:34:17.000000000 +0100
+++ new/tlpkg/tlpobj/sa-tikz.tlpobj 2014-01-30 03:24:43.000000000 +0100
@@ -1,14 +1,14 @@
name sa-tikz
category Package
-revision 28714
+revision 32815
shortdesc TikZ library to draw switching architectures.
relocated 1
-longdesc The provides a library that offers an easy way to draw
+longdesc The package provides a library that offers an easy way to draw
longdesc switching architectures and to customize their aspect.
-runfiles size=22
+runfiles size=26
RELOC/tex/latex/sa-tikz/sa-tikz.sty
RELOC/tex/latex/sa-tikz/tikzlibraryswitching-architectures.code.tex
catalogue-ctan /graphics/pgf/contrib/sa-tikz
-catalogue-date 2013-01-03 19:43:19 +0100
+catalogue-date 2014-01-29 19:47:58 +0100
catalogue-license lppl1.3
-catalogue-version 0.5
+catalogue-version 0.7a
++++++ sapthesis.doc.tar.xz ++++++
++++ 2048 lines of diff (skipped)
++++++ sapthesis.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/sapthesis/sapthesis.cls new/tex/latex/sapthesis/sapthesis.cls
--- old/tex/latex/sapthesis/sapthesis.cls 2012-11-23 23:45:46.000000000 +0100
+++ new/tex/latex/sapthesis/sapthesis.cls 2013-08-22 00:07:40.000000000 +0200
@@ -1,7 +1,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% sapthesis.cls %%
-%% version 3.2 %%
-%% 2012-08-15 %%
+%% version 3.7 %%
+%% 2013-07-20 %%
%% author: Francesco Biccari %%
%% contact: biccari@gmail.com %%
%% %%
@@ -10,7 +10,7 @@
%% %%
%% see README for license information and installation %%
%% see sapthesis-doc.pdf for usage %%
-%% see sapthesis-example.pdf for document examples %%
+%% see the examples folder for document examples %%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -20,9 +20,9 @@
\NeedsTeXFormat{LaTeX2e}[2009/01/01]
\ProvidesClass{sapthesis}%
-[2012/08/15 Sapienza - University of Rome thesis class]
+[2013/07/20 Sapienza - University of Rome thesis class]
-\def\SAP@classVersion{3.2}
+\def\SAP@classVersion{3.7}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Options %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -34,10 +34,12 @@
\newif\ifSAP@customlanguage \SAP@customlanguagefalse
\newif\ifSAP@bn \SAP@bnfalse
\newif\ifSAP@PhD \SAP@PhDfalse
+\newif\ifSAP@Specialization \SAP@Specializationfalse
\newif\ifSAP@MasterP \SAP@MasterPfalse
\newif\ifSAP@MasterS \SAP@MasterSfalse
\newif\ifSAP@LaM \SAP@LaMfalse
\newif\ifSAP@Lau \SAP@Laufalse
+\newif\ifSAP@TFA \SAP@TFAfalse
\newif\ifSAP@noexaminfo \SAP@noexaminfofalse
\newif\ifSAP@femaleauthor \SAP@femaleauthorfalse
@@ -55,8 +57,10 @@
\PassOptionsToPackage{monochrome}{color}
\PassOptionsToPackage{monochrome}{xcolor}}
\define@key[sap]{}{PhD}[]{\SAP@PhDtrue}
+\define@key[sap]{}{Specialization}[]{\SAP@Specializationtrue}
\define@key[sap]{}{LaM}[]{\SAP@LaMtrue}
\define@key[sap]{}{Lau}[]{\SAP@Lautrue}
+\define@key[sap]{}{TFA}[]{\SAP@TFAtrue}
\define@key[sap]{}{MasterP}[]{\SAP@MasterPtrue\SAP@MasterPtrue}
\define@key[sap]{}{MasterS}[]{\SAP@MasterStrue\SAP@MasterStrue}
\define@key[sap]{}{binding}[0pt]{\setlength{\SAP@binding}{#1}}
@@ -71,12 +75,16 @@
\ifSAP@PhD\relax\else
- \ifSAP@LaM\relax\else
- \ifSAP@Lau\relax\else
- \ifSAP@MasterP\relax\else
- \ifSAP@MasterS\relax\else
- \ClassError{sapthesis}{You must specify the PhD, LaM, Lau, MasterP or %
- MasterS option}{}
+ \ifSAP@Specialization\relax\else
+ \ifSAP@LaM\relax\else
+ \ifSAP@Lau\relax\else
+ \ifSAP@MasterP\relax\else
+ \ifSAP@MasterS\relax\else
+ \ifSAP@TFA\relax\else
+ \ClassError{sapthesis}{You must specify the PhD, LaM, Lau, MasterP, %
+ MasterS, Specialization or TFA option}{}
+ \fi
+ \fi
\fi
\fi
\fi
@@ -93,17 +101,13 @@
textheight=641pt,
marginparsep=12pt,
bindingoffset=\SAP@binding,
- hmarginratio=55:89,
vmarginratio=55:89,
includehead,
marginparwidth=72pt,
heightrounded}
-\if@twoside
- \geometry{hmarginratio=55:89}
-\else
- \geometry{hmarginratio=1:1}
-\fi
+\if@twoside\geometry{hmarginratio=55:89}\fi
+
@@ -145,9 +149,13 @@
\renewcommand{\chaptermark}[1]{\markboth{\ifnum \c@chapter>0 \thechapter.\ ##1 \else ##1 \fi}{}}
\renewcommand{\sectionmark}[1]{\markright{\thesection\ ##1}}
\fancyhf{}
-\fancyhead[LE,RO]{\small\bfseries\thepage}
-\fancyhead[LO]{\small\bfseries\nouppercase{\rightmark}}
-\fancyhead[RE]{\small\bfseries\nouppercase{\leftmark}}
+\fancyhead[OR]{\small\bfseries\thepage}
+\fancyhead[OL]{\small\bfseries\nouppercase{\rightmark}}
+% This check is useful to avoid Warnings with oneside option
+\if@twoside
+\fancyhead[ER]{\small\bfseries\nouppercase{\leftmark}}
+\fancyhead[EL]{\small\bfseries\thepage}
+\fi
\renewcommand{\headrulewidth}{0.4pt}
\renewcommand{\footrulewidth}{0pt}}
@@ -156,7 +164,11 @@
\renewcommand{\headrulewidth}{0pt}
\fancyhf{}
%\fancyfoot[C]{\small\scshape\thepage}
-\fancyhead[LE,RO]{\small\bfseries\thepage}
+\fancyhead[OR]{\small\bfseries\thepage}
+% This check is useful to avoid Warnings with oneside option
+\if@twoside
+\fancyhead[EL]{\small\bfseries\thepage}
+\fi
}
\g@addto@macro\frontmatter{\pagestyle{SAP@mainstyle}}
@@ -219,10 +231,12 @@
\def\SAP@submitdate{}
\newcommand{\submitdate}[1]{\def\SAP@submitdate{#1}}
+\let\AcademicYear\submitdate
\def\SAP@IDnumber{}
\newcommand{\IDnumber}[1]{\def\SAP@IDnumber{#1}}
+%% Advisors
\newcount\SAP@advisorcount
\newtoks\SAP@advisortoks
\newcommand{\advisor}[1]{%
@@ -233,6 +247,7 @@
\fi
\advance\SAP@advisorcount\@ne}
+%% Co-Advisors
\newcount\SAP@coadvisorcount
\newtoks\SAP@coadvisortoks
\newcommand{\coadvisor}[1]{%
@@ -242,7 +257,41 @@
\SAP@coadvisortoks=\expandafter{\the\SAP@coadvisortoks\\[0.75mm]#1}%
\fi
\advance\SAP@coadvisorcount\@ne}
-
+
+%% Directors
+\newcount\SAP@directorcount
+\newtoks\SAP@directortoks
+\newcommand{\director}[1]{%
+ \ifnum\SAP@directorcount=\z@
+ \SAP@directortoks={#1}%
+ \else
+ \SAP@directortoks=\expandafter{\the\SAP@directortoks\\[0.75mm]#1}%
+ \fi
+ \advance\SAP@directorcount\@ne}
+
+%% Tutor (TFA only)
+\newcount\SAP@tutorcount
+\newtoks\SAP@tutortoks
+\newcommand{\tutor}[1]{%
+ \ifnum\SAP@tutorcount=\z@
+ \SAP@tutortoks={#1}%
+ \else
+ \SAP@tutortoks=\expandafter{\the\SAP@tutortoks\\[0.75mm]#1}%
+ \fi
+ \advance\SAP@tutorcount\@ne}
+
+%% Tutor Coordinatori (TFA only)
+\newcount\SAP@tutorcoordcount
+\newtoks\SAP@tutorcoordtoks
+\newcommand{\tutorcoord}[1]{%
+ \ifnum\SAP@tutorcoordcount=\z@
+ \SAP@tutorcoordtoks={#1}%
+ \else
+ \SAP@tutorcoordtoks=\expandafter{\the\SAP@tutorcoordtoks\\[0.75mm]#1}%
+ \fi
+ \advance\SAP@tutorcoordcount\@ne}
+
+%% Examiners
\newcount\SAP@examinercount
\newtoks\SAP@examinertoks
\newcommand{\examiner}[1]{%
@@ -268,6 +317,18 @@
\def\SAP@ISBN{}
\newcommand{\ISBN}[1]{\def\SAP@ISBN{#1}}
+\def\SAP@schoolname{}
+\newcommand{\schoolname}[1]{\def\SAP@schoolname{#1}}
+
+\def\SAP@schooladdress{}
+\newcommand{\schooladdress}[1]{\def\SAP@schooladdress{#1}}
+
+\def\SAP@schoolwebsite{}
+\newcommand{\schoolwebsite}[1]{\def\SAP@schoolwebsite{#1}}
+
+\def\SAP@schoolprincipal{}
+\newcommand{\schoolprincipal}[1]{\def\SAP@schoolprincipal{#1}}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% PhD maketitle
@@ -294,6 +355,8 @@
% Titlepage:
\begin{titlepage}
+
+ \linespread{1}\selectfont
\newcommand{\SAP@parbox}[2][]{\hspace{1.72cm}\parbox[t][##1][t]{11.9cm}{##2}}
\parindent=0pt
@@ -364,6 +427,104 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Specialization maketitle
+
+\newcommand{\SAP@maketitleSpecialization}{
+
+% Errors:
+
+\if|\SAP@courseorganizerLabel|\ClassError{sapthesis}{You must specify the Specialization course %
+ organizer}{Example: \protect\courseorganizer{Faculty of ...}}\fi
+\if|\SAP@submitdate|\ClassError{sapthesis}{You must specify the Academic %
+ Year}{Example: \protect\submitdate{2011/2012}}\fi
+\if|\SAP@IDnumber|\ClassError{sapthesis}{You must specify your %
+ ID number (matricola)}{E.g. 123456}\fi
+\if|\SAP@copyyear|\ClassError{sapthesis}{You must specify the %
+ copyright year}{Example: \protect\copyyear{2012}}\fi
+\if|\SAP@authoremail|\ClassError{sapthesis}{You must specify the email of the author}{%
+ Example: \protect\authoremail{author@email.com}}\fi
+
+% Titlepage:
+
+ \begin{titlepage}
+
+ \linespread{1}\selectfont
+
+ \newcommand{\SAP@parbox}[2][]{\hspace{1.72cm}\parbox[t][##1][t]{11.9cm}{##2}}
+ \parindent=0pt
+ \sffamily
+
+ \vspace*{-10mm}
+ \ifSAP@bn
+ \includegraphics[width=5cm]{sapienza-MLblack-pos}
+ \else
+ \includegraphics[width=5cm]{sapienza-MLred-pos}
+ \fi
+
+ \nointerlineskip
+ \vspace{\stretch{0.9}}
+ \nointerlineskip
+
+ \SAP@parbox{\LARGE\textcolor{sapred}{\@title}\par}
+
+ \vspace{\stretch{0.9}}
+
+ \SAP@parbox[3cm]{%
+ \textcolor{sapred}{\SAP@courseorganizerLabel\\[2mm]
+ Corso di specializzazione in \SAP@courseLabel}}
+
+ \SAP@parbox[3cm]{%
+ \ifSAP@femaleauthor
+ \SAP@CandidateLabelFemale\\[2mm]
+ \else
+ \SAP@CandidateLabel\\[2mm]
+ \fi
+ \@author\\[0.75mm]
+ \SAP@IDnumberLabel\ \SAP@IDnumber}
+
+ \SAP@parbox[4.5cm]{%
+ \makebox[11.9cm][l]{%
+ \parbox[t]{5.9cm}{%
+ \ifcase\SAP@advisorcount
+ \ClassError{sapthesis}{You must specify at least one advisor in the preamble}%
+ {E.g. \protect\advisor{Prof. Name Surname}}
+ \or
+ \SAP@ThesisAdvisorLabel\\[2mm]
+ \else
+ \SAP@ThesisAdvisorsLabel\\[2mm]
+ \fi
+ \the\SAP@advisortoks}
+ \hspace{1.5cm}
+ \parbox[t]{5.9cm}{%
+ \ifcase\SAP@directorcount
+ \relax
+ \or
+ \SAP@ThesisDirectorLabel\\[2mm]
+ \else
+ \SAP@ThesisDirectorsLabel\\[2mm]
+ \fi
+ \the\SAP@directortoks}
+ }
+
+ \vspace{1cm}
+
+ \makebox[11.9cm][l]{%
+ \parbox[t]{5.9cm}{%
+ \ifcase\SAP@coadvisorcount
+ \or
+ \SAP@ThesisCoAdvisorLabel\\[2mm]
+ \else
+ \SAP@ThesisCoAdvisorsLabel\\[2mm]
+ \fi
+ \the\SAP@coadvisortoks}
+ }}
+
+ \SAP@parbox{\SAP@AcademicYearLabel\ \SAP@submitdate}
+
+ \end{titlepage}
+\clearpage
+\SAP@composebacktitlepage
+}
%% Laurea and Laurea Magistrale maketitle
\newcommand{\SAP@maketitleLaurea}{
@@ -384,6 +545,8 @@
% Titlepage:
\begin{titlepage}
+
+ \linespread{1}\selectfont
\newcommand{\SAP@parbox}[2][]{\hspace{1.72cm}\parbox[t][##1][t]{11.9cm}{##2}}
\parindent=0pt
@@ -471,6 +634,8 @@
% Titlepage:
\begin{titlepage}
+
+ \linespread{1}\selectfont
\newcommand{\SAP@parbox}[2][]{\hspace{1.72cm}\parbox[t][##1][t]{11.9cm}{##2}}
\parindent=0pt
@@ -537,18 +702,142 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Tirocinio Formativo Attivo (TFA) maketitle
+
+\newcommand{\SAP@maketitleTFA}{
+
+% Errors:
+
+\if|\SAP@courseorganizerLabel|\ClassError{sapthesis}{You must specify the degree %
+ organizer}{Example: \protect\courseorganizer{Faculty of ...}}\fi
+\if|\SAP@submitdate|\ClassError{sapthesis}{You must specify the Academic %
+ Year}{Example: \protect\submitdate{2011/2012}}\fi
+\if|\SAP@IDnumber|\ClassError{sapthesis}{You must specify your %
+ ID number (matricola)}{E.g. 123456}\fi
+\if|\SAP@copyyear|\ClassError{sapthesis}{You must specify the %
+ copyright year}{Example: \protect\copyyear{2012}}\fi
+\if|\SAP@authoremail|\ClassError{sapthesis}{You must specify the email of the author}{%
+ Example: \protect\authoremail{author@email.com}}\fi
+
+% Titlepage:
+
+ \begin{titlepage}
+
+ \linespread{1}\selectfont
+
+ \newcommand{\SAP@parbox}[2][]{\hspace{1.72cm}\parbox[t][##1][t]{11.9cm}{##2}}
+ \parindent=0pt
+ \sffamily
+
+ \vspace*{-10mm}
+ \ifSAP@bn
+ \includegraphics[width=5cm]{sapienza-MLblack-pos}
+ \else
+ \includegraphics[width=5cm]{sapienza-MLred-pos}
+ \fi
+
+ \nointerlineskip
+ \vspace{\stretch{0.9}}
+ \nointerlineskip
+
+ \SAP@parbox{\LARGE\textcolor{sapred}{\@title}\par}
+
+ \vspace{\stretch{0.9}}
+
+ \SAP@parbox[3cm]{%
+ \textcolor{sapred}{\SAP@courseorganizerLabel\\[2mm]
+ Tirocinio Formativo Attivo\\[2mm]
+ Classe \SAP@courseLabel}}
+
+ \SAP@parbox[3cm]{%
+ \ifSAP@femaleauthor
+ \SAP@CandidateLabelFemale\\[2mm]
+ \else
+ \SAP@CandidateLabel\\[2mm]
+ \fi
+ \@author\\[0.75mm]
+ \SAP@IDnumberLabel\ \SAP@IDnumber}
+
+ \SAP@parbox[4.5cm]{%
+ \makebox[11.9cm][l]{%
+ \parbox[t]{5.9cm}{%
+ \ifcase\SAP@advisorcount
+ \ClassError{sapthesis}{You must specify at least one advisor in the preamble}%
+ {E.g. \protect\advisor{Prof. Name Surname}}
+ \or
+ \SAP@ThesisAdvisorLabel\\[2mm]
+ \else
+ \SAP@ThesisAdvisorsLabel\\[2mm]
+ \fi
+ \the\SAP@advisortoks}
+ \hspace{1.5cm}
+ \parbox[t]{5.9cm}{%
+ \ifcase\SAP@coadvisorcount
+ \relax
+ \or
+ \SAP@ThesisCoAdvisorLabel\\[2mm]
+ \else
+ \SAP@ThesisCoAdvisorsLabel\\[2mm]
+ \fi
+ \the\SAP@coadvisortoks}
+ }
+
+ \vspace{1cm}
+
+ \makebox[11.9cm][l]{%
+ \parbox[t]{5.9cm}{%
+ \ifcase\SAP@tutorcount
+ \ClassError{sapthesis}{You must specify at least one tutor in the preamble}%
+ {E.g. \protect\tutor{Prof. Name Surname}}
+ \or
+ \SAP@ThesisTutorLabel\\[2mm]
+ \else
+ \SAP@ThesisTutorsLabel\\[2mm]
+ \fi
+ \the\SAP@tutortoks}
+ \hspace{1.5cm}
+ \parbox[t]{5.9cm}{%
+ \ifcase\SAP@tutorcoordcount
+ \ClassError{sapthesis}{You must specify at least one tutor coordinatore in the preamble}%
+ {E.g. \protect\tutorcoord{Prof. Name Surname}}
+ \or
+ \SAP@ThesisTutorCoordLabel\\[2mm]
+ \else
+ \SAP@ThesisTutorCoordsLabel\\[2mm]
+ \fi
+ \the\SAP@tutorcoordtoks}
+ }}
+
+ \SAP@parbox{\SAP@AcademicYearLabel\ \SAP@submitdate}
+
+ \end{titlepage}
+\clearpage
+\SAP@composebacktitlepage
+}
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Macro for the back of the title page %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\def\SAP@composebacktitlepage{%
{\thispagestyle{empty}
+\linespread{1}\selectfont
\setlength{\parindent}{0pt}
-\ifSAP@noexaminfo
\null
-\vfill
-\else
-\vspace*{\stretch{0.1}}
+\vspace*{1cm}
+\ifSAP@TFA
+\SAP@TFAschoolHeadLabel\\[2mm]
+\SAP@schoolname\\[0.1cm]
+\SAP@schooladdress\\[0.1cm]
+\@ifundefined{href}{\SAP@schoolwebsite}{\href{\SAP@schoolwebsite}{\SAP@schoolwebsite}}\\[0.1cm]
+\SAP@TFAschoolPrincipalLabel: \SAP@schoolprincipal
+\vspace*{1.5cm}
+\fi
+\ifSAP@noexaminfo
+\else
\if?\SAP@examdate?
\SAP@ThesisNotDefensedLabel%
\else
@@ -556,20 +845,22 @@
\SAP@ThesisDefensedLabelB:\\[2mm]
\the\SAP@examinertoks%
\fi
-
-\vspace{\stretch{0.8}}
\fi
+\vfill
+
\hrulefill
\vspace{2mm}
\small
\textbf{\def\\{}\def\newline{}\@title} \\[0.75mm]
\ifSAP@PhD\SAP@PhDthesistype\fi
+\ifSAP@Specialization\SAP@Specializationthesistype\fi
\ifSAP@LaM\SAP@LaMthesistype\fi
\ifSAP@Lau\SAP@Lauthesistype\fi
\ifSAP@MasterS\SAP@MasterSthesistype\fi
\ifSAP@MasterP\SAP@MasterPthesistype\fi
+\ifSAP@TFA\SAP@TFAthesistype\fi
. \SAP@sapienzaname \\[0.75mm]
\if|\SAP@ISBN|\relax\else ISBN: \SAP@ISBN\fi\\[0.75mm]
\copyright\ \SAP@copyyear\ \@author. \SAP@allRightsReservedLabel\\[1.5mm]
@@ -608,10 +899,12 @@
\renewcommand{\maketitle}{%
\ifSAP@PhD\SAP@maketitlePhD\fi
+ \ifSAP@Specialization\SAP@maketitleSpecialization\fi
\ifSAP@LaM\SAP@maketitleLaurea\fi
\ifSAP@Lau\SAP@maketitleLaurea\fi
\ifSAP@MasterS\SAP@maketitleMaster\fi
- \ifSAP@MasterP\SAP@maketitleMaster\fi}
+ \ifSAP@MasterP\SAP@maketitleMaster\fi
+ \ifSAP@TFA\SAP@maketitleTFA\fi}
@@ -652,6 +945,14 @@
\newcommand{\SAP@ThesisAdvisorsLabel}{Thesis Advisors}
\newcommand{\SAP@ThesisCoAdvisorLabel}{Co-Advisor}
\newcommand{\SAP@ThesisCoAdvisorsLabel}{Co-Advisors}
+ \newcommand{\SAP@ThesisDirectorLabel}{Director}
+ \newcommand{\SAP@ThesisDirectorsLabel}{Directors}
+ \newcommand{\SAP@ThesisTutorLabel}{Trainee's Tutor}
+ \newcommand{\SAP@ThesisTutorsLabel}{Trainee's Tutors}
+ \newcommand{\SAP@ThesisTutorCoordLabel}{Coordinating Tutor}
+ \newcommand{\SAP@ThesisTutorCoordsLabel}{Coordinating Tutors}
+ \newcommand{\SAP@TFAschoolHeadLabel}{Training done at:}
+ \newcommand{\SAP@TFAschoolPrincipalLabel}{Principal}
\newcommand{\SAP@DeclarationLabel}{A thesis
submitted in partial fulfillment of the requirements\\
for the degree of Doctor of Philosophy in}
@@ -660,10 +961,12 @@
\newcommand{\SAP@ThesisDefensedLabelB}{in front of a Board of Examiners composed by}
\newcommand{\SAP@chairman}{chairman}
\newcommand{\SAP@PhDthesistype}{Ph.D. thesis}
+ \newcommand{\SAP@Specializationthesistype}{Specialization thesis}
\newcommand{\SAP@LaMthesistype}{Master thesis}
\newcommand{\SAP@Lauthesistype}{Bachelor thesis}
\newcommand{\SAP@MasterPthesistype}{First level master thesis}
\newcommand{\SAP@MasterSthesistype}{Second level master thesis}
+ \newcommand{\SAP@TFAthesistype}{TFA report}
\newcommand{\SAP@sapienzaname}{Sapienza -- University of Rome}
\newcommand{\SAP@versionLabel}{Version}
\newcommand{\SAP@websiteLabel}{Website}
@@ -682,6 +985,14 @@
\newcommand{\SAP@ThesisAdvisorsLabel}{Relatori}
\newcommand{\SAP@ThesisCoAdvisorLabel}{Correlatore}
\newcommand{\SAP@ThesisCoAdvisorsLabel}{Correlatori}
+ \newcommand{\SAP@ThesisDirectorLabel}{Direttore}
+ \newcommand{\SAP@ThesisDirectorsLabel}{Direttori}
+ \newcommand{\SAP@ThesisTutorLabel}{Tutor del Tirocinante}
+ \newcommand{\SAP@ThesisTutorsLabel}{Tutor del Tirocinante}
+ \newcommand{\SAP@ThesisTutorCoordLabel}{Tutor Coordinatore}
+ \newcommand{\SAP@ThesisTutorCoordsLabel}{Tutor Coordinatori}
+ \newcommand{\SAP@TFAschoolHeadLabel}{Tirocinio svolto presso:}
+ \newcommand{\SAP@TFAschoolPrincipalLabel}{Dirigente scolastico}
\newcommand{\SAP@DeclarationLabel}{Tesi presentata
in parziale adempimento dei requisiti necessari\\
per conseguire il titolo di Dottore di Ricerca in}
@@ -690,10 +1001,12 @@
\newcommand{\SAP@ThesisDefensedLabelB}{di fronte a una commissione esaminatrice composta da}
\newcommand{\SAP@chairman}{presidente}
\newcommand{\SAP@PhDthesistype}{Tesi di dottorato}
+ \newcommand{\SAP@Specializationthesistype}{Tesi di Specializzazione}
\newcommand{\SAP@LaMthesistype}{Tesi di Laurea Magistrale}
\newcommand{\SAP@Lauthesistype}{Tesi di Laurea}
\newcommand{\SAP@MasterPthesistype}{Tesi di Master di primo livello}
\newcommand{\SAP@MasterSthesistype}{Tesi di Master di secondo livello}
+ \newcommand{\SAP@TFAthesistype}{TFA. Relazione di tirocinio}
\newcommand{\SAP@sapienzaname}{Sapienza -- Universit\`a di Roma}
\newcommand{\SAP@versionLabel}{Versione}
\newcommand{\SAP@websiteLabel}{Sito web}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sapthesis.tlpobj new/tlpkg/tlpobj/sapthesis.tlpobj
--- old/tlpkg/tlpobj/sapthesis.tlpobj 2012-11-24 04:44:25.000000000 +0100
+++ new/tlpkg/tlpobj/sapthesis.tlpobj 2013-08-22 03:23:32.000000000 +0200
@@ -1,17 +1,17 @@
name sapthesis
category Package
-revision 28345
+revision 31487
shortdesc Typeset theses for Sapienza-University, Rome.
relocated 1
longdesc The class will typeset Ph.D., Master, and Bachelor theses that
longdesc adhere to the publishing guidelines of the Sapienza-University
longdesc of Rome.
-runfiles size=27
+runfiles size=29
RELOC/bibtex/bst/sapthesis/sapthesis.bst
RELOC/tex/latex/sapthesis/sapienza-MLblack-pos.pdf
RELOC/tex/latex/sapthesis/sapienza-MLred-pos.pdf
RELOC/tex/latex/sapthesis/sapthesis.cls
catalogue-ctan /macros/latex/contrib/sapthesis
-catalogue-date 2012-11-23 11:17:42 +0100
+catalogue-date 2013-08-21 10:23:24 +0200
catalogue-license lppl1.3
catalogue-version 3.2
++++++ sasnrdisplay.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/sasnrdisplay/README new/doc/latex/sasnrdisplay/README
--- old/doc/latex/sasnrdisplay/README 2012-03-28 00:01:49.000000000 +0200
+++ new/doc/latex/sasnrdisplay/README 2014-03-08 01:36:17.000000000 +0100
@@ -1,4 +1,4 @@
-% (C) Lars Madsen, daleif@imf.au.dk, 2011/12/01
+% (C) Lars Madsen, daleif@imf.au.dk, 2012/10/10
% This material is subject to the LaTeX Project Public License.
% See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html
% for the details of that license.
@@ -20,6 +20,14 @@
HISTORY:
+2014/03/07
+* bad test for \chapter, fix by using \ifundef instead
+
+2012/10/10
+
+* Added a test for the legacy (unpublished) SASdisplay package. Users
+ should not be using both packages
+
2012/03/27
* Fixed typo within \inputSASoutput configuration
Files old/doc/latex/sasnrdisplay/SASnRdisplay.pdf and new/doc/latex/sasnrdisplay/SASnRdisplay.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/sasnrdisplay/SASnRdisplay.tex new/doc/latex/sasnrdisplay/SASnRdisplay.tex
--- old/doc/latex/sasnrdisplay/SASnRdisplay.tex 2012-03-28 00:01:49.000000000 +0200
+++ new/doc/latex/sasnrdisplay/SASnRdisplay.tex 2014-03-08 01:36:17.000000000 +0100
@@ -133,7 +133,7 @@
\begin{document}
\title{The \textsf{SASnRdisplay} package}
-\author{Lars Madsen\thanks{Email: daleif@imf.au.dk}}
+\author{Lars Madsen\thanks{Email: daleif@imf.au.dk,\SnRversion}}
\maketitle
\chapter*{Introdution}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sasnrdisplay.doc.tlpobj new/tlpkg/tlpobj/sasnrdisplay.doc.tlpobj
--- old/tlpkg/tlpobj/sasnrdisplay.doc.tlpobj 2012-03-28 04:32:00.000000000 +0200
+++ new/tlpkg/tlpobj/sasnrdisplay.doc.tlpobj 2014-03-08 03:22:10.000000000 +0100
@@ -1,6 +1,6 @@
name sasnrdisplay.doc
category Package
-revision 25751
+revision 33120
shortdesc doc files of sasnrdisplay
relocated 1
docfiles size=57
++++++ sasnrdisplay.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/sasnrdisplay/SASnRdisplay.sty new/tex/latex/sasnrdisplay/SASnRdisplay.sty
--- old/tex/latex/sasnrdisplay/SASnRdisplay.sty 2012-03-28 00:01:49.000000000 +0200
+++ new/tex/latex/sasnrdisplay/SASnRdisplay.sty 2014-03-08 01:36:17.000000000 +0100
@@ -1,7 +1,9 @@
-\ProvidesPackage{SASnRdisplay}[2012/03/27 v0.91 by daleif]
+\ProvidesPackage{SASnRdisplay}[2014/03/07 v0.93 by daleif]
-%% $LastChangedDate: 2012-03-27 12:21:59 +0200 (Tue, 27 Mar 2012) $
-%% $LastChangedRevision: 1480 $
+\newcommand\SnRversion{v0.93 2014/03/07}
+
+%% $LastChangedDate: 2012-10-15 16:01:29 +0200 (Mon, 15 Oct 2012) $
+%% $LastChangedRevision: 1552 $
%% $LastChangedBy: daleif $
%%
@@ -102,10 +104,10 @@
\DeclareOptionX{countbysection}{\toggletrue{SnRcountbysection}}
\DeclareOptionX{countbychapter}{%
% if \chapter is not available specify section instead
- \ifdef\chapter{
- \toggletrue{SnRcountbychapter}
- }{
+ \ifundef\chapter{
\toggletrue{SnRcountbysection}
+ }{
+ \toggletrue{SnRcountbychapter}
}
}
@@ -427,7 +429,7 @@
% end rincludecode
% rincludeoutput
\lstdefinestyle{r-include-output}{
- style = r-outout,
+ style = r-output,
style = r-include-user,
style = r-include-output-user,
}
@@ -698,6 +700,16 @@
\InputIfFileExists{SASnRdisplay.cfg}{}{}
\InputIfFileExists{SASnRdisplayuser.cfg}{}{}
+
+\AtBeginDocument{
+ \@ifpackageloaded{SASdisplay}{
+ \PackageError{SASnRdisplay}{SASnRdisplay cannot be loaded at the
+ same time as the legacy SASdisplay package.}{Please remove the
+ SASdisplay package}
+ }{}
+}
+
+
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sasnrdisplay.tlpobj new/tlpkg/tlpobj/sasnrdisplay.tlpobj
--- old/tlpkg/tlpobj/sasnrdisplay.tlpobj 2012-03-28 04:32:00.000000000 +0200
+++ new/tlpkg/tlpobj/sasnrdisplay.tlpobj 2014-03-08 03:22:10.000000000 +0100
@@ -1,6 +1,6 @@
name sasnrdisplay
category Package
-revision 25751
+revision 33120
shortdesc Typeset SAS or R code or output.
relocated 1
longdesc The SASnRdisplay package serves as a front-end to the listings,
@@ -12,6 +12,6 @@
RELOC/tex/latex/sasnrdisplay/SASnRdisplay.cfg
RELOC/tex/latex/sasnrdisplay/SASnRdisplay.sty
catalogue-ctan /macros/latex/contrib/sasnrdisplay
-catalogue-date 2012-03-27 17:23:43 +0200
+catalogue-date 2014-03-07 12:39:33 +0100
catalogue-license lppl1.3
-catalogue-version 0.91
+catalogue-version 0.93
++++++ savesym.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/savesym/savesym.sty new/tex/latex/savesym/savesym.sty
--- old/tex/latex/savesym/savesym.sty 2006-01-13 01:05:59.000000000 +0100
+++ new/tex/latex/savesym/savesym.sty 2013-09-02 22:36:56.000000000 +0200
@@ -18,11 +18,21 @@
% Rolf Niepraschk
% in May 2003. Thank you!
%
-% Copyright 2003 Juergen Goebel,
+% Copyright 2003-2013 Juergen Goebel,
% distributable under the LPPL
+%
+% Change history
+%
+% v1.1 2013/06/01
+% first edition on CTAN
+%
+% v1.2 2013/09/02
+% changed \ProvidesPackage{savesymbol} to \ProvidesPackage{savesym}
+% according to package name
+% changed mail address of maintainer
-\NeedsTeXFormat{LaTeX2e} \ProvidesPackage{savesymbol}[2003/06/01
-v1.1 Saves and restores symbols]
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{savesym}[2013/09/02 v1.2 Saves and restores symbols (JG)]
% Save a symbol that we know is going to get redefined.
\newcommand*\savesymbol[1]{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/savesym.tlpobj new/tlpkg/tlpobj/savesym.tlpobj
--- old/tlpkg/tlpobj/savesym.tlpobj 2010-06-10 18:44:33.000000000 +0200
+++ new/tlpkg/tlpobj/savesym.tlpobj 2013-09-03 03:19:29.000000000 +0200
@@ -1,6 +1,6 @@
name savesym
category Package
-revision 15878
+revision 31565
shortdesc Redefine symbols where names conflict.
relocated 1
longdesc There are a number of symbols (e.g., \Square) that are defined
@@ -13,6 +13,6 @@
runfiles size=1
RELOC/tex/latex/savesym/savesym.sty
catalogue-ctan /macros/latex/contrib/savesym/savesym.sty
-catalogue-date 2007-01-14 15:20:52 +0100
+catalogue-date 2013-09-02 18:12:33 +0200
catalogue-license lppl
-catalogue-version 1.1
+catalogue-version 1.2
++++++ scalerel.doc.tar.xz ++++++
Files old/doc/latex/scalerel/scalerel.pdf and new/doc/latex/scalerel/scalerel.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/scalerel/scalerel.tex new/doc/latex/scalerel/scalerel.tex
--- old/doc/latex/scalerel/scalerel.tex 2013-05-18 00:28:33.000000000 +0200
+++ new/doc/latex/scalerel/scalerel.tex 2014-03-10 21:55:43.000000000 +0100
@@ -1,6 +1,5 @@
\documentclass{article}
-\def\version{1.5}
-%% Copyright 2013 Steven B. Segletes
+\def\version{1.6}
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -29,12 +28,19 @@
% using current display style).
% V1.5 -Eliminated mathstyle package because of incompatibilites with
% many other packages. Implemented \mathchoice approach instead.
+% V1.6 -Made available \LMex and \LMpt lengths (Local Math ex and
+% Local Math pt), usable inside \ThisStyle arguments (1ex/pt in
+% \textstyle and \displaystyle, 0.7ex/pt in \scriptstyle, and
+% 0.5ex/pt in \scriptscriptstyle).
+% -Revised/shortened/improved \Isnextbyte.
+% -Replaced ifthen package calls with etoolbox calls.
\parskip 1em
\parindent 0em
\newcommand\rl{\rule{2em}{0in}}
\usepackage{scalerel}
\usepackage{verbatim}
\usepackage[only,llbracket,rrbracket,llparenthesis,rrparenthesis]{stmaryrd}
+\usepackage{stackengine}
\usepackage{accsupp} % for ensuring the right Unicode codepoint upon pasting
\def\sr{\textsf{scalerel}}
\let\vb\verb
@@ -81,13 +87,23 @@
\vstretch{scale}{object}
\scaleobj{scale}{object}
\end{verbatim}
-There are also several auxiliary commands, supporting backward
-compatibility, \textit{etc.}:
+Unless delimited for text mode, \texttt{object} is assumed to be a math
+object and wil be processed in the \textit{current} math style. On the
+other hand, \texttt{reference} will take on the current mode (text
+or math). If in math mode, \texttt{reference} will likewise be taken in the
+current math style.
+
+There are also several auxiliary commands, useful in their own
+right and, in some cases, supporting backward compatibility:
\begin{verbatim}
- \ignoremathstyle
- \discernmathstyle
\ThisStyle{...\SavedStyle...}
+ \LMex
+ \LMpt
+ \def\scriptstyleScaleFactor{0.7}
+ \def\scriptscriptstyleScaleFactor{0.5}
\Isnextbyte[[v] OR q]{test byte}{string}
+ \ignoremathstyle
+ \discernmathstyle
\end{verbatim}
In all cases, \vb|object| is the object to be scaled or
@@ -153,19 +169,6 @@
its argument (like others in this package) defaults to math mode, and is
displayed in the current math display style.
-As of version 1.4, {\sr} commands will autodetect the current math
-display style and process its arguments in the same mode. However, this
-improvement could ``break'' a prior (rare but) accepted usage of the
-package in which the {\sr} \vb|object| is given in mixed mode
-(containing \vb|$| characters in the middle of the \vb|object|. In
-order to maintain backward compatibility, the user may invoke
-\margcmd{ignoremathstyle}%
-\vb|\ignoremathstyle|. Thereafter, {\sr} objects will be processed in
-the prior (pre-version 1.4) manner, until the command
-\margcmd{discernmathstyle}
-\vb|\discernmathstyle| is later invoked to restore the more modern
-package settings.
-
A useful auxiliary command \vb|\ThisStyle{}| has been introduced for
\margcmd{ThisStyle}%
remembering the current math style. When invoked, this command will
@@ -178,6 +181,25 @@
style does not carry into the box, without the use of
\vb|\SavedStyle|.
+The lengths \verb|\LMex| and \verb|\LMpt| work in conjunction with
+\verb|\ThisStyle|
+\margcmd{LMex}%
+\margcmd{LMpt}%
+and are what I am calling the ``local-mathstyle `ex'\,''
+and ``local-mathstyle `pt','' respectively.
+They are lengths, available for use within the argument of \verb|\ThisStyle|,
+ that scale with the current mathstyle, equalling 1ex and 1pt in
+\verb|\displaystyle| and \verb|\textstyle| math, and scaled by a
+factor of 0.7 in \verb|\scriptstyle| and 0.5 in \verb|\scriptscriptstyle|.
+Such a scalable length is useful when {\sr} is used to place objects
+\margcmd{scriptstyleScaleFactor}%
+relative to each other across various mathstyles. The 0.7 and 0.5
+relative height factors apply to the default Computer Modern font.
+\margcmd{\footnotesize scriptscriptstyleScaleFactor}%
+For other fonts, these scale factors may be reset with a \verb|\def|
+on the macros \verb|\scriptstyleScaleFactor| and
+\verb|\scriptscriptstyleScaleFactor|.
+
A service routine \vb|\Isnextbyte| was employed by this package.
\margcmd{Isnextbyte}%
Because of its more general utility, it is made accessible to the user.
@@ -189,6 +211,19 @@
argument, the output can be suppressed, with the result instead being
stored in a macro \vb|\theresult|.
+As of version 1.4, {\sr} commands will autodetect the current math
+display style and process its arguments in the same mode. However, this
+improvement could ``break'' a prior (rare but) accepted usage of the
+package in which the {\sr} \vb|object| is given in mixed mode
+(containing \vb|$| characters in the middle of the \vb|object|. In
+order to maintain backward compatibility, the user may invoke
+\margcmd{ignoremathstyle}%
+\vb|\ignoremathstyle|. Thereafter, {\sr} objects will be processed in
+the prior (pre-version 1.4) manner, until the command
+\margcmd{discernmathstyle}
+\vb|\discernmathstyle| is later invoked to restore the more modern
+package settings.
+
\section{Usage Examples}
Now for a few examples. Let us define
@@ -367,6 +402,64 @@
\(\scaleobj{2}{\sum_{i=0}^{n}}\) versus
\[\scaleobj{2}{\sum_{i=0}^{n}}\]
+\subsection{The \textbackslash\texttt{ThisStyle}, \textbackslash\texttt{SavedStyle},
+\textbackslash\texttt{LMex}, and \textbackslash\texttt{LMpt} Commands}
+
+These are very powerful macros that provide the ability to save the current
+math style and to import it to various places (for example, inside boxes and other
+macros) where the math style would otherwise be lost. These commands are
+part of this package because the various {\sr} macros employ them to
+automatically import the current math style into their arguments.
+
+The easiest way to show how these macros are used is to provide a working
+example, such as the one given below.
+
+\begin{verbatim}
+\documentclass{article}
+\usepackage{stackengine}
+\usepackage{graphicx}
+\usepackage{scalerel}
+\stackMath
+\def\ccdot{\scalebox{1.15}{$\SavedStyle\cdot$}}
+\def\altdiv{\mathbin{\ThisStyle{%
+ \stackunder[-.6\LMex]{%
+ \stackon[-.45\LMex]{\SavedStyle\sim}{\ccdot}%
+ }{\ccdot}}}}
+\begin{document}
+$A \altdiv B ~~A \div B$\par
+$\scriptstyle A \altdiv B ~~A \div B$\par
+$\scriptscriptstyle A \altdiv B ~~A \div B$\par
+\end{document}
+\end{verbatim}
+
+The output of this example shows a fabricated glyph (\verb|\altdiv|) across the
+math styles, comparing it to \verb|\div|:
+
+\stackMath
+\def\ccdot{\scalebox{1.15}{$\SavedStyle\cdot$}}
+\def\altdiv{\mathbin{\ThisStyle{%
+ \stackunder[-.6\LMex]{\stackon[-.45\LMex]{\SavedStyle\sim}{\ccdot}}{\ccdot}}}}
+\rl\scalebox{3}{\parbox{2in}{
+$A \altdiv B ~~A \div B$\par
+$\scriptstyle A \altdiv B ~~A \div B$\par
+$\scriptscriptstyle A \altdiv B ~~A \div B$\par
+}}
+
+The difficulties that must be overcome are several: the composite glyph is created by
+way of a stack, which processes its arguments in either text mode or \verb|\textstyle|
+math mode; and the stacking distances between the components of the composite
+glyph need to vary with the mathstyle. To overcome the first issue, the \verb|\altdiv|
+macro is wrapped in a \verb|\ThisStyle{...}| wrapper. Whenever one of the glyph
+components (\textit{e.g.}, \verb|\sim| or \verb|\cdot|) is employed within the
+\textsf{stackengine} where the mathstyle is
+otherwise lost, it is prepended with a \verb|\SavedStyle| to reinstate the current
+math style. Thus, the glyph components will present in the proper mathstyle.
+Likewise, the vertical stacking gaps between the glyph components,
+given as optional arguments to the stacking commands, are here specified in
+multiples of \verb|\LMex|. In this way, the stacking gaps will shrink with the
+smaller math styles, keeping the spacings on the same relative scale as the size
+of the smaller glyphs.
+
\section{Real World Application}
\subsection{White Curly Brackets}
@@ -562,6 +655,6 @@
\section{Code Listing}
-\verbatiminput{scalerel.sty}
+\small\verbatiminput{scalerel.sty}
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/scalerel.doc.tlpobj new/tlpkg/tlpobj/scalerel.doc.tlpobj
--- old/tlpkg/tlpobj/scalerel.doc.tlpobj 2013-05-18 03:42:51.000000000 +0200
+++ new/tlpkg/tlpobj/scalerel.doc.tlpobj 2014-03-11 03:24:21.000000000 +0100
@@ -1,9 +1,9 @@
name scalerel.doc
category Package
-revision 30531
+revision 33145
shortdesc doc files of scalerel
relocated 1
-docfiles size=67
+docfiles size=82
RELOC/doc/latex/scalerel/README
RELOC/doc/latex/scalerel/scalerel.pdf
RELOC/doc/latex/scalerel/scalerel.tex
++++++ scalerel.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/scalerel/scalerel.sty new/tex/latex/scalerel/scalerel.sty
--- old/tex/latex/scalerel/scalerel.sty 2013-05-18 00:28:33.000000000 +0200
+++ new/tex/latex/scalerel/scalerel.sty 2014-03-10 21:55:43.000000000 +0100
@@ -1,8 +1,7 @@
\ProvidesPackage{scalerel}
-[2013/05/16 v1.5
+[2014/03/10 v1.6
Routines for constrained scaling and stretching of objects,
relative to a reference object or in absolute terms]
-%% Copyright 2013 Steven B. Segletes
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -16,10 +15,10 @@
%
% The Current Maintainer of this work is Steven B. Segletes.
-% V1.01 Correct typos in documentation
-% V1.1 Corrected usepackage dependencies; Significant doc rewrite.
-% V1.2 Added \scaleleftright and \stretchleftright; revised docs.
-% V1.3 Corrected missing % in stretch routines, added \hstretch and
+% V1.01-Correct typos in documentation
+% V1.1 -Corrected usepackage dependencies; Significant doc rewrite.
+% V1.2 -Added \scaleleftright and \stretchleftright; revised docs.
+% V1.3 -Corrected missing % in stretch routines, added \hstretch and
% \vstretch commands; fixed version number in .sty file
% V1.4 -Auto-detect mathmode and style; use the proper math display
% style; Allow \ignoremathstyle and \discernmathstyle to
@@ -30,16 +29,26 @@
% using current display style).
% V1.5 -Eliminated mathstyle package because of incompatibilites with
% many other packages. Implemented \mathchoice approach instead.
+% V1.6 -Made available \LMex and \LMpt lengths (Local Math ex and
+% Local Math pt), usable inside \ThisStyle arguments (1ex/pt in
+% \textstyle and \displaystyle, 0.7ex/pt in \scriptstyle, and
+% 0.5ex/pt in \scriptscriptstyle).
+% -Revised/shortened/improved \Isnextbyte.
+% -Replaced ifthen package calls with etoolbox calls.
\usepackage{calc}
\usepackage{graphicx}
-\usepackage{ifthen}
+\usepackage{etoolbox}
\global\newlength\thesrwidth
\global\newlength\thesrheight
\global\newlength\srblobheight
\global\newlength\srblobdepth
\global\newlength\mnxsrwidth
\newsavebox{\prebox}
+\newlength\LMex
+\newlength\LMpt
+\def\scriptstyleScaleFactor{.7}
+\def\scriptscriptstyleScaleFactor{.5}
\newcommand\scalerel{\@ifstar{\scalerelplain}{\scalerelplus}}
@@ -166,33 +175,28 @@
\newcommand\ThisStyle[1]{%
\ifmmode%
\def\@mmode{T}\mathchoice%
- {\edef\m@switch{D}#1}%
- {\edef\m@switch{T}#1}%
- {\edef\m@switch{S}#1}%
- {\edef\m@switch{s}#1}%
+ {\edef\m@switch{D}\LMex=1ex\relax\LMpt=1pt\relax#1}%
+ {\edef\m@switch{T}\LMex=1ex\relax\LMpt=1pt\relax#1}%
+ {\edef\m@switch{S}\LMex=\scriptstyleScaleFactor ex\relax%
+ \LMpt=\scriptstyleScaleFactor pt\relax#1}%
+ {\edef\m@switch{s}\LMex=\scriptscriptstyleScaleFactor ex\relax%
+ \LMpt=\scriptscriptstyleScaleFactor pt\relax#1}%
\else%
\def\@mmode{F}%
- \edef\m@switch{T}#1%
+ \edef\m@switch{T}\LMex=1ex\relax\LMpt=1pt\relax#1%
\fi%
}
%
-%\newcommand\get@mmode{\ifmmode\def\@mmode{T}\else\def\@mmode{F}\fi}
-\def\PrimarySignalChar{@}
-\def\SecondarySignalChar{`}
% THIS CAN REPLACE \isnextbyte IN STRINGSTRINGS PACKAGE
% BECAUSE IT WORKS ON CHARS THAT CAN'T BE \edef'ED (\dag, ETC.)
\newcommand\Isnextbyte[3][v]{%
- \let\SignalChar\PrimarySignalChar%
- \protected@edef\@x{\if #2#3\else\SignalChar\fi}%
- \protected@edef\@x{\if \SignalChar\@x F\else T\fi}%
- \let\SignalChar\SecondarySignalChar%
- \protected@edef\@y{\if #2#3\else\SignalChar\fi}%
- \protected@edef\@y{\if \SignalChar\@y F\else T\fi}%
- \ifthenelse{\equal{\@x\@y}{\@y\@x}}%
- {\protected@edef\theresult{\@x}}%
- {\protected@edef\theresult{T}}%
+ \def\SR@Letter@A{#2}%
+ \SR@nextbyte{\SR@Letter@B}#3\relax\relax\relax%
+ \ifdefstrequal{\SR@Letter@A}{\SR@Letter@B}%
+ {\edef\theresult{T}}{\edef\theresult{F}}%
\if q#1\else\theresult\fi%
}
+\def\SR@nextbyte#1#2#3\relax{\def#1{#2}}
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/scalerel.tlpobj new/tlpkg/tlpobj/scalerel.tlpobj
--- old/tlpkg/tlpobj/scalerel.tlpobj 2013-05-18 03:42:51.000000000 +0200
+++ new/tlpkg/tlpobj/scalerel.tlpobj 2014-03-11 03:24:21.000000000 +0100
@@ -1,6 +1,6 @@
name scalerel
category Package
-revision 30531
+revision 33145
shortdesc Constrained scaling and stretching of objects.
relocated 1
longdesc The package provides four commands for vertically scaling and
@@ -14,6 +14,6 @@
runfiles size=2
RELOC/tex/latex/scalerel/scalerel.sty
catalogue-ctan /macros/latex/contrib/scalerel
-catalogue-date 2013-05-17 19:01:50 +0200
+catalogue-date 2014-03-10 14:38:12 +0100
catalogue-license lppl
-catalogue-version 1.5
+catalogue-version 1.6
++++++ schemata.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/schemata/README new/doc/generic/schemata/README
--- old/doc/generic/schemata/README 2013-03-12 23:32:50.000000000 +0100
+++ new/doc/generic/schemata/README 2013-09-25 00:26:32.000000000 +0200
@@ -1,7 +1,7 @@
The schemata package
Charles P. Schaum
-charles dot schaum at att dot net
-v0.6 from 2013/03/10
+charles dot schaum at comcast dot net
+v0.7 from 2013/09/23
Abstract
Files old/doc/generic/schemata/schemata.pdf and new/doc/generic/schemata/schemata.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/schemata.doc.tlpobj new/tlpkg/tlpobj/schemata.doc.tlpobj
--- old/tlpkg/tlpobj/schemata.doc.tlpobj 2013-03-13 04:39:37.000000000 +0100
+++ new/tlpkg/tlpobj/schemata.doc.tlpobj 2013-09-25 03:20:37.000000000 +0200
@@ -1,6 +1,6 @@
name schemata.doc
category Package
-revision 29357
+revision 31743
shortdesc doc files of schemata
relocated 1
docfiles size=142
++++++ schemata.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/schemata/schemata.sty new/tex/generic/schemata/schemata.sty
--- old/tex/generic/schemata/schemata.sty 2013-03-12 23:32:50.000000000 +0100
+++ new/tex/generic/schemata/schemata.sty 2013-09-25 00:26:32.000000000 +0200
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2013 by Charles P. Schaum <charles dot schaum at att dot net>
+%% Copyright (C) 2013 by Charles P. Schaum <charles dot schaum at comcast dot net>
%%
%% This file may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.2 of this license
@@ -24,7 +24,7 @@
\else
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{schemata}
- [2013/03/10 v0.6 generic package to aid construction of topical categories]
+ [2013/09/23 v0.7 generic package to aid construction of topical categories]
\fi
\expandafter\ifx\csname newenvironment\endcsname\relax%
\def\DoBraces{\let\schemaLD\lbrace \let\schemaRD\rbrace}\DoBraces%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/schemata.tlpobj new/tlpkg/tlpobj/schemata.tlpobj
--- old/tlpkg/tlpobj/schemata.tlpobj 2013-03-13 04:39:38.000000000 +0100
+++ new/tlpkg/tlpobj/schemata.tlpobj 2013-09-25 03:20:37.000000000 +0200
@@ -1,6 +1,6 @@
name schemata
category Package
-revision 29357
+revision 31743
shortdesc Print topical diagrams.
relocated 1
longdesc The package facilitates the creation of topical schemata,
@@ -10,6 +10,6 @@
runfiles size=2
RELOC/tex/generic/schemata/schemata.sty
catalogue-ctan /macros/generic/schemata
-catalogue-date 2013-03-12 20:16:10 +0100
+catalogue-date 2013-09-24 17:34:21 +0200
catalogue-license lppl1.3
-catalogue-version 0.6
+catalogue-version 0.7
++++++ selnolig.doc.tar.xz ++++++
++++ 2413 lines of diff (skipped)
++++++ selnolig.tar.xz ++++++
++++ 2169 lines of diff (skipped)
++++++ seminar.doc.tar.xz ++++++
++++ 9623 lines of diff (skipped)
++++++ seminar.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/seminar/sem-a4.sty new/tex/latex/seminar/sem-a4.sty
--- old/tex/latex/seminar/sem-a4.sty 2007-01-12 18:33:16.000000000 +0100
+++ new/tex/latex/seminar/sem-a4.sty 2014-01-01 00:20:30.000000000 +0100
@@ -10,10 +10,12 @@
%% 1999/12/01 or later.
%%
%% BEGIN sem-a4.sty
-\def\paperwidth{210mm}
-\def\paperheight{297mm}
+%\def\paperwidth{210mm}
+%\def\paperheight{297mm}
+\paperwidth=210mm
+\paperheight=297mm
\input sem-page.sty
-\slidewidth 222mm
-\slideheight 152mm
+\slidewidth=222mm
+\slideheight=152mm
\endinput
%% END sem-a4.sty
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/seminar/sem-dem.sty new/tex/latex/seminar/sem-dem.sty
--- old/tex/latex/seminar/sem-dem.sty 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/seminar/sem-dem.sty 2014-01-21 00:17:26.000000000 +0100
@@ -0,0 +1,96 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*- Mode: Latex -*- %%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% sem-dem.sty --- General utility macros for these Seminar demonstration files
+%%
+%% Author : Denis GIROU (CNRS/IDRIS - France)
+%% Created the : Sun Dec 9 21:49:38 2001
+%% Last mod. by : Denis GIROU (CNRS/IDRIS - France)
+%% Last mod. the : Fri Apr 5 21:02:35 2002
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% Identification of the file (constant parameters)
+\def\FileAuthor{Denis Girou}
+\def\FileInfoA{Seminar demonstration files}
+\def\FileName{\jobname}
+
+% Write identification in the PDF file (if one will be generated)
+\RequirePackage{hyperref}
+\newcommand{\HyperSetUp}{%
+\hypersetup{pdftitle={\FileInfoA{} - \FileInfoB},
+ pdfsubject={\FileName{}
+ [\FileDate{} - Version \FileVersion]},
+ pdfauthor={\FileAuthor},
+ pdfkeywords={\FileInfoB{} PSTricks Seminar slides}}}
+
+% Header/footer initialization
+\def\SeminarStandardHeaderFooterDemos{%
+\date{\HLa{\FileDate}}%
+\SeminarStandardHeaderFooter
+ {\LARGE\HLe{Demonstration of \MakeLowercase{\FileInfoB}}}
+ {\HLa{\FileInfoA{} -- \FileInfoB}}
+ {\HLa{Version \FileVersion{} -- }}
+ {\HLe{\FileAuthor}}}
+
+\SeminarStandardHeaderFooterDemos
+
+% General first slide for all the demonstration files
+\newcommand{\SeminarFirstSlide}{{%
+\SeminarSlideFrameBackground{SeminarBackgroundSolid}
+\begin{slide}
+ \ifx\SeminarPaperVersion\AnswerYes
+ \else
+ \vspace*{\stretch{1}} % Due to the special annotation for full screen mode
+ \fi
+
+ \begin{center}
+ \psframebox[fillstyle=solid,fillcolor=red,framearc=0.2]{%
+ \Large\bfseries\color{yellow}
+ \begin{tabular}{c}
+ Seminar demonstration files\\
+ \setlength{\pst@dimg}{\widthof{Seminar demonstration files}}%
+ \setlength{\pst@dimh}{\widthof{\FileInfoB}}%
+ \ifdim\pst@dimg>\pst@dimh
+ \rule[1mm]{\pst@dimg}{0.6mm}\\
+ \else
+ \rule[1mm]{\pst@dimh}{0.6mm}\\
+ \fi
+ \FileInfoB
+ \end{tabular}}
+
+ \vspace{1cm}
+ \psframebox[fillstyle=solid,fillcolor=LightBlue,
+ framesep=0.2,framearc=0.4]{%
+ \bfseries
+ \begin{tabular}{c}
+ \FileAuthor\\
+ \FileDate
+ \end{tabular}}
+
+ \ifx\SeminarPaperVersion\AnswerYes
+ \else
+ \vspace{\stretch{1}}
+ \hfill%
+ \rput[br](0.2,0){%
+ \psframebox[linewidth=0.02,framesep=0.05]{%
+ \footnotesize\bfseries
+ \shortstack[l]{%
+ With Acroread, \textcolor{red}{CTRL-L} switch\\[-1mm]
+ between full screen and window mode}}}
+ \fi
+ \end{center}
+\end{slide}}}
+
+% List of slides
+\newcommand{\SeminarListOfSlides}{{%
+% Background changing
+\ifx\SeminarColorVersion\AnswerYes
+ \renewcommand{\SeminarBackgroundGradientColorBegin}{PaleGreen}%
+ \renewcommand{\SeminarBackgroundGradientColorEnd}{green}%
+ \renewcommand{\SeminarBackgroundGradientAngle}{-90}%
+ \SeminarSlideFrameBackground{SeminarBackgroundGradient}
+\fi
+\renewcommand{\slidestretch}{0.7}% We compress the lines
+\begin{slide}
+ \listofslides
+\end{slide}}}
+
+\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/seminar/semcolor.sty new/tex/latex/seminar/semcolor.sty
--- old/tex/latex/seminar/semcolor.sty 2007-01-12 18:33:16.000000000 +0100
+++ new/tex/latex/seminar/semcolor.sty 2014-01-21 00:17:26.000000000 +0100
@@ -9,8 +9,8 @@
%% Public License, as described in lppl.txt in the base LaTeX distribution.
%% Either version 1.0 or, at your option, any later version.
%%
-\def\fileversion{1.01}
-\def\filedate{2004/05/18}
+\def\fileversion{1.02}
+\def\filedate{2014/01/17}
%%
%% LaTeX style option `semcolor.sty'.
%% For use with LaTeX v2.09 and the `seminar' document style.
@@ -36,7 +36,8 @@
% RN modification begin -- 2004/05/04; Rolf.Niepraschk@ptb.de
%\input{pstricks}
\ProvidesFile{semcolor.sty}[\filedate\space v\fileversion\space (tvz)]
-\RequirePackage{pstricks}
+%\RequirePackage{pstricks}
+\RequirePackage{pst-ovl}
% RN modification end
%
% Set up the frame styles:
@@ -65,9 +66,9 @@
\def\make@overlay#1{%
\setbox\@slidebox=\hbox{%
\pst@initoverlay{#1}%
- \pst@Verb{(0) BOL}%
+ \pst@Verb{ 0 \tx@BOL }%
\copy\@@slidebox
- \pst@Verb{(all) BOL}}}
+ \pst@Verb{ -1 \tx@BOL }}}
\def\@overlay{\pst@overlay}
\addto@hook\before@newslide{\def\curr@overlay{0}}
\@ifundefined{overlaystrue}{}{\ifarticle\else\overlaystrue\layerstrue\fi}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/seminar/seminar.bg2 new/tex/latex/seminar/seminar.bg2
--- old/tex/latex/seminar/seminar.bg2 2007-01-12 18:33:16.000000000 +0100
+++ new/tex/latex/seminar/seminar.bg2 2014-05-14 00:09:26.000000000 +0200
@@ -26,12 +26,13 @@
%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\def\FileVersion{2.1}
-\def\FileDate{May 31, 2002}
+\def\FileVersion{2.3}
+\def\FileDate{2014/05/12}
\typeout{seminar.bg2: various corrections for the Seminar document class^^J%
added since seminar.bug and few add-ons for overlays^^J%
- (Version \FileVersion\space of <\FileDate> (D.G.))}
+ (Version \FileVersion\space of <\FileDate> (DG, hv))}
+\RequirePackage{pst-ovl}
\edef\TheAtCode{\the\catcode`\@}
\catcode`\@=11
@@ -54,54 +55,35 @@
% Used by the \slide@subheading macro but undefined
\def\theslidesubsection{\theslidesection.\arabic{slidesubsection}}
+%% Requires main pst-ovl
+\ifx\PSTovlloaded\endinput\else\input pst-ovl \fi
+
+
\def\slide@heading[#1]#2{%
-% D.G. modification begin - Oct. 15, 1997
-% \stepcounter{slidesection}%
\refstepcounter{slidesection}%
\@addtoreset{slidesubsection}{slidesection}
-% D.G. modification end
\addtocontents{los}{\protect\l@slide
{\the\c@slidesection}{\ignorespaces#1}{\@SCTR}}%
-% D.G. modification begin - May 30, 1997
-% \gdef\theslideheading{#1}%
-% D.G. modification end
\def\@tempa{#2}%
\ifx\@tempa\@empty\else
{\edef\@currentlabel{\csname p@slidesection\endcsname\theslidesection}%
\makeslideheading{#2}}%
\fi
-% D.G. modification begin - May 30, 1997
\gdef\theslideheading{#1}%
-% D.G. modification end
-% D.G. modification begin - Aug. 1, 1997
\gdef\theslidesubheading{}%
-% D.G. modification end
}
\def\slide@subheading[#1]#2{%
-% D.G. modification begin - Oct. 15, 1997
-% \stepcounter{slidesection}%
\refstepcounter{slidesubsection}%
-% D.G. modification end
\addtocontents{los}{\protect\l@subslide
{\the\c@slidesubsection}{\ignorespaces#1}{\@SCTR}}%
-% D.G. modification begin - May 30, 1997
-% \gdef\theslidesubheading{#1}%
-% D.G. modification end
\def\@tempa{#2}%
\ifx\@tempa\@empty\else
{\edef\@currentlabel{\csname p@slidesubsection\endcsname
-% D.G. modification begin - Jul. 18, 1995
-% \theslidesubsection}\makeslideheading{#2}}%
\theslidesubsection}\makeslidesubheading{#2}}%
-% D.G. modification end
\fi
-% D.G. modification begin - May 30, 1997
\gdef\theslidesubheading{#1}%
-% D.G. modification end
}
-
-
% 3 - To correct a bug in the \slidecontents macro
% (reported by Denis Roegel (LORIA) - Sep. 22, 1996)
@@ -109,15 +91,10 @@
\def\slide@contents{%
\def\l@slide##1##2##3{%
-% Modification Denis Roegel begin - Sep. 22, 1996
-% \slide@cline{\slidenumberline{$\bullet$}{##2}}{##3}}%
-% \let\l@subslide\@gobbletwo
-% Modification Denis Roegel end
\slide@cline{\slidenumberline{##1}{##2}}{##3}}%
\let\l@subslide\@gobblethree
\@startlos}
-
% 4 - To solve incompatibility between the `graphicx' package and Seminar.
% The \espfslidesize Seminar macro work only with the old version of
% the `epsfig' package, so with \includegraphics the PostScript files are
@@ -135,18 +112,11 @@
\else % Graphicx package detected
\def\Gin@i{%
\def\Gin@req@sizes{%
-% D.G. modification begin - May 16, 1997
\Gin@nat@height=\inverseslidesmag\Gin@nat@height
\Gin@nat@width=\inverseslidesmag\Gin@nat@width
-% D.G. modification end
\Gin@req@height\Gin@nat@height
\Gin@req@width\Gin@nat@width}%
\@ifnextchar[\Gin@ii{\Gin@ii[]}}
-% D.G. modification begin - Feb. 19, 1997
-%\define@key{Gin}{width}{\def\Gin@ewidth{#1}}
-%\define@key{Gin}{height}{\def\Gin@eheight{#1}}
-%\define@key{Gin}{totalheight}{%
-%\def\Gin@eresize{\totalheight}\def\Gin@eheight{#1}}
\define@key{Gin}{width}{%
\@tempdima=##1\@tempdima=\inverseslidesmag\@tempdima\def\Gin@ewidth{\@tempdima}}
\define@key{Gin}{height}{%
@@ -154,15 +124,11 @@
\define@key{Gin}{totalheight}{%
\def\Gin@eresize{\totalheight}%
\@tempdima=##1\@tempdima=\inverseslidesmag\@tempdima\def\Gin@eheight{\@tempdima}}
-% D.G. modification end
\fi}
\def\epsfslidesize{%
\let\epsfsize\slide@epsfsize
-% D.G. modification begin - Feb. 19, 1997
\GraphicsNotScaled}
-% D.G. modification end
-
% 5 - To solve incompatibily between the LongTable package and Seminar
% (reported by Bhaskar Manda (UIUC) - May 7, 1997)
@@ -182,10 +148,7 @@
\fi
\if@test
\reset@slideoutput
-% D.G. modification begin - May 13, 1997
-% \@@makeslide
\@@makeslideLT
-% D.G. modification end
\process@slide
\fi
\refstepcounter{slide}}
@@ -194,9 +157,7 @@
\setbox\@slidebox\hbox{%
\vfuzz=\slidefuzz\relax
\vbox to\slide@vsize{%
-% D.G. modification begin - May 13, 1997
\box\@outputbox
-% D.G. modification end
\ifcenterslides\vskip\z@ plus .0001fil \fi
\unvbox\@slidebox
\vskip\z@ plus .0001fil}%
@@ -216,10 +177,7 @@
\ifdim\dimen@<\ht\z@
\setbox\@cclv\vbox{\unvbox\z@\copy\LT@foot\vss}%
\@makecol
-% D.G. modification begin - May 13, 1997
-% \@outputpage
\slide@outputLT
-% D.G. modification end
\setbox\z@\vbox{\box\LT@head}%
\fi
\fi
@@ -231,11 +189,7 @@
\else
\setbox\@cclv\vbox{\unvbox\@cclv\copy\LT@foot\vss}%
\@makecol
-% D.G. modification begin - May 13, 1997
-% \@outputpage
-% \global\vsize\@colroom % Work for slides, but not for notes...
\slide@outputLT
-% D.G. modification end
\copy\LT@head
\fi}
@@ -249,7 +203,6 @@
% 6 - To allow automatic changes of language dependent labels,
% for instance by loading the `french' package after Seminar
% (suggested by Bernard Gaulle (IDRIS) - Nov. 20, 1997)
-% D.G. modification begin - Nov. 20, 1997
% From seminar.cls
\def\slidename{Slide}
\def\slidelabel{\bf\slidename{} \theslide}
@@ -262,7 +215,6 @@
\slide@undottedcline{\slidenumberline{##3}{##2}}{}}%
\let\l@subslide\l@slide
\@startlos}
-% D.G. modification end
% 7 - There were several problems when doing a global change of color
@@ -306,19 +258,11 @@
\ifvoid\saved@specials\else
\setbox\@slidebox\hbox{\box\saved@specials\box\@slidebox}%
\fi
-% D.G. modification begin - Mar. 28, 2002
-% \global\let\insert@specials\relax}
\global\let\save@slidespecials@i\save@slidespecials@ii}
-% D.G. modification end
\fi
\addto@hook{\before@newslide}{\save@slidespecials@i}
-
-% D.G. modification begin - 1999
-% \addto@hook\after@slidepage{\pstVerb{0 setgray}}
\after@slidepage={}
-% D.G. modification end
-
% 7 - To vertically correctly center the footer, if defined
% (this is mainly visible when using the `fancyhdr' package, and specially
@@ -334,9 +278,7 @@
% designed on the model of the \newslideframe and \slideframe ones.
% (added by Denis Girou (CNRS/IDRIS) - Jun. 30, 1999)
-% D.G. modification begin - Jun. 30, 1999
\newbox\Seminar@SlideBoxBackground
-% D.G. modification end
\ifarticle
\else
@@ -372,9 +314,7 @@
\advance\textwidth-\evensidemargin
\fi
\setbox\@slidebox=\hbox to \@tempdima{%
-% D.G. modification begin - Jun. 30, 1999
\box\Seminar@SlideBoxBackground
-% D.G. modification end
\kern\oddsidemargin
\vbox to\@tempdimb{%
\ifnum\fancyput@flag>-1
@@ -393,9 +333,7 @@
\hbox to\textwidth{\hss\box\@slidebox\hss}%
\vfill
\vbox to\footheight{%
-% D.G. modification begin - May 15, 1998
\vfill
-% D.G. modification end
\hbox{%
\slidefootfont\relax\strut
\hbox to\textwidth{\@oddfoot}}%
@@ -403,9 +341,7 @@
\hss}%
\ifrotateheaders\@ifrotateslide\rotate@slide\fi
\insert@specials
-% D.G. modification begin - Jun. 24, 1999
\let\protect\noexpand
-% D.G. modification end
\shipout\box\@slidebox
\endgroup
\let\firstmark\botmark}
@@ -413,14 +349,10 @@
\fi
\def\finish@slide{%
-% D.G. modification begin - Jun. 30, 1999
\theSlideFrameBackground
-% D.G. modification end
\theslideframe
\add@slidelabel\slidelabel}
-% D.G. modification begin - Jun. 30, 1999
-% Built according \newslideframe, \slideframe, etc.
\def\SeminarNewSlideFrameBackground#1{%
\@ifnextchar[{\@SeminarNewSlideFrameBackground{#1}}%
@@ -475,15 +407,11 @@
% (added by Denis Girou (CNRS/IDRIS) - Dec. 5, 2001)
\def\overlay#1{%
-% D.G. modification end
\ifoverlays\ifx\@overlay\relax\nooverlays@err\fi\fi
\ifslide
\@tempcnta=#1
\@testfalse
-% D.G. modification begin - Dec. 5, 2001
-% \ifnum\@tempcnta>-1 \ifnum\@tempcnta<10 \@testtrue\fi\fi
\ifnum\@tempcnta>-2 \ifnum\@tempcnta<677 \@testtrue\fi\fi
-% D.G. modification end
\if@test
\c@overlay=\@tempcnta
\ifnum\c@overlay=0
@@ -500,12 +428,8 @@
\@overlay{\the\c@overlay}%
\fi
\else
-% D.G. modification begin - Dec. 5, 2001
-% \@seminarerr{\string\overlay\space argument must be
-% an integer between 0 and 9}\@eha
\@seminarerr{\string\overlay\space argument must be
an integer between 0 and 676}\@eha
-% D.G. modification end
\fi
\else
\@seminarerr{\string\overlay\space can only be used
@@ -517,10 +441,7 @@
\begingroup
\overlay@prep
\c@overlay=1
-% D.G. modification begin - Dec. 5, 2001
-% \@whilenum\c@overlay<10
\@whilenum\c@overlay<677
-% D.G. modification end
\do{%
\test@member{\the\c@overlay}{\overlay@list}%
\if@test
@@ -532,8 +453,6 @@
\advance\c@overlay by 1}%
\endgroup}
-% D.G. modification begin - Dec. 5, 2001
-% \def\theoverlay{\theslide-\alph{overlay}}
\def\theoverlay{{%
\ifnum\c@overlay>26
\@tempcnta=\c@overlay
@@ -549,7 +468,6 @@
\else
\theslide-\alph{overlay}%
\fi}}
-% D.G. modification end
% 10 - Addition for management of cumulative and progressive overlays.
@@ -563,22 +481,16 @@
\def\make@overlay#1{%
\setbox\@slidebox=\hbox{%
\pst@initoverlay{#1}%
-% D.G. modification begin - Dec. 5, 2001
-% \pst@Verb{(0) BOL}%
- \pst@Verb{0 BOL}%
-% D.G. modification end
+ \pst@Verb{0 \tx@BOL }%
\copy\@@slidebox
-% D.G. modification begin - Dec. 5, 2001
-% \pst@Verb{(all) BOL}}}
- \pst@Verb{-1 BOL}}}
-% D.G. modification end
+ \pst@Verb{-1 \tx@BOL }}}
-% D.G. modification begin - Feb. 15, 2002
+\iffalse
% We must redefine too the /BeginOL macro form pstricks.pro, as "all" is now -1
% \def\pst@initoverlay#1{\pst@Verb{\tx@InitOL /TheOL (#1) def}}
\def\pst@initoverlay#1{%
-\pst@Verb{%
-/BeginOL {%
+\pst@Verb{
+/BeginOL {
dup -1 eq exch TheOL eq or
{IfVisible not
{Visible /IfVisible true def}
@@ -587,31 +499,26 @@
{Invisible /IfVisible false def}
if}
ifelse} def
-\tx@InitOL
+\tx@InitOL end
/TheOL #1 def}}
-% D.G. modification end
\def\pst@overlay#1{%
\edef\curr@overlay{#1}%
-% D.G. modification begin - Dec. 5, 2001
-% \pst@Verb{(#1) BOL}%
-\pst@Verb{#1 BOL}%
-% D.G. modification end
+\pst@Verb{#1 \tx@BOL }%
\aftergroup\pst@endoverlay}
\def\pst@endoverlay{%
-% D.G. modification begin - Dec. 5, 2001
-% \pst@Verb{(\curr@overlay) BOL}}
-\pst@Verb{\curr@overlay\space BOL}}
-% D.G. modification end
+\pst@Verb{\curr@overlay\space \tx@BOL }}
+\fi
% Cumulative overlays
-% �������������������
+% ===================
% Cumulative overlays, to force to print all preceding ones
\def\SeminarCumulativeOverlays{%
+\iffalse
\def\pst@initoverlay##1{%
-\pst@Verb{%
-/BeginOL {%
+\pst@Verb{
+/BeginOL {
dup -1 eq exch TheOL le or
{IfVisible not
{Visible /IfVisible true def}
@@ -620,29 +527,25 @@
{Invisible /IfVisible false def}
if}
ifelse} def
-\tx@InitOL
-/TheOL ##1 def}}}
+\tx@InitOL end
+/TheOL ##1 def}}%
+\fi
+}
% Alternative method for same goal (needed when PSTricks nodes are used)
\def\SeminarAltCumulativeOverlays{%
+\iffalse
\def\pst@initoverlay##1{%
-\pst@Verb{%
-/BeginOL {%
- dup -1 eq exch TheOL le or
- {IfVisible not
- {Visible /IfVisible true def}
- if}
- {IfVisible
- {Invisible /IfVisible false def}
- if}
- ifelse} def
-\tx@InitOL
+\pst@Verb{
+\tx@InitOL end
/Visible {initclip} def
/Invisible {CP newpath OLUnit itransform moveto clip newpath moveto} def
-/TheOL ##1 def}}}
+/TheOL ##1 def}}
+\fi
+}
% Progressive overlays
-% ��������������������
+% ===================
% Progressive overlays (at step i, only overlays 0 and i are shown)
\def\SeminarProgressiveOverlays{%
@@ -658,7 +561,7 @@
{Invisible /IfVisible false def}
if}
ifelse} def
-\tx@InitOL
+\tx@InitOL end
/TheOL ##1 def}}}
% Alternative method for the same goal (needed when PSTricks nodes are used)
@@ -674,14 +577,14 @@
{IfVisible
{Invisible /IfVisible false def}
if}
- ifelse} def
-\tx@InitOL
+ ifelse} def
+\tx@InitOL end
/Visible {initclip} def
/Invisible {CP newpath OLUnit itransform moveto clip newpath moveto} def
/TheOL ##1 def}}}
% Generation of the next overlay (minor add-on)
-% ������������������������������
+% =============================================
% (it increment automatically the number of the current overlay)
\newcommand{\SeminarNextOverlay}[1]{%
\addtocounter{overlay}{1}%
@@ -689,7 +592,7 @@
% To force all items in the various list environments to appear
% in their own overlay (minor add-on)
-% ��������������������
+% =============================================================
\let\itemORIG\item
\def\SeminarItemInOverlay{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/seminar/seminar.cls new/tex/latex/seminar/seminar.cls
--- old/tex/latex/seminar/seminar.cls 2008-11-04 01:54:25.000000000 +0100
+++ new/tex/latex/seminar/seminar.cls 2014-01-21 00:17:26.000000000 +0100
@@ -5,12 +5,8 @@
%% Fixes from David Carlisle, Denis Girou,
%% and Frank Küster/Günter Milde (a4paper option fix)
%%
-%\def\fileversion{1.0}
-%\def\filedate{1993/04/01}
-%\def\fileversion{1.4}
-%\def\filedate{1997/10/13}
-\def\fileversion{1.5}
-\def\filedate{2008/10/15}
+\def\fileversion{1.61}
+\def\filedate{2014/01/17}
%%
%% This is a style for typesetting notes and slides.
%%
@@ -30,7 +26,10 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{seminar}[\filedate, \fileversion]
\typeout{%
- Document Style: `seminar' v\fileversion \space <\filedate> (tvz)}
+ Documentclass: `seminar' v\fileversion \space <\filedate> (tvz,hv)}
+%%%%%%%%%%%%%%%% fix hv
+\def\tx@BOL{}
+%%%%%%%%%%%%%%%
\def\test@member#1#2{%
\edef\@tempg{,#2,#1,}%
\edef\@temph{####1,#1,}%
@@ -47,10 +46,15 @@
\errmessage{#1^^J}}
\def\notslide@err#1{\message{Cannot use \string#1 in slide environments}}
\def\new@slidebox{\alloc@4\box\chardef\insc@unt}
+\RequirePackage{pst-ovl}
+%%
+%\RequirePackage{geometry}
+%\geometry{dvips,paperwidth=8.5in,paperheight=11in}
\newdimen\slidewidth \slidewidth 8.5in
\newdimen\slideheight \slideheight 6.3in
-\paperwidth 8.5in
-\paperheight 11in
+\paperwidth=8.5in
+\paperheight=11in
+%%
\def\addto@preamblecmds#1{%
\begingroup
\def\do{\noexpand\do\noexpand}%
@@ -77,6 +81,7 @@
\DeclareOption{a4}{%
\paperwidth 210mm
\paperheight 297mm
+% \geometry{paperwidth=210mm,paperheight=297mm}
\slidewidth 222mm
\slideheight 152mm\relax}
\DeclareOption{a4paper}{\csname ds@a4\endcsname}%
@@ -96,6 +101,9 @@
\let\paperheight\footheight
\let\paperwidth\footheight
\LoadClass{article}
+
+\RequirePackage{pst-ovl}% hv 20131224
+
\renewcommand\normalsize{%
\@setfontsize\normalsize\@xpt\@xiipt
\abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
@@ -1199,8 +1207,10 @@
\def\@semtwoupmagerr#1{%
\@seminarerr{\string#1 must come before \string\twoup}\@eha}
\addto@preamblecmds{\twoup\do\@twoup}
-\openin1 seminar.con
-\ifeof1\else\closein1 \relax\@@input seminar.con\fi
+%
+\InputIfFileExists{seminar.con}{}
+%\ifeof1\else\closein1 \relax\@@input seminar.con\fi
+%
\endinput
%%
%% END `seminar.cls'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/seminar/seminar.sty new/tex/latex/seminar/seminar.sty
--- old/tex/latex/seminar/seminar.sty 2007-01-12 18:33:16.000000000 +0100
+++ new/tex/latex/seminar/seminar.sty 2014-05-14 00:09:26.000000000 +0200
@@ -7,8 +7,8 @@
%%
%% seminar.doc
%%
-\def\fileversion{1.0}
-\def\filedate{93/04/01}
+\def\fileversion{1.62}
+\def\filedate{14/05/12}
%%
%% LaTeX document style `seminar', for use with LaTeX v2.09.
%% This is a style for typesetting notes and slides.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/seminar/semlayer.sty new/tex/latex/seminar/semlayer.sty
--- old/tex/latex/seminar/semlayer.sty 2007-01-12 18:33:16.000000000 +0100
+++ new/tex/latex/seminar/semlayer.sty 2014-01-21 00:17:26.000000000 +0100
@@ -84,7 +84,8 @@
\def\theoverlayframe{}
\def\overlaylabel{\bf Overlay \theoverlay}
\def\layerlabel{\bf Layer \thelayer}
-\newcounter{overlay}
+\@ifundefined{c@overlay}{\newcounter{overlay}}{}%%% hv 20131224
+%\newcounter{overlay}
\def\theoverlay{\theslide-\alph{overlay}}
\def\currlayer{}
\def\thelayer{\theoverlay-\currlayer}
@@ -151,6 +152,7 @@
\def\layerpagestyle#1{\@ifgoodps{#1}{\edef\layer@pagestyle{#1}}}
\overlaypagestyle{}
\layerpagestyle{}
+
\endinput
%%
%% End of file `semlayer.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/seminar/tvz-code.sty new/tex/latex/seminar/tvz-code.sty
--- old/tex/latex/seminar/tvz-code.sty 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/seminar/tvz-code.sty 2014-01-01 00:20:30.000000000 +0100
@@ -0,0 +1,291 @@
+%% BEGIN tvz-code.sty
+%% 93/04/01
+%% Tim Van Zandt Timothy.VAN-ZANDT@insead.edu
+%%
+%% Lousy hacks for typesetting the documented code for the
+%%
+%% This file may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License, either version 1.2 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.2 or later is part of all distributions of LaTeX version
+%% 1999/12/01 or later.
+%%
+%% seminar.sty and PSTricks packages.
+
+\input tvz-hax.sty
+\input doc.sty % Tested with v1.7k
+\input art11.sty
+
+
+%%%%%%%%%%%%%%%%%%% PAGE PARAMETERS %%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% Paragraphs are marked by space rather than indentation:
+\parindent 0pt
+\parskip 4pt plus 1pt minus 1pt
+
+% Textwidth just wide enough for 78 characters of code.
+\setbox\@tempboxa=\hbox{\small\tt f}
+\textwidth 78\wd\@tempboxa
+\oddsidemargin\paperwidth\relax
+\advance\oddsidemargin -\textwidth
+\divide\oddsidemargin 2
+\advance\oddsidemargin -1in
+\setbox\@tempboxa=\hbox{\tiny 999\ }
+\advance\oddsidemargin\wd\@tempboxa
+\evensidemargin\oddsidemargin
+
+\if@twoside
+ \advance\oddsidemargin .3in
+ \advance\evensidemargin -.3in
+\fi
+
+% No headers, 1in top margin
+\topmargin 0pt
+\headheight 0pt
+\headsep 0pt
+
+% Total bottom margin 1in, text height 9in
+\textheight 9in
+\footskip .625in
+
+% Now adjust for different paper size:
+\@tempdima=\paperheight
+\advance\@tempdima-11in
+\divide\@tempdima 2
+\advance\topmargin \@tempdima
+
+% Marginal notes always on left.
+\marginparwidth 3.5cm
+\marginparsep .5cm
+\reversemarginpar
+
+
+%%%%%%%%%%%%%%%%%%% MACROCODE PATCH FOR SHORT META %%%%%%%%%%%
+
+\expandafter\def\expandafter\macrocode\expandafter{%
+ \expandafter\DeleteShortMeta
+ \macrocode}
+
+%%%%%%%%%%%%%%%%%%%% DOC PREAMBLE %%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\newbox\junkbox
+\def\DocInput#1{%
+ \MakePercentIgnore
+ \setbox\junkbox=\hbox\bgroup
+ \input{#1}%
+ \MakePercentComment}
+\let\EndDocPreamble\egroup
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%% VERBATIM %%%%%%%%%%%%%%%%%%%%%%%%%
+
+% Use fancybox.sty's LVerbatim environment. Each line should contain
+% percent plus three spaces (or other char), including blank lines. E.g.,
+% \begin{LVerbatim}
+% foo
+% bar
+% \end{LVerbatim}
+
+\def\EveryVerbatimLine#1#2#3#4{}
+\begingroup
+ \catcode`\%=12
+ \catcode`\ =\active
+ \global\EndVerbatimTokens{% }
+\endgroup
+\AltGetVerbatim
+
+
+%%%%%%%%%%%%%%%%%% INDEXING %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% Things are faster without \MakeIndex
+
+\def\MakeIndex{\makeindex\EnableCrossrefs}
+\DisableCrossrefs
+
+% Use \codelabel[int]{foo} to label last line of code plus int.
+% E.g., to label first and then last line of some code:
+% \codelabel[1]{foo}
+% \begin{macrocode}
+% foo
+% bar
+% \end{macrocode}
+% \codelabel{foo}
+
+\def\codelabel{\@ifnextchar[{\@codelabel}{\@codelabel[0]}}
+\def\@codelabel[#1]#2{%
+ \@bsphack
+ \begingroup
+ \advance\c@CodelineNo #1
+ \def\@currentlabel{\the\c@CodelineNo}%
+ \label{#2}%
+ \endgroup
+ \@esphack}
+
+% Definitions in code are indexed by page number, but other occurences
+% are indexed by the line of code.
+
+\CodelineIndex
+\def\SpecialMainPageIndex#1{%
+ {\let\special@index\index\SpecialMainIndex{#1}}}
+\renewcommand{\theCodelineNo}{{\rm\tiny\arabic{CodelineNo}}}
+
+% Index numbers for main definitions are set in bold rather than underlined.
+
+\def\main#1{{\bf #1}}
+
+% two column index
+
+\setcounter{IndexColumns}{2}
+
+% Customize index prologue:
+
+\def\index@prologue{%
+ \section*{Index}\markboth{Index}{Index}%
+ \addcontentsline{toc}{section}{Index}%
+ The {\bf bold} numbers denote the pages where the entries are defined,
+ and all other numbers indicate the {\em lines of code} where
+ the entries are used.}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%% MACRO %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% A change to the macro environment; prints macro names within the margins
+% of the text, instead of as marginal notes. Use one \macro command,
+% with comma separated macro names.
+
+\newif\iffirst@macroname
+\newif\ifnestedmacro
+
+\def\macro{%
+ \ifnum\macro@level=\z@
+ \def\next{\MakePrivateLetters \m@cro@}%
+ \else
+ \def\next{\@latexerr{Nested \string\begin{macro}}\@eha
+ \endgroup\end{macro}\macro@level=\z@\begin{macro}}
+ \fi
+ \next}
+\def\m@cro@#1{%
+ \first@macronametrue
+ \m@@cro@@#1,\@nil,}
+\def\m@@cro@@#1,{%
+ \def\@tempa{#1}\def\@tempb{\@nil}%
+ \ifx\@tempa\@tempb
+ \let\next\finishm@@cro@@
+ \else
+ {\advance\c@CodelineNo\@ne\SpecialMainPageIndex{#1}\nobreak}%
+ \DoNotIndex{#1}%
+ \iffirst@macroname
+ \edef\saved@macronames{\string#1}%
+ \first@macronamefalse
+ \else
+ \def\comma{\noexpand\comma}%
+ \edef\saved@macronames{\saved@macronames\comma\string#1}%
+ \fi
+ \let\next\m@@cro@@
+ \fi
+ \next}
+\def\finishm@@cro@@{%
+ \advance\macro@level\@ne
+ \def\comma{{\rm, }}%
+ \ListMacroNames{\saved@macronames}}
+
+\let\endmacro\relax
+
+\def\ListMacroNames{%
+ \@startsection{subsubsection}{3}{\z@}{-2.25ex plus -.5ex minus-.2ex}%
+ {1.3ex plus.2ex}{\csname reset@font\endcsname\large\tt}*}
+
+\MacroIndent 0pt
+
+\def\MacroFont{\small\tt}
+
+
+%%%%%%%%%%%%%%%%%%%%% DoNot Index %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\DoNotIndex{\ ,\!,\[,\\,\],\^,\`,\{,\},\~}
+\DoNotIndex{\@warning,\active}
+\DoNotIndex{\begingroup,\catcode,\char,\csname,\def,\do}
+\DoNotIndex{\docdate,\dospecials,\edef,\else,\endcsname,\endgroup}
+\DoNotIndex{\expandafter,\fi,\filedate,\fileversion}
+\DoNotIndex{\gdef,\if,\ifcat}
+\DoNotIndex{\ifx,\immediate,\lccode,\let}
+\DoNotIndex{\lowercase,\next,\noexpand}
+\DoNotIndex{\relax,\space,\the}
+\DoNotIndex{\toks@,\typeout,\write}
+\DoNotIndex{\@M,\@arabic,\@author,\@auxout,\@bsphack,\@car,\@date}
+\DoNotIndex{\@dblarg,\@dblfloat,\@eha,\@empty,\@esphack,\@evenfoot}
+\DoNotIndex{\@evenhead,\@float,\@gobble,\@gobbletwo,\@gtempa,\@ifnextchar}
+\DoNotIndex{\@ifundefined,\@ixpt,\@latexerr,\@listI,\@listi,\@listii}
+\DoNotIndex{\@listiii,\@listiv,\@listv,\@listvi,\@makefnmark,\@mkboth}
+\DoNotIndex{\@namedef,\@nameuse,\@mne,\@nil,\@normalsize,\@oddfoot}
+\DoNotIndex{\@oddhead,\@tempa,\@tempb,\@tempc,\@tempd}
+\DoNotIndex{\@tempdima,\@testfalse,\@testtrue,\test@member}
+\DoNotIndex{\@thanks,\@thefnmark,\@title}
+\DoNotIndex{\@topnum,\@viiipt,\@viipt,\@vipt,\@vpt,\@xiipt}
+\DoNotIndex{\@xipt,\@xpt,\@xivpt,\@xviipt,\@xxpt,\@xxvpt}
+\DoNotIndex{\addcontentsline}
+\DoNotIndex{\advance,\aftergroup,\baselinestretch,\begin}
+\DoNotIndex{\belowdisplayshortskip,\belowdisplayskip,\bf,\bgroup}
+\DoNotIndex{\box,\c@@page,\c@page,\c@secnumdepth,\clearpage,\columnsep}
+\DoNotIndex{\columnwidth,\copy,\dimen@,\dimen@i,\dimen@ii,\divide}
+\DoNotIndex{\dp,\ds@article,\ds@notes,\ds@notesonly}
+\DoNotIndex{\ds@slidesonly,\egrou,\end,\end@dblfoloat,\end@float}
+\DoNotIndex{\endinput,\fnsymbol,\footheight,\footnotesep,\footskip}
+\DoNotIndex{\global,\globaldefs,\hbox,\headheight,\headsep,\hfil}
+\DoNotIndex{\hrule,\hskip,\hss,\ht,\Huge,\huge}
+\DoNotIndex{\if@filesw,\if@test,\if@twocolumn,\if@twoside}
+\DoNotIndex{\ifcase,\ifdim,\ifvmode,\ignorespaces}
+\DoNotIndex{\input,\interlinepenalty,\itemsep,\ixpt,\label}
+\DoNotIndex{\labelsep,\labelwidth,\LARGE,\large,\Large}
+\DoNotIndex{\leavevmode,\leftmargin,\leftmargini,\leftmarginii}
+\DoNotIndex{\leftmarginiii,\leftmarginiv,\leftmarginv}
+\DoNotIndex{\leftmarginvi,\leftmark,\leftskip,\lineskip}
+\DoNotIndex{\magstep,\marginparsep,\marginparwidth,\markboth}
+\DoNotIndex{\markright,\medbreak,\multiply,\newbox,\newcount}
+\DoNotIndex{\newcounter,\newdimen,\newif,\newlabel,\newpage}
+\DoNotIndex{\newtoks,\nobreak,\nointerlineskip,\normallineskip}
+\DoNotIndex{\normalsize,\null,\number,\numberline,\oddsidemargin}
+\DoNotIndex{\offinterlineskip,\or,\par,\parbox,\parskip,\partopsep}
+\DoNotIndex{\prevdepth,\protect,\ref,\refstepcounter,\rightmrk}
+\DoNotIndex{\rm,\scriptsize,\section,\sectionmark,\setbox,\setcounter}
+\DoNotIndex{\sl,\small,\stepcounter,\string,\textheight,\textwidth}
+\DoNotIndex{\thefootnote,\thepage,\thesection,\thesubsection}
+\DoNotIndex{\thispagestyle,\tiny,\topmargin,\topsep,\uppercase}
+\DoNotIndex{\vbox,\vfill,\viiipt,\viipt,\vipt,\vpt,\vskip,\vss}
+\DoNotIndex{\wd,\xcommentloaded@,\xdef,\xiipt,\xipt,\xivpt,\xpt}
+\DoNotIndex{\xviipt,\xxpt,\xxvpt,\z@}
+\DoNotIndex{\abovedisplayskip,\abovedisplayshortskip,\@currentlabel}
+\DoNotIndex{\@dottedtocline,\@ne\@setsize,\@starttoc,\@tempboxa,\@}
+\DoNotIndex{\arraystretch,\centerline,\egroup,\end@dblfloat}
+\DoNotIndex{\evensidemargin,\footnotesize,\ifnum,\parindent,\parsep}
+\DoNotIndex{\rightmark,\@afterindenttrue,\@ne,\if@specialpage.\long}
+\DoNotIndex{\fboxrule,\fboxsep,\@for,\vfil}
+\DoNotIndex{\@@fortmp,\@@tempa,\@@tempb,\@ehd,\@for,\@fortmp,\@m}
+\DoNotIndex{\@mparswitchfalse,\@mparswitchtrue,\@nnil,\@spaces}
+\DoNotIndex{\@specialstyle,\@temptokena,\@twosidefalse,\@twosidetrue}
+\DoNotIndex{\@whilenum,\alph,\arabic,\count@,\errhelp,\errmessage}
+\DoNotIndex{\fbox,\index,\minipage,\newcommand,\overfullrule}
+\DoNotIndex{\pagestyle,\raggedright,\ref@stepcounter,renewcommand}
+\DoNotIndex{\semcolor@loaded,today,\@tempcnta,\@tempcntb,\trivlist,\t,\p}
+\DoNotIndex{\today,\item,\@colht,\@currenvir,\@thefoot,\@thehead}
+\DoNotIndex{\@totalleftmargin,\allowbreak,\@captype,\@footnotetext}
+\DoNotIndex{\@listdepth,\@minipagefalse,\@minipagetrue,\@mpfn,\@mpfootins}
+\DoNotIndex{\endtrivlist,\everypar,\hsize,\ifvoid,\lastskip}
+\DoNotIndex{\linewidth,\skip,\thempfn,\thempfootnote,\topskip,\unvbox}
+\DoNotIndex{\@@input,\@@par,\@acci,\@accii,\@acciii,\@cclv,\@height}
+\DoNotIndex{\@maxdepth,\@tempdimb,\@tempg,\@temph,\@texttop,\@twocolumnfalse}
+\DoNotIndex{\@xfloat,\addvspace,\alloc@,\bigskipamount,\botmark,\chardef}
+\DoNotIndex{\closein,\closeout,\count,\countdef,\dimen,\glossary,\goodbreak}
+\DoNotIndex{\insc@unt,\intextsep,\kern,\mag,\marginpar,\maxdepth,\medskip}
+\DoNotIndex{\moveleft,\newinsert,\newskip,\onecolumn,\openin,\openout}
+\DoNotIndex{\read,\renewcommand,\repeat,\rightskip,\strut,\vfuzz,\voffset}
+\DoNotIndex{\vsize}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\endinput
+
+%% END tvz-code.sty
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/seminar/tvz-hax.sty new/tex/latex/seminar/tvz-hax.sty
--- old/tex/latex/seminar/tvz-hax.sty 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/seminar/tvz-hax.sty 2014-01-01 00:20:30.000000000 +0100
@@ -0,0 +1,266 @@
+%% BEGIN tvz-hax.sty
+%% 93/04/01
+%% Tim Van Zandt Timothy.VAN-ZANDT@insead.edu
+%%
+%% These are some lousy hacks for typesetting the code
+%% and User's Guide in the Seminar and PSTricks packages.
+%%
+%% This file may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License, either version 1.2 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.2 or later is part of all distributions of LaTeX version
+%% 1999/12/01 or later.
+%%
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%% PAPER SIZES %%%%%%%%%%%%%%%%%%%%%%
+
+% Default paper size is 8.5in by 11in.
+% Just include the `a4' style option for A4 paper size.
+% For other paper sizes, define \paperwidth and \paperheight
+% before the \documentstyle command.
+
+\@ifundefined{paperwidth}{\def\paperwidth{8.5in}}{}
+\@ifundefined{paperheight}{\def\paperheight{11in}}{}
+\@namedef{ds@a4}{\def\paperwidth{210mm}\def\paperheight{297mm}}
+
+
+%%%%%%%%%%%%%%%%%%%% INPUTS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\newif\iftwoup
+\@namedef{ds@2up}{\input 2up.tex \twouptrue}
+
+\input article.sty
+\input fancybox.sty % Version 0.93 or later.
+
+\iftwoup
+ \if@twoside
+ \targetlayout{twosided}
+ \fi
+\fi
+
+\if@twoside
+ \def\twosideclearpage{%
+ \clearpage
+ \ifodd\c@page\else
+ \thispagestyle{empty}%
+ \null\leavevmode
+ \clearpage
+ \fi}
+\else
+ \let\twosideclearpage\clearpage
+\fi
+
+
+%%%%%%%%%%%%%%%%%%%%% MISC %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\def\arraystretch{1.2}
+
+\hfuzz 1pt
+
+% Just in case I'm using AmS-LaTeX.
+\def\makeatother{\catcode`\@=12\relax}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%% SHORT META %%%%%%%%%%%%%%%%%%%%%%%%
+
+% Works in verbatim environments, unless specially designed.
+\begingroup
+ \catcode`\<=\active
+ \gdef\ShortMeta{%
+ \catcode`\<=\active
+ \def<##1>{{\MetaFont ##1\/}}}
+\endgroup
+\def\DeleteShortMeta{\catcode`\<=12\relax}
+\def\MetaFont{\sl} % For meta arguments.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%% FILE VERSIONS %%%%%%%%%%%%%%%%%%%%%
+
+% \GetVersion{file} scans first ten lines of <file> for
+% \filedate and \fileversion definitions.
+%
+% \CheckVersion{file} scans <scans> file for \filedate and \fileversion
+% and then compares these witha \FileDate and \FileVersion.
+%
+\def\GetVersion#1{%
+ \immediate\openin1=#1
+ \count@=0
+ \let\fileversion\relax
+ \let\filedate\relax
+ \@testtrue
+ \loop
+ \if@test
+ \advance\count@1
+ \immediate\read1 to \@tempa
+ \@tempa
+ \ifnum\count@=10
+ \@latexerr{Couldn't find fileversion}\@eha
+ \@testfalse
+ \else
+ \ifx\fileversion\relax
+ \@testtrue
+ \else
+ \ifx\filedate\relax
+ \@testtrue
+ \else
+ \@testfalse
+ \fi
+ \fi
+ \fi
+ \repeat}
+
+\def\CheckVersion#1{%
+ \GetVersion{#1}
+ \ifx\FileVersion\fileversion
+ \ifx\FileDate\filedate\else
+ \@latexerr{Doc date (\FileDate) and file date (\filedate)
+ do not match}\@eha
+ \fi
+ \else
+ \@latexerr{Doc version (\FileVersion) and file version (\fileversion)
+ do not match}\@eha
+ \fi}
+
+% This expands the date, as defined in \filedate.
+
+\def\expanddate#1/#2/#3/{%
+ \number#3{}
+ \month=#2
+ \ifcase\month\or
+ January \or February \or March \or April \or May \or June \or
+ July \or August \or September \or October \or November \or December
+ \fi
+ 19#1}
+\def\thefiledate{\expandafter\expanddate\filedate/}
+\date{\thefiledate}
+
+
+%%%%%%%%%%%%%%%%% LOGOS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\def\AmS{{\protect\the\textfont\tw@
+ A\kern-.1667em\lower.5ex\hbox{M}\kern-.125em S}}
+
+\def\b@LaTeX{%
+ \begingroup
+ \csname reset@font\endcsname
+ \rm\bf
+ L\kern-.32em
+ \raise.36ex\hbox{%
+ \ifx\@currsize\Huge\LARGE\else
+ \ifx\@currsize\huge\Large\else
+ \ifx\@currsize\LARGE\large\else
+ \ifx\@currsize\Large\normalsize\else
+ \ifx\@currsize\large\small\else
+ \ifx\@currsize\normalsize\footnotesize\else
+ \ifx\@currsize\small\scriptsize\else
+ \ifx\@currsize\footnotesize\scriptscriptsize
+ \fi\fi\fi\fi\fi\fi\fi\fi
+ \bf A}%
+ \kern-.15em
+ T\kern-.1667em
+ \lower.7ex\hbox{E}\kern-.125em
+ X%
+ \endgroup}
+\def\bLaTeX{\b@LaTeX}
+
+
+%%%%%%%%%%%%%%% PAGE STYLE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% The `docheadings' page style uses footers rather than headers.
+
+\def\ps@docheadings{%
+ \let\@mkboth\markboth
+ \def\@oddhead{}%
+ \let\@evenhead\@oddhead%
+ \def\@oddfoot{%
+ \small\sf
+ \rightmark
+ \hfil
+ \thepage}%
+ \def\@evenfoot{%
+ \small\sf
+ \thepage
+ \hfil
+ \theheadertitle}%
+ \def\sectionmark##1{\markright {##1}}}%
+\pagestyle{docheadings}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%% Table of Contents %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% Tighten up spacing in TOC:
+
+\newskip\tempskip
+\def\TOCshrink{.5}
+\def\TableOfContents{%
+ \begin{quote}
+ \begin{center} \Large\bf Contents \end{center}
+ \def\numberline##1{\hbox to 0pt{\hss##1\hskip 1em}}%
+ \let\oldaddvspace\addvspace
+ \def\addvspace##1{%
+ \tempskip##1\relax
+ \oldaddvspace{\TOCshrink\tempskip}}
+ \@starttoc{toc}%
+ \end{quote}}
+\def\tableofcontents{%
+ \clearpage
+ \markright{Table of contents}%
+ \TableOfContents
+ \clearpage}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%% code and examples %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% `Ex' is an environment for putting samples of code.
+% It is a variant of
+% \begin{quote}\tt ... \end{quote}.
+% It is NOT verbatim.
+
+\def\NotNested{%
+ \def\begin##1{%
+ \@latexerr{Bad nesting of environments.
+ Perhaps missing \end{\@currenvir}}\@eha
+ \end{\@currenvir}%
+ \begin{##1}}}
+
+\def\Ex{%
+ \NotNested
+ \list{}{}\item[]%
+ \if@minipage\else\vskip\parskip\fi
+ \leftskip\@totalleftmargin
+ \rightskip\z@
+ \parindent\z@
+ \parskip\z@
+ \parfillskip\@flushglue
+ \hfuzz 1pt
+ \@@par
+ \global\@inlabelfalse}
+\def\endEx{\endlist}
+
+% Various things to make it easier to write code and examples:
+
+\begingroup
+ \catcode`\{=12 \catcode`\}=12
+ \catcode`\(=1 \catcode`\)=2
+ \catcode`\+=0 \catcode`\\=12
+ +gdef+|(\) % \| = character \
+ +gdef+{({) % \{ = character {
+ +gdef+}(}) % \} = character }
++endgroup
+\def\Backslash{\protect\|}
+
+% Define some functional font commands:
+
+\def\MainFont{\tt} % For macro definitions.
+\def\UsageFont{\tt} % For in-line macro names.
+\def\InlineFont{\tt} % For other in-line snipets of code.
+\def\DisplayFont{\tt} % For displayed code.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\endinput
+%% END tvz-hax.sty
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/seminar/tvz-user.sty new/tex/latex/seminar/tvz-user.sty
--- old/tex/latex/seminar/tvz-user.sty 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/seminar/tvz-user.sty 2014-01-01 00:20:30.000000000 +0100
@@ -0,0 +1,215 @@
+%%
+%% This file may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License, either version 1.2 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.2 or later is part of all distributions of LaTeX version
+%% 1999/12/01 or later.
+%%
+%% BEGIN tvz-user.sty
+%% 93/04/01
+
+\input tvz-hax.sty
+
+\def\papersizeadjust{%
+ \@tempdima=\paperwidth\relax
+ \advance\@tempdima-8.5in
+ \divide\@tempdima 2
+ \advance\oddsidemargin\@tempdima
+ \advance\evensidemargin\@tempdima
+ \@tempdima=\paperheight
+ \advance\@tempdima-11in
+ \divide\@tempdima 2
+ \advance\topmargin\@tempdima}
+
+\begingroup
+ \catcode`\"=\active
+ \gdef\ShortVerb{%
+ \catcode`\"=\active
+ \def"{\Verb"}}%
+ \gdef\DeleteShortVerb{\catcode`\"=12\relax}
+\endgroup
+
+% Paragraphs are marked by large space rather than indentation:
+\setlength{\parindent}{0pt}
+\setlength{\parskip}{7pt plus 1pt minus 1pt}
+
+% Reduce \topsep:
+\def\@listI{%
+ \leftmargin\leftmargini
+ \parsep 5\p@ plus2.5\p@ minus\p@
+ %\topsep 10\p@ plus4\p@ minus6\p@
+ \topsep 5\p@ plus2\p@ minus2\p@
+ \itemsep 5\p@ plus2.5\p@ minus\p@}
+\let\@listi\@listI
+\@listi
+\def\@listii{%
+ \leftmargin\leftmarginii
+ \labelwidth\leftmarginii
+ \advance\labelwidth-\labelsep
+ %\topsep 5\p@ plus2.5\p@ minus\p@
+ \topsep 2\p@ plus.5\p@ minus\p@
+ \parsep 2.5\p@ plus\p@ minus\p@
+ \itemsep \parsep}
+\def\@listiii{%
+ \leftmargin\leftmarginiii
+ \labelwidth\leftmarginiii
+ \advance\labelwidth-\labelsep
+ %\topsep 2.5\p@ plus\p@ minus\p@
+ \topsep 1\p@ plus.2\p@ minus.2\p@
+ \parsep \z@
+ \partopsep \p@ plus\z@ minus\p@
+ \itemsep \topsep}
+
+\skip\footins 20pt plus 4pt minus 2pt
+
+%%%%%%%%%%%%%%%%%%%%%%% Special hacks for User's Guides %%%%%%%%%%%%%%%%%%%%%
+%%
+%% Listing questions
+\newcounter{faq}[section]
+\def\thefaq{\arabic{faq}}
+\let\l@faq\@gobbletwo
+\def\faq{\@startsection{faq}{2}{\z@}%
+ {3.25ex plus 1ex minus .2ex}{1.5ex plus .2ex}{\faqfont}}
+\def\faqfont{\normalsize\sf}
+\def\faqmark#1{}
+%%
+%% Listing errors
+\def\error{\vskip 2ex\noindent}
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\@ifundefined{AmSTeX}
+ {\def\AmSTeX{\leavevmode\hbox{$\cal A\kern-.2em\lower.376ex%
+ \hbox{$\cal M$}\kern-.2em\cal S$-\TeX}}}{}
+\@ifundefined{BibTeX}
+ {\def\BibTeX{{\rm B\kern-.05em{\sc i\kern-.025em b}\kern-.08em%
+ T\kern-.1667em\lower.7ex\hbox{E}\kern-.125emX}}}{}
+\@ifundefined{SliTeX}
+ {\def\SliTeX{{\rm S\kern-.06emL\kern-.18em\raise.32ex\hbox
+ {\sc i}\kern -.03em\TeX}}}{}
+\@ifundefined{PlainTeX}{\def\PlainTeX{{\sc Plain}\kern2pt\TeX}}{}
+
+%%%%%%%%%%%%%%% Special indexing for User's Guides %%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%%
+\@ifundefined{actualchar}{\def\actualchar{@}}{}
+\@ifundefined{quotechar}{\def\quotechar{"}}{}
+\@ifundefined{levelchar}{\def\levelchar{!}}{}
+\@ifundefined{encapchar}{\def\encapchar{|}}{}
+\@ifundefined{verbatimchar}{\def\verbatimchar{+}}{}
+%%
+%% These are the indexing commands:
+%%
+%% Commands: \MainIndex \UsageIndex
+%% Environments: \MainEnvIndex \UsageEnvIndex
+%% Style options: \MainOptionIndex \UsageOptionIndex
+%% Counters: \MainCntIndex \UsageCntIndex
+\def\@Index#1{\@bsphack\index{#1}\@esphack}
+\def\Index#1#2{%
+ \@bsphack
+ \index{\expandafter\@gobble\string#2\actualchar\string
+ \verb\quotechar*\verbatimchar\string#2\verbatimchar
+ \encapchar #1}}
+{\catcode`\!=0 !catcode`!\=12!gdef!special@gobble#1{!if\#1!else#1!fi}}
+\def\MainIndex{\Index{main}}
+\def\UsageIndex{\Index{usage}}
+\def\SpecialIndex#1#2#3{%
+ \@Index{#3\actualchar{\tt #3} (#1)\encapchar #2}%
+ \@Index{#1s:\levelchar{\tt #3}\encapchar #2}}
+\def\MainEnvIndex{\SpecialIndex{environment}{main}}
+\def\UsageEnvIndex{\SpecialIndex{environment}{usage}}
+\def\MainOptionIndex{\SpecialIndex{option}{main}}
+\def\UsageOptionIndex{\SpecialIndex{option}{usage}}
+\def\MainCntIndex{\SpecialIndex{counter}{main}}
+\def\UsageCntIndex{\SpecialIndex{counter}{usage}}
+%%
+%% Font for index page numbers:
+\def\main#1{{\bf #1}}
+\def\usage#1{{#1}}
+%%
+%% These combine various functions:
+%%
+%% Commands: \Main \Usage
+%% Environments: \MainEnv \UsageEnv
+%% Style options: \MainOption \UsageOption
+%% Counters: \MainCnt \UsageCnt
+%%
+%% The "Main" ones
+%% * Index argument.
+%% * Print argument with \MainFont
+%% * Create label +foo, e+foo or o+foo.
+%%
+%% The "Usage" ones
+%% * Index argument.
+%% * Print argument with \UsageFont.
+%%
+\def\SpecialLabel#1#2+{\label{+#2}}
+\def\LabelIndex#1{\MainIndex{#1}\expandafter\SpecialLabel\string#1+}
+\def\Main#1{%
+ \MainIndex{#1}%
+ \expandafter\SpecialLabel\string#1+%
+ {\MainFont\string#1}}
+\def\Usage#1{\UsageIndex{#1}{\UsageFont\string#1}}
+\def\MainEnv#1{%
+ \MainEnvIndex{#1}%
+ \label{e+#1}%
+ {\MainFont #1}}
+\def\UsageEnv#1{\UsageEnvIndex{#1}{\UsageFont #1}}
+\def\MainOption#1{%
+ \MainOptionIndex{#1}%
+ \label{o+#1}%
+ {\MainFont #1}}
+\def\UsageOption#1{\UsageOptionIndex{#1}{\UsageFont #1}}
+\def\MainCnt#1{%
+ \MainCntIndex{#1}%
+ \label{c+#1}%
+ {\MainFont #1}}
+\def\UsageCnt#1{\UsageCntIndex{#1}{\UsageFont #1}}
+%%
+%% These are abbreviations.
+%%
+\def\N{\Main}
+\def\n{\Usage}
+\def\E{\MainEnv}
+\def\e{\UsageEnv}
+\def\O{\MainOption}
+\def\o{\UsageOption}
+\def\C{\MainCnt}
+\def\c{\UsageCnt}
+%%
+%% This is for listing commands in a description environment.
+\def\xitem#1{\item[\Main{#1}]}
+%%
+%%
+\renewcommand{\EveryVerbatimLine}[2]{}
+\VerbatimFootnotes
+
+%% User's guide and documented code have different index prologue.
+\def\PrintUserIndex{{\let\ps@plain\@empty\@input{\jobname.ind}}}
+
+\begingroup
+ \catcode`\<=1 \catcode`\>=2
+ \catcode`\{=13 \catcode`\}=12
+ \catcode`\[=13
+ \gdef\@MD<%
+ \catcode`\{=13 \catcode`\}=12 \catcode`\[=13
+ \def{##1}<\{<\MetaFont ##1\/>\}>%
+ \def[##1]<\string[<\MetaFont ##1\/>]>>
+\endgroup
+\def\MD{%
+ \NotNested
+ \Ex
+ \begingroup
+ \@MD
+ \def\end{\par\endgroup\end}%
+ \def\\{\@centercr\Main}%
+ \MainFont
+ \Main}
+\def\endMD{\endEx}
+
+\endinput
+%% END tvz-user.sty
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/seminar.tlpobj new/tlpkg/tlpobj/seminar.tlpobj
--- old/tlpkg/tlpobj/seminar.tlpobj 2010-06-10 18:44:42.000000000 +0200
+++ new/tlpkg/tlpobj/seminar.tlpobj 2014-05-14 03:24:44.000000000 +0200
@@ -1,6 +1,6 @@
name seminar
category Package
-revision 18322
+revision 34011
shortdesc Make overhead slides.
relocated 1
longdesc A class that produces overhead slides (transparencies), with
@@ -12,9 +12,10 @@
longdesc tuned to 21st-century presentation styles. Note that the
longdesc seminar distribution relies on the xcomment package, which was
longdesc once part of the bundle, but now has a separate existence.
-runfiles size=41
+runfiles size=48
RELOC/tex/latex/seminar/npsfont.sty
RELOC/tex/latex/seminar/sem-a4.sty
+ RELOC/tex/latex/seminar/sem-dem.sty
RELOC/tex/latex/seminar/sem-page.sty
RELOC/tex/latex/seminar/semcolor.sty
RELOC/tex/latex/seminar/semhelv.sty
@@ -26,7 +27,10 @@
RELOC/tex/latex/seminar/semlcmss.sty
RELOC/tex/latex/seminar/semrot.sty
RELOC/tex/latex/seminar/slidesec.sty
+ RELOC/tex/latex/seminar/tvz-code.sty
+ RELOC/tex/latex/seminar/tvz-hax.sty
+ RELOC/tex/latex/seminar/tvz-user.sty
catalogue-ctan /macros/latex/contrib/seminar
-catalogue-date 2010-05-17 14:53:01 +0200
+catalogue-date 2014-01-20 13:04:19 +0100
catalogue-license lppl1.2
-catalogue-version 1.5
+catalogue-version 1.61
++++++ texlive-specs-t-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/.*")