summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-03-08 00:36:17 +0000
committerKarl Berry <karl@freefriends.org>2014-03-08 00:36:17 +0000
commit97e3024e1323d96a34c3e11668b634eec32dbafe (patch)
tree941e399edff7729fc3a02b82367819ebd69a6705
parent288b7a34a38e9ddb9e922faa48c3efddbde0a944 (diff)
sasnrdisplay (7mar14)
git-svn-id: svn://tug.org/texlive/trunk@33120 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/sasnrdisplay/README10
-rw-r--r--Master/texmf-dist/doc/latex/sasnrdisplay/SASnRdisplay.pdfbin192008 -> 192028 bytes
-rw-r--r--Master/texmf-dist/doc/latex/sasnrdisplay/SASnRdisplay.tex2
-rw-r--r--Master/texmf-dist/tex/latex/sasnrdisplay/SASnRdisplay.sty26
4 files changed, 29 insertions, 9 deletions
diff --git a/Master/texmf-dist/doc/latex/sasnrdisplay/README b/Master/texmf-dist/doc/latex/sasnrdisplay/README
index fb461506cdd..43a15e8b86f 100644
--- a/Master/texmf-dist/doc/latex/sasnrdisplay/README
+++ b/Master/texmf-dist/doc/latex/sasnrdisplay/README
@@ -1,4 +1,4 @@
-% (C) Lars Madsen, daleif@imf.au.dk, 2011/12/01
+% (C) Lars Madsen, daleif@imf.au.dk, 2012/10/10
% This material is subject to the LaTeX Project Public License.
% See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html
% for the details of that license.
@@ -20,6 +20,14 @@ packages.
HISTORY:
+2014/03/07
+* bad test for \chapter, fix by using \ifundef instead
+
+2012/10/10
+
+* Added a test for the legacy (unpublished) SASdisplay package. Users
+ should not be using both packages
+
2012/03/27
* Fixed typo within \inputSASoutput configuration
diff --git a/Master/texmf-dist/doc/latex/sasnrdisplay/SASnRdisplay.pdf b/Master/texmf-dist/doc/latex/sasnrdisplay/SASnRdisplay.pdf
index abae8d4d98b..fec356366b7 100644
--- a/Master/texmf-dist/doc/latex/sasnrdisplay/SASnRdisplay.pdf
+++ b/Master/texmf-dist/doc/latex/sasnrdisplay/SASnRdisplay.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/sasnrdisplay/SASnRdisplay.tex b/Master/texmf-dist/doc/latex/sasnrdisplay/SASnRdisplay.tex
index ce3ad5dbc37..c317da93077 100644
--- a/Master/texmf-dist/doc/latex/sasnrdisplay/SASnRdisplay.tex
+++ b/Master/texmf-dist/doc/latex/sasnrdisplay/SASnRdisplay.tex
@@ -133,7 +133,7 @@ noneedspace
\begin{document}
\title{The \textsf{SASnRdisplay} package}
-\author{Lars Madsen\thanks{Email: daleif@imf.au.dk}}
+\author{Lars Madsen\thanks{Email: daleif@imf.au.dk,\SnRversion}}
\maketitle
\chapter*{Introdution}
diff --git a/Master/texmf-dist/tex/latex/sasnrdisplay/SASnRdisplay.sty b/Master/texmf-dist/tex/latex/sasnrdisplay/SASnRdisplay.sty
index 350c9bb82d4..7fd8d1bc48b 100644
--- a/Master/texmf-dist/tex/latex/sasnrdisplay/SASnRdisplay.sty
+++ b/Master/texmf-dist/tex/latex/sasnrdisplay/SASnRdisplay.sty
@@ -1,7 +1,9 @@
-\ProvidesPackage{SASnRdisplay}[2012/03/27 v0.91 by daleif]
+\ProvidesPackage{SASnRdisplay}[2014/03/07 v0.93 by daleif]
-%% $LastChangedDate: 2012-03-27 12:21:59 +0200 (Tue, 27 Mar 2012) $
-%% $LastChangedRevision: 1480 $
+\newcommand\SnRversion{v0.93 2014/03/07}
+
+%% $LastChangedDate: 2012-10-15 16:01:29 +0200 (Mon, 15 Oct 2012) $
+%% $LastChangedRevision: 1552 $
%% $LastChangedBy: daleif $
%%
@@ -102,10 +104,10 @@
\DeclareOptionX{countbysection}{\toggletrue{SnRcountbysection}}
\DeclareOptionX{countbychapter}{%
% if \chapter is not available specify section instead
- \ifdef\chapter{
- \toggletrue{SnRcountbychapter}
- }{
+ \ifundef\chapter{
\toggletrue{SnRcountbysection}
+ }{
+ \toggletrue{SnRcountbychapter}
}
}
@@ -427,7 +429,7 @@
% end rincludecode
% rincludeoutput
\lstdefinestyle{r-include-output}{
- style = r-outout,
+ style = r-output,
style = r-include-user,
style = r-include-output-user,
}
@@ -698,6 +700,16 @@
\InputIfFileExists{SASnRdisplay.cfg}{}{}
\InputIfFileExists{SASnRdisplayuser.cfg}{}{}
+
+\AtBeginDocument{
+ \@ifpackageloaded{SASdisplay}{
+ \PackageError{SASnRdisplay}{SASnRdisplay cannot be loaded at the
+ same time as the legacy SASdisplay package.}{Please remove the
+ SASdisplay package}
+ }{}
+}
+
+
\endinput