Hello community,
here is the log from the commit of package texlive-specs-d for openSUSE:Factory checked in at 2015-04-25 09:50:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-d (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-d.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-d"
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-d/texlive-specs-d.changes 2015-02-24 13:00:30.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.texlive-specs-d.new/texlive-specs-d.changes 2015-04-25 09:51:42.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
+
+-------------------------------------------------------------------
New:
----
boondox.doc.tar.xz
boondox.tar.xz
brandeis-dissertation.doc.tar.xz
brandeis-dissertation.tar.xz
bxcjkjatype.doc.tar.xz
bxcjkjatype.tar.xz
cbfonts-fd.doc.tar.xz
cbfonts-fd.tar.xz
chronology.doc.tar.xz
chronology.tar.xz
texlive-specs-d-rpmlintrc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-d.spec ++++++
++++ 5890 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-d/texlive-specs-d.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-d.new/texlive-specs-d.spec
++++++ borceux.doc.tar.xz ++++++
++++++ borceux.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/borceux.tlpobj new/tlpkg/tlpobj/borceux.tlpobj
--- old/tlpkg/tlpobj/borceux.tlpobj 2011-01-13 04:09:16.000000000 +0100
+++ new/tlpkg/tlpobj/borceux.tlpobj 2014-04-18 02:37:10.000000000 +0200
@@ -18,6 +18,5 @@
RELOC/tex/generic/borceux/MiniDiagram
RELOC/tex/generic/borceux/MultipleArrows
catalogue-ctan /macros/generic/diagrams/borceux
-catalogue-date 2009-01-02 20:30:08 +0100
-catalogue-license noinfo
-catalogue-version 3.1
+catalogue-date 2012-02-21 12:29:07 +0100
+catalogue-license other-free
++++++ breakcites.doc.tar.xz ++++++
++++++ breakcites.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/breakcites.tlpobj new/tlpkg/tlpobj/breakcites.tlpobj
--- old/tlpkg/tlpobj/breakcites.tlpobj 2011-01-11 04:14:08.000000000 +0100
+++ new/tlpkg/tlpobj/breakcites.tlpobj 2014-04-18 02:37:15.000000000 +0200
@@ -11,5 +11,5 @@
runfiles size=1
RELOC/tex/latex/breakcites/breakcites.sty
catalogue-ctan /macros/latex/contrib/breakcites
-catalogue-date 2010-12-11 10:17:50 +0100
-catalogue-license noinfo
+catalogue-date 2012-10-06 23:31:05 +0200
+catalogue-license other-free
++++++ cabin.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/cabin/README new/doc/fonts/cabin/README
--- old/doc/fonts/cabin/README 2013-01-26 00:10:54.000000000 +0100
+++ new/doc/fonts/cabin/README 2013-07-23 00:05:12.000000000 +0200
@@ -1,4 +1,4 @@
-This is the README for the cabin package, version 2013-01-24.
+This is the README for the cabin package, version 2013-07-20.
This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
the Cabin and Cabin Condensed families of sans serif fonts, designed by
@@ -26,17 +26,20 @@
\usepackage[sfdefault]{cabin}
-This re-defines \familydefault, not \rmdefault. LuaLaTeX and xeLaTeX
-users who might prefer type1 fonts or who wish to avoid fontspec may use
-the type1 option.
+LuaLaTeX and xeLaTeX users who might prefer type1 fonts or who wish
+to avoid fontspec may use the type1 option.
Other options include:
-bold \bfdefault is bold
-semibold \bfdefault is semibold
+bold
+semibold
-regular \mddefault is regular
-medium \mddefault is medium
+regular
+medium
+
+These are now implemented by defining macros recognized by commands
+defined in package mweights (without re-defining \bfdefault or
+\mddefault).
condensed
Files old/doc/fonts/cabin/samples.pdf and new/doc/fonts/cabin/samples.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/cabin/samples.tex new/doc/fonts/cabin/samples.tex
--- old/doc/fonts/cabin/samples.tex 2012-11-26 00:21:05.000000000 +0100
+++ new/doc/fonts/cabin/samples.tex 2013-07-18 00:11:41.000000000 +0200
@@ -1,9 +1,12 @@
\documentclass{article}
\usepackage[T1]{fontenc}
-\usepackage[sfdefault]{cabin}
+\usepackage[medium,semibold]{cabin}
\usepackage{lipsum}
\begin{document}
+
+\sf\mdseries
+
\subsection*{Regular}
\lipsum[1]
@@ -13,6 +16,8 @@
\subsection*{Bold}
\textbf{\lipsum[3]}
+{\fontseries{sb}\selectfont\lipsum[3]}
+
\subsection*{Bold Italic}
\textbf{\textit{\lipsum[4]}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cabin.doc.tlpobj new/tlpkg/tlpobj/cabin.doc.tlpobj
--- old/tlpkg/tlpobj/cabin.doc.tlpobj 2013-01-26 04:32:35.000000000 +0100
+++ new/tlpkg/tlpobj/cabin.doc.tlpobj 2013-07-23 03:19:35.000000000 +0200
@@ -1,9 +1,9 @@
name cabin.doc
category Package
-revision 28942
+revision 31265
shortdesc doc files of cabin
relocated 1
-docfiles size=58
+docfiles size=49
RELOC/doc/fonts/cabin/OFL.txt
RELOC/doc/fonts/cabin/README
RELOC/doc/fonts/cabin/samples-condensed.pdf
++++++ cabin.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/cabin/cabin.sty new/tex/latex/cabin/cabin.sty
--- old/tex/latex/cabin/cabin.sty 2012-11-26 00:21:05.000000000 +0100
+++ new/tex/latex/cabin/cabin.sty 2013-07-23 00:05:12.000000000 +0200
@@ -1,6 +1,6 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{cabin}
- [2012/11/13 (Bob Tennent) Supports Cabin fonts for all LaTeX engines.]
+ [2013/07/20 (Bob Tennent) Supports Cabin fonts for all LaTeX engines.]
\RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
@@ -37,35 +37,23 @@
\ProcessOptionsX\relax
\ifcabin@otf
- \ifcabin@semibold
- \edef\cabin@boldstyle{SemiBold}
- \else
- \edef\cabin@boldstyle{Bold}
- \fi
- \ifcabin@medium
- \edef\cabin@regstyle{Medium}
- \else
- \edef\cabin@regstyle{Regular}
- \fi
+ \def\cabin@boldstyle{Bold}
+ \ifcabin@semibold\def\cabin@boldstyle{SemiBold}\fi
+ \def\cabin@regstyle{Regular}
+ \ifcabin@medium\def\cabin@regstyle{Medium}\fi
\else % type1
- \ifcabin@semibold
- \renewcommand*{\bfdefault}{sb}
- \else
- \renewcommand*{\bfdefault}{b}
- \fi
- \ifcabin@medium
- \renewcommand*{\mddefault}{mb}
- \else
- \renewcommand*{\mddefault}{m}
- \fi
+ \def\bfseries@sf{b}
+ \ifcabin@semibold\def\bfseries@sf{sb}\fi
+ \def\mdseries@sf{m}
+ \ifcabin@medium\def\mdseries@sf{mb}\fi
\fi
\ifcabin@otf
\RequirePackage{fontspec}
\else
- \RequirePackage{fontenc,fontaxes}
+ \RequirePackage{fontenc,fontaxes,mweights}
\fi
\ifcabin@otf
@@ -107,19 +95,15 @@
\else % type1
\def\cabinfamily{Cabin-TLF}
\def\cabincondensedfamily{CabinCondensed-TLF}
- \ifcabin@condensed
- \renewcommand*\sfdefault{\cabincondensedfamily}
- \ifcabin@default\renewcommand*\familydefault{\cabincondensedfamily}\fi
- \else
- \renewcommand*\sfdefault{\cabinfamily}
- \ifcabin@default\renewcommand*\familydefault{\cabinfamily}\fi
- \fi
\newcommand*\cabin{\fontfamily{\cabinfamily}\selectfont}
\newcommand*\cabincondensed{\fontfamily{\cabincondensedfamily}\selectfont}
+ \def\sfdefault{\cabinfamily}
+ \ifcabin@condensed\def\sfdefault{\cabincondensedfamily}\fi
+ \ifcabin@default\edef\familydefault{\sfdefault}\edef\seriesdefault{\mdseries@sf}\fi
\fi
+\ifcabin@otf
% turn off defaults in case other fonts are selected:
-\ifcabin@otf
\defaultfontfeatures{}
\fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cabin.tlpobj new/tlpkg/tlpobj/cabin.tlpobj
--- old/tlpkg/tlpobj/cabin.tlpobj 2013-01-26 04:32:35.000000000 +0100
+++ new/tlpkg/tlpobj/cabin.tlpobj 2013-07-23 03:19:35.000000000 +0200
@@ -1,6 +1,6 @@
name cabin
category Package
-revision 28942
+revision 31265
shortdesc A humanist Sans Serif font, with LaTeX support.
relocated 1
longdesc Cabin is a humanist sans with four weights and true italics and
@@ -8,10 +8,11 @@
longdesc Cabin was inspired by Edward Johnston's and Eric Gill's
longdesc typefaces, with a touch of modernism. Cabin incorporates modern
longdesc proportions, optical adjustments, and some elements of the
-longdesc geometric sans. cabin.sty supports LaTeX, pdfLaTeX, xeLaTeX and
-longdesc luaLaTeX. An sfdefault option is provided to enable Cabin as
-longdesc the default text font. The fontaxes package is required for use
-longdesc with [pdf]LaTeX.
+longdesc geometric sans. cabin.sty supports use of the font under LaTeX,
+longdesc pdfLaTeX, xeLaTeX and luaLaTeX; it uses the mweights, to manage
+longdesc the user's view of all those font weights. An sfdefault option
+longdesc is provided to enable Cabin as the default text font. The
+longdesc fontaxes package is required for use with [pdf]LaTeX.
execute addMap cabin.map
runfiles size=1480
RELOC/fonts/enc/dvips/cabin/cbn_6vzwvh.enc
@@ -377,5 +378,5 @@
RELOC/tex/latex/cabin/TS1CabinCondensed-TLF.fd
RELOC/tex/latex/cabin/cabin.sty
catalogue-ctan /fonts/cabin
-catalogue-date 2013-01-25 11:29:15 +0100
+catalogue-date 2013-07-22 16:10:46 +0200
catalogue-license ofl
++++++ calculator.doc.tar.xz ++++++
++++ 1633 lines of diff (skipped)
++++++ calculator.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/calculator/calculator.sty new/tex/latex/calculator/calculator.sty
--- old/tex/latex/calculator/calculator.sty 2012-07-23 19:28:43.000000000 +0200
+++ new/tex/latex/calculator/calculator.sty 2014-02-24 23:58:28.000000000 +0100
@@ -5,21 +5,27 @@
%% The original source files were:
%%
%% calculator.dtx (with options: `calculator')
-%% ------------------------------------------------------------------
-%% The calculator and calculus packages
-%% Copyright (C) 2012 by Robert Fuster
-%% All rights reserved
+%% This is a generated file.
%%
-%% This file may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
-%% of this license or (at your option) any later version.
-%% The latest version of this license is in:
+%% This work may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License, either version 1.3 of this license
+%% or (at your option) any later version. The latest version of this
+%% license is in:
%%
-%% http://www.latex-project.org/lppl.txt
+%% http://www.latex-project.org/lppl.txt
%%
%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 1999/12/01 or later.
-%% ------------------------------------------------------------------
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Robert Fuster
+%%
+%% This work consists of the files calculator.dtx and calculator.ins
+%% and the derived files calculator.sty, calculus.ins, and several
+%% calculator<nn>.tex derived files.
+%%
+%%
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -39,8 +45,9 @@
+
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{calculator}[2012/06/10 v.1.0a]
+\ProvidesPackage{calculator}[2014/02/20 v.2.0]
\newdimen\cctr@lengtha
\newdimen\cctr@lengthb
\newdimen\cctr@epsilon
@@ -67,6 +74,37 @@
must be an integer\MessageBreak
I can't define #1^#2}}
+\def\cctr@Warnbigarcsin#1{%
+ \PackageWarning{calculator}%
+ {The argument in arcsin\MessageBreak
+ must be a number between -1 and 1\MessageBreak
+ I can't define arcsin(#1)}}
+
+\def\cctr@Warnbigarccos#1{%
+ \PackageWarning{calculator}%
+ {The argument in arccos\MessageBreak
+ must be a number between -1 and 1\MessageBreak
+ I can't define arccos(#1)}}
+
+\def\cctr@Warnsmallarcosh#1{%
+ \PackageWarning{calculator}%
+ {The argument in arcosh\MessageBreak
+ must be a number greater or equal than 1\MessageBreak
+ I can't define arcosh(#1)}}
+
+\def\cctr@Warnbigartanh#1{%
+ \PackageWarning{calculator}%
+ {The argument in artanh\MessageBreak
+ must be a number between -1 and 1\MessageBreak
+ I can't define artanh(#1)}}
+
+\def\cctr@Warnsmallarcoth#1{%
+ \PackageWarning{calculator}%
+ {The argument in arcoth\MessageBreak
+ must be a number greater than 1\MessageBreak
+ or smaller than -1\MessageBreak
+ I can't define arcoth(#1)}}
+
\def\cctr@Warnsingmatrix#1#2#3#4{%
\PackageWarning{calculator}%
{Matrix (#1 #2 ; #3 #4) is singular\MessageBreak
@@ -77,18 +115,18 @@
{Matrix (#1 #2 #3; #4 #5 #6; #7 #8 #9) is singular\MessageBreak
Its inverse is not defined}}
-\def\cctr@WarnIncLinSys{\PackageWarning{xpicture}{%
+\def\cctr@WarnIncLinSys{\PackageWarning{calculator}{%
Incompatible linear system}}
-\def\cctr@WarnIncTDLinSys{\PackageWarning{xpicture}{%
+\def\cctr@WarnIncTDLinSys{\PackageWarning{calculator}{%
Incompatible or indeterminate linear system\MessageBreak
For 3x3 systems I can solve only determinate systems}}
-\def\cctr@WarnIndLinSys{\PackageWarning{xpicture}{%
+\def\cctr@WarnIndLinSys{\PackageWarning{calculator}{%
Indeterminate linear system.\MessageBreak
I will choose one of the infinite solutions}}
-\def\cctr@WarnZeroLinSys{\PackageWarning{xpicture}{%
+\def\cctr@WarnZeroLinSys{\PackageWarning{calculator}{%
0x=0 linear system. Every vector is a solution!\MessageBreak
I will choose the (0,0) solution}}
@@ -124,6 +162,18 @@
The value of the variable\MessageBreak
in the logarithm function must be positive\MessageBreak
I can't define log(#1)}}
+
+\def\cctr@Warncrossprod(#1)(#2){%
+ \PackageWarning{calculator}%
+ {Vector product only defined\MessageBreak
+ for 3 dimmensional vectors.\MessageBreak
+ I can't define (#1)x(#2)}}
+
+\def\cctr@Warnnoangle(#1)(#2){%
+ \PackageWarning{calculator}%
+ {Angle between two vectors only defined\MessageBreak
+ for nonzero vectors.\MessageBreak
+ I can't define an angle between (#1) and (#2)}}
\def\COPY#1#2{\edef#2{#1}\ignorespaces}
\def\GLOBALCOPY#1#2{\xdef#2{#1}\ignorespaces}
\def\@OUTPUTSOL#1{\GLOBALCOPY{#1}{\cctr@outa}\endgroup\COPY{\cctr@outa}{#1}}
@@ -185,6 +235,12 @@
\divide\cctr@lengtha\cctr@lengthb
\COPY{\number\cctr@lengtha}{#3}
\fi\ignorespaces}
+\def\LENGTHADD#1#2#3{\cctr@lengtha=#1
+ \cctr@lengthb=#2
+ \advance\cctr@lengtha by \cctr@lengthb
+ \setlength{#3}{\cctr@lengtha}\ignorespaces}
+\def\LENGTHSUBTRACT#1#2#3{%
+ \LENGTHADD{#1}{-#2}{#3}}
\def\LENGTHDIVIDE#1#2#3{%
\begingroup
\cctr@lengtha=#1
@@ -692,8 +748,7 @@
\def\@BASICLOG#1#2{\begingroup
\SUBTRACT{#1}{1}{\cctr@tempw}
\cctr@lengthb=5\p@%
- \cctr@lengtha=\cctr@epsilon%
- \@whilenum \cctr@lengthb>\cctr@lengtha \do {%
+ \@whilenum \cctr@lengthb>\cctr@epsilon \do {%
\COPY{\cctr@tempw}{\cctr@tempoldw}
\EXP{\cctr@tempw}{\cctr@tempxw}
\DIVIDE{#1}{\cctr@tempxw}{\cctr@tempxw}
@@ -705,6 +760,196 @@
\cctr@lengthb<\z@ \cctr@lengthb=-\cctr@lengthb
\fi}%
\COPY{\cctr@tempw}{#2}\@OUTPUTSOL{#2}}
+\def\ARCSIN#1#2{%
+ \begingroup
+ \ifdim #1\p@ = \z@
+ \COPY{0}{#2}
+ \else
+ \ifdim #1\p@ = 1\p@
+ \COPY{\numberHALFPI}{#2}
+ \else
+ \ifdim #1\p@ = -1\p@
+ \COPY{-\numberHALFPI}{#2}
+ \else
+ \ifdim #1\p@ > 1\p@
+ \let#2\undefined
+ \cctr@Warnbigarcsin{#1}
+ \else
+ \ifdim #1\p@ < -1\p@
+ \let#2\undefined
+ \cctr@Warnbigarcsin{#1}
+ \else
+ \ifdim #1\p@ >0.89\p@
+ \SUBTRACT{1}{#1}{\cctr@tempx}
+ \DIVIDE{\cctr@tempx}{2}{\cctr@tempx}
+ \SQRT{\cctr@tempx}{\cctr@tempxx}
+ \ARCSIN{\cctr@tempxx}{#2}
+ \MULTIPLY{2}{#2}{#2}
+ \SUBTRACT{\numberHALFPI}{#2}{#2}
+ \else
+ \ifdim #1\p@ <-0.89\p@
+ \ADD{1}{#1}{\cctr@tempx}
+ \DIVIDE{\cctr@tempx}{2}{\cctr@tempx}
+ \SQRT{\cctr@tempx}{\cctr@tempxx}
+ \ARCSIN{\cctr@tempxx}{#2}
+ \MULTIPLY{2}{#2}{#2}
+ \SUBTRACT{#2}{\numberHALFPI}{#2}
+ \else
+ \COPY{#1}{#2}
+ \ABSVALUE{#1}{\cctr@tempy}
+ \ifdim \cctr@tempy\p@ < 0.04\p@
+ \else
+ \cctr@lengthb=5\p@
+ \COPY{16383}{\cctr@tempy}
+ \@whilenum \cctr@lengthb>\cctr@epsilon \do {%
+ \COPY{#2}{\cctr@tempw}
+ \COPY{\cctr@tempy}{\cctr@tempoldy}
+ \SIN{\cctr@tempw}{\cctr@tempz}
+ \SUBTRACT{\cctr@tempz}{#1}{\cctr@tempz}
+ \COS{\cctr@tempw}{\cctr@tempy}
+ \DIVIDE{\cctr@tempz}{\cctr@tempy}{\cctr@tempz}
+ \SUBTRACT{\cctr@tempw}{\cctr@tempz}{\cctr@tempz}
+ \COPY{\cctr@tempz}{#2}
+ \SUBTRACT{#2}{\cctr@tempw}{\cctr@tempy}
+ \ABSVALUE{\cctr@tempy}{\cctr@tempy}
+ \cctr@lengthb=\cctr@tempy\p@%
+ \ifdim\cctr@tempy\p@=\cctr@tempoldy\p@
+ \cctr@lengthb=\z@
+ \fi}\fi\fi\fi\fi\fi\fi\fi\fi\@OUTPUTSOL{#2}}
+\def\ARCCOS#1#2{%
+ \begingroup
+ \ifdim #1\p@ = \z@
+ \COPY{\numberHALFPI}{#2}
+ \else
+ \ifdim #1\p@ = 1\p@
+ \COPY{0}{#2}
+ \else
+ \ifdim #1\p@ = -1\p@
+ \COPY{\numberPI}{#2}
+ \else
+ \ifdim #1\p@ > 1\p@
+ \let#2\undefined
+ \cctr@Warnbigarccos{#1}
+ \else
+ \ifdim #1\p@ < -1\p@
+ \let#2\undefined
+ \cctr@Warnbigarccos{#1}
+ \else
+ \ARCSIN{#1}{#2}
+ \SUBTRACT{\numberHALFPI}{#2}{#2}
+ \fi\fi\fi\fi\fi\@OUTPUTSOL{#2}}
+\def\ARCTAN#1#2{%
+ \begingroup
+ \ifdim#1\p@<-1\p@
+ \DIVIDE{1}{#1}{\cctr@tempb}
+ \ARCTAN{\cctr@tempb}{#2}
+ \SUBTRACT{-\numberHALFPI}{#2}{#2}
+ \else
+ \ifdim#1\p@>1\p@
+ \DIVIDE{1}{#1}{\cctr@tempb}
+ \ARCTAN{\cctr@tempb}{#2}
+ \SUBTRACT{\numberHALFPI}{#2}{#2}
+ \else
+ \@BASICARCTAN{#1}{#2}
+ \fi
+ \fi\@OUTPUTSOL{#2}}
+\def\@BASICARCTAN#1#2{%
+ \begingroup
+ \ifdim#1\p@=\z@ \COPY{0}{#2}
+ \else
+ \SQUARE{#1}{\cctr@tempa}
+ \MULTIPLY{64}{\cctr@tempa}{#2}
+ \ADD{15}{#2}{#2}
+ \DIVIDE{\cctr@tempa}{#2}{#2}
+ \MULTIPLY{49}{#2}{#2}
+ \ADD{13}{#2}{#2}
+ \DIVIDE{\cctr@tempa}{#2}{#2}
+ \MULTIPLY{36}{#2}{#2}
+ \ADD{11}{#2}{#2}
+ \DIVIDE{\cctr@tempa}{#2}{#2}
+ \MULTIPLY{25}{#2}{#2}
+ \ADD{9}{#2}{#2}
+ \DIVIDE{\cctr@tempa}{#2}{#2}
+ \MULTIPLY{16}{#2}{#2}
+ \ADD{7}{#2}{#2}
+ \DIVIDE{\cctr@tempa}{#2}{#2}
+ \MULTIPLY{9}{#2}{#2}
+ \ADD{5}{#2}{#2}
+ \DIVIDE{\cctr@tempa}{#2}{#2}
+ \MULTIPLY{4}{#2}{#2}
+ \ADD{3}{#2}{#2}
+ \DIVIDE{\cctr@tempa}{#2}{#2}
+ \ADD{1}{#2}{#2}
+ \DIVIDE{#1}{#2}{#2}
+ \fi\@OUTPUTSOL{#2}}
+\def\ARCCOT#1#2{%
+ \begingroup
+ \ARCTAN{#1}{#2}
+ \SUBTRACT{\numberHALFPI}{#2}{#2}
+ \@OUTPUTSOL{#2}}
+\def\ARSINH#1#2{%
+ \begingroup
+ \SQUARE{#1}{\cctr@tempa}
+ \ADD{1}{\cctr@tempa}{\cctr@tempa}
+ \SQRT{\cctr@tempa}{\cctr@tempb}
+ \ADD{#1}{\cctr@tempb}{\cctr@tempb}
+ \LOG\cctr@tempb{#2}
+ \@OUTPUTSOL{#2}}
+
+\def\ARCOSH#1#2{%
+ \begingroup
+ \ifdim#1\p@<1\p@
+ \let#2\undefined
+ \cctr@Warnsmallarcosh{#1}
+ \else
+ \SQUARE{#1}{\cctr@tempa}
+ \SUBTRACT{\cctr@tempa}{1}{\cctr@tempa}
+ \SQRT{\cctr@tempa}{\cctr@tempb}
+ \ADD{#1}{\cctr@tempb}{\cctr@tempb}
+ \LOG\cctr@tempb{#2}
+ \fi\@OUTPUTSOL{#2}}
+\def\ARTANH#1#2{%
+ \begingroup
+ \ifdim#1\p@<-0.99998\p@
+ \let#2\undefined
+ \cctr@Warnbigartanh{#1}
+ \else
+ \ifdim#1\p@>0.99998\p@
+ \let#2\undefined
+ \cctr@Warnbigartanh{#1}
+ \else
+ \COPY{#1}{\cctr@tempa}
+ \ADD1\cctr@tempa\cctr@tempb
+ \SUBTRACT1\cctr@tempa\cctr@tempc
+ \LOG\cctr@tempb\cctr@tempB
+ \LOG\cctr@tempc\cctr@tempC
+ \SUBTRACT\cctr@tempB\cctr@tempC{#2}
+ \DIVIDE{#2}{2}{#2}
+ \fi
+ \fi\@OUTPUTSOL{#2}}
+\def\ARCOTH#1#2{%
+ \begingroup
+ \ifdim#1\p@>-0.99998\p@
+ \ifdim#1\p@<0.99998\p@
+ \let#2\undefined
+ \cctr@Warnsmallarcoth{#1}
+ \else
+ \ifdim#1\p@>\p@
+ \COPY{#1}{\cctr@tempa}
+ \ADD1\cctr@tempa\cctr@tempb
+ \SUBTRACT\cctr@tempa1\cctr@tempc
+ \LOG\cctr@tempb\cctr@tempB
+ \LOG\cctr@tempc\cctr@tempC
+ \SUBTRACT\cctr@tempB\cctr@tempC{#2}
+ \DIVIDE{#2}{2}{#2}
+ \else
+ \fi
+ \fi
+ \else
+ \MULTIPLY{-1}{#1}{\cctr@tempa}
+ \ARCOTH{\cctr@tempa}{#2}
+ \COPY{-#2}{#2}
+ \fi\@OUTPUTSOL{#2}}
\def\VECTORSIZE(#1)#2{\expandafter\@VECTORSIZE(#1,,){#2}}
\def\@VECTORSIZE(#1,#2,#3,#4)#5{\ifx$#3$\COPY{2}{#5}
\else\COPY{3}{#5}\fi\ignorespaces}
@@ -760,6 +1005,28 @@
\ifnum\cctr@size=2
\@@SCALARPRODUCT(#1)(#2){#3}
\else \@@@SCALARPRODUCT(#1)(#2){#3}\fi\@OUTPUTSOL{#3}}
+
+\let\DOTPRODUCT\SCALARPRODUCT
+
+\def\@@VECTORPRODUCT(#1)(#2)(#3,#4){%
+ \let#3\undefined
+ \let#4\undefined
+ \cctr@Warncrossprod(#1)(#2)}
+
+\def\@@@VECTORPRODUCT(#1,#2,#3)(#4,#5,#6)(#7,#8,#9){%
+ \DETERMINANT(#2,#3;#5,#6){#7}
+ \DETERMINANT(#3,#1;#6,#4){#8}
+ \DETERMINANT(#1,#2;#4,#5){#9}}
+
+\def\VECTORPRODUCT(#1)(#2)(#3){%
+ \begingroup
+ \VECTORSIZE(#1){\cctr@size}
+ \ifnum\cctr@size=2
+ \@@VECTORPRODUCT(#1)(#2)(#3)
+ \else \@@@VECTORPRODUCT(#1)(#2)(#3)\fi\@OUTPUTSOL{#3}}
+
+\let\CROSSPRODUCT\VECTORPRODUCT
+
\def\@@VECTORADD(#1,#2)(#3,#4)(#5,#6){%
\ADD{#1}{#3}{#5}
\ADD{#2}{#4}{#6}}
@@ -819,6 +1086,23 @@
\VECTORNORM(#1){\cctr@tempa}
\DIVIDE{1}{\cctr@tempa}{\cctr@tempa}
\SCALARVECTORPRODUCT{\cctr@tempa}(#1)(#2)\@OUTPUTVECTOR(#2)}
+\def\TWOVECTORSANGLE(#1)(#2)#3{%
+ \begingroup
+ \VECTORNORM(#1){\cctr@tempa}
+ \VECTORNORM(#2){\cctr@tempb}
+ \SCALARPRODUCT(#1)(#2){\cctr@tempc}
+ \ifdim \cctr@tempa\p@ =\z@
+ \let#3\undefined
+ \cctr@Warnnoangle(#1)(#2)
+ \else
+ \ifdim \cctr@tempb\p@ =\z@
+ \let#3\undefined
+ \cctr@Warnnoangle(#1)(#2)
+ \else
+ \DIVIDE{\cctr@tempc}{\cctr@tempa}{\cctr@tempc}
+ \DIVIDE{\cctr@tempc}{\cctr@tempb}{\cctr@tempc}
+ \ARCCOS{\cctr@tempc}{#3}
+ \fi\fi\@OUTPUTSOL{#3}}
\def\@TDMATRIXCOPY(#1,#2,#3;#4,#5,#6;#7,#8,#9){%
\COPY{#1}{\cctr@solAA}
\COPY{#2}{\cctr@solAB}
@@ -1207,6 +1491,6 @@
\def\numberSQRTFIVE{2.23607}
\def\numberCOSXLV{0.70711}
\def\numberCOSXXX{0.86603}
-%%
+\endinput
%%
%% End of file `calculator.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/calculator/calculus.sty new/tex/latex/calculator/calculus.sty
--- old/tex/latex/calculator/calculus.sty 2012-07-23 19:28:43.000000000 +0200
+++ new/tex/latex/calculator/calculus.sty 2014-02-24 23:58:28.000000000 +0100
@@ -5,21 +5,27 @@
%% The original source files were:
%%
%% calculator.dtx (with options: `calculus')
-%% ------------------------------------------------------------------
-%% The calculator and calculus packages
-%% Copyright (C) 2012 by Robert Fuster
-%% All rights reserved
+%% This is a generated file.
%%
-%% This file may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
-%% of this license or (at your option) any later version.
-%% The latest version of this license is in:
+%% This work may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License, either version 1.3 of this license
+%% or (at your option) any later version. The latest version of this
+%% license is in:
%%
-%% http://www.latex-project.org/lppl.txt
+%% http://www.latex-project.org/lppl.txt
%%
%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 1999/12/01 or later.
-%% ------------------------------------------------------------------
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Robert Fuster
+%%
+%% This work consists of the files calculator.dtx and calculator.ins
+%% and the derived files calculator.sty, calculus.ins, and several
+%% calculator<nn>.tex derived files.
+%%
+%%
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -39,9 +45,9 @@
+
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{calculus}
- [2012/06/10 v.1.0a]
+\ProvidesPackage{calculus}[2014/02/20 v.2.0]
\RequirePackage{calculator}
\def\ccls@ErrorFuncDef#1{%
\PackageError{calculus}%
@@ -320,6 +326,50 @@
\newfunction{\HEAVISIDEfunction}{%
\ifdim \t\p@<\z@ \COPY{0}{\y}\else\COPY{1}{\y}\fi
\COPY{0}{\Dy}}
+\newfunction{\ARCSINfunction}{%
+ \ARCSIN{\t}{\y}
+ \SQUARE{\t}{\yy}
+ \SUBTRACT{1}{\yy}{\yy}
+ \SQRT{\yy}{\Dy}
+ \DIVIDE{1}{\Dy}{\Dy}}
+\newfunction{\ARCCOSfunction}{%
+ \ARCCOS{\t}{\y}
+ \SQUARE{\t}{\yy}
+ \SUBTRACT{1}{\yy}{\yy}
+ \SQRT{\yy}{\Dy}
+ \DIVIDE{-1}{\Dy}{\Dy}}
+\newfunction{\ARCTANfunction}{%
+ \ARCTAN{\t}{\y}
+ \SQUARE{\t}{\yy}
+ \ADD{1}{\yy}{\yy}
+ \DIVIDE{1}{\yy}{\Dy}}
+\newfunction{\ARCCOTfunction}{%
+ \ARCCOT{\t}{\y}
+ \SQUARE{\t}{\yy}
+ \ADD{1}{\yy}{\yy}
+ \DIVIDE{-1}{\yy}{\Dy}}
+\newfunction{\ARSINHfunction}{%
+ \ARSINH{\t}{\y}
+ \SQUARE{\t}{\yy}
+ \ADD{1}{\yy}{\yy}
+ \SQRT{\yy}{\Dy}
+ \DIVIDE{1}{\Dy}{\Dy}}
+\newfunction{\ARCOSHfunction}{%
+ \ARCOSH{\t}{\y}
+ \SQUARE{\t}{\yy}
+ \SUBTRACT{\yy}{1}{\yy}
+ \SQRT{\yy}{\Dy}
+ \DIVIDE{1}{\Dy}{\Dy}}
+\newfunction{\ARTANHfunction}{%
+ \ARTANH{\t}{\y}
+ \SQUARE{\t}{\yy}
+ \SUBTRACT{1}{\yy}{\yy}
+ \DIVIDE{1}{\yy}{\Dy}}
+\newfunction{\ARCOTHfunction}{%
+ \ARCOTH{\t}{\y}
+ \SQUARE{\t}{\yy}
+ \SUBTRACT{1}{\yy}{\yy}
+ \DIVIDE{1}{\yy}{\Dy}}
\def\CONSTANTfunction#1#2{%
\def#2##1##2##3{%
\xdef##2{#1}%
@@ -433,6 +483,6 @@
#1{##1}{##2}{##3}
#2{##1}{##4}{##5}}}
\let\VECTORfunction\PARAMETRICfunction
-%%
+\endinput
%%
%% End of file `calculus.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/calculator.tlpobj new/tlpkg/tlpobj/calculator.tlpobj
--- old/tlpkg/tlpobj/calculator.tlpobj 2012-07-24 04:33:45.000000000 +0200
+++ new/tlpkg/tlpobj/calculator.tlpobj 2014-02-25 03:20:37.000000000 +0100
@@ -1,6 +1,6 @@
name calculator
category Package
-revision 27112
+revision 33041
shortdesc Use LaTeX as a scientific calculator.
relocated 1
longdesc The calculator and calculus packages define several
@@ -10,10 +10,10 @@
longdesc and functional calculations need in the author's package
longdesc xpicture, but the numeric abilities of "calculator" and
longdesc "calculus" may be useful in other contexts.
-runfiles size=15
+runfiles size=19
RELOC/tex/latex/calculator/calculator.sty
RELOC/tex/latex/calculator/calculus.sty
catalogue-ctan /macros/latex/contrib/calculator
-catalogue-date 2012-07-03 11:28:15 +0200
+catalogue-date 2014-02-24 19:14:14 +0100
catalogue-license lppl1.2
-catalogue-version 1.0a
+catalogue-version 2.0
++++++ calxxxx-yyyy.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/calxxxx-yyyy/README new/doc/latex/calxxxx-yyyy/README
--- old/doc/latex/calxxxx-yyyy/README 2013-01-01 00:16:19.000000000 +0100
+++ new/doc/latex/calxxxx-yyyy/README 2014-01-01 00:16:52.000000000 +0100
@@ -1,4 +1,4 @@
-README for calxxxx-yyyy, 2013/01/01, v1.0e
+README for calxxxx-yyyy, 2014/01/01, v1.0f
TABLE OF CONTENTS
@@ -17,8 +17,8 @@
==============
To print a calendar for some given years, use the \textsf{calxxxx-yyyy.tex}
-file. LaTeXe it, type in the year to start with (for example 2013), the
-year to end with (for example 2030), and the calendars for those years are
+file. LaTeXe it, type in the year to start with (for example 2014), the
+year to end with (for example 2031), and the calendars for those years are
produced.
It is possible to print the calendars in different languages.
@@ -45,8 +45,8 @@
Also a ZIP file is provided that contains the files:
the manual (README.tex, README.pdf), the compiled examples
-(cal2013-2030_DE.pdf, cal2013-2030_DK.pdf, and
-cal2013-2030_EN.pdf), and this README, already
+(cal2014-2031_DE.pdf, cal2014-2031_DK.pdf, and
+cal2014-2031_EN.pdf), and this README, already
sorted in a TDS tree:
CTAN:install/macros/latex/contrib/calxxxx-yyyy.tds.zip
@@ -92,8 +92,8 @@
d) Copy the documentation files to
"TDS:doc/latex/calxxxx-yyyy/":
README, README.tex, README.pdf
- (and e.g. cal2013-2030_DE.pdf, cal2013-2030_DK.pdf,
- and cal2013-2030_EN.pdf).
+ (and e.g. cal2014-2031_DE.pdf, cal2014-2031_DK.pdf,
+ and cal2014-2031_EN.pdf).
e) Update the databases if necessary, e.g. for teTeX:
mktexlsr .../texmf
Files old/doc/latex/calxxxx-yyyy/README.pdf and new/doc/latex/calxxxx-yyyy/README.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/calxxxx-yyyy/README.tex new/doc/latex/calxxxx-yyyy/README.tex
--- old/doc/latex/calxxxx-yyyy/README.tex 2013-01-01 00:16:19.000000000 +0100
+++ new/doc/latex/calxxxx-yyyy/README.tex 2014-01-01 00:16:52.000000000 +0100
@@ -17,9 +17,9 @@
\begin{document}
\section*{\texttt{ReadMe} for cal$xxxx-yyyy$.tex file}
-Version: v1.0e
+Version: v1.0f
-\noindent Date: 2013/01/01\newline
+\noindent Date: 2014/01/01\newline
This file explains the use of the \textsf{calxxxx-yyyy.tex} file,
available at\newline
@@ -31,7 +31,7 @@
\hspace*{-1.98471pt}To print a calendar for some given years,
use the \textsf{calxxxx-yyyy.tex} file. \LaTeXe{} it, type in the year to start with
-(for example 2013), the year to end with (for example 2030), and the calendars
+(for example 2014), the year to end with (for example 2031), and the calendars
for those years are produced.
It is possible to print the calendars in different languages. Currently
@@ -47,10 +47,10 @@
Public License, either version 1.3c of this license or (at your option) any
later version. This version of this license is in
-http://www.latex-project.org/lppl/lppl-1-3c.txt\newline
+\url{http://www.latex-project.org/lppl/lppl-1-3c.txt}\newline
and the latest version of this license is in
-http://www.latex-project.org/lppl.txt\newline
+\url{http://www.latex-project.org/lppl.txt}\newline
and version 1.3c or later is part of all distributions of \LaTeX{} version
2005/12/01 or later.
@@ -66,6 +66,6 @@
- \url{ftp://ftp.ctan.org/tex-archive/macros/latex/contrib/kalender/}\newline
\noindent A list of my (H.-Martin M\"{u}nch) packages can be found at\newline
-\url{http://www.Uni-Bonn.de/~uzs5pv/LaTeX.html}.
+\url{http://www.ctan.org/author/muench-hm}.
\end{document}
\ No newline at end of file
Files old/doc/latex/calxxxx-yyyy/cal2013-2030_DE.pdf and new/doc/latex/calxxxx-yyyy/cal2013-2030_DE.pdf differ
Files old/doc/latex/calxxxx-yyyy/cal2013-2030_DK.pdf and new/doc/latex/calxxxx-yyyy/cal2013-2030_DK.pdf differ
Files old/doc/latex/calxxxx-yyyy/cal2013-2030_EN.pdf and new/doc/latex/calxxxx-yyyy/cal2013-2030_EN.pdf differ
Files old/doc/latex/calxxxx-yyyy/cal2014-2031_DE.pdf and new/doc/latex/calxxxx-yyyy/cal2014-2031_DE.pdf differ
Files old/doc/latex/calxxxx-yyyy/cal2014-2031_DK.pdf and new/doc/latex/calxxxx-yyyy/cal2014-2031_DK.pdf differ
Files old/doc/latex/calxxxx-yyyy/cal2014-2031_EN.pdf and new/doc/latex/calxxxx-yyyy/cal2014-2031_EN.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/calxxxx-yyyy.doc.tlpobj new/tlpkg/tlpobj/calxxxx-yyyy.doc.tlpobj
--- old/tlpkg/tlpobj/calxxxx-yyyy.doc.tlpobj 2013-01-01 04:31:25.000000000 +0100
+++ new/tlpkg/tlpobj/calxxxx-yyyy.doc.tlpobj 2014-01-01 04:40:23.000000000 +0100
@@ -1,12 +1,12 @@
name calxxxx-yyyy.doc
category Package
-revision 28675
+revision 32526
shortdesc doc files of calxxxx-yyyy
relocated 1
docfiles size=107
RELOC/doc/latex/calxxxx-yyyy/README
RELOC/doc/latex/calxxxx-yyyy/README.pdf
RELOC/doc/latex/calxxxx-yyyy/README.tex
- RELOC/doc/latex/calxxxx-yyyy/cal2013-2030_DE.pdf
- RELOC/doc/latex/calxxxx-yyyy/cal2013-2030_DK.pdf
- RELOC/doc/latex/calxxxx-yyyy/cal2013-2030_EN.pdf
+ RELOC/doc/latex/calxxxx-yyyy/cal2014-2031_DE.pdf
+ RELOC/doc/latex/calxxxx-yyyy/cal2014-2031_DK.pdf
+ RELOC/doc/latex/calxxxx-yyyy/cal2014-2031_EN.pdf
++++++ calxxxx-yyyy.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/calxxxx-yyyy/calxxxx-yyyy.tex new/tex/latex/calxxxx-yyyy/calxxxx-yyyy.tex
--- old/tex/latex/calxxxx-yyyy/calxxxx-yyyy.tex 2013-01-01 00:16:19.000000000 +0100
+++ new/tex/latex/calxxxx-yyyy/calxxxx-yyyy.tex 2014-01-01 00:16:52.000000000 +0100
@@ -1,9 +1,9 @@
% calxxx-yyyy.tex
% file version: v1.0e
-% file date: 2013/01/01
-% documentation date: 2013/01/01
+% file date: 2014/01/01
+% documentation date: 2014/01/01
%
-% Copyright (C) 2010 - 2013 H.-Martin M\"{u}nch (Martin dot Muench at Uni-Bonn dot de)
+% Copyright (C) 2010 - 2014 H.-Martin M\"{u}nch (Martin dot Muench at Uni-Bonn dot de)
% Portions of code copyrighted by Slobodan Jankovi\'{c}.
% This file was invented in 1999 by Slobodan Jankovi\'{c}.
% I was not able to reach him at slobodan@archimed.filfak.ni.ac.yu
@@ -37,8 +37,8 @@
%
% This work consists of the main source files calxxxx-yyyy.tex and README.tex
% and the derived files
-% README.pdf, cal2013-2030_DE.pdf, cal2013-2030_DK.pdf,
-% and cal2013-2030_EN.pdf
+% README.pdf, cal2014-2031_DE.pdf, cal2014-2031_DK.pdf,
+% and cal2014-2031_EN.pdf
% and the README.txt.
\documentclass[12pt,a4paper,danish,german,english]{report}
@@ -337,7 +337,7 @@
\message{^^J}\message{^^J}%
\newline%
\tiny{\indent Original calxxxx.\TeX \ \copyright \ 1999/12/19 Slobodan Jankovi\'{c};\ %
-these calendars produced with calxxxx-yyyy 2013/01/01 v1.0e by \texttt{Martin.Muench@Uni-Bonn.de};\ %
+these calendars produced with calxxxx-yyyy 2014/01/01 v1.0f by \texttt{Martin.Muench@Uni-Bonn.de};\ %
\iflanguage{english}{English by Slobodan Jankovi\'{c}.}{%
\iflanguage{german}{Deutsch von H.-Martin M\"{u}nch.}{%
\iflanguage{danish}{Dansk af Michael Lodahl.}{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/calxxxx-yyyy.tlpobj new/tlpkg/tlpobj/calxxxx-yyyy.tlpobj
--- old/tlpkg/tlpobj/calxxxx-yyyy.tlpobj 2013-01-01 04:31:25.000000000 +0100
+++ new/tlpkg/tlpobj/calxxxx-yyyy.tlpobj 2014-01-01 04:40:23.000000000 +0100
@@ -1,6 +1,6 @@
name calxxxx-yyyy
category Package
-revision 28675
+revision 32526
shortdesc Print a calendar for a group of years.
relocated 1
longdesc The package prints a calendar for 2 or more years, according to
@@ -11,6 +11,6 @@
runfiles size=4
RELOC/tex/latex/calxxxx-yyyy/calxxxx-yyyy.tex
catalogue-ctan /macros/latex/contrib/calxxxx-yyyy
-catalogue-date 2012-12-31 22:53:16 +0100
+catalogue-date 2013-12-31 16:27:42 +0100
catalogue-license lppl1.3
-catalogue-version 1.0e
+catalogue-version 1.0f
++++++ cancel.doc.tar.xz ++++++
Files old/doc/latex/cancel/cancel.pdf and new/doc/latex/cancel/cancel.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cancel/cancel.tex new/doc/latex/cancel/cancel.tex
--- old/doc/latex/cancel/cancel.tex 2010-02-22 00:20:18.000000000 +0100
+++ new/doc/latex/cancel/cancel.tex 2013-12-31 00:23:59.000000000 +0100
@@ -14,9 +14,9 @@
\addtokomafont{title}{\rmfamily}
-\title{The \textsf{cancel} package\thanks{This manual corresponds to \textsf{cancel}~v2.1, dated~12--Mar--2000.}}
+\title{The \textsf{cancel} package\thanks{This manual corresponds to \textsf{cancel}~v2.2, dated~12--Apr--2013.}}
\author{Donald Arseneau\\\href{mailto:asnd@triumf.ca}{\texttt{asnd@triumf.ca}}}
-\date{12--Mar--2000}
+\date{12--Apr--2013}
\publishers{I contribute this software to the public domain. No rights reserved.}
@@ -42,7 +42,7 @@
\section{Options:}
-Bt default, none of these commands affects the horizontal spacing,
+By default, none of these commands affects the horizontal spacing,
so they might over-print neighboring parts of the formula (or text).
They do add their height to the expression, so there should never be
unintended vertical overlap. There is a package option \texttt{[makeroom]} to
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cancel.doc.tlpobj new/tlpkg/tlpobj/cancel.doc.tlpobj
--- old/tlpkg/tlpobj/cancel.doc.tlpobj 2010-06-10 18:20:52.000000000 +0200
+++ new/tlpkg/tlpobj/cancel.doc.tlpobj 2013-12-31 03:22:35.000000000 +0100
@@ -1,8 +1,8 @@
name cancel.doc
category Package
-revision 17124
+revision 32508
shortdesc doc files of cancel
relocated 1
-docfiles size=67
+docfiles size=65
RELOC/doc/latex/cancel/cancel.pdf
RELOC/doc/latex/cancel/cancel.tex
++++++ cancel.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/cancel/cancel.sty new/tex/latex/cancel/cancel.sty
--- old/tex/latex/cancel/cancel.sty 2010-02-22 00:20:18.000000000 +0100
+++ new/tex/latex/cancel/cancel.sty 2013-12-31 00:23:59.000000000 +0100
@@ -1,6 +1,9 @@
-% cancel.sty version 2.1 12-Mar-2000.
+% cancel.sty version 2.2 12-Apr-2013.
% Donald Arseneau asnd@triumf.ca
-% I contribute this software to the public domain. No rights reserved.
+% This software is contributed to the public domain by its author,
+% who disclaims all copyrights. For people and jurisdictions that
+% do not recognize contribution to the public domain, this software
+% is licensed by the terms of the unlicense, http://unlicense.org/.
%
% Commands:
% ~~~~~~~~~
@@ -16,7 +19,7 @@
%
% Options:
% ~~~~~~~~
-% Bt default, none of these commands affects the horizontal spacing,
+% By default, none of these commands affects the horizontal spacing,
% so they might over-print neighboring parts of the formula (or text).
% They do add their height to the expression, so there should never be
% unintended vertical overlap. There is a package option [makeroom] to
@@ -48,7 +51,7 @@
% through math to indicate "cancellation" is poor design. I don't recommend
% that you use this package at all.
-\ProvidesPackage{cancel}[2000/03/12 v2.1 Cancel math terms]
+\ProvidesPackage{cancel}[2013/04/12 v2.2 Cancel math terms]
\newcommand{\CancelColor}{}
\newcommand{\cancelto}{1}% default option = smaller
@@ -75,7 +78,7 @@
\@cancel{\@can@slash{+}\@can@slash{-}}\hbox{#1}\fi}
\newcommand\@cancel[3]{%
-\@begin@tempboxa\hbox{\m@th$#2{#3}$}%
+\OriginalPictureCmds\@begin@tempboxa\hbox{\m@th$#2{#3}$}%
\dimen@\height
\setbox\@tempboxa\hbox{$\m@th\vcenter{\box\@tempboxa}$}%
\advance\dimen@-\height % the difference in height
@@ -126,7 +129,7 @@
\fi
\newcommand\@cancelto[4]{%
-\@begin@tempboxa\hbox{\m@th$#3{#4}$}%
+\OriginalPictureCmds\@begin@tempboxa\hbox{\m@th$#3{#4}$}%
\dimen@\width % wide
\@min@pt\dimen@ 2\@min@pt\totalheight4
\ifdim\totalheight<\dimen@
@@ -172,3 +175,10 @@
\hfil \box\@tempboxa \kern\wd\z@ \hfil \cr}}
\def\@min@pt#1#2{\ifdim#1<#2\p@ #1#2\p@ \relax\fi}
+
+% pict2e removes bounding box from line and vector, so use original
+% versions by declaring \OriginalPictureCmds; make it a no-op if undefined
+
+\@ifundefined{OriginalPictureCmds}{\let\OriginalPictureCmds\relax}{}
+
+% Sometime maybe find a better solution that uses all slopes with pict2e
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cancel.tlpobj new/tlpkg/tlpobj/cancel.tlpobj
--- old/tlpkg/tlpobj/cancel.tlpobj 2010-06-10 18:20:52.000000000 +0200
+++ new/tlpkg/tlpobj/cancel.tlpobj 2013-12-31 03:22:35.000000000 +0100
@@ -1,6 +1,6 @@
name cancel
category Package
-revision 17124
+revision 32508
shortdesc Place lines through maths formulae.
relocated 1
longdesc A package to draw diagonal lines ("cancelling" a term) and
@@ -9,6 +9,6 @@
runfiles size=2
RELOC/tex/latex/cancel/cancel.sty
catalogue-ctan /macros/latex/contrib/cancel
-catalogue-date 2010-02-23 16:16:11 +0100
+catalogue-date 2013-12-30 10:37:07 +0100
catalogue-license pd
-catalogue-version 2.0
+catalogue-version 2.2
++++++ cbfonts.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cbfonts.doc.tlpobj new/tlpkg/tlpobj/cbfonts.doc.tlpobj
--- old/tlpkg/tlpobj/cbfonts.doc.tlpobj 2010-11-05 04:11:41.000000000 +0100
+++ new/tlpkg/tlpobj/cbfonts.doc.tlpobj 2013-09-11 03:20:45.000000000 +0200
@@ -1,6 +1,6 @@
name cbfonts.doc
category Package
-revision 20304
+revision 31624
shortdesc doc files of cbfonts
relocated 1
docfiles size=149
++++++ cbfonts.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-d/cbfonts.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-d.new/cbfonts.tar.xz differ: char 26, line 1
++++++ censor.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/censor/README new/doc/latex/censor/README
--- old/doc/latex/censor/README 2013-05-02 23:47:46.000000000 +0200
+++ new/doc/latex/censor/README 2013-06-26 00:57:38.000000000 +0200
@@ -1,4 +1,4 @@
-CENSOR
+The censor package
This package provides simple tools for creating redacted documents with
blacked-out text. It's tools are useful both for creating documents in
@@ -7,8 +7,7 @@
transfer and completion in the restricted environment).
As of V2.0, the ability to blackout larger blocks of text is available,
-up to a whole paragraph simply, and even across paragraph boundaries
-(with a small modification required to your text).
+up to a whole paragraph simply, and even across paragraph boundaries.
V2.1 tries to minimize formatting discrepancies (i.e., text spacing)
between the redacted and unredacted versions of the document.
@@ -20,3 +19,7 @@
V3.1 gives unrestricted use of \par in arguments to \blackout. Also,
\xblackout introduced to give interword blacking not offered by
\blackout.
+
+V3.2 allows control over the characteristics (depth and height) of the
+censor blackout rule. It also gives additional control on how to handle
+the censoring of periods.
Files old/doc/latex/censor/censor.pdf and new/doc/latex/censor/censor.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/censor/censor.tex new/doc/latex/censor/censor.tex
--- old/doc/latex/censor/censor.tex 2013-05-02 23:47:46.000000000 +0200
+++ new/doc/latex/censor/censor.tex 2013-08-03 01:21:26.000000000 +0200
@@ -13,8 +13,8 @@
\small \rule{0in}{1em}Tools for Producing Redacted Documents\\
\large \rule{0in}{2em} Steven B. Segletes\\
steven.b.segletes.civ@mail.mil\\
-\rule{0em}{2em}2013/05/02\\
-v3.10
+\rule{0em}{2em}\today\\
+v\censorversionnumber
\end{center}
\section{Introduction}
@@ -525,7 +525,30 @@
commands, discussed in the prior section, are used in this mode, where
the source file is in an unsecure environment.
-\clearpage
+\section{Censor Marks}
+
+The censor (blacking) mark is a \verb|\rule| which has a depth
+\(-\)0.3ex (\textit{i.e.}, below the baseline), and a height of 2.1ex,
+by default. The characteristics of that rule may be changed by setting
+the following two lengths.
+
+\itshape
+\verb| \censorruledepth=|length\\
+\verb| \censorruleheight=|length
+\upshape
+
+In addition, it was mentioned that periods are not censored, so as to
+preserve the ability of \LaTeX{} to produce censored output of
+\textit{identical} spacing to the uncensored output. If, however, the
+preservation of space is not essential, and the user does not wish to
+have periods appear in the censored output, the definition
+\verb|\censordot|, by default
+
+\verb| \def\censordot{.}|
+
+can be redefined as a blank space, as a null character, or something
+else, at the users' discretion.
+
\section{Summary \& Miscellany}
The complete set of commands available to the \textsf{censor} package,
@@ -542,6 +565,9 @@
only\upshape)\\
\verb| \StopCensoring|\\
\verb| \RestartCensoring|\\
+\verb| \censorruledepth=|\it length\\
+\verb| \censorruleheight=|length\\
+\verb| \def\censordot{.| \upshape or \it character\tt\}\\
~\\}
The star ({\tt*}) version of the commands is envisioned when the source
document is being created in an unsecure environment, whereas, the
@@ -576,7 +602,10 @@
it is most convenient to place it as a keyword identifier:\\
\verb| \def\Name{\blackout{Little Bo Peep}}|\\
such that subsequent reference is done indirectly:\\
-\verb| We examine the life of {\Name} in this report|
+\verb| We examine the life of {\Name} in this report|\\
+(Even so, it should be noted that censoring can still affect text
+justification, because censored words are never hyphenated across line
+boundaries, whereas the original text may have been.)
The source code for \textsf{censor} is so short as to be included below:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/censor.doc.tlpobj new/tlpkg/tlpobj/censor.doc.tlpobj
--- old/tlpkg/tlpobj/censor.doc.tlpobj 2013-05-03 03:41:59.000000000 +0200
+++ new/tlpkg/tlpobj/censor.doc.tlpobj 2013-08-03 03:19:21.000000000 +0200
@@ -1,9 +1,9 @@
name censor.doc
category Package
-revision 30208
+revision 31332
shortdesc doc files of censor
relocated 1
-docfiles size=52
+docfiles size=54
RELOC/doc/latex/censor/README
RELOC/doc/latex/censor/censor.pdf
RELOC/doc/latex/censor/censor.tex
++++++ censor.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/censor/censor.sty new/tex/latex/censor/censor.sty
--- old/tex/latex/censor/censor.sty 2013-05-02 23:47:46.000000000 +0200
+++ new/tex/latex/censor/censor.sty 2013-08-03 01:21:26.000000000 +0200
@@ -1,9 +1,9 @@
% censor.sty
+\def\censorversionnumber{3.21}
\ProvidesPackage{censor}
-[2013/05/02 v3.10
+[2013/06/24 \censorversionnumber
Provides capability for redaction of sensitive information]
-%% Copyright 2009, 2012, 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
@@ -26,13 +26,24 @@
% 3.00 - \censorbox introduced to handle figures, tables, etc.
% 3.10 - Made \blackout work with \par in argument. Introduced
% \xblackout
+% 3.20 - Specify depth/height of censor rule. Introduced \def\censordot{}
+% 3.21 - Fixed bug regarding \xblackout rules remaining after a
+% \StopCensoring
\usepackage{pbox}
\usepackage{ifnextok}
+\newlength\censorruledepth
+\newlength\censorruleheight
+
+\censorruledepth=-0.3ex% -0.3ex DEFAULT
+\censorruleheight=2.1ex% 2.1ex DEFAULT
+\def\censordot{.}% versus \def\censordot{ }%
+
+\newcommand\censorrule[1]{\protect\rule[\censorruledepth]{#1}{\censorruleheight}}
+
\newcommand\censor{\@ifstar{\@cenlen}{\@cenword}}
- \newcommand\@cenlen[1]{\protect\rule[-.3ex]{#1 ex}{2.1ex}}
- \newcommand\@cenword[1]{%
- \protect\rule[-.3ex]{\widthofpbox{#1}}{2.1ex}}
+ \newcommand\@cenlen[1]{\censorrule{#1 ex}}
+ \newcommand\@cenword[1]{\censorrule{\widthofpbox{#1}}}
\newcommand\un@censor{\@ifstar{\un@cenlen}{\un@cenword}}
\newcommand\un@cenlen[1]{\protect\underline{\hspace{#1 ex}}}
@@ -41,10 +52,12 @@
\newcommand\StopCensoring{%
\let\censor\un@censor%
\let\censorbox\un@censorbox%
+ \let\xblackout\blackout%
}
\newcommand\RestartCensoring{%
\renewcommand\censor{\@ifstar{\@cenlen}{\@cenword}}%
\renewcommand\censorbox{\@ifstar{\censor@dim}{\censor@box}}%
+ \let\xblackout\sv@xblackout%
}
\let\sv@tilde~
@@ -60,7 +73,7 @@
% \def\bl@t#1#2{\censor{#2}#1}
% V2.10 DEFINITION (MADE \long IN V3.1):
-\long\def\bl@t#1#2{\if\bpar#2\par\else\if.#2#2\else\censor{#2}\fi\fi#1}
+\long\def\bl@t#1#2{\if\bpar#2\par\else\if.#2\censordot\else\censor{#2}\fi\fi#1}
%\def\bpar{_} %V3.00 DEFINITION
\let\bpar\par %AS OF V3.1, CAN HANDLE \par
@@ -74,6 +87,8 @@
\let~\sv@tilde%
}
+\let\sv@xblackout\xblackout
+
\long\def\xcensor@Block{\IfNextToken\stringend{\@gobble}%
{\IfNextToken\@sptoken{ \def\@justspace{T}\xbl@t{\xcensor@Block}}%
{\xbl@t{\xcensor@Block}}}}
@@ -84,11 +99,11 @@
\newlength\rletterlap\setlength\rletterlap{0.55ex}
\newlength\afterspacelap\setlength\afterspacelap{0.0ex}
-\def\@periodrlap{\rlap{\rule[-.3ex]{\periodrlap}{2.1ex}}}
-\def\@afterperiodlap{\llap{\rule[-.3ex]{\afterperiodlap}{2.1ex}}}
-\def\@lletterlap{\llap{\rule[-.3ex]{\lletterlap}{2.1ex}}}
-\def\@rletterlap{\rlap{\rule[-.3ex]{\rletterlap}{2.1ex}}}
-\def\@afterspacelap{\llap{\rule[-.3ex]{\afterspacelap}{2.1ex}}}
+\def\@periodrlap{\rlap{\censorrule{\periodrlap}}}
+\def\@afterperiodlap{\llap{\censorrule{\afterperiodlap}}}
+\def\@lletterlap{\llap{\censorrule{\lletterlap}}}
+\def\@rletterlap{\rlap{\censorrule{\rletterlap}}}
+\def\@afterspacelap{\llap{\censorrule{\afterspacelap}}}
\long\def\xbl@t#1#2{%
\if\par#2%
@@ -100,7 +115,7 @@
\if.#2%
\def\@justperiod{T}%
\@periodrlap%
- #2%
+ \censordot%
\else%
\if F\@justpar%
\if T\@justperiod%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/censor.tlpobj new/tlpkg/tlpobj/censor.tlpobj
--- old/tlpkg/tlpobj/censor.tlpobj 2013-05-03 03:41:59.000000000 +0200
+++ new/tlpkg/tlpobj/censor.tlpobj 2013-08-03 03:19:21.000000000 +0200
@@ -1,6 +1,6 @@
name censor
category Package
-revision 30208
+revision 31332
shortdesc Facilities for controlling restricted text in a document.
relocated 1
longdesc The package allows a convenient redaction/censor capability to
@@ -10,6 +10,6 @@
runfiles size=2
RELOC/tex/latex/censor/censor.sty
catalogue-ctan /macros/latex/contrib/censor
-catalogue-date 2013-05-02 20:50:09 +0200
+catalogue-date 2013-07-31 09:50:54 +0200
catalogue-license lppl1.3
-catalogue-version 3.10
+catalogue-version 3.21
++++++ cfr-lm.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/cfr-lm/README new/doc/fonts/cfr-lm/README
--- old/doc/fonts/cfr-lm/README 2010-07-12 00:41:56.000000000 +0200
+++ new/doc/fonts/cfr-lm/README 2014-03-04 05:59:40.000000000 +0100
@@ -1,5 +1,5 @@
manifest.txt
-Copyright 2010 Clea F. Rees
+Copyright 2014 Clea F. Rees
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
@@ -26,7 +26,7 @@
The encoding t1-clm.etx is derived from the file t1.etx supplied with
fontinst. A copy of fontinst including an unmodified copy of t1.etx is
-available from http://tug.ctan.org/tex-archive/fonts/utilities/fontinst.
+available from http://mirror.ctan.org/fonts/utilities/fontinst.
Warning - Experimental
----------------------
@@ -61,6 +61,10 @@
text as these are the only languages I typeset more than a word or two
of once in a blue moon.
+Moreover, version 1.4 adds experimental support for microtype. While this
+should work fine since it basically uses the settings for Latin Modern and
+Computer Modern Roman, I'm far from confident about this.
+
Documentation
-------------
@@ -69,5 +73,5 @@
Clea F. Rees
-cfrees <at> imapmail <dot> org
-2010/05/30
+ReesC21 <at> cardiff <dot> ac <dot> uk
+2014/03/01
Files old/doc/fonts/cfr-lm/cfr-lm.pdf and new/doc/fonts/cfr-lm/cfr-lm.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/cfr-lm/cfr-lm.tex new/doc/fonts/cfr-lm/cfr-lm.tex
--- old/doc/fonts/cfr-lm/cfr-lm.tex 2010-07-12 00:41:56.000000000 +0200
+++ new/doc/fonts/cfr-lm/cfr-lm.tex 2014-03-04 05:59:40.000000000 +0100
@@ -1,7 +1,7 @@
% !TEX TS-program = pdflatex
% !TEX encoding = UTF-8 Unicode
%% cfr-lm.tex
-%% Copyright 2010 Clea F. Rees
+%% Copyright 2014 Clea F. Rees
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -12,14 +12,17 @@
% version 2005/12/01 or later.
%
% This work has the LPPL maintenance status `maintained'.
-%
+%
% The Current Maintainer of this work is Clea F. Rees.
%
% This work consists of all files listed in manifest.txt.
\listfiles
-\documentclass[11pt,british]{article}
-\usepackage{babel}
-\usepackage[utf8x]{inputenc}
+\documentclass[11pt,british,a4paper]{article}
+\usepackage{babel}
+\usepackage[utf8]{inputenc}
+\usepackage{csquotes}
+ \MakeAutoQuote{‘}{’}
+ \MakeAutoQuote*{“}{”}
\usepackage[T1]{fontenc}
\usepackage{textcomp,cfr-lm}
\usepackage{fancyhdr,lastpage,fancyref}
@@ -29,12 +32,12 @@
\usepackage{url}
\urlstyle{sf}
\usepackage{microtype}
-\usepackage[a4paper,headheight=14pt]{geometry} % use 14pt for 11pt text, 15pt for 12pt text
+\usepackage[headheight=14pt]{geometry} % use 14pt for 11pt text, 15pt for 12pt text
\title{cfr-lm}
-\author{Clea F.\ Rees\footnote{cfrees <at> imapmail <dot> org}}
-\def\dyddiad{30th May, 2010}
-\def\fyversion{Version 1.3}
+\author{Clea F.\ Rees\footnote{reesc21 <at> cardiff <dot> ac <dot> uk}}
+\def\dyddiad{St.\ David's Day, 2014}
+\def\fyversion{Version 1.4}
\date{\fyversion\ --- \dyddiad}
\pagestyle{fancy}
\fancyhf[lh]{\itshape \fyversion}
@@ -43,7 +46,7 @@
\fancyhf[lf]{}
\fancyhf[rf]{}
\fancyhf[cf]{\itshape --- \thepage~\ofname~\pageref{LastPage} ---}
-
+
\begin{document}
\maketitle\thispagestyle{empty}
@@ -51,7 +54,7 @@
/Creator (TeX)
/Producer (pdfTeX)
/Author (Clea F.\ Rees)
- /Title (cfr-lm)
+ /Title (cfr-lm)
/Subject (TeX)
/Keywords (TeX,LaTeX,font,fonts,tex,latex,LatinModern,Latin Modern,latinmodern,cfr-lm,lm,LM,osf,OSF,figure,figures,digit,digits,proportional,tabular,lining,oldstyle,Latin,Modern,Clea,Rees)}
\pdfcatalog{%
@@ -61,12 +64,12 @@
% \pagestyle{empty} % if you want this, you probably want to comment out \maketitle as well...?
\setlength{\parindent}{0pt}
\setlength{\parskip}{0.5em}
-
+
\newcommand*{\lpack}[1]{\textsf{#1}}
\newcommand*{\fgroup}[1]{\textsf{#1}}
\begin{abstract}
- \hspace*{-\parindent}\lpack{cfr-lm} is an \emph{experimental} package offering enhanced support for the Latin Modern fonts in \TeX/\LaTeX. A number of features of the Latin Modern fonts are not easily accessible via the default \TeX/\LaTeX\ support provided in the official distribution. This package aims to provide \TeX/\LaTeX\ support for a number of these features including various styles of digits, upright italic and oblique small-caps shapes, and alternative weights and widths. It also supports the variable width typewriter, ``dunhill'' and ``quotation'' fonts. Version 1.3 supports version 2.004 of the Latin Modern fonts.
+ \hspace*{-\parindent}\lpack{cfr-lm} is an \emph{experimental} package offering enhanced support for the Latin Modern fonts in \TeX/\LaTeX. A number of features of the Latin Modern fonts are not easily accessible via the default \TeX/\LaTeX\ support provided in the official distribution. This package aims to provide \TeX/\LaTeX\ support for a number of these features including various styles of digits, upright italic and oblique small-caps shapes, and alternative weights and widths. It also supports the variable width typewriter, ‘dunhill’ and ‘quotation’ fonts. Version 1.3 supports version 2.004 of the Latin Modern fonts. Version 1.4 adds experimental support for (but does not require) \lpack{microtype}.
\end{abstract}
\tableofcontents
@@ -80,7 +83,9 @@
\lpack{cfr-lm} consists of all files listed in \lpack{manifest.txt}\ and these files are released under the \LaTeX\ Project Public Licence as explained in the included licensing notices.
-Version 1.3 of the package has benefited greatly from feedback provided by Enrico Gregorio, who essentially rewrote the style file using keyval to show me how I ought to be setting the various options up, and Lars Hellström who demonstrated considerable patience in answering my many questions about using fontinst and some peculiarities of the Latin Modern fonts. I hope the changes in the production of the virtual fonts will improve accent placement in ``faked'' glyphs (i.e.\ in the case of characters not included in the \textsc{ec}/\textsc{t1} font encoding which \TeX\ therefore creates by combining glyphs which are included). The changes involve ignoring all font dimensions given in the \textsc{afm} files and taking them from the relevant \textsc{tfm} files supplied with Latin Modern instead. The exception to this is the value of \verb|acccapheight| which is set to zero in the \textsc{tfm}s. The current virtual font setup uses \lpack{fontinst}'s default value in this case.
+Version 1.3 of the package benefited greatly from feedback provided by Enrico Gregorio, who essentially rewrote the style file using keyval to show me how I ought to be setting the various options up, and Lars Hellström who demonstrated considerable patience in answering my many questions about using fontinst and some peculiarities of the Latin Modern fonts. I hope the changes in the production of the virtual fonts will improve accent placement in ‘faked’ glyphs (i.e.\ in the case of characters not included in the \textsc{ec}/\textsc{t1} font encoding which \TeX\ therefore creates by combining glyphs which are included). The changes involve ignoring all font dimensions given in the \textsc{afm} files and taking them from the relevant \textsc{tfm} files supplied with Latin Modern instead. The exception to this is the value of \verb|acccapheight| which is set to zero in the \textsc{tfm}s. The current virtual font setup uses \lpack{fontinst}'s default value in this case.
+
+If you load \lpack{microtype}, version 1.4 \emph{should} automatically figure out the family-specific settings to use. This is done using aliases which tell \lpack{microtype} to treat the virtual fonts provided by this package in the same way it treats Latin Modern and Computer Modern Roman. See \fref{sec:mt} for details. This \emph{seems} to work for me but please let me know if it does not work for you. In the worst case, the output should be no worse with version 1.4 of this package than it was with version 1.3. That is, at worst \lpack{microtype} should just use generic settings as it did before.
These improvements notwithstanding, please note that, unlike the fonts themselves and the official support provided by \lpack{lm}, including \path{lmodern.sty}, this alternative support package is \emph{experimental}. Although I do not expect the package to raid your fridge or make off with your best computer, it certainly contains bugs and may not work as advertised. If you let me know of problems, I will solve them if I can. If you can correct the problems and send me the fixes, that would be even better.
@@ -105,14 +110,16 @@
In addition to the requirements of \path{clm-test.tex}, the documentation requires:
\begin{itemize}
+ \item \lpack{array}
+ \item \lpack{booktabs}
+ \item \lpack{csquotes}
\item \lpack{fancyhdr}
- \item \lpack{lastpage}
\item \lpack{fancyref}
- \item \lpack{array}
+ \item \lpack{lastpage}
\item \lpack{longtable}
- \item \lpack{verbatim}
- \item \lpack{booktabs}
+ \item \lpack{multirow}
\item \lpack{url}
+ \item \lpack{verbatim}
\end{itemize}
\section{Limitations}
@@ -207,9 +214,9 @@
& \fgroup{clm2j} & proportional, oldstyle & \lpack{cfr-lm} \verb|rm| default\tabularnewline\midrule
\multirow{4}{.2\textwidth}{Latin Modern Sans}%
& \fgroup{clms} & tabular, lining & similar to \lpack{lm} \verb|sf| default\tabularnewline\cmidrule{3-4}
- & \fgroup{clm2s} & proportional, lining & \tabularnewline\cmidrule{3-4}
+ & \fgroup{clm2s} & proportional, lining & \tabularnewline\cmidrule{3-4}
& \fgroup{clmjs} & tabular, oldstyle & \tabularnewline\cmidrule{3-4}
- & \fgroup{clm2js} & proportional, oldstyle & \lpack{cfr-lm} \verb|sf| default\tabularnewline\pagebreak%\midrule
+ & \fgroup{clm2js} & proportional, oldstyle & \lpack{cfr-lm} \verb|sf| default\tabularnewline\midrule
\multirow{2}{.2\textwidth}{Latin Modern Mono\footnote{The duplication in \TeX\ name here is to avoid \TeX\ complaining if commands to use proportional digits are issued while one of these fonts is active and to ensure that it is possible to switch smoothly to these fonts if another font with proportional digits is active.}}%
& \fgroup{clmt}, \fgroup{clm2t} & tabular, lining & similar to \lpack{lm} \verb|tt| default\tabularnewline\cmidrule{3-4}
& \fgroup{clmjt}, \fgroup{clm2jt} & tabular, oldstyle & \tabularnewline\midrule
@@ -223,12 +230,13 @@
& \fgroup{clm2qs} & proportional, lining & \tabularnewline\cmidrule{3-4}
& \fgroup{clmjqs} & tabular, oldstyle & \tabularnewline\cmidrule{3-4}
& \fgroup{clm2jqs} & proportional, oldstyle & \tabularnewline\midrule
- \multirow{4}{.2\textwidth}{Latin Modern Roman Dunhill}%\multirow{nrows}[bigstruts]{width}[fixup]{text}; or * for {width}
+ \multirow{4}{.2\textwidth}{Latin Modern Roman Dunhill}%\multirow{nrows}[bigstruts]{width}[fixup]{text}; or * for {width}
& \fgroup{clmd} & tabular, lining & \tabularnewline\cmidrule{3-4}
& \fgroup{clm2d} & proportional, lining & \tabularnewline\cmidrule{3-4}
& \fgroup{clmdj} & tabular, oldstyle & \tabularnewline\cmidrule{3-4}
& \fgroup{clm2dj} & proportional, oldstyle & \tabularnewline
\end{longtable}
+\clearpage
\subsection{Shapes, weights and widths}
@@ -241,7 +249,7 @@
& & demi & upright, oblique\tabularnewline\midrule
\fgroup{clms}, \fgroup{clm2s}, \fgroup{clmjs}, \fgroup{clm2js} & standard & normal & upright, oblique\tabularnewline\cmidrule{3-4}
& & bold & upright, oblique\tabularnewline\cmidrule{2-4}
- & condensed & demi & upright, oblique\tabularnewline\pagebreak%\midrule
+ & condensed & demi & upright, oblique\tabularnewline\midrule
\fgroup{clmt}, \fgroup{clm2t}, \fgroup{clmjt}, \fgroup{clm2jt} & standard & normal & upright, oblique,\\italic, small-caps,\\oblique small-caps\tabularnewline\cmidrule{3-4}
& & bold & upright, oblique\tabularnewline\cmidrule{3-4}
& & light & upright, oblique\tabularnewline\cmidrule{2-4}
@@ -252,7 +260,7 @@
\fgroup{clmqs}, \fgroup{clm2qs}, \fgroup{clmjqs}, \fgroup{clm2jqs} & & normal & upright, oblique\tabularnewline\cmidrule{3-4}
& & bold & upright, oblique\tabularnewline\midrule
\fgroup{clmd}, \fgroup{clm2d}, \fgroup{clmdj}, \fgroup{clm2dj} & standard & normal & upright, oblique\tabularnewline\cmidrule{3-4}
- & & bold & upright, oblique\tabularnewline
+ & & bold & upright, oblique\tabularnewline
\end{longtable}
Where applicable, oblique small-caps are substituted for italic small-caps; italic or oblique for upright italic; oblique for italic; and upright for small-caps. This means that some of the commands described in \fref{sec:commands} will fail silently to avoid undue clutter in the log file.
@@ -260,8 +268,8 @@
\section{The \LaTeX\ package}\label{sec:support}
To load this package, write \verb|\usepackage{cfr-lm}| in your document preamble. By default, the package will define \fgroup{clm2j}, \fgroup{clm2js} and \fgroup{clm2jv} as the default roman/serif, sans and typewriter fonts but you can control the choice by passing options to the package.
-
-The package recognises four keys. Three of these keys take various options which take the value true or false. These control the default style of figures to be used for each of roman/serif, sans and typewriter text, and whether variable or monowidth typewriter will be used by default. The fourth key itself takes a true or false value but has no effect unless \verb|\qtfont| is already defined\footnote{This key is designed to control use of LM Sans Quotation in conjunction with prior redefinitions of appropriate environments. Since this is not the sort of redefining a font package should be doing, the option will have absolutely no effect unless you do some prior work to make use of it. In any case, the font can still be accessed directly using the commands explained in \fref{sec:commands}.}.
+
+The package recognises four keys. Three of these keys take various options which take the value true or false. These control the default style of figures to be used for each of roman/serif, sans and typewriter text, and whether variable or monowidth typewriter will be used by default. The fourth key itself takes a true or false value but has no effect unless \verb|\qtfont| is already defined\footnote{This key is designed to control use of LM Sans Quotation in conjunction with prior redefinitions of appropriate environments. Since this is not the sort of redefining a font package should be doing, the option will have absolutely no effect unless you do some prior work to make use of it. In any case, the font can still be accessed directly using the commands explained in \fref{sec:commands}.}.
\begin{longtable}{l>{\raggedright}p{.25\textwidth}>{\raggedright}ll}
\toprule
\textbf{key} & \textbf{affects} & \textbf{option} & \textbf{possible values}\tabularnewline\midrule\endhead
@@ -289,7 +297,7 @@
sf={oldstyle,proportional},%
tt={oldstyle=false,proportional=true,monowidth}%
]{cfr-lm}
-
+
\usepackage[%
rm={oldstyle=false, proportional=true},%
sf={lining=false,tabular=false},%
@@ -307,19 +315,19 @@
]{cfr-lm}
\end{verbatim}
That is, by default, oldstyle, proportional figures for roman, sans and typewriter text and variable width typewriter will be selected.
-
+
\section{Additional font selection commands}\label{sec:commands}
\lpack{cfr=lm}\ loads \lpack{nfssext-cfr}\ which is an extension of the package \lpack{nfssext}\ supplied by Philipp Lehman as part of The Font Installation Guide. The file extends the font selection commands to facilitate access to various font features. Both the original and the extension are designed for use with a wide range of fonts. For this reason, only a subset of the additional commands are relevant to any particular font support package. Those relevant to \lpack{cfr-lm}\ are described below.
-
+
I consider my additions to \lpack{nfssext-cfr}\ to be \emph{highly experimental}. If things don't work as advertised, apart from letting me know about the problem, you may be able to access the features you need by issuing a \verb|\normalfont| and then selecting features from there. This command will return you to the default document text font --- typically the relevant serif in regular weight, standard width and upright shape with the style of figures determined by the package and options loaded.
\subsection{nfssext-cfr}
These commands are available when \lpack{cfr-lm}\ is loaded. If for some reason you wish to make them available at any other time, use \verb|\usepackage{nfssext-cfr}| in your document preamble.
-Note that only combinations supported by the fonts will appear as expected because the commands will only have an effect if the active font offers the relevant variant. For example, trying to switch to a condensed width will have no effect if any of the LM Roman fonts is active. This means that only a subset of combinations are possible. In other cases, one of two things should happen. First, a `silent' substitution may be made. For example, if you request proportional figures while using monowidth typewriter, tabular figures will be silently substituted. Second, console messages may warn you that the combination you tried to use isn't available. If you request titling while using monowidth typewriter, a console message will warn you it was unavailable. The file \path{clm-test.tex} gives an idea of what's possible and also serves as an example illustrating some of the commands provided by \lpack{cfr-lm} and other ways of accessing the fonts..
-
+Note that only combinations supported by the fonts will appear as expected because the commands will only have an effect if the active font offers the relevant variant. For example, trying to switch to a condensed width will have no effect if any of the LM Roman fonts is active. This means that only a subset of combinations are possible. In other cases, one of two things should happen. First, a ‘silent’ substitution may be made. For example, if you request proportional figures while using monowidth typewriter, tabular figures will be silently substituted. Second, console messages may warn you that the combination you tried to use isn't available. If you request titling while using monowidth typewriter, a console message will warn you it was unavailable. The file \path{clm-test.tex} gives an idea of what's possible and also serves as an example illustrating some of the commands provided by \lpack{cfr-lm} and other ways of accessing the fonts..
+
\subsubsection{Widths}
\begin{longtable}{lll}
@@ -344,8 +352,6 @@
Similar considerations in the case of light condensed monowidth typewriter mean that the \emph{order} in which commands are issued is critical. In this case, a light-weight standard-width font is available, but no normal-weight condensed font is provided. Consequently, \verb|\texttm{\textlg{\textcd{a successful switch}}}| will produce \texttm{\textlg{\textcd{a successful switch}}} while \verb|\texttm{\textcd{\textlg{an unsuccessful switch}}}| will result in \texttm{\textcd{\textlg{an unsuccessful switch}}} and a warning in the log. In this case, the latter command is equivalent to \verb|\texttm{\textlg{}}| because \verb|\textcd{}| can only succeed \emph{after} \verb|\textlg{}|.
-\vfill\pagebreak
-
\subsubsection{Weights}
\begin{longtable}{lll}
@@ -355,7 +361,7 @@
light & \verb|\lgweight| & \verb|\textlg{}|\\
semi-bold & \verb|\sbweight| & \verb|\textsb{}|\\
\end{longtable}
-
+
\begin{verbatim}
\textsb{Semi-bold and \textsl{semi-bold oblique} serif}\\
\texttt{\textlg{Light typewriter}}
@@ -374,9 +380,9 @@
\bottomrule\endfoot
oblique small-caps\footnote{Actually the command switches to \emph{italic} small-caps but since LM does not offer this, oblique small-caps are substituted}%
& \verb|\sishape| & \verb|\textsi{}|\\
- upright italic & \verb|\uishape| & \verb|\textui{}|\\
+ upright italic & \verb|\uishape| & \verb|\textui{}|\\
\end{longtable}
-
+
\begin{verbatim}
\textsi{I always avoid a kangaroo.}\\
\textui{Nobody is despised who can manage a crocodile.}
@@ -396,8 +402,8 @@
\textsf{\textsi{The bits about kangaroos and crocodiles were from Lewis Carroll.}}\\
\textbf{\textui{Sylvia snorkeled snappily.}}
\end{center}
-where upright sans and bold italic are substituted for italic small-caps sans and bold upright italic since neither is available. Note that the first substitution produces a warning in the log while the second is done ``silently''.
-
+where upright sans and bold italic are substituted for italic small-caps sans and bold upright italic since neither is available. Note that the first substitution produces a warning in the log while the second is done ‘silently’.
+
\subsubsection{Figures}
Commands are provided to change either one or both aspects of digits' style:
@@ -408,13 +414,13 @@
lining & \verb|\lstyle| & \verb|\textl{}|\\
oldstyle & \verb|\ostyle| & \verb|\texto{}|\\
proportional & \verb|\pstyle| & \verb|\textp{}|\\
- tabular & \verb|\tstyle| & \verb|\textt{}|\\
- proportional, lining & \verb|\plstyle| & \verb|\textpl{}|\\
- proportional, oldstyle & \verb|\postyle| & \verb|\textpo{}|\\
- tabular, lining & \verb|\tlstyle| & \verb|\texttl{}|\\
- tabular, oldstyle & \verb|\tostyle| & \verb|\textto{}|
+ tabular & \verb|\tstyle| & \verb|\textt{}|\\
+ proportional, lining & \verb|\plstyle| & \verb|\textpl{}|\\
+ proportional, oldstyle & \verb|\postyle| & \verb|\textpo{}|\\
+ tabular, lining & \verb|\tlstyle| & \verb|\texttl{}|\\
+ tabular, oldstyle & \verb|\tostyle| & \verb|\textto{}|
\end{longtable}
-
+
In this document, proportional, oldstyle figures are used by default for roman/serif, sans and typewriter:
\begin{center}
0123456789\\
@@ -433,7 +439,7 @@
\textsf{\textl{0123456789}}\\
\texttt{\textl{0123456789}}
\end{center}
-First, note that it is necessary to reissue \verb|\textl{}| after switching to sans or typewriter text. This is because both switching to sans or typewriter and switching to another figure style involves a switch of font family\footnote{Compare a switch in width or weight which does not typically involve a change of active font family.}.
+First, note that it is necessary to reissue \verb|\textl{}| after switching to sans or typewriter text. This is because both switching to sans or typewriter and switching to another figure style involves a switch of font family\footnote{Compare a switch in width or weight which does not typically involve a change of active font family.}.
Second, note that the output shows \emph{proportional} lining figures because the command \verb|\textl{}| only changes \emph{one} aspect of the style. Because proportional figures were already active, the command switched to proportional, lining figures. Tabular, lining digits may be accessed in several ways:
\begin{verbatim}
@@ -456,7 +462,7 @@
\textbf{typewriter font} & \textbf{style command} & \textbf{text command}\\\midrule\endhead
\bottomrule\endfoot
variable typewriter & \verb|\tvstyle| & \verb|\texttv{}|\\
- monowidth typewriter & \verb|\tmstyle| & \verb|\texttm{}|
+ monowidth typewriter & \verb|\tmstyle| & \verb|\texttm{}|
\end{longtable}
Variable width is default in this document so
@@ -477,11 +483,11 @@
\toprule
\textbf{font} & \textbf{style command} & \textbf{text command}\\\midrule\endhead
\bottomrule\endfoot
- sans quotation & \verb|\qtstyle| & \verb|\textqt{}|
+ sans quotation & \verb|\qtstyle| & \verb|\textqt{}|
\end{longtable}
For example, \verb|\textqt{some text in the font}| will produce \textqt{some text in the font}.
-
+
\subsubsection{Latin Modern Roman Dunhill}
This font may be accessed as follows:
@@ -491,7 +497,7 @@
\bottomrule\endfoot
titling & \verb|\tistyle| & \verb|\textti{}|\\
\end{longtable}
-
+
To ensure the command succeeds independently of the currently active font, you may wish to issue \verb|\normalfont| first. For example:
\begin{verbatim}
\normalfont\textti{Kinky Querulous Rhinos X-Ray Exultant Risque Zebras}\\
@@ -501,11 +507,17 @@
\begin{center}
\normalfont\textti{Kinky Querulous Rhinos X-Ray Exultant Risque Zebras}\\
\textti{\textsl{Kinky Querulous Rhinos X-Ray Exultant Risque Zebras}}
- \end{center}
-
+ \end{center}
+
\subsection{zeroslash}
-
+
\lpack{cfr-lm}\ provides one additional command. \verb|\zeroslash| will produce the \zeroslash\ character from the current font.
-
-\end{document}
+
+\section{Microtype}\label{sec:mt}
+
+Version 1.4 adds support for family-specific microtypographical features supported by \lpack{microtype}. This code will do nothing if you do not load \lpack{microtype}. If you do use these features, all regular roman and sans families, together with the sans quotation font, will use the settings for Computer Modern Roman. The fallback generic settings will continue to be applied to the typewriter and ‘dunhill’ families.
+
+The code responsible for this is in a block at the end of \lpack{cfr-lm.sty} so it should be easy to find and remove should it cause any trouble. (But do let me know in this case so that I can correct any issues for everybody.)
+
+\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/cfr-lm/manifest.txt new/doc/fonts/cfr-lm/manifest.txt
--- old/doc/fonts/cfr-lm/manifest.txt 2010-07-17 01:48:20.000000000 +0200
+++ new/doc/fonts/cfr-lm/manifest.txt 2014-03-04 05:59:40.000000000 +0100
@@ -1,5 +1,5 @@
manifest.txt
-Copyright 2010 Clea F. Rees
+Copyright 2014 Clea F. Rees
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
@@ -27,7 +27,7 @@
The encoding t1-clm.etx is derived from the file t1.etx supplied with
fontinst. A copy of fontinst including an unmodified copy of t1.etx is
available from
-http://tug.ctan.org/tex-archive/fonts/utilities/fontinst.
+http://mirror.ctan.org/fonts/utilities/fontinst.
manifest.txt
README
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cfr-lm.doc.tlpobj new/tlpkg/tlpobj/cfr-lm.doc.tlpobj
--- old/tlpkg/tlpobj/cfr-lm.doc.tlpobj 2010-09-12 04:04:01.000000000 +0200
+++ new/tlpkg/tlpobj/cfr-lm.doc.tlpobj 2014-03-05 03:21:18.000000000 +0100
@@ -1,9 +1,9 @@
name cfr-lm.doc
category Package
-revision 19666
+revision 33090
shortdesc doc files of cfr-lm
relocated 1
-docfiles size=676
+docfiles size=670
RELOC/doc/fonts/cfr-lm/README
RELOC/doc/fonts/cfr-lm/cfr-lm.pdf
RELOC/doc/fonts/cfr-lm/cfr-lm.tex
++++++ cfr-lm.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/cfr-lm/cfr-lm.sty new/tex/latex/cfr-lm/cfr-lm.sty
--- old/tex/latex/cfr-lm/cfr-lm.sty 2010-07-12 00:41:56.000000000 +0200
+++ new/tex/latex/cfr-lm/cfr-lm.sty 2014-03-04 05:59:40.000000000 +0100
@@ -1,4 +1,4 @@
-%% Copyright 2010 Clea F. Rees
+%% Copyright 2014 Clea F. Rees
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -9,19 +9,27 @@
% version 2005/12/01 or later.
%
% This work has the LPPL maintenance status `maintained'.
-%
+%
% The Current Maintainer of this work is Clea F. Rees.
%
% This work consists of all files listed in manifest.txt.
%
-% Parts of this file are based on lmodern.sty which is included with
+% Parts of this file are based on lmodern.sty which is included with
% the Latin Modern fonts released by GUST and available from
% http://www.gust.org.pl/projects/e-foundry/latin-modern.
-%
+%
% Improvements to this file in v1.2 (unpublished) and v1.3 owe almost
% everything to Enrico Gregorio.
+%
+% v1.4 adds family-specific support for microtype. This draws also on the
+% documentation for the microtype package and MinionPro.sty. MinionPro.sty
+% is available as part of the minionpro package and can be obtain from
+% http://mirror.ctan.org/fonts/minionpro. MinionPro.sty is in the public
+% domain. The documentation for microtype is available in English and German
+% from http://ctan.org/pkg/microtype. It is part of the microtype package which
+% is itself licensed under the LPPL.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{cfr-lm}[2010/05/20 v1.3 cfr-lm for use with LatinModern v2.004]
+\ProvidesPackage{cfr-lm}[2014/03/01 v1.4 cfr-lm for use with LatinModern v2.004]
\RequirePackage{xkeyval}
\RequirePackage[T1]{fontenc}
\RequirePackage{textcomp}
@@ -55,7 +63,7 @@
\def\cfrlm@rmpt{2}%
\fi}
-%:boolkeys for sans osf/lf
+%:boolkeys for sans osf/lf
\define@boolkey[cfrlm]{sf}{oldstyle}[true]{%
\ifcfrlm@sf@oldstyle
\def\cfrlm@sfol{j}%
@@ -110,7 +118,7 @@
\else
\def\cfrlm@ttpt{2}%
\fi}
-
+
%:boolkeys for typewriter mono/variable width
\define@boolkey[cfrlm]{tt}{monowidth}[true]{%
\ifcfrlm@tt@monowidth
@@ -129,10 +137,10 @@
\define@key{cfr-lm.sty}{rm}{%
\setkeys[cfrlm]{rm}{#1}}
-%:options for sans
+%:options for sans
\define@key{cfr-lm.sty}{sf}{%
\setkeys[cfrlm]{sf}{#1}}
-
+
%:options for typewriter
\define@key{cfr-lm.sty}{tt}{%
\setkeys[cfrlm]{tt}{#1}}
@@ -143,6 +151,7 @@
%:defaults to ensure everything is defined to something
\ExecuteOptionsX{rm={oldstyle,proportional},sf={oldstyle,proportional},tt={oldstyle,proportional,variable},qt=false}
+%\ExecuteOptionsX{rm={lining,tabular},sf={oldstyle,proportional},tt={oldstyle,proportional,variable},qt=false}
%:options override defaults
\ProcessOptionsX
@@ -191,7 +200,7 @@
\SetMathAlphabet{\mathit}{bold} {OT1}{lmr}{bx}{it}
\SetMathAlphabet{\mathtt}{bold} {OT1}{lmtt}{m}{n}
-\def\mathsterling{\mathit{\mathchar"70BF}}
+\def\mathsterling{\mathit{\mathchar"70BF}}
%:new in v1.1
\DeclareRobustCommand{\dotdigitenc}{%
@@ -200,4 +209,34 @@
\DeclareTextFontCommand{\textdde}{\dotdigitenc}
\newcommand*{\zeroslash}{\textdde{\char 250}}
+%:Partly from microtype docs; partly from MinionPro package
+%
+% We need to set up aliases for the font families created by cfr-lm so that
+% microtype recognises them as similar to Computer Modern Roman.
+%
+% T1 families in cfr-lm: clm clm2 clm2d clm2dj clm2j clm2jqs clm2js clm2jt
+% clm2jv clm2qs clm2s clm2t clm2v clmd clmdj clmj clmjqs clmjs clmjt clmjv
+% clmqs clms clmt clmv
+%
+% See variants set in nfssext-cfr
+%
+% Ref: http://tex.stackexchange.com/a/75440/39222
+\newcommand{\cfr@ffs}{% alias to cmr
+ clm,clm2,clm2j,clmj,% roman
+ clms,clm2js,clm2s,clmjs,% sans
+ clmqs,clm2jqs,clm2qs,clmjqs%
+% clm2d,clm2dj,clmd,clmdj,% leave unaliased?
+% clm2jv,clmjv,clm2v,clmv,% leave unaliased?
+% clmt,clm2t,clmjt,clm2jt% leave unaliased?
+ }
+\gdef\cfrlm@MicroType@Aliases{%
+ \@for \xx:=\cfr@ffs \do {%
+ \DeclareMicrotypeAlias{\xx}{cmr}}%
+ }
+\def\cfrlm@MT@Hook{\cfrlm@MicroType@Aliases}
+\@ifpackageloaded{microtype}{%
+ \cfrlm@MT@Hook}{%
+ \@ifundefined{Microtype@Hook}{%
+ \let\Microtype@Hook\cfrlm@MT@Hook}{% MinionPro has \global before this
+ \g@addto@macro\Microtype@Hook{\cfrlm@MT@Hook}}}
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cfr-lm.tlpobj new/tlpkg/tlpobj/cfr-lm.tlpobj
--- old/tlpkg/tlpobj/cfr-lm.tlpobj 2010-09-12 04:04:02.000000000 +0200
+++ new/tlpkg/tlpobj/cfr-lm.tlpobj 2014-03-05 03:21:20.000000000 +0100
@@ -1,6 +1,6 @@
name cfr-lm
category Package
-revision 19666
+revision 33090
shortdesc Enhanced support for the Latin Modern fonts.
relocated 1
longdesc The package supports a number of features of the Latin Modern
@@ -910,7 +910,7 @@
RELOC/tex/latex/cfr-lm/uclms.fd
RELOC/tex/latex/cfr-lm/uclmt.fd
RELOC/tex/latex/cfr-lm/uclmv.fd
-catalogue-ctan /macros/latex/contrib/cfr-lm
-catalogue-date 2010-09-08 11:26:01 +0200
+catalogue-ctan /fonts/cfr-lm
+catalogue-date 2014-03-03 08:32:08 +0100
catalogue-license lppl
-catalogue-version 1.3
+catalogue-version 1.4
++++++ changes.doc.tar.xz ++++++
++++ 13272 lines of diff (skipped)
++++++ changes.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scripts/changes/delcmdchanges.bash new/scripts/changes/delcmdchanges.bash
--- old/scripts/changes/delcmdchanges.bash 2011-10-05 01:23:13.000000000 +0200
+++ new/scripts/changes/delcmdchanges.bash 1970-01-01 01:00:00.000000000 +0100
@@ -1,249 +0,0 @@
-#!/bin/bash
-
-################################################################################
-#
-# Copyright (C) 2011 Silvano Chiaradonna (ISTI-CNR)
-#
-# Macro: delcmdchanges.bash
-#
-# License:
-# This program is free software; you can redistribute
-# it and/or modify it under the terms of the
-# GNU General Public License as published by the Free
-# Software Foundation; either version 2 of the License,
-# or (at your option) any later version.
-#
-# This program is distributed in the hope that it will
-# be useful, but WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE. See the GNU General Public
-# License for more details.
-#
-# You should have received a copy of the GNU General
-# Public License along with this program; if not,
-# write to the Free Software Foundation, Inc., 59
-# Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# An on-line copy of the GNU General Public License can
-# be downloaded from the FSF web page at:
-# http://www.gnu.org/copyleft/gpl.html
-#
-# Version: 1.0
-#
-# Purpose:
-# This script deletes all changes-commands of the package changes.sty, accepting changes. If option -i is specified you will be prompted to accept or reject changes interactively.
-#
-# Usage:
-# delcmdchanges.bash [-i] [-h] <inputfile> <outputfile>
-#
-# Requirements:
-# linux systems
-#
-################################################################################
-
-usage()
-{
- cat << EOF
-usage: $0 [options] <inputfile> <outputfile>
-
-This script deletes all changes-commands of the package changes.sty, accepting changes. If option -i is specified you will be prompted to accept or reject changes interactively.
-
-options:
- -h show this message
- -i interactive mode
-EOF
-}
-
-#-----------------------MAIN----------------
-
-while getopts ":ih" opt; do
- case $opt in
- i)
- imode="1"
- shift
- ;;
- h)
- usage
- exit
- ;;
- \?)
- echo "Invalid option: -$OPTARG" >&2
- usage
- exit
- ;;
- esac
-done
-
-if [ ! -e "$1" ]; then
- echo "Input file not found: $1" >&2
- exit
-fi
-
-INFILE="$1"
-OUTFILE="$2"
-
-rm -f "${OUTFILE}"
-touch "${OUTFILE}"
-
-awk -v im=${imode} -v fn=${OUTFILE} '
-# remove commands (accepting changes):
-# \added[<authorid>][<remark>]{<new text>}
-# \deleted[<authorid>][<remark>]{<deleted text>}
-# \replaced[<authorid>][<remark>]{<new text>}{<old text>}
-
- BEGIN { EOT = SUBSEP }
-
-{ line[NR] = $0 }
-
-END {
- do {
- buf0 = ""
- found = 0
- added = 0
- deleted = 0
- replaced = 0
- while (!found && (c = getc()) != EOT) { # parsing commands
- buf0 = buf0 c
- if( match(buf0, /\\added[[:space:]]*\[[^\]]*\][[:space:]]*\[[^\]]*\][[:space:]]*{/) ||
- match(buf0, /\\added[[:space:]]*\[[^\]]*\][[:space:]]*{/) ||
- match(buf0, /\\added[[:space:]]*{/) ) { # found command \added[<authorid>][<remark>]{<new text>}
- added = 1
- found = 1
- balance = 1
- } else
- if( match(buf0, /\\deleted[[:space:]]*\[[^\]]*\][[:space:]]*\[[^\]]*\][[:space:]]*{/) ||
- match(buf0, /\\deleted[[:space:]]*\[[^\]]*\][[:space:]]*{/) ||
- match(buf0, /\\deleted[[:space:]]*{/) ) { # found command \deleted[<authorid>][<remark>]{<deleted text>}
- deleted = 1
- found = 1
- balance = 1
- } else
- if( match(buf0, /\\replaced[[:space:]]*\[[^\]]*\][[:space:]]*\[[^\]]*\][[:space:]]*{/) ||
- match(buf0, /\\replaced[[:space:]]*\[[^\]]*\][[:space:]]*{/) ||
- match(buf0, /\\replaced[[:space:]]*{/) ) { # found command \replaced[<authorid>][<remark>]{<new text>}{<old text>}
- replaced = 1
- found = 1
- balance = 1
- }
- }
- if( RLENGTH == -1 ) # command not found
- pbuf0 = buf0
- else { # command found
- pbuf0 = substr(buf0, 1, RSTART-1)
- cmd = substr(buf0, RSTART, RLENGTH) # the command
- }
- printf("%s", pbuf0) >> fn # print text preceding command
- if (c == EOT)
- break
- buf = ""
- if( added ) { # command \added[][]{}
- while (found && balance > 0 && (c = getc()) != EOT) # parsing <new text>
- buf = buf c # <new text>
- cmd = cmd buf # the command
- if ( im ) { # interactive mode
- printf("\nat line: %d\n%s\n", nr,cmd)
- printf("Accept added text, Reject added text, Ignore or Finish accepting changes? [A|r|i|f]")
- getline imoderes < "/dev/tty"
- if( imoderes != "r" && imoderes != "i" ) { # accept added text
- pbuf = substr(buf, 1, length(buf)-1) # remove ending curly brace "}"
- printf("%s", pbuf) >> fn # print <new text>
- if( imoderes == "f" ) # finish accepting changes
- im = 0 # normal mode
- } else
- if( imoderes == "i" ) # ignore cmd
- printf("%s", cmd) >> fn
- } else { # accept change
- pbuf = substr(buf, 1, length(buf)-1) # remove ending curly brace "}"
- printf("%s", pbuf) >> fn # print <new text>
- }
- } # \added[][]{}
- else
- if( deleted ) { # command \deleted[][]{}
- while (found && balance > 0 && (c = getc()) != EOT) # parsing <deleted text>
- buf = buf c # <deleted text> to skip
- cmd = cmd buf # the command
- if ( im ) { # interactive mode
- printf("\nat line: %d\n%s\n", nr,cmd)
- printf("Accept to remove text, Reject deletion, Ignore or Finish accepting changes? [A|r|i|f]")
- getline imoderes < "/dev/tty"
- if( imoderes == "r" ) { # reject deletion
- pbuf = substr(buf, 1, length(buf)-1) # remove ending curly brace "}"
- printf("%s", pbuf) >> fn # print <deleted text>
- } else
- if( imoderes == "i" ) # ignore cmd
- printf("%s", cmd) >> fn
- else # accept changes
- if( imoderes == "f" ) # finish accepting changes
- im = 0 # normal mode
- } # else accept changes
- } # \deleted[][]{}
- else
- if ( replaced ) { # command \replaced[][]{}{}
- while (replaced && balance > 0 && (c = getc()) != EOT) # parsing <new text>
- buf = buf c # <new text>
- cmd = cmd buf # the command
- pbufnt = substr(buf, 1, length(buf)-1) # new text
- buf = ""
- skip=0
- while ( !skip && (c = getc()) != EOT ) { # skip first curly brace "{"
- buf = buf c
- if ( c !~ /[[:space:]]/ )
- skip = 1
- }
- cmd = cmd buf # the command
- if ( c != "{" ) { # found "{"
- printf("\nOps! Syntax error at line %d of input file: \"%s\"\nPlease fix command \\replaced[][]{}{}: \"{\" is expected.\n\n", nr+1, cmd)
- break
- }
- buf = ""
- balance = 1 # reset balance
- while (replaced && balance > 0 && (c = getc()) != EOT) # parsing <old text>
- buf = buf c # <old text>
- cmd = cmd buf # the command
- pbufot = substr(buf, 1, length(buf)) # old text
- if ( im ) { # interactive mode
- printf("\nat line: %d\n%s\n", nr,cmd)
- printf("Accept change, Reject change, Ignore or Finish accepting changes? [A|r|i|f]")
- getline imoderes < "/dev/tty"
- if( imoderes == "r" ) { # reject change
- printf("%s", pbufot) >> fn # print <old text>
- } else
- if( imoderes == "i" ) { # ignore cmd
- printf("%s", cmd) >> fn
- } else { # accept change
- printf("%s", pbufnt) >> fn # print <new text>
- if( imoderes == "f" ) # finish accepting changes
- im = 0 # normal mode
- }
- } else { # accept change
- printf("%s", pbufnt) >> fn # print <new text>
- }
- } # \replaced[][]{}{}
- } while(c != EOT)
-}
-
-function getc()
-{
- if (!nr) {
- nr = 1
- nc = 1
- }
-
- if (nr > NR)
- return EOT
- if (nc > length(line[nr])) {
- ++nr
- nc = 1
- return "\n"
- }
- c = substr(line[nr], nc, 1)
- ++nc
- if (c == "{")
- ++balance
- else if (c == "}")
- --balance
- if (balance < 0)
- balance = 0
- return c
-} ' "${INFILE}"
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/changes/changes.sty new/tex/latex/changes/changes.sty
--- old/tex/latex/changes/changes.sty 2012-05-01 01:32:45.000000000 +0200
+++ new/tex/latex/changes/changes.sty 2013-08-14 00:48:35.000000000 +0200
@@ -7,7 +7,7 @@
%% changes.dtx (with options: `changes')
%%
%% changes.dtx
-%% Copyright 2007-2012 Ekkart Kleinod (ekleinod@edgesoft.de)
+%% Copyright 2007-2013 Ekkart Kleinod (ekleinod@edgesoft.de)
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -41,8 +41,8 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{changes}
-[2012/04/25 v1.0.0 changes-Paket]
-\typeout{*** changes-Paket 2012/04/25 v1.0.0 ***}
+[2013/08/13 v2.0.2 changes-Paket]
+\typeout{*** changes-Paket 2013/08/13 v2.0.2 ***}
\RequirePackage{xkeyval}
\RequirePackage{xifthen}
\newboolean{Changes@optiondraft}
@@ -152,7 +152,8 @@
\equal{#1}{superscript}\or
\equal{#1}{subscript}\or
\equal{#1}{brackets}\or
-\equal{#1}{footnote}
+\equal{#1}{footnote}\or
+\equal{#1}{none}
}
{\renewcommand{\Changes@optionauthormarkup}{#1}}
{\PackageWarning{changes}{authormarkup '#1' unknown, using '\Changes@optionauthormarkup'}}
@@ -222,6 +223,10 @@
id=\@empty,
remark=\@empty
}{}
+\DeclareOptionX{style}{\def\Changes@loc@style{#1}}
+\presetkeys{Changes@loc}{
+style=list
+}{}
\ProcessOptionsX*\relax
\newboolean{Changes@colored}
\setboolean{Changes@colored}{true}
@@ -254,48 +259,58 @@
{}
\ifthenelse{\isundefined{\addto}}
{
-\def\listchangesname{Changes}
+\def\listofchangesname{List of changes}
+\def\summaryofchangesname{Changes}
\def\changesaddname{Added}
\def\changesdeletename{Deleted}
\def\changesreplacename{Replaced}
\def\changesauthorname{Author}
\def\changesanonymousname{anonymous}
\def\changesnoloc{List of changes is available after the next \LaTeX\ run.}
+\def\changesnosoc{Summary of changes is available after the next \LaTeX\ run.}
}{
-\addto\captionsngerman{\def\listchangesname{\"Anderungen}}
+\addto\captionsngerman{\def\listofchangesname{Liste der \"Anderungen}}
+\addto\captionsngerman{\def\summaryofchangesname{\"Anderungen}}
\addto\captionsngerman{\def\changesaddname{Eingef\"ugt}}
\addto\captionsngerman{\def\changesdeletename{Gel\"oscht}}
\addto\captionsngerman{\def\changesreplacename{Ersetzt}}
\addto\captionsngerman{\def\changesauthorname{Autor}}
\addto\captionsngerman{\def\changesanonymousname{Anonym}}
-\addto\captionsngerman{\def\changesnoloc{\"Anderungsliste nach dem n\"achsten \LaTeX-Lauf verf\"ugbar.}}
+\addto\captionsngerman{\def\changesnoloc{Liste der \"Anderungen nach dem n\"achsten \LaTeX-Lauf verf\"ugbar.}}
+\addto\captionsngerman{\def\changesnosoc{\"Anderungen nach dem n\"achsten \LaTeX-Lauf verf\"ugbar.}}
-\addto\captionsgerman{\def\listchangesname{\"Anderungen}}
+\addto\captionsgerman{\def\listofchangesname{Liste der \"Anderungen}}
+\addto\captionsgerman{\def\summaryofchangesname{\"Anderungen}}
\addto\captionsgerman{\def\changesaddname{Eingef\"ugt}}
\addto\captionsgerman{\def\changesdeletename{Gel\"oscht}}
\addto\captionsgerman{\def\changesreplacename{Ersetzt}}
\addto\captionsgerman{\def\changesauthorname{Autor}}
\addto\captionsgerman{\def\changesanonymousname{Anonym}}
-\addto\captionsgerman{\def\changesnoloc{\"Anderungsliste nach dem n\"achsten \LaTeX-Lauf verf\"ugbar.}}
+\addto\captionsgerman{\def\changesnoloc{Liste der \"Anderungen nach dem n\"achsten \LaTeX-Lauf verf\"ugbar.}}
+\addto\captionsgerman{\def\changesnosoc{\"Anderungen nach dem n\"achsten \LaTeX-Lauf verf\"ugbar.}}
-\addto\captionsenglish{\def\listchangesname{Changes}}
+\addto\captionsenglish{\def\listofchangesname{List of changes}}
+\addto\captionsenglish{\def\summaryofchangesname{Changes}}
\addto\captionsenglish{\def\changesaddname{Added}}
\addto\captionsenglish{\def\changesdeletename{Deleted}}
\addto\captionsenglish{\def\changesreplacename{Replaced}}
\addto\captionsenglish{\def\changesauthorname{Author}}
\addto\captionsenglish{\def\changesanonymousname{anonymous}}
\addto\captionsenglish{\def\changesnoloc{List of changes is available after the next \LaTeX\ run.}}
+\addto\captionsenglish{\def\changesnosoc{Summary of changes is available after the next \LaTeX\ run.}}
-\addto\captionsitalian{\def\listchangesname{Modifiche}}
+\addto\captionsitalian{\def\listofchangesname{Lista delle modifiche}}
+\addto\captionsitalian{\def\summaryofchangesname{Modifiche}}
\addto\captionsitalian{\def\changesaddname{Aggiunte}}
\addto\captionsitalian{\def\changesdeletename{Cancellazioni}}
\addto\captionsitalian{\def\changesreplacename{Sostituzioni}}
\addto\captionsitalian{\def\changesauthorname{Autore}}
\addto\captionsitalian{\def\changesanonymousname{anonimo}}
\addto\captionsitalian{\def\changesnoloc{La lista delle modifiche sar\`a disponibile alla prossima esecuzione di \LaTeX.}}
+\addto\captionsitalian{\def\changesnosoc{Le modifiche sar\`a disponibile alla prossima esecuzione di \LaTeX.}}
}
-\newcommand{\Changes@extension}{loc}
-\newcommand{\setlocextension}[1]{
+\newcommand{\Changes@extension}{soc}
+\newcommand{\setsocextension}[1]{
\renewcommand{\Changes@extension}{#1}
}
\newcounter{Changes@AuthorCount}
@@ -324,6 +339,7 @@
\ifthenelse{\equal{\Changes@optionauthormarkup}{subscript}}{\textsubscript{#1}}{}%
\ifthenelse{\equal{\Changes@optionauthormarkup}{brackets}}{(#1)}{}%
\ifthenelse{\equal{\Changes@optionauthormarkup}{footnote}}{\footnote{#1}}{}%
+\ifthenelse{\equal{\Changes@optionauthormarkup}{none}}{}{}%
}
\newcommand{\setauthormarkup}[1]{
\renewcommand{\Changes@Markup@Author}[1]{#1}
@@ -385,7 +401,7 @@
\renewcommand{\Changes@Markup@Deleted}[1]{#1}
}
\newboolean{Changes@WrongID}
-\newcommand{\Changes@output}[4]{%
+\newcommand{\Changes@output}[6]{%
\ifthenelse{\boolean{Changes@optiondraft}}%
{%
\setboolean{Changes@WrongID}{true}%
@@ -422,25 +438,33 @@
{\Changes@Remark{#3}{#4}}%
{}%
}%
+\ifthenelse{\equal{\@empty}{#3}}%
+{\def\Changes@locid{}}%
+{\def\Changes@locid{~(#3)}}%
+\addcontentsline{loc}{subsection}{#6\Changes@locid: \truncate{.3\textwidth}{#5}}%
}%
{#2}%
}
\newcommand{\added}[2][\@empty]{%
\setkeys{Changes@added}{#1}%
-\Changes@output
-{\Changes@Markup@Added{#2}}
-{#2}
-{\Changes@added@id}
+\Changes@output%
+{\Changes@Markup@Added{#2}}%
+{#2}%
+{\Changes@added@id}%
{\Changes@added@remark}%
+{#2}%
+{\changesaddname}%
\stepcounter{Changes@AddCount\Changes@added@id}%
}
\newcommand{\deleted}[2][\@empty]{%
\setkeys{Changes@deleted}{#1}%
-\Changes@output
-{\Changes@Markup@Deleted{#2}}
-{\@bsphack \expandafter \@esphack}
-{\Changes@deleted@id}
+\Changes@output%
+{\Changes@Markup@Deleted{#2}}%
+{\@bsphack \expandafter \@esphack}%
+{\Changes@deleted@id}%
{\Changes@deleted@remark}%
+{#2}%
+{\changesdeletename}%
\stepcounter{Changes@DeleteCount\Changes@deleted@id}%
}
\newcommand{\replaced}[3][\@empty]{%
@@ -450,8 +474,11 @@
{#2}
{\Changes@replaced@id}
{\Changes@replaced@remark}%
+{#2}%
+{\changesreplacename}%
\stepcounter{Changes@ReplaceCount\Changes@replaced@id}%
}
+\RequirePackage[breakall]{truncate}
\def\changes@chopline#1;#2;#3;#4;#5;#6 \\{
\def\Changes@InID{#1}
\def\Changes@InColor{#2}
@@ -460,13 +487,37 @@
\def\Changes@InDeleted{#5}
\def\Changes@InReplaced{#6}
}
-\newcommand{\listofchanges}{%
+\newlength{\Changes@Len@summ}
+\setlength{\Changes@Len@summ}{.2\textwidth}
+\newboolean{Changes@MoreLines}
+\newcommand{\listofchanges}[1][style=list]{%
+\setkeys{Changes@loc}{#1}%
+\ifthenelse{\equal{\@empty}{\Changes@loc@style}}
+{\def\Changes@loc@style{list}}
+{
+\ifthenelse{
+\equal{\Changes@loc@style}{list}\or
+\equal{\Changes@loc@style}{summary}
+}
+{}
+{\def\Changes@loc@style{list}}
+}
+\ifthenelse{\equal{\Changes@loc@style}{list}}
+{
+\section*{\listofchangesname}
+\IfFileExists{\jobname.loc}
+{}{
+\emph{\changesnoloc}
+\PackageWarning{changes}{LaTeX rerun needed for list of changes}
+}
+\@starttoc{loc}
+}
+{
\ifthenelse{\boolean{Changes@optiondraft}}
{
-\section*{\listchangesname}
+\section*{\summaryofchangesname}
\IfFileExists{\jobname.\Changes@extension}
{
-\newboolean{Changes@MoreLines}
\setboolean{Changes@MoreLines}{true}
\newread\Changes@InFile
\openin\Changes@InFile = \jobname.\Changes@extension
@@ -476,34 +527,32 @@
\setboolean{Changes@MoreLines}{false}
\else
\expandafter\changes@chopline\Changes@Line\\
-\begin{tabbing}
-mm\=mmmmmm\=\kill
-{
+\textbf{%
\ifthenelse{\boolean{Changes@colored}}
{\color{\Changes@InColor}}
{}
\ifthenelse{\equal{\Changes@InID}{\@empty}}
{\changesauthorname: \changesanonymousname}
-{
+{%
\changesauthorname: \Changes@InID
\ifthenelse{\equal{\Changes@InName}{\@empty}}
{}
{ (\Changes@InName)}
}
}\\
-\>\changesaddname:\>\Changes@InAdded\\
-\>\changesdeletename:\>\Changes@InDeleted\\
-\>\changesreplacename:\>\Changes@InReplaced\\
-\end{tabbing}
+\parbox{\Changes@Len@summ}{\changesaddname~\dotfill~\Changes@InAdded}\\
+\parbox{\Changes@Len@summ}{\changesdeletename~\dotfill~\Changes@InDeleted}\\
+\parbox{\Changes@Len@summ}{\changesreplacename~\dotfill~\Changes@InReplaced}\\[1ex]
\fi
}
\closein\Changes@InFile
-}{
-\emph{\changesnoloc}
-\PackageWarning{changes}{LaTeX rerun needed for list of changes}
+}{%
+\emph{\changesnosoc}
+\PackageWarning{changes}{LaTeX rerun needed for summary of changes}
}
}{}
}
+}
\AtEndDocument{
\newwrite\Changes@OutFile
\immediate\openout\Changes@OutFile = \jobname.\Changes@extension
@@ -523,6 +572,6 @@
\immediate\closeout\Changes@OutFile
\let\protect\Changes@protect
}
-%% Copyright 2007-2012 Ekkart Kleinod
+%% Copyright 2007-2013 Ekkart Kleinod
%%
%% End of file `changes.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/changes.tlpobj new/tlpkg/tlpobj/changes.tlpobj
--- old/tlpkg/tlpobj/changes.tlpobj 2012-05-01 04:37:55.000000000 +0200
+++ new/tlpkg/tlpobj/changes.tlpobj 2013-08-14 03:19:22.000000000 +0200
@@ -1,6 +1,6 @@
name changes
category Package
-revision 26165
+revision 31424
shortdesc Manual change markup.
relocated 1
longdesc The package allows the user to manually markup changes of text,
@@ -10,10 +10,9 @@
longdesc associated colour. It also allows you to define a markup for
longdesc authors or annotations. A bash script is provided for removing
longdesc the changes.
-runfiles size=8
- RELOC/scripts/changes/delcmdchanges.bash
+runfiles size=5
RELOC/tex/latex/changes/changes.sty
catalogue-ctan /macros/latex/contrib/changes
-catalogue-date 2012-04-26 11:05:40 +0200
+catalogue-date 2013-08-13 17:34:49 +0200
catalogue-license lppl1.3
-catalogue-version 1.0.0
+catalogue-version 2.0.2
++++++ chemfig.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/chemfig/README new/doc/generic/chemfig/README
--- old/doc/generic/chemfig/README 2012-11-18 01:44:15.000000000 +0100
+++ new/doc/generic/chemfig/README 2013-11-29 00:21:14.000000000 +0100
@@ -4,7 +4,7 @@
ChemFig package
v1.0g
- 2012/11/16
+ 2013/11/28
___________________________________
Maintainer: Christian Tellechea
Files old/doc/generic/chemfig/chemfig_doc_en.pdf and new/doc/generic/chemfig/chemfig_doc_en.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/chemfig/chemfig_doc_en.tex new/doc/generic/chemfig/chemfig_doc_en.tex
--- old/doc/generic/chemfig/chemfig_doc_en.tex 2012-11-18 01:44:15.000000000 +0100
+++ new/doc/generic/chemfig/chemfig_doc_en.tex 2013-11-29 00:21:14.000000000 +0100
@@ -3,7 +3,7 @@
% | |
% | Chemfig manual |
% | |
-% | November 16, 2012 |
+% | November 28, 2013 |
% | |
% |__________________________________________________________________|
%
@@ -15,7 +15,7 @@
% Comments, bug reports and suggestions are welcome.
% Licence : Released under the LaTeX Project Public License v1.3c or
% later, see http://www.latex-project.org/lppl.txt
-% Copyright : Christian Tellechea 2010-2012
+% Copyright : Christian Tellechea 2010-2013
%
% The "chemfig" package consists of the 8 following files:
% chemfig.tex (the code of the package)
@@ -873,6 +873,8 @@
\chemsign{+}
\chemname{\chemfig{H_2O}}{Water}
\chemnameinit{}/
+
+If \verb|\chemname*{<nom>}| is written, the macro does not take into account the previous names.
\newpage
\part{Advanced usage}\label{utilisation.avancee}
Files old/doc/generic/chemfig/chemfig_doc_fr.pdf and new/doc/generic/chemfig/chemfig_doc_fr.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/chemfig/chemfig_doc_fr.tex new/doc/generic/chemfig/chemfig_doc_fr.tex
--- old/doc/generic/chemfig/chemfig_doc_fr.tex 2012-11-18 01:44:15.000000000 +0100
+++ new/doc/generic/chemfig/chemfig_doc_fr.tex 2013-11-29 00:21:14.000000000 +0100
@@ -3,7 +3,7 @@
% | |
% | Documentation de ChemFig |
% | |
-% | 16 novembre 2012 |
+% | 28 novembre 2013 |
% | |
% |__________________________________________________________________|
%
@@ -15,7 +15,7 @@
% Comments, bug reports and suggestions are welcome.
% Licence : Released under the LaTeX Project Public License v1.3c or
% later, see http://www.latex-project.org/lppl.txt
-% Copyright : Christian Tellechea 2010-2012
+% Copyright : Christian Tellechea 2010-2013
%
% L'extension "chemfig" est constituée de ces 8 fichiers :
% chemfig.tex (le code de l'extention)
@@ -873,6 +873,8 @@
\chemsign{+}
\chemname{\chemfig{H_2O}}{Eau}
\chemnameinit{}/
+
+Si l'on écrit \verb|\chemname*{<nom>}|, alors la macro ne tient pas compte des noms rencontrés précédemment.
\newpage
\part{Utilisation avancée}\label{utilisation.avancee}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chemfig.doc.tlpobj new/tlpkg/tlpobj/chemfig.doc.tlpobj
--- old/tlpkg/tlpobj/chemfig.doc.tlpobj 2012-11-18 04:29:57.000000000 +0100
+++ new/tlpkg/tlpobj/chemfig.doc.tlpobj 2013-11-29 03:21:14.000000000 +0100
@@ -1,9 +1,9 @@
name chemfig.doc
category Package
-revision 28287
+revision 32270
shortdesc doc files of chemfig
relocated 1
-docfiles size=716
+docfiles size=626
RELOC/doc/generic/chemfig/README
RELOC/doc/generic/chemfig/chemfig_doc_en.pdf
RELOC/doc/generic/chemfig/chemfig_doc_en.tex
++++++ chemfig.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/chemfig/chemfig.sty new/tex/generic/chemfig/chemfig.sty
--- old/tex/generic/chemfig/chemfig.sty 2012-11-18 01:44:15.000000000 +0100
+++ new/tex/generic/chemfig/chemfig.sty 2013-11-29 00:21:14.000000000 +0100
@@ -1,9 +1,9 @@
% __________________________________________________________________
% | |
% | |
-% | chemfig v1.0g |
+% | chemfig v1.0h |
% | |
-% | November 16, 2012 |
+% | November 28, 2013 |
% | |
% |__________________________________________________________________|
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/chemfig/chemfig.tex new/tex/generic/chemfig/chemfig.tex
--- old/tex/generic/chemfig/chemfig.tex 2012-11-18 01:44:15.000000000 +0100
+++ new/tex/generic/chemfig/chemfig.tex 2013-11-29 00:21:14.000000000 +0100
@@ -1,9 +1,9 @@
% __________________________________________________________________
% | |
% | |
-% | chemfig v1.0g |
+% | chemfig v1.0h |
% | |
-% | November 16, 2012 |
+% | November 28, 2013 |
% | |
% |__________________________________________________________________|
%
@@ -14,7 +14,7 @@
% Comments, bug reports and suggestions are welcome.
% Licence : Released under the LaTeX Project Public License v1.3c or
% later, see http://www.latex-project.org/lppl.txt
-% Copyright : Christian Tellechea 2010-2012
+% Copyright : Christian Tellechea 2010-2013
%
% The "chemfig" package consists of the 8 following files:
% chemfig.tex (this file)
@@ -74,10 +74,10 @@
\def#1%
}
-\CF@def\CF@ver {1.0g}
-\CF@def\CF@date {2012/11/16}
-\CF@def\CF@fr@date {16 novembre 2012}
-\CF@def\CF@en@date {November 16, 2012}
+\CF@def\CF@ver {1.0h}
+\CF@def\CF@date {2013/11/28}
+\CF@def\CF@fr@date {28 novembre 2013}
+\CF@def\CF@en@date {November 28, 2013}
\CF@def\CF@package@name{chemfig}
\expandafter\ifx\csname @latexerr\endcsname\relax% on n'utilise pas LaTeX ?
@@ -128,6 +128,7 @@
\newif\ifCF@incycle
\newif\ifCF@cyclearc
\newif\ifCF@definesubmol
+\newif\ifCF@name@dp@adjust
\newdimen\CF@dim
@@ -906,7 +907,7 @@
\or% 4 = liaison Cram pleine de #2 vers #3
\CF@create@normnodes{#2@@}{#3@@}{\CF@cram@basewidth/2}{}%
\expandafter\filldraw\expandafter[\CF@current@bondstyle,line join=bevel](#2@@1)--(#2@@2)--(#3@@)--(#2@@1);
- \or% 5 = liaison Cram pleine de #3 vers #2
+ \or% 5 = liaison Cram creuse de #3 vers #2
\CF@create@normnodes{#3@@}{#2@@}{\CF@cram@basewidth/2}{}%
\expandafter\filldraw\expandafter[\CF@current@bondstyle,line join=bevel](#3@@1)--(#3@@2)--(#2@@)--(#3@@1);
\or% 6 = liaison Cram pointill\'ee de #2 vers #3
@@ -1393,7 +1394,8 @@
\CF@def\CF@remove@equichars#1<>#2\@nil{#1#2}
\CF@def\chemmove{%
- \@testopt\CF@chemmove{}}
+ \@testopt\CF@chemmove{}%
+}
\CF@def\CF@chemmove[#1]#2{%
\ifx\@empty#2\@empty
@@ -1409,9 +1411,9 @@
\CF@def\chemnameinit#1{%
\setbox\CF@stuff@box\hbox{#1}%
- \edef\CF@dp@max{\the\dp\CF@stuff@box}%
+ \xdef\CF@dp@max{\the\dp\CF@stuff@box}%
}
-\chemnameinit{}
+\let\CF@dp@max\z@
\CF@def\CF@parse@molname#1\\#2\@nil{%
\hbox to\CF@wd@stuffbox{\hss#1\hss}%
@@ -1423,18 +1425,24 @@
}
\CF@def\chemname{%
- \@testopt\CF@chemname{1.5ex}%
+ \@ifstar
+ {\CF@name@dp@adjustfalse\CF@chemnam@i}
+ {\CF@name@dp@adjusttrue\CF@chemnam@i}%
+}
+
+\CF@def\CF@chemnam@i{%
+ \@testopt\CF@chemname@ii{1.5ex}%
}
-\CF@def\CF@chemname[#1]#2#3{%
+\CF@def\CF@chemname@ii[#1]#2#3{%
\setbox\CF@stuff@box\hbox{#2}%
\edef\CF@wd@stuffbox{\the\wd\CF@stuff@box}\edef\CF@dp@stuffbox{\the\dp\CF@stuff@box}%
\leavevmode
- \ifdim\CF@dp@max<\CF@dp@stuffbox\let\CF@dp@max\CF@dp@stuffbox\fi
+ \ifdim\CF@dp@max<\CF@dp@stuffbox\global\let\CF@dp@max\CF@dp@stuffbox\fi
\vtop{%
\box\CF@stuff@box
\nointerlineskip
- \kern\dimexpr#1+\CF@dp@max-\CF@dp@stuffbox\relax
+ \kern\dimexpr#1\ifCF@name@dp@adjust+\CF@dp@max-\CF@dp@stuffbox\fi\relax
\CF@parse@molname#3\\\@nil
}%
}
@@ -1766,14 +1774,18 @@
% trace un fl\`eche initi\'ee par (@nom--@nom)
% #1=type de fl\`eche #2=nom depart #3=ancre d\'epart #4=nom arriv\'ee #5=ancre arriv\'ee #6=style fl\`eche
-\CF@def\CF@direct@arrow#1#2#3#4#5#6{%
+\def\CF@direct@arrow#1#2#3#4#5#6{%
+ \expandafter\def\expandafter\CF@arrow@start@name\expandafter{\@gobble#2}%
+ \expandafter\def\expandafter\CF@arrow@end@name\expandafter{\@gobble#4}%
\path[sloped,allow upside down](\@gobble#2\ifx\@empty#3\@empty\else.#3\fi)--(\@gobble#4\ifx\@empty#5\@empty\else.#5\fi)%
coordinate[pos=0,xshift=\CF@arrow@offset](start@direct@arrow)%
coordinate[pos=1,xshift=-\CF@arrow@offset](end@direct@arrow);%
\def\CF@arrow@start@node{start@direct@arrow}%
\def\CF@arrow@end@node{end@direct@arrow}%
- \expandafter\def\expandafter\CF@arrow@start@name\expandafter{\@gobble#2}%
- \expandafter\def\expandafter\CF@arrow@end@name\expandafter{\@gobble#4}%
+ \pgfmathanglebetweenpoints
+ {\pgfpointanchor{\@gobble#2}{\ifx\@empty#3\@empty center\else#3\fi}}
+ {\pgfpointanchor{\@gobble#4}{\ifx\@empty#5\@empty center\else#5\fi}}%
+ \let\CF@arrow@current@angle\pgfmathresult
\ifx\@empty#6\@empty\else\CF@add@tocs\CF@arrow@current@style{#6,}\fi%
\csname\CF@grab@arrow@name#1[]\@nil\expandafter\endcsname\CF@grab@arrow@args#1[]\@nil[][][][][][][][]\@nil
}
@@ -2021,18 +2033,18 @@
\CF@arrow@shift@nodes{#3}%
\CF@arrow@display@label{#1}{0.5}+\CF@arrow@start@node{#2}{0.5}-\CF@arrow@end@node}
-\definearrow5{-U>}{% #4=coeff du rayon de l'arc de cercle #5=1/2 angle
+\definearrow5{-U>}{%
\CF@arrow@shift@nodes{#3}%
\expandafter\draw\expandafter[\CF@arrow@current@style,-CF@full](\CF@arrow@start@node)--(\CF@arrow@end@node)node[midway](Uarrow@arctangent){};%
- \edef\CF@tmp@str{\ifx\@empty#1\@empty[draw=none]\fi}%
+ \edef\CF@tmp@str{[\ifx\@empty#1\@empty draw=none\else\unexpanded\expandafter{\CF@arrow@current@style}\fi]}%
\expandafter\draw\CF@tmp@str (Uarrow@arctangent)%
arc[radius=\CF@compound@sep*\CF@current@arrow@length*\ifx\@empty#4\@empty0.333\else#4\fi,start angle=\CF@arrow@current@angle-90,%
delta angle=-\ifx\@empty#5\@empty60\else#5\fi]node(Uarrow@start){};
- \edef\CF@tmp@str{[\ifx\@empty#2\@empty draw=none,\fi-CF@full]}%
+ \edef\CF@tmp@str{[\ifx\@empty#2\@empty draw=none\else\unexpanded\expandafter{\CF@arrow@current@style},-CF@full\fi]}%
\expandafter\draw\CF@tmp@str (Uarrow@arctangent)%
arc[radius=\CF@compound@sep*\CF@current@arrow@length*\ifx\@empty#4\@empty0.333\else#4\fi,start angle=\CF@arrow@current@angle-90,%
delta angle=\ifx\@empty#5\@empty60\else#5\fi]node(Uarrow@end){};
- \edef\CF@tmp@str{\if\string-\expandafter\@car\detokenize{#4.}\@nil-\else+\fi}%
+ \pgfmathparse{#51*#41*cos(\CF@arrow@current@angle)<0?"-":"+"}\let\CF@tmp@str\pgfmathresult
\CF@arrow@display@label{#1}{0}\CF@tmp@str{Uarrow@start}{#2}{1}\CF@tmp@str{Uarrow@end}%
}
@@ -2083,7 +2095,7 @@
l'on \'ecrit \chemfig{*5(=====)}, on obtient deux polygones
r\'eguliers concentriques.
- La s\'equence de contr\^ole \setnodestyle permet de sp\'ecifier
- le style des nœuds dessin\'es par tikz.
+ le style des noeuds dessin\'es par tikz.
----------------------------------------------------------------------
v0.3 2010/11/21
- Am\'elioration de \definesubmol qui accepte les s\'equences de
@@ -2101,7 +2113,7 @@
- Mise en place de la repr\'esentation des m\'ecanismes
r\'eactionnels avec la synatxe "@{<nom>}" devant un atome o\`u
"@{<nom>,<coeff>}" au tout d\'ebut de l'argument d'une liaison.
- Cette syntaxe permet de placer un nœud (au sens de tikz) qui
+ Cette syntaxe permet de placer un noeud (au sens de tikz) qui
deviendra l'extr\'emit\'e des fl\`eches des m\'ecanismes.
Le trac\'e des fl\`eches est faite par la macro \chemmove dont
l'argument optionnel devient celui de l'environnement
@@ -2198,4 +2210,13 @@
- r\'e-\'ecriture des macros \chemabove et \chembemow pour
prendre en compte le bug (d\'esormais corrig\'e) dans luatex.
- nouvelle macro \setstacksep qui d\'efinit l'espacement par
- d\'efaut dans les macros \chemabove et \chembelow.
\ No newline at end of file
+ d\'efaut dans les macros \chemabove et \chembelow.
+----------------------------------------------------------------------
+v1.0h 2013/11/28
+ - \chemname admet maintenant une version \'etoil\'e qui ne tient
+ pas compte des profondeurs pr\'ec\'edentes.
+ - \CF@dp@max est g\'er\'e globalement.
+ - correction d'un bug dans "-U>" : le style de la flèche n'était
+ pris en compte pour l'arc.
+ - correction d'un bug dans \CF@direct@arrow : l'angle de la
+ fl\`eche n'\'etait pas calcul\'e
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/chemfig/t-chemfig.tex new/tex/generic/chemfig/t-chemfig.tex
--- old/tex/generic/chemfig/t-chemfig.tex 2012-11-18 01:44:15.000000000 +0100
+++ new/tex/generic/chemfig/t-chemfig.tex 2013-11-29 00:21:14.000000000 +0100
@@ -1,9 +1,9 @@
% __________________________________________________________________
% | |
% | |
-% | chemfig v1.0g |
+% | chemfig v1.0h |
% | |
-% | November 16, 2012 |
+% | November 28, 2013 |
% | |
% |__________________________________________________________________|
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chemfig.tlpobj new/tlpkg/tlpobj/chemfig.tlpobj
--- old/tlpkg/tlpobj/chemfig.tlpobj 2012-11-18 04:29:58.000000000 +0100
+++ new/tlpkg/tlpobj/chemfig.tlpobj 2013-11-29 03:21:15.000000000 +0100
@@ -1,6 +1,6 @@
name chemfig
category Package
-revision 28287
+revision 32270
shortdesc Draw molecules with easy syntax.
relocated 1
longdesc The package provides the command \chemfig{<code>}, which draws
@@ -15,6 +15,6 @@
RELOC/tex/generic/chemfig/chemfig.tex
RELOC/tex/generic/chemfig/t-chemfig.tex
catalogue-ctan /macros/generic/chemfig
-catalogue-date 2012-02-24 23:23:08 +0100
+catalogue-date 2013-11-27 22:19:17 +0100
catalogue-license lppl1.3
-catalogue-version 1.0f
+catalogue-version 1.0g
++++++ chemmacros.doc.tar.xz ++++++
++++ 15640 lines of diff (skipped)
++++++ chemmacros.tar.xz ++++++
++++ 12231 lines of diff (skipped)
++++++ chemnum.doc.tar.xz ++++++
++++ 5137 lines of diff (skipped)
++++++ chemnum.tar.xz ++++++
++++ 3377 lines of diff (skipped)
++++++ chemstyle.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/chemstyle/README new/doc/latex/chemstyle/README
--- old/doc/latex/chemstyle/README 2009-06-08 01:22:28.000000000 +0200
+++ new/doc/latex/chemstyle/README 2013-07-05 21:04:42.000000000 +0200
@@ -1,24 +1,45 @@
-----------------------------------------------------------------
-The chemstyle bundle --- Schemes and style for chemistry
-E-mail: joseph.wright@morningstar2.co.uk
-Released under the LaTeX Project Public License v1.3c or later
-See http://www.latex-project.org/lppl.txt
-----------------------------------------------------------------
+The chemstyle bundle - Schemes and style for chemistry
+======================================================
-The chemstyle bundle provides two packages: chemstyle and
-chemscheme. Both are intended to help chemists create floating
+The `chemstyle` bundle provides two packages: `chemstyle` and
+`chemscheme`. Both are intended to help chemists create floating
graphics and match published styles.
-The chemscheme package consists of two parts, both related to
-chemical schemes. The package adds a scheme float type to the
-LaTeX default types figure and table. The scheme float type
+The `chemscheme` package consists of two parts, both related to
+chemical schemes. The package adds a `scheme` float type to the
+LaTeX default types figure and table. The `scheme` float type
acts in the same way as those defined by the LaTeX kernel, but
is intended for chemical schemes. The package also provides a
method for adding automatic chemical numbering to schemes.
-The chemstyle package provides a "one-stop shop" for setting up
+The `chemstyle` package provides a "one-stop shop" for setting up
formatting of LaTeX documents following the editorial policies
of various chemical journals. It provides a number of handy
chemistry-related commands, and loads several support packages
to aid the chemist.
+Installation
+------------
+
+The package is supplied in `.dtx` format and as a pre-extracted
+`.zip` file, `chemstyle.tds.zip`. The later is most convenient
+for most users: simply unzip this in your local `texmf`
+directory. If you want to unpack the `.dtx` yourself, running
+`tex chemstyle.dtx` will extract the package whereas `latex
+chemstyle.dtx` will extract it and also typeset the
+documentation.
+
+Typesetting the documentation requires a number of packages in
+addition to those needed to use the package. This is mainly
+because of the number of demonstration items included in the
+text. To compile the documentation without error, you will
+need the packages:
+ - `booktabs`
+ - `csquotes`
+ - `helvet`
+ - `mathpazo`
+ - `mhchem`
+ - `microtype`
+ - `listings`
+ - `lmodern`
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/chemstyle/chemstyle-demo.tex new/doc/latex/chemstyle/chemstyle-demo.tex
--- old/doc/latex/chemstyle/chemstyle-demo.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/chemstyle/chemstyle-demo.tex 2013-07-05 21:04:42.000000000 +0200
@@ -0,0 +1,11 @@
+\documentclass[a4paper]{article}
+\usepackage[T1]{fontenc} % Modern font encoding
+\usepackage[runs=2]{auto-pst-pdf} % Use EPS graphics with pdfLaTeX
+\usepackage{booktabs} % Better table layouts
+\usepackage[journal=rsc]{chemstyle} % Of course!
+\usepackage{geometry} % Easy page layout
+\usepackage{lmodern} % Use Latin Modern fonts
+\usepackage[version=3]{mhchem} % Formula subscripts using \ce{}
+\begin{document}
+\end{document}
+
Files old/doc/latex/chemstyle/chemstyle.pdf and new/doc/latex/chemstyle/chemstyle.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/chemstyle/scheme-one.eps new/doc/latex/chemstyle/scheme-one.eps
--- old/doc/latex/chemstyle/scheme-one.eps 2012-01-31 00:59:13.000000000 +0100
+++ new/doc/latex/chemstyle/scheme-one.eps 1970-01-01 01:00:00.000000000 +0100
@@ -1,661 +0,0 @@
-%%Creator: ChemDraw Std(tm) 10.0
-%%Title: scheme-one.eps
-%%CreationDate: 21/07/2007 12:00
-%%DocumentSuppliedProcSets: chemdict30 24 13
-%%DocumentFonts: Helvetica Helvetica-Oblique
-%%BoundingBox: 30 78 288 144
-%%EndComments
-%%BeginProcSet: chemdict30 24 13
-userdict/chemdict30 210 dict put
-chemdict30 begin/version 24 def/sv 13 def
-/b{bind def}bind def/L{load def}b/R{null def}b/d/def L/a/add L/al/aload L
-/as/astore L/at/atan L/cp/closepath L/cv/curveto L/cw/currentlinewidth L
-/cpt/currentpoint L/dv/div L/D/dup L/e/exch L/F/false L/f/fill L/fa/forall L
-/g/get L/gi/getinterval L/gr/grestore L/gs/gsave L/ie/ifelse L/ix/index L
-/l/lineto L/mt/matrix L/M/moveto L/m/mul L/n/neg L/np/newpath L/pb/pathbbox L
-/P/pop L/r/roll L/rl/rlineto L/rm/rmoveto L/ro/rotate L/rp/repeat L
-/ru/round L/sc/scale L/sl/setlinewidth L/sm/setmatrix L/st/stroke L
-/sp/strokepath L/sq/sqrt L/s/sub L/T/true L/tr/transform L/xl/translate L
-/xc/exec L/A R/N R/St R/X R/Y R/aL R/bL R/bS R/bd R/bs R/cX R/cY R/ch R/co R
-/fB R/fI R/fS R/fZ R/fl R/ft R/iX R/iY R/idx R/lh R/llx R/lly R/lp R/nH R
-/nSq R/newdict R/ps R/rad R/rev R/sL R/sba R/sbl R/sbs R/sn R/spa R/tB R
-/typ R/urx R/ury R/w R/wF R/xX R/xY R/rBg R/gBg R/bBg R/gry R/rDst R/gDst R
-/bDst R/cpd R/Aeq R/Ath R/Aos R/Ach R/ed R/sf 20 d/cW 20 d/lW 20 d/bW 75 d
-/wF 1.5 d/aF 11.875 d/aR 0.263 d/aA 50 d/hS 54 d/pA 32 d/sh F d/S{sf m}b
-/dL{[hS] 0 setdash}b/o{1 ix}b/rot{3 -1 r}b/x{e d}b/CMT mt d/TM mt d
-/SM{CMT sm}b/XY{X D m Y D m a sq}b/s1 1 string d/fp{T charpath flattenpath}b
-/p{tr ru 0.25 a e ru 0.25 a e itransform}b/Wd{65536. dv}b
-/C{Wd rot Wd rot Wd rot setrgbcolor}b
-/setcmykcolor where{P/sk/setcmykcolor L}{/sk{4 1 r 3{3 ix a D 0 lt{P 0}if D 1\
- gt{P 1}if 1 e s 3 1 r}rp setrgbcolor P}b}ie/sg{D currenthsbcolor P rot seths\
-bcolor currenthsbcolor e P e P o s D m .001 gt{setgray}{P}ie}b
-/sBg{65535 dv/bBg x 65535 dv/gBg x 65535 dv/rBg
-x}b
-/sRmp{currentrgbcolor bBg e s/bDst x gBg e s/gDst x rBg e s/rDst x}b
-/dD{np 2 1 r 4 2 r xl 2 dv D sc -1 0 M 0 -1 l 1 0 l 0 1 l cp SM 0 ne{f}{lW 0.\
-8 m sl st}ie}b
-/dM{gs np 3 1 r xl D sc 0 4 M 0 -8 rl 3.5 2 rm -7 4 rl 0 -4 rm 7 4 rl SM st g\
-r}b/dQ{gs np 0 360 arc 0.5 sg f gr}b
-/dR{lW 0.8 m sl 2 ix s/Y x 2 ix s/X x xl Rr SM st}b
-/dT{fp pb 3 1 r s 3 2 r s 2 1 r rm f}b/N 0 d/db{array/bs x/N 0 d}b
-/B{bs N rot put/N N 1 a d}b
-/SpA{gs np o o xl rot s e rot s o 0 ne o 0 ne or{at ro}{P P}ie
-aR aL m n D aL a 0 M 0 o n aA n aA arc cp f gr}b
-/SpH{gs np o o xl rot s e rot s o 0 ne o 0 ne or{at ro}{P P}ie
-0 cw 2 dv xl
-aR aL m n D aL a 0 M 0 o n aA n 0 arc cp f gr}b/Sp{/St x 0.316/aR x gs
-aF lW m 0.8 m St 4 and 0 ne{bW m lW dv bW sl}if/aL x
-St 8 and 0 ne{8 ix 8 ix 3 ix 3 ix SpA}if
-St 16 and 0 ne{2 ix 6 m 1 a D ix e D ix e D ix e D ix e P SpA}if
-St 32 and 0 ne{8 ix 8 ix 3 ix 3 ix SpH}if
-St 64 and 0 ne{2 ix 6 m 1 a D ix e D ix e D ix e D ix e P SpH}if
-St 2 and 0 ne{St 4 and 0 ne{[hS bW m lW dv] 0 setdash}{dL}ie}if
-np M{cv}rp St 128 and 0 ne{f}{st}ie gr}b/Ha{gs np 3 1 r
-xl D sc -.7 1.4 M 0.7 1.4 l -.7 2.4 M 0.7 2.4 l SM st gr}b
-/OP{3 ix 3 ix xl 3 -1 r s 3 1 r
-e s o o at ro D m e D m a sq}b
-/OB{/bS x OP D bS dv D lW 2 m lt{P lW 2 m}if/bd x}b
-/DA{np 0 0 M aL 0 aR aL m 180 aA s 180 aA a arc cp f}b
-/OA{np 0 cw -2 dv M aL 0 aR aL m 180 aA s
-180 arc 0 cw -2 dv rl cp f}b
-/Ast{SM cw 0.8 m sl st}b/SA{aF m lW m/aL x 0.263/aR x aL 1 aR s m np 0 M
- rad 0 l gs Ast gr}b
-/CA{aF lW m 0.8 m/aL x 0.316/aR x aL 1 aR s m 2 dv rad D m o D m s D 0 le{P
-P P}{sq at 2
-m np rad 0 rad 180 6 -1 r s 180 6 -1 r s arc gs Ast gr cpt
-e at ro}ie}b/AA{np rad 0 rad 180 180 6 -1 r a arc gs SM st gr}b
-/RA{lW m/w x np rad w M w .7 dv w l rad w n M w .7 dv w n l w
- .35 dv w 2 m M 0 0
-l w .35 dv w -2 m l st}b
-/HA{lW m/w x np 0 0 M w 2 m D l w 2 m w l rad w l rad w n l w 2 m
-w n l w 2 m D n l cp st}b
-/Ar1{gs 5 1 r OP/rad x{{2.25 SA DA}{1.5 SA DA}{1 SA DA}{lW 4 m sl 4.5 SA DA}
-{lW 4 m sl 3 SA DA}{lW 4 m sl 2 SA
-DA}{270 CA DA}{180 CA DA}{120 CA DA}{90 CA DA}{2.5 RA}{2.5
-HA}{1 -1 sc 270 CA DA}{1 -1 sc 180 CA DA}{1 -1 sc 120 CA DA}{1 -1 sc 90 CA
-DA}{5 RA}{5 HA}{dL 2.25 SA DA}{dL 1.5 SA DA}{dL 1 SA DA}{2.25 SA OA}{1.5 SA
-OA}{1 SA OA}{1 -1 sc 2.25 SA OA}{1 -1 sc 1.5 SA OA}
-{1 -1 sc 1 SA OA}{270 CA OA}{180 CA OA}{120 CA OA}{90 CA OA}{1 -1 sc 270 CA
-OA}{1 -1 sc 180 CA OA}{1 -1 sc 120 CA OA}{1 -1 sc 90 CA OA}{1 -1 sc 270
-AA}{1 -1 sc 180 AA}{1 -1 sc 120 AA}{1 -1 sc 90 AA}}e g xc
-gr}b/ac{arcto 4{P}rp}b/rO{4 cw m}b/Cr{0 0 1 0 360 arc}b/Ac{XY D sc Cr SM}b
-/OrA{Y X at ro XY D rev{neg}if sc}b/Ov{OrA 1 0.4 sc Cr SM}b
-/Asc{OrA 1 27 dv D sc}b/LB{9 -6 M
-21 -10 27 -8 27 0 cv
-27 8 21 10 9 6 cv
--3 2 -3 -2 9 -6 cv
-cp}b/DLB{0 0 M
-0 0 -9.51 9.65 -9.51 18.02 cv
--9.51 23.22 -6.75 27 0 27 cv
-6.75 27 9.51 23.22 9.51 18.02 cv
-9.51 9.65 0 0 0 0 cv
-cp}b/ZLB{LB}b
-/dt{gs np M SM cpt np rot 4.5 dv 0 360 arc f gr}b
-/whf{gs 1 setgray f gr SM st}b/blf{gs f gr SM st}b/Rr{0 rO M
-0 Y X Y rO ac
-X Y X 0 rO ac
-X 0 0 0 rO ac
-0 0 0 Y rO ac
-cp}b/Rc{0 0 M
-0 Y l
-X Y l
-X 0 l
-cp}b/grf{gs 0.5 sg f gr SM st}b/gG{D 32 dv D m 1 e s/gry x
-currentrgbcolor bDst gry m a 3 1 r gDst gry m a 3 1 r rDst gry m a 3 1 r
-setrgbcolor}b/gS{dtransform CMT idtransform
-m D 0 lt{n}if sq n D
-CMT dtransform idtransform
-e 2 m e
-xl
-7 m 32 a 256 dv D sc}b/gLB{sh{sRmp
-32 -0.5 0.5{gs
-gG
-13.5 0 xl
-D 32 s 64 dv 13.5 m D 7 m 24 dv
-gS
--13.5 0 xl
-LB f
-gr}for
-LB SM st}{LB grf}ie}b/gOv{sh{sRmp
-32 -0.5 0.5{gs
-gG
-D 32 s 64 dv 0.65 m D
-gS
-Cr f
-gr}for
-Cr SM st}{Cr grf}ie}b/gAc{sh{sRmp
-32 -0.5 0.5{gs
-gG
-D 32 s 64 dv D
-gS
-Cr f
-gr}for
-Cr SM st}{Cr grf}ie}b
-/gDLB{sh{sRmp
-32 -0.5 0.5{gs
-gG
-0 13.5 xl
-D 32 s 64 dv 13.5 m D 7 m 24 dv e
-gS
-0 -13.5 xl
-DLB f
-gr}for
-DLB SM st}{DLB grf}ie}b/gRr{sh{sRmp
-32 -0.5 0.5{gs
-gG
-X 2 dv Y 2 dv xl
-D 32 s 64 dv X Y lt{X}{Y}ie m 0.25 m D
-gS
-X -2 dv Y -2 dv xl
-Rr f
-gr}for
-Rr SM st}{Rr grf}ie}b/gRc{sh{sRmp
-32 -0.5 0.5{gs
-gG
-X 2 dv Y 2 dv xl
-D 32 s 64 dv X Y lt{X}{Y}ie m 0.25 m D
-gS
-X -2 dv Y -2 dv xl
-Rc f
-gr}for
-Rc SM st}{Rc grf}ie}b/gZLB{gLB}b/Ath{Y X at ro XY 2 dv/rad x gs D SA DA gr
- rad 2 m 0 xl 180 ro SA DA}b/Aeq{Y X at ro XY/rad x
-rev{1 -1 sc}if
-gs
-0 lW 2 m xl
-D SA OA
-gr
-rad 0 xl
-180 ro
-0 lW 2 m xl
-SA OA}b/Aos{X Y M SM cpt xl XY e dv lW 1.667 m o o lt{e}if P D sc}b/Ach{5 Aos
-gs/Helvetica findfont[1 0 0 -1 0 0]makefont 5.5 scalefont setfont
-D stringwidth P 2 dv D 1 a/rad x
-n 0 M show gr
-rad 2 s -5 M
-rad n -5 rad n 1 2 ac
-rad n 1 rad 1 2 ac
-rad 1 rad -5 2 ac
-rad -5 rad n -5 2 ac
-cp Ast}b/Ar{D 39 lt{Ar1}
-{gs 5 1 r o o xl 3 -1 r e s 3 1 r s e
-o 0 lt o 0 lt ne/rev x
-D 0 lt{1 -1 sc neg}if/Y x D 0 lt{-1 1 sc neg}
-if/X x np{{Y 16 div D 2 S lt{P 2 S}if/lp x
-lp 0 M 0 0 l 0 Y l lp Y l
-X lp s 0 M X 0 l X Y l X lp s Y l SM st}{Y 16 div D 2 S lt{P 2 S}if/lp x
-lp 0 M
-0 0 0 Y lp ac
-0 Y 2 dv lp neg o lp ac
-0 Y 2 dv 0 Y lp ac
-0 Y lp Y lp ac
-X lp s 0 M
-X 0 X Y lp ac
-X Y 2 dv X lp a o lp ac
-X Y 2 dv X Y lp ac
-X Y X lp s Y lp ac SM st}{Y D 2 dv Y 180 pA s 180 pA a arc st
-np X Y s Y 2 dv
-Y pA D neg arcn st}{Rc SM st}{X lW 2 dv a lW -2 dv M
-rO D rl
-X lW 2 dv a rO a Y lW 2 dv a rO a l
-rO lW -2 dv a Y lW 2 dv a rO a l
-lW -2 dv Y lW 2 dv a l
-0 Y l X Y l X 0 l cp f
-0 0 M
-0 Y l
-X Y l
-X 0 l cp
-SM st}{Rr SM st}{rO Y M rO rO xl
-0 Y X Y rO ac
-X Y X 0 rO ac
-X 0 0 0 rO ac
-rO neg D xl X Y 0 Y rO ac
-cp f
-Rr st}{Ac st}{OrA gAc}{Ov st}{OrA 1 .4 sc gOv}{Asc LB whf}{Asc gLB}
-{Asc gs gLB gr
--1 -1 sc LB whf}{Asc gs gLB gr
--0.4 -0.4 sc LB whf}{Asc LB gs whf gr
-np -0.4 -0.4 sc gLB}{Asc DLB -1 -1 sc DLB gs whf gr
-np 90 ro gs gDLB gr -1 -1 sc gDLB}{Asc gs -1 -1 sc ZLB whf gr
-gs 3.6 12 sc gOv gr
-ZLB whf}{Asc gs -1 -1 sc gZLB gr
-gs 3.6 12 sc Cr whf gr
-gZLB}{0 0 M X Y l SM st}{bW sl 0 0 M X Y l SM st}
-{dL 0 0 M X Y l SM st}{OrA 1 16 dv D sc
-0 -1 M
-0 0 1 0 1 ac
-8 0 8 1 1 ac
-8 0 16 0 1 ac
-16 0 16 -1 1 ac
-SM st}{XY D 0 0 dt X Y dt}{XY 2 dv X Y dt}{XY D X Y dt 0 0 M SM cpt xl
-2 dv D sc
-1 0 M -1 0 l
-0 1 M 0 -1 l
-Ast}{XY D X Y dt 0 0 M SM cpt xl
-2 dv D sc
-1 0 M -1 0 l
-Ast}{4.5 Aos
-1 0 M -1 0 l
-0 1 M 0 -1 l
-2 0 M 0 0 2 0 360 arc
-Ast}{4.5 Aos
-1 0 M -1 0 l
-2 0 M 0 0 2 0 360 arc
-Ast}{2.25 Ath}{1.5 Ath}{1 Ath}{2.25 Aeq}{1.5 Aeq}{1 Aeq}{OrA 1 16 dv D sc
-0 -1 M 0 0 l 16 0 l 16 -1 l SM st}{5 Aos
-1 -1 M -1 -1 l
-0 2 M 0 -2 l
-Ast}{5 Aos
-1 -1 M -1 -1 l
-1 1 M -1 1 l
-0 2 M 0 -2 l
-Ast}{4.5 Aos
-1 0 M -1 0 l
-0 1 M 0 -1 l
-Ast}{4.5 Aos
-1 0 M -1 0 l
-Ast}{gRc}{gRr}{Rc blf}{Rr blf}{Ac blf}{Ov blf}{Asc DLB -1 -1 sc DLB gs whf gr
-np 90 ro DLB -1 -1 sc DLB blf}{Asc gs -1 -1 sc ZLB blf gr
-gs 3.6 12 sc Cr whf gr
-ZLB blf}{Asc gs -1 -1 sc ZLB whf gr
-gs 3.6 12 sc Cr blf gr
-ZLB whf}{Asc LB gs whf gr
-np -0.4 -0.4 sc LB blf}{Asc LB gs f gr gs SM st gr
-np -0.4 -0.4 sc LB whf}{Asc LB blf}{Asc LB gs f gr gs SM st gr
-np -1 -1 sc LB whf}{Ac whf}{OrA gAc}{Ac blf}{Ov whf}
-{OrA 1 .4 sc gOv}{Ov blf}{(Rac)Ach}{(Abs)Ach}{(Rel)Ach}
-}e 39 s g xc gr}ie}b/DS{np M l st}b
-/DD{gs dL DS gr}b/DB{gs 12 OB bW sl np 0 0 M 0 l st gr}b/ap{e 3 ix a
-e 2 ix a}b/PT{D 2 4 gi al P OP D 1 sc
-o length 6 gt{P 6 g}{e P 8 dv}ie
-D lW 2 m lt{P lW 2 m}if
-0 e
-0 0
-3 -1 r s 3 1 r e s e
-0 0 M 1 0 l
-0 0 ap M 1 0 ap l
-e n e n
-0 0 ap M 1 0 ap l
-P P}b/DT{gs np PT SM st gr}b
-/NH{lW s D hS dv ru
-cvi D 0 eq{P 1}if/nH x
-D hS nH m s
-D 0 lt{P .1 s nH dv}{nH 2 a dv D 0 xl 2 m s nH dv}ie}b
-/Bd{D type/arraytype ne{bs e g}if{{P}{{{DS}{DD}{gs 12 OB np
-bW 2 dv/bd x
-lW 2 dv e D NH e{D bd M bd n l}for
-st gr}{gs 12 OB np
-lW 2 dv 0 xl NH 1 sc
-bW 2 dv wF m nH 1 a dv/bd x
-0 1 nH
-{D 1 a bd m o o M n l}for SM st gr}{P}{DB}{gs 12 OB
-np 0 lW 2 dv o o n M l bW 2 dv
-wF m o o l n l
-cp f gr}{P}{gs 12 OB/bL x
-bW 2 dv D lW lt{P lW}if/bd x np 0 0 M
-bL bd 4 m dv ru 2 o o lt{e}if P cvi/nSq x
-bL nSq 2 m dv D sc
-nSq{.135 .667 .865 .667 1 0 rcurveto
-.135 -.667 .865 -.667 1 0 rcurveto}rp SM st gr}{gs 12 OB
-np 0 lW 2 dv o o n M l bW 2 dv
-wF m o o l n l
-cp SM lW 0.8 m sl st gr}{P}{4 2 r gs OP/rad x 1 SA DA gr}{P}
-}o 1 g 1 s g e 2 4 gi al P
-5 -1 r xc}{al P 8 ix 1 eq{DD}{DS}ie 5 -1 r 2 eq{DB}{DS}ie P}{DT}}o 0 g g xc}b
-/ed{gs cpt np cw 2 dv 0 360 arc f gr}b
-/SPe{gs 0 e xl 1 1 S dv D n sc CMT currentmatrix P lW sl 4.0 setmiterlimit
-np}b/ws{Wd 0 32 4 -1 roll widthshow}b/blank/Times-Roman findfont/CharStrings
-g/space g d/mv 256 array d/NUL/SOH/STX/ETX/EOT/ENQ/ACK/BEL/BS/HT/LF/VT
-/FF/CR/SO/SI
-/DLE/DC1/DC2/DC3/DC4/NAK/SYN/ETB/CAN/EM/SUB/ESC/FS/GS/RS/US
-mv 0 32 gi as P
-mv 32/Times-Roman findfont/Encoding get
-32 96 gi putinterval
-mv 39/quotesingle put
-mv 96/grave put/unknown/unknown/quotesinglbase/florin/quotedblbase/ellipsis
-/dagger/daggerdbl
-/circumflex/perthousand/Scaron/guilsinglleft/OE/unknown/unknown/unknown
-/unknown/quoteleft/quoteright/quotedblleft/quotedblright/bullet/endash
-/emdash
-/tilde/trademark/scaron/guilsinglright/oe/unknown/unknown/Ydieresis
-/blank/exclamdown/cent/sterling/currency/yen/brokenbar/section
-/dieresis/copyright/ordfeminine/guillemotleft/logicalnot/hyphen/registered
-/macron
-/degree/plusminus/twosuperior/threesuperior/acute/mu/paragraph
-/periodcentered
-/cedilla/onesuperior/ordmasculine/guillemotright/onequarter/onehalf
-/threequarters/questiondown
-/Agrave/Aacute/Acircumflex/Atilde/Adieresis/Aring/AE/Ccedilla
-/Egrave/Eacute/Ecircumflex/Edieresis/Igrave/Iacute/Icircumflex/Idieresis
-/Eth/Ntilde/Ograve/Oacute/Ocircumflex/Otilde/Odieresis/multiply
-/Oslash/Ugrave/Uacute/Ucircumflex/Udieresis/Yacute/Thorn/germandbls
-/agrave/aacute/acircumflex/atilde/adieresis/aring/ae/ccedilla
-/egrave/eacute/ecircumflex/edieresis/igrave/iacute/icircumflex/idieresis
-/eth/ntilde/ograve/oacute/ocircumflex/otilde/odieresis/divide
-/oslash/ugrave/uacute/ucircumflex/udieresis/yacute/thorn/ydieresis
-mv 128 128 gi as P/fSt 50 string d(ChemDraw)fSt copy P/fD{D/Symbol eq{
-findfont[1 0 0 -1 0 0]makefont}{D {findfont}stopped{/Helvetica findfont}if
-D length dict/newdict x{
-1 index/FID ne{1 index/FontMatrix eq{[1 0 0 -1 0 0]matrix concatmatrix}if
-newdict 3 1 r put}{P P}ie}forall
-newdict/Encoding mv put
-fSt 8 fSt length 8 sub gi cvs length 8 add
-fSt 0 rot gi cvn newdict definefont}ie}b/ts{gs xl ro 0 0 M}b
-/nl{0 e xl 0 0 M}b/tx{ft e g e sf m rot D 96 and 0 ne{
-64 and 0 ne{-0.5}{0.25}ie e 0.75 m}{P 0 e}ie
-D 4 -1 r e scalefont setfont m cpt P e M}b
-end
-%%EndProcSet
-%%EndProlog
-
-chemdict30 begin
-/cW 24 def
-/bW 48 def
-/lW 12 def
-/hS 32 def
-/sh true def
-222 SPe[
-/Helvetica
-fD
-/Helvetica-Oblique
-fD]/ft x
-600 1560 M
-5760 1560 l
-5760 2880 l
-600 2880 l
-cp clip np
-65535 65535
-65535 sBg
-0 1640 2178 ts
-0.0000 0.0000 0.0000 1.0000 sk
-0 10 0 tx
-(N)show
-gr
-0 1182 2178 ts
-0.0000 0.0000 0.0000 1.0000 sk
-0 10 0 tx
-(N)show
-gr
-gs
-0.0000 0.0000 0.0000 1.0000 sk
-np
-1619 2364 M
-1627 2376 l
-1335 2376 l
-1344 2364 l
-cp
-f
-gr
-gs
-0.0000 0.0000 0.0000 1.0000 sk
-np
-1598 2330 M
-1598 2342 l
-1364 2342 l
-1364 2330 l
-cp
-f
-gr
-gs
-0.0000 0.0000 0.0000 1.0000 sk
-np
-1669 2208 M
-1681 2212 l
-1627 2376 l
-1619 2364 l
-cp
-f
-gr
-gs
-0.0000 0.0000 0.0000 1.0000 sk
-np
-1481 1941 M
-1481 1926 l
-1629 2034 l
-1622 2043 l
-cp
-f
-gr
-gs
-0.0000 0.0000 0.0000 1.0000 sk
-np
-1343 2041 M
-1336 2032 l
-1481 1926 l
-1481 1941 l
-cp
-f
-gr
-gs
-0.0000 0.0000 0.0000 1.0000 sk
-np
-1363 2069 M
-1356 2059 l
-1478 1971 l
-1485 1981 l
-cp
-f
-gr
-gs
-0.0000 0.0000 0.0000 1.0000 sk
-np
-1344 2364 M
-1335 2376 l
-1282 2212 l
-1293 2209 l
-cp
-f
-gr
-0 1033 2091 ts
-0.0000 0.0000 0.0000 1.0000 sk
--377
-0 M
-0 10 0 tx
-(Mes)show
-gr
-gs
-0.0000 0.0000 0.0000 1.0000 sk
-np
-1055 2043 M
-1059 2031
-l
-1167 2066 l
-1163 2078 l
-cp
-f
-gr
-0 1897 2091 ts
-0.0000 0.0000 0.0000 1.0000 sk
-0 10 0 tx
-(Mes)show
-gr
-gs
-0.0000 0.0000 0.0000 1.0000 sk
-np
-1878 2040 M
-1882 2051
-l
-1802 2077 l
-1798 2066 l
-cp
-f
-gr
-gs
-12 D sl/lW x
-24 /cW x
-48 /bW x
-32 /hS x
-0.0000 0.0000 0.0000 1.0000 sk
-10 D sl/lW x
-1228 1973 M
-1295
-1973 l st
-1261 1940 M
-1261 2006 l st
-gr
-0 2085 2400 ts
-0.0000 0.0000 0.0000 1.0000 sk
-0 10 0 tx
-(Br)show
-64 10 0 tx
-(\226)show
-gr
-0 5084 2247 ts
-0.0000 0.0000 0.0000 1.0000 sk
-0 10 0 tx
-(N)show
-gr
-0 4625 2247 ts
-0.0000 0.0000 0.0000 1.0000 sk
-0 10 0 tx
-(N)show
-gr
-gs
-0.0000 0.0000 0.0000 1.0000 sk
-np
-5062 2433 M
-5071 2445 l
-4778 2445 l
-4787 2433 l
-cp
-f
-gr
-gs
-0.0000 0.0000 0.0000 1.0000 sk
-np
-5042 2399 M
-5042 2411 l
-4808 2411 l
-4808 2399 l
-cp
-f
-gr
-gs
-0.0000 0.0000 0.0000 1.0000 sk
-np
-5113 2277 M
-5124 2281 l
-5071 2445 l
-5062 2433 l
-cp
-f
-gr
-gs
-0.0000 0.0000 0.0000 1.0000 sk
-np
-4925 2010 M
-4925 1995 l
-5072 2102 l
-5065 2112 l
-cp
-f
-gr
-gs
-0.0000 0.0000 0.0000 1.0000 sk
-np
-4787 2110 M
-4779 2101 l
-4925 1995 l
-4925 2010 l
-cp
-f
-gr
-gs
-0.0000 0.0000 0.0000 1.0000 sk
-np
-4787 2433 M
-4778 2445 l
-4725 2281 l
-4737 2278 l
-cp
-f
-gr
-0 4476 2160 ts
-0.0000 0.0000 0.0000 1.0000 sk
--377 0 M
-0 10 0 tx
-(Mes)show
-gr
-gs
-0.0000 0.0000 0.0000 1.0000 sk
-np
-4498 2112 M
-4502 2100
-l
-4610 2135 l
-4606 2147 l
-cp
-f
-gr
-0 5340 2160 ts
-0.0000 0.0000 0.0000 1.0000 sk
-0 10 0 tx
-(Mes)show
-gr
-gs
-0.0000 0.0000 0.0000 1.0000 sk
-np
-5321 2109 M
-5325 2120
-l
-5246 2146 l
-5243 2134 l
-cp
-f
-gr
-gs
-12 D sl/lW x
-24 /cW x
-48 /bW x
-32 /hS x
-0.0000 0.0000 0.0000 1.0000 sk
-np
-4962 1946 17 0 360 arc
-cp
-f
-np
-4887 1946 17 0 360 arc
-cp
-f
-gr
-0 3236 1785 ts
-0.0000 0.0000 0.0000 1.0000 sk
--364.5 0 M
-0 10 0 tx
-(KO-)show
-2 10 1 tx
-(t)show
-0 10 0 tx
-(-Bu)show
-201 nl
--114.5 0 M
-0 10 0 tx
-(thf)show
-gr
-gs
-12 D sl/lW x
-24 /cW x
-48 /bW x
-32 /hS x
-0.0000 0.0000 0.0000 1.0000 sk
-10 D sl/lW x
-3597 2130 M
-2771 2130 l st
-gs
-3581 2161 3701 2130 3701 2130 3596 2143 3581 2161 3581 2161 3581 2098
-3596 2116 3596 2130 3701 2130 3581 2098 3581 2098 4 3701 2130 0 Sp
-gr
-gr
-0
-1215 2805 ts
-0.0000 0.0000 0.0000 1.0000 sk
-0 10 0 tx
-gr
-0 4642 2805 ts
-0.0000 0.0000 0.0000 1.0000 sk
-0 10 0 tx
-gr
-gr end
-%%Trailer
-showpage
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/chemstyle/scheme-two.eps new/doc/latex/chemstyle/scheme-two.eps
--- old/doc/latex/chemstyle/scheme-two.eps 2012-01-31 00:59:13.000000000 +0100
+++ new/doc/latex/chemstyle/scheme-two.eps 1970-01-01 01:00:00.000000000 +0100
@@ -1,663 +0,0 @@
-%%Creator: ChemDraw Std(tm) 10.0
-%%Title: scheme-two.eps
-%%CreationDate: 21/07/2007 12:00
-%%DocumentSuppliedProcSets: chemdict30 24 13
-%%DocumentFonts: Helvetica Helvetica-Oblique
-%%BoundingBox: 30 78 288 144
-%%EndComments
-%%BeginProcSet: chemdict30 24 13
-userdict/chemdict30 210 dict put
-chemdict30 begin/version 24 def/sv 13 def
-/b{bind def}bind def/L{load def}b/R{null def}b/d/def L/a/add L/al/aload L
-/as/astore L/at/atan L/cp/closepath L/cv/curveto L/cw/currentlinewidth L
-/cpt/currentpoint L/dv/div L/D/dup L/e/exch L/F/false L/f/fill L/fa/forall L
-/g/get L/gi/getinterval L/gr/grestore L/gs/gsave L/ie/ifelse L/ix/index L
-/l/lineto L/mt/matrix L/M/moveto L/m/mul L/n/neg L/np/newpath L/pb/pathbbox L
-/P/pop L/r/roll L/rl/rlineto L/rm/rmoveto L/ro/rotate L/rp/repeat L
-/ru/round L/sc/scale L/sl/setlinewidth L/sm/setmatrix L/st/stroke L
-/sp/strokepath L/sq/sqrt L/s/sub L/T/true L/tr/transform L/xl/translate L
-/xc/exec L/A R/N R/St R/X R/Y R/aL R/bL R/bS R/bd R/bs R/cX R/cY R/ch R/co R
-/fB R/fI R/fS R/fZ R/fl R/ft R/iX R/iY R/idx R/lh R/llx R/lly R/lp R/nH R
-/nSq R/newdict R/ps R/rad R/rev R/sL R/sba R/sbl R/sbs R/sn R/spa R/tB R
-/typ R/urx R/ury R/w R/wF R/xX R/xY R/rBg R/gBg R/bBg R/gry R/rDst R/gDst R
-/bDst R/cpd R/Aeq R/Ath R/Aos R/Ach R/ed R/sf 20 d/cW 20 d/lW 20 d/bW 75 d
-/wF 1.5 d/aF 11.875 d/aR 0.263 d/aA 50 d/hS 54 d/pA 32 d/sh F d/S{sf m}b
-/dL{[hS] 0 setdash}b/o{1 ix}b/rot{3 -1 r}b/x{e d}b/CMT mt d/TM mt d
-/SM{CMT sm}b/XY{X D m Y D m a sq}b/s1 1 string d/fp{T charpath flattenpath}b
-/p{tr ru 0.25 a e ru 0.25 a e itransform}b/Wd{65536. dv}b
-/C{Wd rot Wd rot Wd rot setrgbcolor}b
-/setcmykcolor where{P/sk/setcmykcolor L}{/sk{4 1 r 3{3 ix a D 0 lt{P 0}if D 1\
- gt{P 1}if 1 e s 3 1 r}rp setrgbcolor P}b}ie/sg{D currenthsbcolor P rot seths\
-bcolor currenthsbcolor e P e P o s D m .001 gt{setgray}{P}ie}b
-/sBg{65535 dv/bBg x 65535 dv/gBg x 65535 dv/rBg
-x}b
-/sRmp{currentrgbcolor bBg e s/bDst x gBg e s/gDst x rBg e s/rDst x}b
-/dD{np 2 1 r 4 2 r xl 2 dv D sc -1 0 M 0 -1 l 1 0 l 0 1 l cp SM 0 ne{f}{lW 0.\
-8 m sl st}ie}b
-/dM{gs np 3 1 r xl D sc 0 4 M 0 -8 rl 3.5 2 rm -7 4 rl 0 -4 rm 7 4 rl SM st g\
-r}b/dQ{gs np 0 360 arc 0.5 sg f gr}b
-/dR{lW 0.8 m sl 2 ix s/Y x 2 ix s/X x xl Rr SM st}b
-/dT{fp pb 3 1 r s 3 2 r s 2 1 r rm f}b/N 0 d/db{array/bs x/N 0 d}b
-/B{bs N rot put/N N 1 a d}b
-/SpA{gs np o o xl rot s e rot s o 0 ne o 0 ne or{at ro}{P P}ie
-aR aL m n D aL a 0 M 0 o n aA n aA arc cp f gr}b
-/SpH{gs np o o xl rot s e rot s o 0 ne o 0 ne or{at ro}{P P}ie
-0 cw 2 dv xl
-aR aL m n D aL a 0 M 0 o n aA n 0 arc cp f gr}b/Sp{/St x 0.316/aR x gs
-aF lW m 0.8 m St 4 and 0 ne{bW m lW dv bW sl}if/aL x
-St 8 and 0 ne{8 ix 8 ix 3 ix 3 ix SpA}if
-St 16 and 0 ne{2 ix 6 m 1 a D ix e D ix e D ix e D ix e P SpA}if
-St 32 and 0 ne{8 ix 8 ix 3 ix 3 ix SpH}if
-St 64 and 0 ne{2 ix 6 m 1 a D ix e D ix e D ix e D ix e P SpH}if
-St 2 and 0 ne{St 4 and 0 ne{[hS bW m lW dv] 0 setdash}{dL}ie}if
-np M{cv}rp St 128 and 0 ne{f}{st}ie gr}b/Ha{gs np 3 1 r
-xl D sc -.7 1.4 M 0.7 1.4 l -.7 2.4 M 0.7 2.4 l SM st gr}b
-/OP{3 ix 3 ix xl 3 -1 r s 3 1 r
-e s o o at ro D m e D m a sq}b
-/OB{/bS x OP D bS dv D lW 2 m lt{P lW 2 m}if/bd x}b
-/DA{np 0 0 M aL 0 aR aL m 180 aA s 180 aA a arc cp f}b
-/OA{np 0 cw -2 dv M aL 0 aR aL m 180 aA s
-180 arc 0 cw -2 dv rl cp f}b
-/Ast{SM cw 0.8 m sl st}b/SA{aF m lW m/aL x 0.263/aR x aL 1 aR s m np 0 M
- rad 0 l gs Ast gr}b
-/CA{aF lW m 0.8 m/aL x 0.316/aR x aL 1 aR s m 2 dv rad D m o D m s D 0 le{P
-P P}{sq at 2
-m np rad 0 rad 180 6 -1 r s 180 6 -1 r s arc gs Ast gr cpt
-e at ro}ie}b/AA{np rad 0 rad 180 180 6 -1 r a arc gs SM st gr}b
-/RA{lW m/w x np rad w M w .7 dv w l rad w n M w .7 dv w n l w
- .35 dv w 2 m M 0 0
-l w .35 dv w -2 m l st}b
-/HA{lW m/w x np 0 0 M w 2 m D l w 2 m w l rad w l rad w n l w 2 m
-w n l w 2 m D n l cp st}b
-/Ar1{gs 5 1 r OP/rad x{{2.25 SA DA}{1.5 SA DA}{1 SA DA}{lW 4 m sl 4.5 SA DA}
-{lW 4 m sl 3 SA DA}{lW 4 m sl 2 SA
-DA}{270 CA DA}{180 CA DA}{120 CA DA}{90 CA DA}{2.5 RA}{2.5
-HA}{1 -1 sc 270 CA DA}{1 -1 sc 180 CA DA}{1 -1 sc 120 CA DA}{1 -1 sc 90 CA
-DA}{5 RA}{5 HA}{dL 2.25 SA DA}{dL 1.5 SA DA}{dL 1 SA DA}{2.25 SA OA}{1.5 SA
-OA}{1 SA OA}{1 -1 sc 2.25 SA OA}{1 -1 sc 1.5 SA OA}
-{1 -1 sc 1 SA OA}{270 CA OA}{180 CA OA}{120 CA OA}{90 CA OA}{1 -1 sc 270 CA
-OA}{1 -1 sc 180 CA OA}{1 -1 sc 120 CA OA}{1 -1 sc 90 CA OA}{1 -1 sc 270
-AA}{1 -1 sc 180 AA}{1 -1 sc 120 AA}{1 -1 sc 90 AA}}e g xc
-gr}b/ac{arcto 4{P}rp}b/rO{4 cw m}b/Cr{0 0 1 0 360 arc}b/Ac{XY D sc Cr SM}b
-/OrA{Y X at ro XY D rev{neg}if sc}b/Ov{OrA 1 0.4 sc Cr SM}b
-/Asc{OrA 1 27 dv D sc}b/LB{9 -6 M
-21 -10 27 -8 27 0 cv
-27 8 21 10 9 6 cv
--3 2 -3 -2 9 -6 cv
-cp}b/DLB{0 0 M
-0 0 -9.51 9.65 -9.51 18.02 cv
--9.51 23.22 -6.75 27 0 27 cv
-6.75 27 9.51 23.22 9.51 18.02 cv
-9.51 9.65 0 0 0 0 cv
-cp}b/ZLB{LB}b
-/dt{gs np M SM cpt np rot 4.5 dv 0 360 arc f gr}b
-/whf{gs 1 setgray f gr SM st}b/blf{gs f gr SM st}b/Rr{0 rO M
-0 Y X Y rO ac
-X Y X 0 rO ac
-X 0 0 0 rO ac
-0 0 0 Y rO ac
-cp}b/Rc{0 0 M
-0 Y l
-X Y l
-X 0 l
-cp}b/grf{gs 0.5 sg f gr SM st}b/gG{D 32 dv D m 1 e s/gry x
-currentrgbcolor bDst gry m a 3 1 r gDst gry m a 3 1 r rDst gry m a 3 1 r
-setrgbcolor}b/gS{dtransform CMT idtransform
-m D 0 lt{n}if sq n D
-CMT dtransform idtransform
-e 2 m e
-xl
-7 m 32 a 256 dv D sc}b/gLB{sh{sRmp
-32 -0.5 0.5{gs
-gG
-13.5 0 xl
-D 32 s 64 dv 13.5 m D 7 m 24 dv
-gS
--13.5 0 xl
-LB f
-gr}for
-LB SM st}{LB grf}ie}b/gOv{sh{sRmp
-32 -0.5 0.5{gs
-gG
-D 32 s 64 dv 0.65 m D
-gS
-Cr f
-gr}for
-Cr SM st}{Cr grf}ie}b/gAc{sh{sRmp
-32 -0.5 0.5{gs
-gG
-D 32 s 64 dv D
-gS
-Cr f
-gr}for
-Cr SM st}{Cr grf}ie}b
-/gDLB{sh{sRmp
-32 -0.5 0.5{gs
-gG
-0 13.5 xl
-D 32 s 64 dv 13.5 m D 7 m 24 dv e
-gS
-0 -13.5 xl
-DLB f
-gr}for
-DLB SM st}{DLB grf}ie}b/gRr{sh{sRmp
-32 -0.5 0.5{gs
-gG
-X 2 dv Y 2 dv xl
-D 32 s 64 dv X Y lt{X}{Y}ie m 0.25 m D
-gS
-X -2 dv Y -2 dv xl
-Rr f
-gr}for
-Rr SM st}{Rr grf}ie}b/gRc{sh{sRmp
-32 -0.5 0.5{gs
-gG
-X 2 dv Y 2 dv xl
-D 32 s 64 dv X Y lt{X}{Y}ie m 0.25 m D
-gS
-X -2 dv Y -2 dv xl
-Rc f
-gr}for
-Rc SM st}{Rc grf}ie}b/gZLB{gLB}b/Ath{Y X at ro XY 2 dv/rad x gs D SA DA gr
- rad 2 m 0 xl 180 ro SA DA}b/Aeq{Y X at ro XY/rad x
-rev{1 -1 sc}if
-gs
-0 lW 2 m xl
-D SA OA
-gr
-rad 0 xl
-180 ro
-0 lW 2 m xl
-SA OA}b/Aos{X Y M SM cpt xl XY e dv lW 1.667 m o o lt{e}if P D sc}b/Ach{5 Aos
-gs/Helvetica findfont[1 0 0 -1 0 0]makefont 5.5 scalefont setfont
-D stringwidth P 2 dv D 1 a/rad x
-n 0 M show gr
-rad 2 s -5 M
-rad n -5 rad n 1 2 ac
-rad n 1 rad 1 2 ac
-rad 1 rad -5 2 ac
-rad -5 rad n -5 2 ac
-cp Ast}b/Ar{D 39 lt{Ar1}
-{gs 5 1 r o o xl 3 -1 r e s 3 1 r s e
-o 0 lt o 0 lt ne/rev x
-D 0 lt{1 -1 sc neg}if/Y x D 0 lt{-1 1 sc neg}
-if/X x np{{Y 16 div D 2 S lt{P 2 S}if/lp x
-lp 0 M 0 0 l 0 Y l lp Y l
-X lp s 0 M X 0 l X Y l X lp s Y l SM st}{Y 16 div D 2 S lt{P 2 S}if/lp x
-lp 0 M
-0 0 0 Y lp ac
-0 Y 2 dv lp neg o lp ac
-0 Y 2 dv 0 Y lp ac
-0 Y lp Y lp ac
-X lp s 0 M
-X 0 X Y lp ac
-X Y 2 dv X lp a o lp ac
-X Y 2 dv X Y lp ac
-X Y X lp s Y lp ac SM st}{Y D 2 dv Y 180 pA s 180 pA a arc st
-np X Y s Y 2 dv
-Y pA D neg arcn st}{Rc SM st}{X lW 2 dv a lW -2 dv M
-rO D rl
-X lW 2 dv a rO a Y lW 2 dv a rO a l
-rO lW -2 dv a Y lW 2 dv a rO a l
-lW -2 dv Y lW 2 dv a l
-0 Y l X Y l X 0 l cp f
-0 0 M
-0 Y l
-X Y l
-X 0 l cp
-SM st}{Rr SM st}{rO Y M rO rO xl
-0 Y X Y rO ac
-X Y X 0 rO ac
-X 0 0 0 rO ac
-rO neg D xl X Y 0 Y rO ac
-cp f
-Rr st}{Ac st}{OrA gAc}{Ov st}{OrA 1 .4 sc gOv}{Asc LB whf}{Asc gLB}
-{Asc gs gLB gr
--1 -1 sc LB whf}{Asc gs gLB gr
--0.4 -0.4 sc LB whf}{Asc LB gs whf gr
-np -0.4 -0.4 sc gLB}{Asc DLB -1 -1 sc DLB gs whf gr
-np 90 ro gs gDLB gr -1 -1 sc gDLB}{Asc gs -1 -1 sc ZLB whf gr
-gs 3.6 12 sc gOv gr
-ZLB whf}{Asc gs -1 -1 sc gZLB gr
-gs 3.6 12 sc Cr whf gr
-gZLB}{0 0 M X Y l SM st}{bW sl 0 0 M X Y l SM st}
-{dL 0 0 M X Y l SM st}{OrA 1 16 dv D sc
-0 -1 M
-0 0 1 0 1 ac
-8 0 8 1 1 ac
-8 0 16 0 1 ac
-16 0 16 -1 1 ac
-SM st}{XY D 0 0 dt X Y dt}{XY 2 dv X Y dt}{XY D X Y dt 0 0 M SM cpt xl
-2 dv D sc
-1 0 M -1 0 l
-0 1 M 0 -1 l
-Ast}{XY D X Y dt 0 0 M SM cpt xl
-2 dv D sc
-1 0 M -1 0 l
-Ast}{4.5 Aos
-1 0 M -1 0 l
-0 1 M 0 -1 l
-2 0 M 0 0 2 0 360 arc
-Ast}{4.5 Aos
-1 0 M -1 0 l
-2 0 M 0 0 2 0 360 arc
-Ast}{2.25 Ath}{1.5 Ath}{1 Ath}{2.25 Aeq}{1.5 Aeq}{1 Aeq}{OrA 1 16 dv D sc
-0 -1 M 0 0 l 16 0 l 16 -1 l SM st}{5 Aos
-1 -1 M -1 -1 l
-0 2 M 0 -2 l
-Ast}{5 Aos
-1 -1 M -1 -1 l
-1 1 M -1 1 l
-0 2 M 0 -2 l
-Ast}{4.5 Aos
-1 0 M -1 0 l
-0 1 M 0 -1 l
-Ast}{4.5 Aos
-1 0 M -1 0 l
-Ast}{gRc}{gRr}{Rc blf}{Rr blf}{Ac blf}{Ov blf}{Asc DLB -1 -1 sc DLB gs whf gr
-np 90 ro DLB -1 -1 sc DLB blf}{Asc gs -1 -1 sc ZLB blf gr
-gs 3.6 12 sc Cr whf gr
-ZLB blf}{Asc gs -1 -1 sc ZLB whf gr
-gs 3.6 12 sc Cr blf gr
-ZLB whf}{Asc LB gs whf gr
-np -0.4 -0.4 sc LB blf}{Asc LB gs f gr gs SM st gr
-np -0.4 -0.4 sc LB whf}{Asc LB blf}{Asc LB gs f gr gs SM st gr
-np -1 -1 sc LB whf}{Ac whf}{OrA gAc}{Ac blf}{Ov whf}
-{OrA 1 .4 sc gOv}{Ov blf}{(Rac)Ach}{(Abs)Ach}{(Rel)Ach}
-}e 39 s g xc gr}ie}b/DS{np M l st}b
-/DD{gs dL DS gr}b/DB{gs 12 OB bW sl np 0 0 M 0 l st gr}b/ap{e 3 ix a
-e 2 ix a}b/PT{D 2 4 gi al P OP D 1 sc
-o length 6 gt{P 6 g}{e P 8 dv}ie
-D lW 2 m lt{P lW 2 m}if
-0 e
-0 0
-3 -1 r s 3 1 r e s e
-0 0 M 1 0 l
-0 0 ap M 1 0 ap l
-e n e n
-0 0 ap M 1 0 ap l
-P P}b/DT{gs np PT SM st gr}b
-/NH{lW s D hS dv ru
-cvi D 0 eq{P 1}if/nH x
-D hS nH m s
-D 0 lt{P .1 s nH dv}{nH 2 a dv D 0 xl 2 m s nH dv}ie}b
-/Bd{D type/arraytype ne{bs e g}if{{P}{{{DS}{DD}{gs 12 OB np
-bW 2 dv/bd x
-lW 2 dv e D NH e{D bd M bd n l}for
-st gr}{gs 12 OB np
-lW 2 dv 0 xl NH 1 sc
-bW 2 dv wF m nH 1 a dv/bd x
-0 1 nH
-{D 1 a bd m o o M n l}for SM st gr}{P}{DB}{gs 12 OB
-np 0 lW 2 dv o o n M l bW 2 dv
-wF m o o l n l
-cp f gr}{P}{gs 12 OB/bL x
-bW 2 dv D lW lt{P lW}if/bd x np 0 0 M
-bL bd 4 m dv ru 2 o o lt{e}if P cvi/nSq x
-bL nSq 2 m dv D sc
-nSq{.135 .667 .865 .667 1 0 rcurveto
-.135 -.667 .865 -.667 1 0 rcurveto}rp SM st gr}{gs 12 OB
-np 0 lW 2 dv o o n M l bW 2 dv
-wF m o o l n l
-cp SM lW 0.8 m sl st gr}{P}{4 2 r gs OP/rad x 1 SA DA gr}{P}
-}o 1 g 1 s g e 2 4 gi al P
-5 -1 r xc}{al P 8 ix 1 eq{DD}{DS}ie 5 -1 r 2 eq{DB}{DS}ie P}{DT}}o 0 g g xc}b
-/ed{gs cpt np cw 2 dv 0 360 arc f gr}b
-/SPe{gs 0 e xl 1 1 S dv D n sc CMT currentmatrix P lW sl 4.0 setmiterlimit
-np}b/ws{Wd 0 32 4 -1 roll widthshow}b/blank/Times-Roman findfont/CharStrings
-g/space g d/mv 256 array d/NUL/SOH/STX/ETX/EOT/ENQ/ACK/BEL/BS/HT/LF/VT
-/FF/CR/SO/SI
-/DLE/DC1/DC2/DC3/DC4/NAK/SYN/ETB/CAN/EM/SUB/ESC/FS/GS/RS/US
-mv 0 32 gi as P
-mv 32/Times-Roman findfont/Encoding get
-32 96 gi putinterval
-mv 39/quotesingle put
-mv 96/grave put/unknown/unknown/quotesinglbase/florin/quotedblbase/ellipsis
-/dagger/daggerdbl
-/circumflex/perthousand/Scaron/guilsinglleft/OE/unknown/unknown/unknown
-/unknown/quoteleft/quoteright/quotedblleft/quotedblright/bullet/endash
-/emdash
-/tilde/trademark/scaron/guilsinglright/oe/unknown/unknown/Ydieresis
-/blank/exclamdown/cent/sterling/currency/yen/brokenbar/section
-/dieresis/copyright/ordfeminine/guillemotleft/logicalnot/hyphen/registered
-/macron
-/degree/plusminus/twosuperior/threesuperior/acute/mu/paragraph
-/periodcentered
-/cedilla/onesuperior/ordmasculine/guillemotright/onequarter/onehalf
-/threequarters/questiondown
-/Agrave/Aacute/Acircumflex/Atilde/Adieresis/Aring/AE/Ccedilla
-/Egrave/Eacute/Ecircumflex/Edieresis/Igrave/Iacute/Icircumflex/Idieresis
-/Eth/Ntilde/Ograve/Oacute/Ocircumflex/Otilde/Odieresis/multiply
-/Oslash/Ugrave/Uacute/Ucircumflex/Udieresis/Yacute/Thorn/germandbls
-/agrave/aacute/acircumflex/atilde/adieresis/aring/ae/ccedilla
-/egrave/eacute/ecircumflex/edieresis/igrave/iacute/icircumflex/idieresis
-/eth/ntilde/ograve/oacute/ocircumflex/otilde/odieresis/divide
-/oslash/ugrave/uacute/ucircumflex/udieresis/yacute/thorn/ydieresis
-mv 128 128 gi as P/fSt 50 string d(ChemDraw)fSt copy P/fD{D/Symbol eq{
-findfont[1 0 0 -1 0 0]makefont}{D {findfont}stopped{/Helvetica findfont}if
-D length dict/newdict x{
-1 index/FID ne{1 index/FontMatrix eq{[1 0 0 -1 0 0]matrix concatmatrix}if
-newdict 3 1 r put}{P P}ie}forall
-newdict/Encoding mv put
-fSt 8 fSt length 8 sub gi cvs length 8 add
-fSt 0 rot gi cvn newdict definefont}ie}b/ts{gs xl ro 0 0 M}b
-/nl{0 e xl 0 0 M}b/tx{ft e g e sf m rot D 96 and 0 ne{
-64 and 0 ne{-0.5}{0.25}ie e 0.75 m}{P 0 e}ie
-D 4 -1 r e scalefont setfont m cpt P e M}b
-end
-%%EndProcSet
-%%EndProlog
-
-chemdict30 begin
-/cW 24 def
-/bW 48 def
-/lW 12 def
-/hS 32 def
-/sh true def
-222 SPe[
-/Helvetica
-fD
-/Helvetica-Oblique
-fD]/ft x
-600 1560 M
-5760 1560 l
-5760 2880 l
-600 2880 l
-cp clip np
-65535 65535
-65535 sBg
-0 1640 2178 ts
-0.0000 0.0000 0.0000 1.0000 sk
-0 10 0 tx
-(N)show
-gr
-0 1182 2178 ts
-0.0000 0.0000 0.0000 1.0000 sk
-0 10 0 tx
-(N)show
-gr
-gs
-0.0000 0.0000 0.0000 1.0000 sk
-np
-1619 2364 M
-1627 2376 l
-1335 2376 l
-1344 2364 l
-cp
-f
-gr
-gs
-0.0000 0.0000 0.0000 1.0000 sk
-np
-1598 2330 M
-1598 2342 l
-1364 2342 l
-1364 2330 l
-cp
-f
-gr
-gs
-0.0000 0.0000 0.0000 1.0000 sk
-np
-1669 2208 M
-1681 2212 l
-1627 2376 l
-1619 2364 l
-cp
-f
-gr
-gs
-0.0000 0.0000 0.0000 1.0000 sk
-np
-1481 1941 M
-1481 1926 l
-1629 2034 l
-1622 2043 l
-cp
-f
-gr
-gs
-0.0000 0.0000 0.0000 1.0000 sk
-np
-1343 2041 M
-1336 2032 l
-1481 1926 l
-1481 1941 l
-cp
-f
-gr
-gs
-0.0000 0.0000 0.0000 1.0000 sk
-np
-1363 2069 M
-1356 2059 l
-1478 1971 l
-1485 1981 l
-cp
-f
-gr
-gs
-0.0000 0.0000 0.0000 1.0000 sk
-np
-1344 2364 M
-1335 2376 l
-1282 2212 l
-1293 2209 l
-cp
-f
-gr
-0 1033 2091 ts
-0.0000 0.0000 0.0000 1.0000 sk
--377
-0 M
-0 10 0 tx
-(Mes)show
-gr
-gs
-0.0000 0.0000 0.0000 1.0000 sk
-np
-1055 2043 M
-1059 2031
-l
-1167 2066 l
-1163 2078 l
-cp
-f
-gr
-0 1897 2091 ts
-0.0000 0.0000 0.0000 1.0000 sk
-0 10 0 tx
-(Mes)show
-gr
-gs
-0.0000 0.0000 0.0000 1.0000 sk
-np
-1878 2040 M
-1882 2051
-l
-1802 2077 l
-1798 2066 l
-cp
-f
-gr
-gs
-12 D sl/lW x
-24 /cW x
-48 /bW x
-32 /hS x
-0.0000 0.0000 0.0000 1.0000 sk
-10 D sl/lW x
-1228 1973 M
-1295
-1973 l st
-1261 1940 M
-1261 2006 l st
-gr
-0 2085 2400 ts
-0.0000 0.0000 0.0000 1.0000 sk
-0 10 0 tx
-(Br)show
-64 10 0 tx
-(\226)show
-gr
-0 5084 2247 ts
-0.0000 0.0000 0.0000 1.0000 sk
-0 10 0 tx
-(N)show
-gr
-0 4625 2247 ts
-0.0000 0.0000 0.0000 1.0000 sk
-0 10 0 tx
-(N)show
-gr
-gs
-0.0000 0.0000 0.0000 1.0000 sk
-np
-5062 2433 M
-5071 2445 l
-4778 2445 l
-4787 2433 l
-cp
-f
-gr
-gs
-0.0000 0.0000 0.0000 1.0000 sk
-np
-5042 2399 M
-5042 2411 l
-4808 2411 l
-4808 2399 l
-cp
-f
-gr
-gs
-0.0000 0.0000 0.0000 1.0000 sk
-np
-5113 2277 M
-5124 2281 l
-5071 2445 l
-5062 2433 l
-cp
-f
-gr
-gs
-0.0000 0.0000 0.0000 1.0000 sk
-np
-4925 2010 M
-4925 1995 l
-5072 2102 l
-5065 2112 l
-cp
-f
-gr
-gs
-0.0000 0.0000 0.0000 1.0000 sk
-np
-4787 2110 M
-4779 2101 l
-4925 1995 l
-4925 2010 l
-cp
-f
-gr
-gs
-0.0000 0.0000 0.0000 1.0000 sk
-np
-4787 2433 M
-4778 2445 l
-4725 2281 l
-4737 2278 l
-cp
-f
-gr
-0 4476 2160 ts
-0.0000 0.0000 0.0000 1.0000 sk
--377 0 M
-0 10 0 tx
-(Mes)show
-gr
-gs
-0.0000 0.0000 0.0000 1.0000 sk
-np
-4498 2112 M
-4502 2100
-l
-4610 2135 l
-4606 2147 l
-cp
-f
-gr
-0 5340 2160 ts
-0.0000 0.0000 0.0000 1.0000 sk
-0 10 0 tx
-(Mes)show
-gr
-gs
-0.0000 0.0000 0.0000 1.0000 sk
-np
-5321 2109 M
-5325 2120
-l
-5246 2146 l
-5243 2134 l
-cp
-f
-gr
-gs
-12 D sl/lW x
-24 /cW x
-48 /bW x
-32 /hS x
-0.0000 0.0000 0.0000 1.0000 sk
-np
-4962 1946 17 0 360 arc
-cp
-f
-np
-4887 1946 17 0 360 arc
-cp
-f
-gr
-0 3236 1785 ts
-0.0000 0.0000 0.0000 1.0000 sk
--364.5 0 M
-0 10 0 tx
-(KO-)show
-2 10 1 tx
-(t)show
-0 10 0 tx
-(-Bu)show
-201 nl
--114.5 0 M
-0 10 0 tx
-(thf)show
-gr
-gs
-12 D sl/lW x
-24 /cW x
-48 /bW x
-32 /hS x
-0.0000 0.0000 0.0000 1.0000 sk
-10 D sl/lW x
-3597 2130 M
-2771 2130 l st
-gs
-3581 2161 3701 2130 3701 2130 3596 2143 3581 2161 3581 2161 3581 2098
-3596 2116 3596 2130 3701 2130 3581 2098 3581 2098 4 3701 2130 0 Sp
-gr
-gr
-0
-1215 2805 ts
-0.0000 0.0000 0.0000 1.0000 sk
-0 10 0 tx
-(TMP1)show
-gr
-0 4642 2805 ts
-0.0000 0.0000 0.0000 1.0000 sk
-0 10 0 tx
-(TMP2)show
-gr
-gr end
-%%Trailer
-showpage
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chemstyle.doc.tlpobj new/tlpkg/tlpobj/chemstyle.doc.tlpobj
--- old/tlpkg/tlpobj/chemstyle.doc.tlpobj 2012-01-31 04:30:53.000000000 +0100
+++ new/tlpkg/tlpobj/chemstyle.doc.tlpobj 2013-07-06 03:22:07.000000000 +0200
@@ -1,11 +1,10 @@
name chemstyle.doc
category Package
-revision 25246
+revision 31096
shortdesc doc files of chemstyle
relocated 1
-docfiles size=78
+docfiles size=71
RELOC/doc/latex/chemstyle/README
RELOC/doc/latex/chemstyle/chemscheme.cdx
+ RELOC/doc/latex/chemstyle/chemstyle-demo.tex
RELOC/doc/latex/chemstyle/chemstyle.pdf
- RELOC/doc/latex/chemstyle/scheme-one.eps
- RELOC/doc/latex/chemstyle/scheme-two.eps
++++++ chemstyle.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/chemstyle/chemscheme.sty new/tex/latex/chemstyle/chemscheme.sty
--- old/tex/latex/chemstyle/chemscheme.sty 2012-01-31 00:59:13.000000000 +0100
+++ new/tex/latex/chemstyle/chemscheme.sty 2013-07-05 21:04:42.000000000 +0200
@@ -14,7 +14,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{chemscheme}
- [2011/01/28 v2.0l Schemes for chemistry]
+ [2013/07/03 v2.0m Schemes for chemistry]
\RequirePackage{kvoptions,psfrag}
\SetupKeyvalOptions{
family=cst,
@@ -239,6 +239,10 @@
\def\listschemename{Schemenverzeichnis}%
\def\schemename{Schema}%
}%
+ \addto{\captionsitalian}{%
+ \def\listschemename{Lista degli schemi}%
+ \def\schemename{Schema}%
+ }%
\expandafter\selectlanguage\expandafter{\languagename}%
}{}%
}
@@ -326,7 +330,7 @@
\AtBeginDocument{\cst@ref@check@sub}
%%
-%% Copyright (C) 2006-2011 by
+%% Copyright (C) 2006-2011,2013 by
%% Joseph Wright
%%
%% It may be distributed and/or modified under the conditions of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/chemstyle/chemstyle.sty new/tex/latex/chemstyle/chemstyle.sty
--- old/tex/latex/chemstyle/chemstyle.sty 2012-01-31 00:59:13.000000000 +0100
+++ new/tex/latex/chemstyle/chemstyle.sty 2013-07-05 21:04:42.000000000 +0200
@@ -14,7 +14,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{chemstyle}
- [2011/01/28 v2.0l Schemes and style for chemistry]
+ [2013/07/03 v2.0m Schemes and style for chemistry]
\RequirePackage{amstext,caption,chemscheme,xspace}
\SetupKeyvalOptions{
family=cst,
@@ -339,6 +339,7 @@
\cst@refsec@lang@define{german}{Literatur}{und}{Notizen}
\cst@refsec@lang@define{french}{R\'ef\'erences}{et}{Notes}
\cst@refsec@lang@define{frenchb}{R\'ef\'erences}{et}{Notes}
+\cst@refsec@lang@define{italian}{Bibliografia}{e}{Note}
\ifcst@notes
\AtBeginDocument{\cst@refsec@set}
\fi
@@ -477,7 +478,7 @@
\cst@ref@load
%%
-%% Copyright (C) 2006-2011 by
+%% Copyright (C) 2006-2011,2013 by
%% Joseph Wright
%%
%% It may be distributed and/or modified under the conditions of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/chemstyle/config/angew.chemstyle.cfg new/tex/latex/chemstyle/config/angew.chemstyle.cfg
--- old/tex/latex/chemstyle/config/angew.chemstyle.cfg 2012-01-31 00:59:13.000000000 +0100
+++ new/tex/latex/chemstyle/config/angew.chemstyle.cfg 2013-07-05 21:04:42.000000000 +0200
@@ -13,7 +13,7 @@
%% ----------------------------------------------------------------
%%
\ProvidesFile{angew.chemstyle.cfg}
- [2011/01/28 v2.0l Angew. Chem. journal style]
+ [2013/07/03 v2.0m Angew. Chem. journal style]
\setkeys{cst}{
abbremph = false,
radhyphen = false
@@ -29,7 +29,7 @@
}
%%
-%% Copyright (C) 2006-2011 by
+%% Copyright (C) 2006-2011,2013 by
%% Joseph Wright
%%
%% It may be distributed and/or modified under the conditions of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/chemstyle/config/ic.chemstyle.cfg new/tex/latex/chemstyle/config/ic.chemstyle.cfg
--- old/tex/latex/chemstyle/config/ic.chemstyle.cfg 2012-01-31 00:59:13.000000000 +0100
+++ new/tex/latex/chemstyle/config/ic.chemstyle.cfg 2013-07-05 21:04:42.000000000 +0200
@@ -13,7 +13,7 @@
%% ----------------------------------------------------------------
%%
\ProvidesFile{ic.chemstyle.cfg}
- [2011/01/28 v2.0l Inorg. Chem. journal style]
+ [2013/07/03 v2.0m Inorg. Chem. journal style]
\DeclareCaptionLabelSeparator{perquad}{.\quad}
\captionsetup{
labelfont = {bf,it,sf},
@@ -40,7 +40,7 @@
}
%%
-%% Copyright (C) 2006-2011 by
+%% Copyright (C) 2006-2011,2013 by
%% Joseph Wright
%%
%% It may be distributed and/or modified under the conditions of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/chemstyle/config/jacs.chemstyle.cfg new/tex/latex/chemstyle/config/jacs.chemstyle.cfg
--- old/tex/latex/chemstyle/config/jacs.chemstyle.cfg 2012-01-31 00:59:13.000000000 +0100
+++ new/tex/latex/chemstyle/config/jacs.chemstyle.cfg 2013-07-05 21:04:42.000000000 +0200
@@ -13,7 +13,7 @@
%% ----------------------------------------------------------------
%%
\ProvidesFile{jacs.chemstyle.cfg}
- [2011/01/28 v2.0l J. Am. Chem. Soc. journal style]
+ [2013/07/03 v2.0m J. Am. Chem. Soc. journal style]
\DeclareCaptionLabelSeparator{perquad}{.\quad}
\captionsetup{
labelfont = {bf,it,sf},
@@ -40,7 +40,7 @@
}
%%
-%% Copyright (C) 2006-2011 by
+%% Copyright (C) 2006-2011,2013 by
%% Joseph Wright
%%
%% It may be distributed and/or modified under the conditions of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/chemstyle/config/jomc.chemstyle.cfg new/tex/latex/chemstyle/config/jomc.chemstyle.cfg
--- old/tex/latex/chemstyle/config/jomc.chemstyle.cfg 2012-01-31 00:59:13.000000000 +0100
+++ new/tex/latex/chemstyle/config/jomc.chemstyle.cfg 2013-07-05 21:04:42.000000000 +0200
@@ -13,7 +13,7 @@
%% ----------------------------------------------------------------
%%
\ProvidesFile{jomc.chemstyle.cfg}
- [2011/01/28 v2.0l J. Organomet. Chem. journal style]
+ [2013/07/03 v2.0m J. Organomet. Chem. journal style]
\setkeys{cst}{
abbremph = false,
radhyphen = true,
@@ -31,7 +31,7 @@
}
%%
-%% Copyright (C) 2006-2011 by
+%% Copyright (C) 2006-2011,2013 by
%% Joseph Wright
%%
%% It may be distributed and/or modified under the conditions of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/chemstyle/config/orglett.chemstyle.cfg new/tex/latex/chemstyle/config/orglett.chemstyle.cfg
--- old/tex/latex/chemstyle/config/orglett.chemstyle.cfg 2012-01-31 00:59:13.000000000 +0100
+++ new/tex/latex/chemstyle/config/orglett.chemstyle.cfg 2013-07-05 21:04:42.000000000 +0200
@@ -13,7 +13,7 @@
%% ----------------------------------------------------------------
%%
\ProvidesFile{orglett.chemstyle.cfg}
- [2011/01/28 v2.0l Org. Lett. journal style]
+ [2013/07/03 v2.0m Org. Lett. journal style]
\DeclareCaptionLabelSeparator{perquad}{.\quad}
\captionsetup{
labelfont = bf,
@@ -112,7 +112,7 @@
}
%%
-%% Copyright (C) 2006-2011 by
+%% Copyright (C) 2006-2011,2013 by
%% Joseph Wright
%%
%% It may be distributed and/or modified under the conditions of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/chemstyle/config/rsc.chemstyle.cfg new/tex/latex/chemstyle/config/rsc.chemstyle.cfg
--- old/tex/latex/chemstyle/config/rsc.chemstyle.cfg 2012-01-31 00:59:13.000000000 +0100
+++ new/tex/latex/chemstyle/config/rsc.chemstyle.cfg 2013-07-05 21:04:42.000000000 +0200
@@ -13,7 +13,7 @@
%% ----------------------------------------------------------------
%%
\ProvidesFile{rsc.chemstyle.cfg}
- [2011/01/28 v2.0l RSC journal style]
+ [2013/07/03 v2.0m RSC journal style]
\captionsetup{
labelsep = quad,
labelfont = bf
@@ -23,7 +23,7 @@
}
%%
-%% Copyright (C) 2006-2011 by
+%% Copyright (C) 2006-2011,2013 by
%% Joseph Wright
%%
%% It may be distributed and/or modified under the conditions of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/chemstyle/config/tetlett.chemstyle.cfg new/tex/latex/chemstyle/config/tetlett.chemstyle.cfg
--- old/tex/latex/chemstyle/config/tetlett.chemstyle.cfg 2012-01-31 00:59:13.000000000 +0100
+++ new/tex/latex/chemstyle/config/tetlett.chemstyle.cfg 2013-07-05 21:04:42.000000000 +0200
@@ -13,7 +13,7 @@
%% ----------------------------------------------------------------
%%
\ProvidesFile{tetlett.chemstyle.cfg}
- [2011/01/28 v2.0l Tetrahedron Lett. journal style]
+ [2013/07/03 v2.0m Tetrahedron Lett. journal style]
\captionsetup{
labelsep = period,
labelfont = bf,
@@ -25,7 +25,7 @@
}
%%
-%% Copyright (C) 2006-2011 by
+%% Copyright (C) 2006-2011,2013 by
%% Joseph Wright
%%
%% It may be distributed and/or modified under the conditions of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chemstyle.tlpobj new/tlpkg/tlpobj/chemstyle.tlpobj
--- old/tlpkg/tlpobj/chemstyle.tlpobj 2012-01-31 04:30:53.000000000 +0100
+++ new/tlpkg/tlpobj/chemstyle.tlpobj 2013-07-06 03:22:08.000000000 +0200
@@ -1,6 +1,6 @@
name chemstyle
category Package
-revision 25246
+revision 31096
shortdesc Writing chemistry with style.
relocated 1
longdesc Chemstyle has been developed as a successor to the LaTeX
@@ -25,6 +25,6 @@
RELOC/tex/latex/chemstyle/config/rsc.chemstyle.cfg
RELOC/tex/latex/chemstyle/config/tetlett.chemstyle.cfg
catalogue-ctan /macros/latex/contrib/chemstyle
-catalogue-date 2012-01-29 01:08:38 +0100
+catalogue-date 2013-07-05 11:22:34 +0200
catalogue-license lppl1.3
-catalogue-version 2.0l
+catalogue-version 2.0m
++++++ cherokee.doc.tar.xz ++++++
++++++ cherokee.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cherokee.tlpobj new/tlpkg/tlpobj/cherokee.tlpobj
--- old/tlpkg/tlpobj/cherokee.tlpobj 2011-01-13 04:09:16.000000000 +0100
+++ new/tlpkg/tlpobj/cherokee.tlpobj 2014-04-18 02:39:49.000000000 +0200
@@ -10,11 +10,14 @@
longdesc been arbitrarily encoded in the range 38-122; the cherokee
longdesc package provides commands that map each such syllable to the
longdesc appropriate character; for example, Segwoya himself would be
-longdesc represented \Cse\Cgwo\Cya.
+longdesc represented \Cse\Cgwo\Cya. The font is distributed as Metafont
+longdesc source; it works very poorly in modern environments, and could
+longdesc do with expert attention (if you are interested, please contact
+longdesc the CTAN team for details).
runfiles size=8
RELOC/fonts/source/public/cherokee/cherokee.mf
RELOC/fonts/tfm/public/cherokee/cherokee.tfm
RELOC/tex/latex/cherokee/cherokee.sty
catalogue-ctan /fonts/cherokee
-catalogue-date 2008-12-25 20:17:19 +0100
-catalogue-license noinfo
+catalogue-date 2014-04-14 00:54:59 +0200
+catalogue-license other-free
++++++ chess-problem-diagrams.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/chess-problem-diagrams/README new/doc/latex/chess-problem-diagrams/README
--- old/doc/latex/chess-problem-diagrams/README 2012-11-20 02:10:45.000000000 +0100
+++ new/doc/latex/chess-problem-diagrams/README 2013-06-24 01:43:55.000000000 +0200
@@ -1,5 +1,5 @@
diagram --- A package for typesetting chessproblems
-Version 1.6.4 / Stefan Hoening 2012
+Version 1.6.5 / Stefan Hoening 2013
CONTENTS
Files old/doc/latex/chess-problem-diagrams/diagram.pdf and new/doc/latex/chess-problem-diagrams/diagram.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chess-problem-diagrams.doc.tlpobj new/tlpkg/tlpobj/chess-problem-diagrams.doc.tlpobj
--- old/tlpkg/tlpobj/chess-problem-diagrams.doc.tlpobj 2012-11-20 04:42:33.000000000 +0100
+++ new/tlpkg/tlpobj/chess-problem-diagrams.doc.tlpobj 2013-06-24 03:37:26.000000000 +0200
@@ -1,8 +1,8 @@
name chess-problem-diagrams.doc
category Package
-revision 28303
+revision 30870
shortdesc doc files of chess-problem-diagrams
relocated 1
-docfiles size=82
+docfiles size=84
RELOC/doc/latex/chess-problem-diagrams/README
RELOC/doc/latex/chess-problem-diagrams/diagram.pdf
++++++ chess-problem-diagrams.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/chess-problem-diagrams/diagram.sty new/tex/latex/chess-problem-diagrams/diagram.sty
--- old/tex/latex/chess-problem-diagrams/diagram.sty 2012-11-20 02:10:45.000000000 +0100
+++ new/tex/latex/chess-problem-diagrams/diagram.sty 2013-06-24 01:43:55.000000000 +0200
@@ -883,6 +883,13 @@
}%
}
\def\Imi{\ch@fig{157}}
+\def\wE{\ch@fig{216}}
+\def\nE{\ch@fig{222}}
+\def\sE{\ch@fig{228}}
+\def\wX{\ch@fig{180}}
+\def\nX{\ch@fig{186}}
+\def\sX{\ch@fig{192}}
+
\def\dia@above{%
\@dia@number%
\@dia@authors%
@@ -1476,9 +1483,13 @@
% An imitator should not count for any color.
\let\cpd@stepcounterPieces\relax
\advance\help@a 145%
+ \else\if#1E% Equihopper
+ \advance\help@a 216%
+ \else\if#1X% Equihopper senkrecht
+ \advance\help@a 180%
\else%
\errmessage{invalid piece!}%
- \fi\fi\fi\fi\fi\fi\fi%
+ \fi\fi\fi\fi\fi\fi\fi\fi\fi%
\futurelet\r@tate\chkr@tate%
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chess-problem-diagrams.tlpobj new/tlpkg/tlpobj/chess-problem-diagrams.tlpobj
--- old/tlpkg/tlpobj/chess-problem-diagrams.tlpobj 2012-11-20 04:42:33.000000000 +0100
+++ new/tlpkg/tlpobj/chess-problem-diagrams.tlpobj 2013-06-24 03:37:27.000000000 +0200
@@ -1,6 +1,6 @@
name chess-problem-diagrams
category Package
-revision 28303
+revision 30870
shortdesc A package for typesetting chess problem diagrams.
relocated 1
longdesc This package provides macros to typeset chess problem diagrams
@@ -9,6 +9,6 @@
runfiles size=14
RELOC/tex/latex/chess-problem-diagrams/diagram.sty
catalogue-ctan /macros/latex/contrib/chess-problem-diagrams
-catalogue-date 2012-11-19 10:39:58 +0100
+catalogue-date 2013-06-22 23:41:37 +0200
catalogue-license lppl1.2
-catalogue-version 1.6.4
+catalogue-version 1.6.5
++++++ chessboard.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/chessboard/README new/doc/latex/chessboard/README
--- old/doc/latex/chessboard/README 2007-12-23 19:30:27.000000000 +0100
+++ new/doc/latex/chessboard/README 2014-05-02 23:14:31.000000000 +0200
@@ -1,7 +1,9 @@
chessboard --- A package to print chessboards
-Version 1.5 Ulrike Fischer 2007
+Version 1.7 Ulrike Fischer 2014
CHANGES
+1.7: chessboard no longer loads amssymb (to avoid clashes)
+1.6: Corrected some bugs. Added textfont key for text style.
1.5: Corrected some bugs.
Added key getpiecelists.
Adapted the package to xskak.
@@ -26,9 +28,13 @@
- chessboard-scr.dtx
- chessboard.ins
- chessboard.pdf
+- chessboard.sty
+- chessboard-keys-main.sty
+- chessboard-keys-pgf.sty
+- chessboard-pgf.sty
-Run TeX/LaTeX on chessboard.ins to unpack the dtx.
-Put the four extracted files in tex/latex/chessboard/.
+Move the four .sty in <texmf>/tex/latex/chessboard/. You can regenerate the .sty by runing
+TeX/LaTeX on chessboard.ins to unpack the dtx.
The dtx-file doesn't contain any documentation.
So running LaTeX on it makes no sense!
@@ -48,11 +54,13 @@
It has a lot of options to place pieces on the board. Using exotic pieces e.g. for
fairy chess is possible.
It can be used together with the newest version (1.4) of the skak package
-which you can find at CTAN and together with xskak.
+which you can find at CTAN and together with xskak.
REQUIREMENTS
chessboard uses some primitives of e\TeX. It needs a recent version
-of chessfss and xkeyval. It also needs the packages xifthen,
-pgfcore and pgfbaseshapes (from the pgf bundle),
-and pst-node (from pstricks).
+of chessfss and xkeyval. It also needs the packages xifthen, tikz, pgfcore and pgfbaseshapes (from the pgf bundle),
+and - if run with latex - pst-node (from pstricks).
+
+LICENSE
+This material is subject to the LaTeX Project Public License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chessboard.doc.tlpobj new/tlpkg/tlpobj/chessboard.doc.tlpobj
--- old/tlpkg/tlpobj/chessboard.doc.tlpobj 2010-07-15 04:00:55.000000000 +0200
+++ new/tlpkg/tlpobj/chessboard.doc.tlpobj 2014-05-03 03:26:36.000000000 +0200
@@ -1,6 +1,6 @@
name chessboard.doc
category Package
-revision 19440
+revision 33801
shortdesc doc files of chessboard
relocated 1
docfiles size=2
++++++ chessboard.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/chessboard/chessboard-keys-main.sty new/tex/latex/chessboard/chessboard-keys-main.sty
--- old/tex/latex/chessboard/chessboard-keys-main.sty 2007-12-23 19:30:27.000000000 +0100
+++ new/tex/latex/chessboard/chessboard-keys-main.sty 2014-05-02 23:14:31.000000000 +0200
@@ -4,10 +4,10 @@
%%
%% The original source files were:
%%
-%% chessboard-src.dtx (with options: `keysmain')
+%% chessboard-src.dtx (with options: `chessboard-keys-main')
%%
%% chessboard: a package to print chessboards
-%% Copyright 2006 UlrikeFischer (skak@nililand.de)
+%% Copyright 2006-2014 Ulrike Fischer (chess@nililand.de)
%% -------------------------------------------
%%
%% This file can be redistributed and/or modified under the terms of
@@ -16,8 +16,8 @@
%% License, or (at your option) any later version.
%%
%% For error reports see documentation.
-\ProvidesFile{chessboard-keys-main.sty}[2007/12/20 key definitions
-for chessboard.sty v1.5 ]
+\ProvidesFile{chessboard-keys-main.sty}[2014/05/01 version v1.7 key definitions for chessboard.sty]
+%%$Date: 2011/03/23 08:42:57 $$Version: 66142533647c $
%%file=Linie=column=vertikal=al_f_abetisch= a-h
%%rank=Reihe=row=horizontal=numbe_r_=1-8
@@ -892,7 +892,8 @@
\define@key[UFCB]{locfill}{addfontcolors}[true]{% D
\toks@=\expandafter{\board@val@fontcolorstack}%
- \board@do@l@addto@macro\board@val@boardfontcolors{\the\toks@}}
+ \edef\@@next{\noexpand\board@do@l@addto@macro\noexpand\board@val@boardfontcolors{\the\toks@}}%
+ \@@next}
\define@key[UFCB]{glofill}{setfontcolors}[true]{% D
\board@do@l@addto@macro\board@val@savedkeylist{,setfontcolors=#1}{}}%
@@ -1298,7 +1299,6 @@
\define@key[UFCB]{glofill}{addfen}{% D
\board@do@l@addto@macro\board@val@savedkeylist{,addfen=#1}}%
-
%%% other name for usefen
\define@key[UFCB]{locfill}{restorefen}{% D
\edef\board@temp@curfen{\csname chessgame.#1\endcsname}%
@@ -1534,6 +1534,7 @@
\define@key[UFCB]{gloinit}{game}{%
\board@do@l@addto@macro\board@val@savedkeylist{,game=#1}{}}%
+
\endinput
%%
%% End of file `chessboard-keys-main.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/chessboard/chessboard-keys-pgf.sty new/tex/latex/chessboard/chessboard-keys-pgf.sty
--- old/tex/latex/chessboard/chessboard-keys-pgf.sty 2007-12-23 19:30:27.000000000 +0100
+++ new/tex/latex/chessboard/chessboard-keys-pgf.sty 2014-05-02 23:14:31.000000000 +0200
@@ -4,10 +4,10 @@
%%
%% The original source files were:
%%
-%% chessboard-src.dtx (with options: `keyspgf')
+%% chessboard-src.dtx (with options: `chessboard-keys-pgf')
%%
%% chessboard: a package to print chessboards
-%% Copyright 2006 UlrikeFischer (skak@nililand.de)
+%% Copyright 2006-2014 Ulrike Fischer (chess@nililand.de)
%% -------------------------------------------
%%
%% This file can be redistributed and/or modified under the terms of
@@ -16,9 +16,8 @@
%% License, or (at your option) any later version.
%%
%% For error reports see documentation.
-
-\ProvidesFile{chessboard-keys-pgf.sty}[2007/12/20 key definitions for
-chessboard.sty v1.5]
+\ProvidesFile{chessboard-keys-pgf.sty}[2014/05/01 version v1.7 key definitions for chessboard.sty]
+%%$Date: 2011/03/17 13:42:38 $$Version: e7ec1b100ede $
%% new 1.5.: style keys for curvemove
\define@key[UFCB]{bez}{x1}{\def\board@val@bezxi{#1}}
@@ -928,8 +927,6 @@
%% obsolete key,
\define@choicekey[UFCB]{locfill}{applycolor}[\@tempval\@tempnr]{all,none,white,black}{% D
- \PackageWarning{chessboard}{The behaviour of applycolor has changed
- \MessageBreak Please read the documentation!}%
\ifcase\@tempnr\relax
\board@do@setsinglekeys*[UFCB]{locfill}{trimtocolor=false}%
\or
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/chessboard/chessboard-pgf.sty new/tex/latex/chessboard/chessboard-pgf.sty
--- old/tex/latex/chessboard/chessboard-pgf.sty 2007-12-23 19:30:27.000000000 +0100
+++ new/tex/latex/chessboard/chessboard-pgf.sty 2014-05-02 23:14:31.000000000 +0200
@@ -4,10 +4,10 @@
%%
%% The original source files were:
%%
-%% chessboard-src.dtx (with options: `pgf')
+%% chessboard-src.dtx (with options: `chessboard-pgf')
%%
%% chessboard: a package to print chessboards
-%% Copyright 2006 UlrikeFischer (skak@nililand.de)
+%% Copyright 2006-2014 Ulrike Fischer (chess@nililand.de)
%% -------------------------------------------
%%
%% This file can be redistributed and/or modified under the terms of
@@ -16,7 +16,8 @@
%% License, or (at your option) any later version.
%%
%% For error reports see documentation.
-\ProvidesFile{chessboard-pgf.sty}[2007/12/20 pgf code for chessboard v1.5]
+\ProvidesFile{chessboard-pgf.sty}[2014/05/01 version v1.7 pgf code for chessboard.sty]
+%%$Date: 2011/01/11 14:07:20 $$Version: 3d9f59c743f1 $
\newcommand\board@pgf@extrabackground{}%
\newcommand\board@pgf@extramarkground{}%
@@ -499,7 +500,6 @@
\pgfusepath{stroke}}%
\newcommand\board@pgf@curvemove[2][]{
- %\begin{pgfscope}
\setkeys[UFCB]{bez}{#1}%
\pgfsetlinewidth{\board@pgf@linewidth}%
\pgfsetarrowsend{\board@pgf@arrow}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/chessboard/chessboard.sty new/tex/latex/chessboard/chessboard.sty
--- old/tex/latex/chessboard/chessboard.sty 2007-12-23 19:30:27.000000000 +0100
+++ new/tex/latex/chessboard/chessboard.sty 2014-05-02 23:14:31.000000000 +0200
@@ -4,10 +4,10 @@
%%
%% The original source files were:
%%
-%% chessboard-src.dtx (with options: `main')
+%% chessboard-src.dtx (with options: `chessboard')
%%
%% chessboard: a package to print chessboards
-%% Copyright 2006 UlrikeFischer (skak@nililand.de)
+%% Copyright 2006-2014 Ulrike Fischer (chess@nililand.de)
%% -------------------------------------------
%%
%% This file can be redistributed and/or modified under the terms of
@@ -16,8 +16,9 @@
%% License, or (at your option) any later version.
%%
%% For error reports see documentation.
-\NeedsTeXFormat{LaTeX2e}%
-\ProvidesPackage{chessboard}[2007/12/20 v1.5 print chessboards]
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{chessboard}[2014/05/01 version v1.7 print chessboards]
+%%$Date: 2011/03/23 08:42:57 $$Version: 66142533647c $
\DeclareOption{skaknew}{}%
\ProcessOptions
@@ -37,14 +38,15 @@
\RequirePackage{chessfss}[2006/03/31]
-
\RequirePackage{xkeyval}%
\RequirePackage{xifthen}%
\RequirePackage{ifpdf}%
-\RequirePackage{pgfcore, pgfbaseshapes}%
+\RequirePackage{tikz}%
+\usepgfmodule{shapes}
\ifpdf\else
\RequirePackage{pst-node}%
-\fi \RequirePackage{amssymb}
+\fi
+
%%%%%%%
%% naming conventions
%%%%%%%
@@ -315,7 +317,7 @@
%% getting the list of fields where pieces resides
%% added 2007-12-11, version 1.5.
-%% the piecelists are stored in cblist
+%% the piecelists are stored in cblist
\newcommand\board@do@getpiecelists{%
\setcounter{cnt@board@file}{\board@val@minfilenum}%
@@ -324,8 +326,8 @@
\csname board@\board@val@game @piececharlist\endcsname}%
\@for\board@temp@piecechar:=\board@temp@curlist
\do {%
- \expandafter\def\csname cblist\board@temp@piecechar\endcsname{}%
- \expandafter\def\csname board@temp@\board@temp@piecechar @comma\endcsname{}}%
+ \expandafter\xdef\csname cblist\board@temp@piecechar\endcsname{}%
+ \expandafter\xdef\csname board@temp@\board@temp@piecechar @comma\endcsname{}}%
\xdef\cblistempty{}%
\def\board@temp@empty@comma{}%
\whiledo
@@ -516,7 +518,7 @@
\csname board@val@lang\board@val@curlang @\board@temp@char\endcsname}%
\else
\PackageError{chessboard}%
- {Char #1 unknown in input language \board@val@curlang!}%
+ {Char #1 unknown in input language \board@val@curlang!}%
{You either misspelled the char for the piece or forgot to define it for the current language}%
\fi
\@namedef{board@the@piece@\board@temp@curpiece @white}{%
@@ -572,7 +574,7 @@
\addtocounter{cnt@board@rank}{-1}}}%
%%%%%%
-%% Scanning a FEN to set the fields
+%% Scanning a FEN (only the first part) to set the fields
%%%%%%
\def\@usenone@until@nil#1\@nil{}%
@@ -804,17 +806,17 @@
\cbDefineMoverStyle%
{square}
- {$\square$}
- {$\square$}
- {$\blacksquare$}
- {$\blacksquare$}
+ {\tikz \draw[color=black] (0,0) rectangle (0.65em,0.65em);}
+ {\tikz \draw[color=black] (0,0) rectangle (0.65em,0.65em);}
+ {\tikz \fill[color=black] (0,0) rectangle (0.65em,0.65em);}
+ {\tikz \fill[color=black] (0,0) rectangle (0.65em,0.65em);}
\cbDefineMoverStyle%
- {triangle}
- {$\triangledown$}
- {$\vartriangle$}
- {$\blacktriangledown$}
- {$\blacktriangle$}
+ {triangle}
+ {\tikz \draw[color=black] (0.6ex,0pt)--(0,1.25ex)--(1.2ex,1.25ex) --cycle;}
+ {\tikz \draw[color=black] (0.6ex,1.25ex)--(0,0)--(1.2ex,0) --cycle;}
+ {\tikz \fill[color=black] (0.6ex,0pt)--(0,1.25ex)--(1.2ex,1.25ex) --cycle;}
+ {\tikz \fill[color=black] (0.6ex,1.25ex)--(0,0)--(1.2ex,0) --cycle;}
\cbDefineMoverStyle%
%#1: optional, can be used for checks
@@ -1054,6 +1056,7 @@
\newcommand\chessboard[1][]{%
\begingroup
+ \normallineskip=1pt\relax\normallineskiplimit=0pt\relax%14.3.2011
\savekeys[UFCB]{locset}{\global{psset},\global{psskak},\global{inverse}}%
%%% Initialisation
%% combine the the global keys and the keys in argument
@@ -1197,7 +1200,7 @@
\csname board@val@moverstyle@\board@val@moverstyle\endcsname
\else
\PackageWarning{chessboard}%
- {Moverstyle \board@val@moverstyle\ is not defined, I will use
+ {Moverstyle '\board@val@moverstyle' is not defined, I will use
type square instead}%
\board@val@moverstyle@square
\fi
@@ -1430,6 +1433,7 @@
\def\currentfontcolors{\board@val@fontcolorstack}
\setkeys*[UFCB]{glofill}{language=english,trimtocolor=false,trimarea=\board,trim,usepgf=all,pgfstyle=none}%
\board@do@setsinglekeys*[UFCB]{locfill}{language=english}%
+
\endinput
%%
%% End of file `chessboard.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chessboard.tlpobj new/tlpkg/tlpobj/chessboard.tlpobj
--- old/tlpkg/tlpobj/chessboard.tlpobj 2010-07-15 04:00:55.000000000 +0200
+++ new/tlpkg/tlpobj/chessboard.tlpobj 2014-05-03 03:26:36.000000000 +0200
@@ -1,6 +1,6 @@
name chessboard
category Package
-revision 19440
+revision 33801
shortdesc Print chess boards.
relocated 1
longdesc This package offers commands to print chessboards. It can print
@@ -16,6 +16,6 @@
RELOC/tex/latex/chessboard/chessboard-pgf.sty
RELOC/tex/latex/chessboard/chessboard.sty
catalogue-ctan /macros/latex/contrib/chessboard
-catalogue-date 2008-08-17 13:56:26 +0200
+catalogue-date 2014-05-01 22:32:50 +0200
catalogue-license lppl
-catalogue-version 1.5
+catalogue-version 1.7
++++++ chet.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/chet/README new/doc/latex/chet/README
--- old/doc/latex/chet/README 2011-10-29 01:44:33.000000000 +0200
+++ new/doc/latex/chet/README 2013-12-12 00:06:49.000000000 +0100
@@ -8,6 +8,6 @@
alternatives to LaTeX's default environments (which can all still be
used in chet).
-To use chet just copy chet.sty in the folder of the TeX file you are
-compiling (or in your path) and include \usepackage{chet} in the
-preamble of your LaTeX file.
\ No newline at end of file
+To use chet just copy chet.sty and chetref.bst in the folder of the TeX
+file you are compiling (or in your path) and include \usepackage{chet} in
+the preamble of your LaTeX file.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chet.doc.tlpobj new/tlpkg/tlpobj/chet.doc.tlpobj
--- old/tlpkg/tlpobj/chet.doc.tlpobj 2012-12-22 04:32:03.000000000 +0100
+++ new/tlpkg/tlpobj/chet.doc.tlpobj 2013-12-12 03:21:02.000000000 +0100
@@ -1,6 +1,6 @@
name chet.doc
category Package
-revision 28606
+revision 32384
shortdesc doc files of chet
relocated 1
docfiles size=46
++++++ chet.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibtex/bst/chet/chetref.bst new/bibtex/bst/chet/chetref.bst
--- old/bibtex/bst/chet/chetref.bst 2011-11-02 23:55:32.000000000 +0100
+++ new/bibtex/bst/chet/chetref.bst 2013-12-12 00:06:49.000000000 +0100
@@ -112,7 +112,7 @@
s num.names$ 'numnames :=
numnames 'namesleft :=
{ namesleft #0 > }
- { s nameptr "{f{.}.~}{vv~~}{ll}{,~jj}" format.name$ 't :=
+ { s nameptr "{f.~}{vv~~}{ll}{,~jj}" format.name$ 't :=
nameptr #1 >
{ namesleft #1 >
{ ", " * t * }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/chet/chet.sty new/tex/latex/chet/chet.sty
--- old/tex/latex/chet/chet.sty 2012-12-22 00:30:29.000000000 +0100
+++ new/tex/latex/chet/chet.sty 2013-12-12 00:06:49.000000000 +0100
@@ -137,13 +137,13 @@
% Table of contents formatting
\setcounter{tocdepth}{3}
-\renewcommand{\cfttoctitlefont}{\hfill\bfseries}
-\renewcommand{\cftaftertoctitle}{\hfill}
+\renewcommand{\cfttoctitlefont}{\bfseries}
\renewcommand{\cftsecaftersnum}{.}
\renewcommand{\cftsubsecaftersnum}{.}
\renewcommand{\cftsubsubsecaftersnum}{.}
\renewcommand{\cftdotsep}{8}
\newcommand{\toc}{\tableofcontents}
+\renewcommand\contentsname{\centerline{Contents}}
% Numbered equation with optional label
\NewDocumentCommand\eqn{mo}{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chet.tlpobj new/tlpkg/tlpobj/chet.tlpobj
--- old/tlpkg/tlpobj/chet.tlpobj 2012-12-22 04:32:03.000000000 +0100
+++ new/tlpkg/tlpobj/chet.tlpobj 2013-12-12 03:21:03.000000000 +0100
@@ -1,6 +1,6 @@
name chet
category Package
-revision 28606
+revision 32384
shortdesc LaTeX layout inspired by harvmac.
relocated 1
longdesc The package is designed to streamline the work of typesetting,
@@ -9,6 +9,6 @@
RELOC/bibtex/bst/chet/chetref.bst
RELOC/tex/latex/chet/chet.sty
catalogue-ctan /macros/latex/contrib/chet
-catalogue-date 2012-12-09 16:35:11 +0100
+catalogue-date 2013-12-11 21:08:43 +0100
catalogue-license lppl1.3
-catalogue-version 1.5
+catalogue-version 1.6
++++++ chickenize.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/luatex/chickenize/README new/doc/luatex/chickenize/README
--- old/doc/luatex/chickenize/README 2013-02-26 01:29:48.000000000 +0100
+++ new/doc/luatex/chickenize/README 2013-08-24 00:23:28.000000000 +0200
@@ -6,7 +6,7 @@
chickenize.sty (LaTeX user interface)
chickenize.lua (Lua package code) [does the actual work]
-You need an up-to-date TeX Live (2011 or 2012, if possible) to use this package. Maybe a full MiKTeX will do, too.
+You need an up-to-date TeX Live (2013) to use this package. Maybe a full MiKTeX will do, too.
For any comments or suggestions, contact me:
arno dot trautmann at gmx dot de
Files old/doc/luatex/chickenize/chickenize.pdf and new/doc/luatex/chickenize/chickenize.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chickenize.doc.tlpobj new/tlpkg/tlpobj/chickenize.doc.tlpobj
--- old/tlpkg/tlpobj/chickenize.doc.tlpobj 2013-02-26 04:33:02.000000000 +0100
+++ new/tlpkg/tlpobj/chickenize.doc.tlpobj 2013-08-24 03:21:25.000000000 +0200
@@ -1,6 +1,6 @@
name chickenize.doc
category Package
-revision 29232
+revision 31505
shortdesc doc files of chickenize
relocated 1
docfiles size=44
++++++ chickenize.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/luatex/chickenize/chickenize.lua new/tex/luatex/chickenize/chickenize.lua
--- old/tex/luatex/chickenize/chickenize.lua 2013-02-26 01:29:48.000000000 +0100
+++ new/tex/luatex/chickenize/chickenize.lua 2013-08-24 00:23:28.000000000 +0200
@@ -8,13 +8,14 @@
--
-- EXPERIMENTAL CODE
--
--- This package is copyright © 20012 Arno L. Trautmann. It may be distributed and/or
+-- This package is copyright © 2013 Arno L. Trautmann. It may be distributed and/or
-- modified under the conditions of the LaTeX Project Public License, either version 1.3c
-- of this license or (at your option) any later version. This work has the LPPL mainten-
-- ance status ‘maintained’.
local nodenew = node.new
local nodecopy = node.copy
+local nodetail = node.tail
local nodeinsertbefore = node.insert_before
local nodeinsertafter = node.insert_after
local noderemove = node.remove
@@ -32,8 +33,8 @@
color_pop = nodenew(WHAT,COL)
color_push.stack = 0
color_pop.stack = 0
-color_push.cmd = 1
-color_pop.cmd = 2
+color_push.command = 1
+color_pop.command = 2
chicken_pagenumbers = true
chickenstring = {}
@@ -43,10 +44,6 @@
-- set this to a small value to fool somebody, or to see if your text has been read carefully. This is also a great way to lay easter eggs for your own class / package …
chicken_substitutions = 0 -- value to count the substituted chickens. Makes sense for testing your proofreaders.
-local tbl = font.getfont(font.current())
-local space = tbl.parameters.space
-local shrink = tbl.parameters.space_shrink
-local stretch = tbl.parameters.space_stretch
local match = unicode.utf8.match
chickenize_ignore_word = false
chickenize_real_stuff = function(i,head)
@@ -145,8 +142,8 @@
w = line.width/65536*0.99625 -- empirical correction factor (?)
rot.data = "-1 0 0 1 "..w.." 0 cm"
rot2.data = "-1 0 0 1 "..-w.." 0 cm"
- line.head = node.insert_before(line.head,line.head,node.copy(rot))
- node.insert_after(line.head,node.tail(line.head),node.copy(rot2))
+ line.head = node.insert_before(line.head,line.head,nodecopy(rot))
+ nodeinsertafter(line.head,nodetail(line.head),nodecopy(rot2))
odd = true
else
odd = false
@@ -165,8 +162,8 @@
w = -g.width/65536*0.99625
rot.data = "-1 0 0 1 " .. w .." 0 cm"
rot2.data = "-1 0 0 1 " .. -w .." 0 cm"
- line.head = node.insert_before(line.head,g,node.copy(rot))
- node.insert_after(line.head,g,node.copy(rot2))
+ line.head = node.insert_before(line.head,g,nodecopy(rot))
+ nodeinsertafter(line.head,g,nodecopy(rot2))
end
odd = false
else
@@ -200,12 +197,48 @@
for line in nodetraverseid(0,head) do
for glyph in nodetraverseid(37,line.head) do
glyphnumber = glyphnumber + 1
+ if (glyph.next.id == 10) and (glyph.next.next.id ==37) then
+ spacenumber = spacenumber + 1
+ end
end
end
return head
end
printglyphnumber = function()
- texiowrite_nl("\n Number of glyphs in this document: "..glyphnumber.."\n")
+ texiowrite_nl("\nNumber of glyphs in this document: "..glyphnumber)
+ texiowrite_nl("Number of spaces in this document: "..spacenumber)
+ texiowrite_nl("Glyphs plus spaces: "..glyphnumber+spacenumber.."\n")
+end
+countwords = function(head)
+ for glyph in nodetraverseid(37,head) do
+ if (glyph.next.id == 10) then
+ wordnumber = wordnumber + 1
+ end
+ end
+ wordnumber = wordnumber + 1 -- add 1 for the last word in a paragraph which is not found otherwise
+ return head
+end
+printwordnumber = function()
+ texiowrite_nl("\nNumber of words in this document: "..wordnumber)
+end
+
+function detectdoublewords(head)
+ prevlastword = {} -- array of numbers representing the glyphs
+ prevfirstword = {}
+ newlastword = {}
+ newfirstword = {}
+ for line in nodetraverseid(0,head) do
+ for g in nodetraverseid(37,line.head) do
+texio.write_nl("next glyph",#newfirstword+1)
+ newfirstword[#newfirstword+1] = g.char
+ if (g.next.id == 10) then break end
+ end
+texio.write_nl("nfw:"..#newfirstword)
+ end
+end
+
+function printdoublewords()
+ texio.write_nl("finished")
end
local quotestrings = {
[171] = true, [172] = true,
@@ -331,12 +364,12 @@
local letterspace_pen = nodenew(nodeid"penalty")
letterspace_spec.width = tex.sp"0pt"
-letterspace_spec.stretch = tex.sp"2pt"
+letterspace_spec.stretch = tex.sp"0.05pt"
letterspace_glue.spec = letterspace_spec
letterspace_pen.penalty = 10000
letterspaceadjust = function(head)
for glyph in nodetraverseid(nodeid"glyph", head) do
- if glyph.prev and (glyph.prev.id == nodeid"glyph" or glyph.prev.id == nodeid"disc") then
+ if glyph.prev and (glyph.prev.id == nodeid"glyph" or glyph.prev.id == nodeid"disc" or glyph.prev.id == nodeid"kern") then
local g = nodecopy(letterspace_glue)
nodeinsertbefore(head, glyph, g)
nodeinsertbefore(head, g, nodecopy(letterspace_pen))
@@ -345,12 +378,12 @@
return head
end
textletterspaceadjust = function(head)
- for glyph in node.traverse_id(node.id"glyph", head) do
+ for glyph in nodetraverseid(nodeid"glyph", head) do
if node.has_attribute(glyph,luatexbase.attributes.letterspaceadjustattr) then
- if glyph.prev and (glyph.prev.id == node.id"glyph" or glyph.prev.id == node.id"disc") then
+ if glyph.prev and (glyph.prev.id == node.id"glyph" or glyph.prev.id == node.id"disc" or glyph.prev.id == nodeid"kern") then
local g = node.copy(letterspace_glue)
- node.insert_before(head, glyph, g)
- node.insert_before(head, g, node.copy(letterspace_pen))
+ nodeinsertbefore(head, glyph, g)
+ nodeinsertbefore(head, g, nodecopy(letterspace_pen))
end
end
end
@@ -711,7 +744,7 @@
for _, str in ipairs({...}) do
pdf.print(str .. " ")
end
- pdf.print("\string\n")
+ pdf.print("\n")
end
function move (p)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/luatex/chickenize/chickenize.sty new/tex/luatex/chickenize/chickenize.sty
--- old/tex/luatex/chickenize/chickenize.sty 2013-02-26 01:29:48.000000000 +0100
+++ new/tex/luatex/chickenize/chickenize.sty 2013-08-24 00:23:28.000000000 +0200
@@ -8,12 +8,12 @@
%%
%% EXPERIMENTAL CODE
%%
-%% This package is copyright © 20012 Arno L. Trautmann. It may be distributed and/or
+%% This package is copyright © 2013 Arno L. Trautmann. It may be distributed and/or
%% modified under the conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version. This work has the LPPL mainten-
%% ance status ‘maintained’.
\ProvidesPackage{chickenize}%
- [2013/02/24 v0.2 chickenize package]
+ [2013/08/22 v0.2.1a chickenize package]
\input{chickenize}
\iffalse
\DeclareDocumentCommand\includegraphics{O{}m}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/luatex/chickenize/chickenize.tex new/tex/luatex/chickenize/chickenize.tex
--- old/tex/luatex/chickenize/chickenize.tex 2013-02-26 01:29:48.000000000 +0100
+++ new/tex/luatex/chickenize/chickenize.tex 2013-08-24 00:23:28.000000000 +0200
@@ -8,7 +8,7 @@
%%
%% EXPERIMENTAL CODE
%%
-%% This package is copyright © 20012 Arno L. Trautmann. It may be distributed and/or
+%% This package is copyright © 2013 Arno L. Trautmann. It may be distributed and/or
%% modified under the conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version. This work has the LPPL mainten-
%% ance status ‘maintained’.
@@ -78,15 +78,29 @@
\directlua{luatexbase.remove_from_callback("post_linebreak_filter","stretch_expansion")}}
\def\countglyphs{
- \directlua{glyphnumber = 0
+ \directlua{glyphnumber = 0 spacenumber = 0
luatexbase.add_to_callback("post_linebreak_filter",countglyphs,"countglyphs")
luatexbase.add_to_callback("stop_run",printglyphnumber,"printglyphnumber")
}
}
+\def\countwords{
+ \directlua{wordnumber = 0
+ luatexbase.add_to_callback("pre_linebreak_filter",countwords,"countwords")
+ luatexbase.add_to_callback("stop_run",printwordnumber,"printwordnumber")
+ }
+}
+
+\def\detectdoublewords{
+ \directlua{
+ luatexbase.add_to_callback("post_linebreak_filter",detectdoublewords,"detectdoublewords")
+ luatexbase.add_to_callback("stop_run",printdoublewords,"printdoublewords")
+ }
+}
+
\def\dosomethingfunny{
%% should execute one of the “funny” commands, but randomly. So every compilation is completely different. Maybe a list of commands could be specified to exclude total nonesense-functions. Maybe also on a per-paragraph-basis?
- }
+}
\def\dubstepenize{
\chickenize
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chickenize.tlpobj new/tlpkg/tlpobj/chickenize.tlpobj
--- old/tlpkg/tlpobj/chickenize.tlpobj 2013-02-26 04:33:02.000000000 +0100
+++ new/tlpkg/tlpobj/chickenize.tlpobj 2013-08-24 03:21:25.000000000 +0200
@@ -1,6 +1,6 @@
name chickenize
category Package
-revision 29232
+revision 31505
shortdesc Use lua callbacks for "interesting" textual effects.
relocated 1
longdesc The package allows manipulations of any LuaTeX document (it is
@@ -10,11 +10,11 @@
longdesc badness and font expansion of each line, and letterspaceadjust
longdesc doing what its name says) could be useful in a "normal" LuaTeX
longdesc document.
-runfiles size=11
+runfiles size=12
RELOC/tex/luatex/chickenize/chickenize.lua
RELOC/tex/luatex/chickenize/chickenize.sty
RELOC/tex/luatex/chickenize/chickenize.tex
catalogue-ctan /macros/luatex/generic/chickenize
-catalogue-date 2013-02-24 22:35:53 +0100
+catalogue-date 2013-08-23 07:33:01 +0200
catalogue-license lppl1.3
-catalogue-version 0.2
+catalogue-version 0.2.1a
++++++ chktex.doc.tar.xz ++++++
Files old/texmf-dist/doc/chktex/ChkTeX.pdf and new/texmf-dist/doc/chktex/ChkTeX.pdf differ
Files old/texmf-dist/doc/man/man1/chktex.man1.pdf and new/texmf-dist/doc/man/man1/chktex.man1.pdf differ
Files old/texmf-dist/doc/man/man1/chkweb.man1.pdf and new/texmf-dist/doc/man/man1/chkweb.man1.pdf differ
Files old/texmf-dist/doc/man/man1/deweb.man1.pdf and new/texmf-dist/doc/man/man1/deweb.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chktex.doc.tlpobj new/tlpkg/tlpobj/chktex.doc.tlpobj
--- old/tlpkg/tlpobj/chktex.doc.tlpobj 2013-04-10 21:00:13.000000000 +0200
+++ new/tlpkg/tlpobj/chktex.doc.tlpobj 2014-04-30 03:25:39.000000000 +0200
@@ -1,6 +1,6 @@
name chktex.doc
category TLCore
-revision 29821
+revision 33741
shortdesc doc files of chktex
docfiles size=65
texmf-dist/doc/chktex/ChkTeX.pdf
++++++ chktex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chktex.tlpobj new/tlpkg/tlpobj/chktex.tlpobj
--- old/tlpkg/tlpobj/chktex.tlpobj 2013-04-10 21:00:13.000000000 +0200
+++ new/tlpkg/tlpobj/chktex.tlpobj 2014-04-30 03:25:39.000000000 +0200
@@ -1,6 +1,6 @@
name chktex
category TLCore
-revision 29821
+revision 33741
shortdesc Check for errors in LaTeX documents.
longdesc The program reports typographic and other errors in LaTeX
longdesc documents. Filters are also provided for checking the LaTeX
@@ -11,6 +11,6 @@
texmf-dist/scripts/chktex/chkweb.sh
texmf-dist/scripts/chktex/deweb.pl
catalogue-ctan /support/chktex
-catalogue-date 2012-12-29 15:06:49 +0100
+catalogue-date 2014-02-26 23:03:13 +0100
catalogue-license gpl
-catalogue-version 1.7.1
+catalogue-version 1.7.2
++++++ texlive-specs-d-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/.*")