summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/bibtex/bst/stellenbosch/usmeg-a.bst11
-rw-r--r--Master/texmf-dist/bibtex/bst/stellenbosch/usmeg-n.bst11
-rw-r--r--Master/texmf-dist/bibtex/bst/stellenbosch/ussagus.bst10
-rw-r--r--Master/texmf-dist/doc/latex/stellenbosch/CHANGELOG20
-rw-r--r--Master/texmf-dist/doc/latex/stellenbosch/USbib-1.0c.pdfbin265222 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/stellenbosch/USbib-2.0.pdfbin0 -> 243751 bytes
-rw-r--r--Master/texmf-dist/doc/latex/stellenbosch/USsummary-1.0a.pdfbin177776 -> 159278 bytes
-rw-r--r--Master/texmf-dist/doc/latex/stellenbosch/USthesis-2.2a.pdfbin0 -> 467302 bytes
-rw-r--r--Master/texmf-dist/doc/latex/stellenbosch/templates/masters-sample.zipbin5959 -> 6440 bytes
-rw-r--r--Master/texmf-dist/doc/latex/stellenbosch/templates/report-sample.zipbin6906 -> 7132 bytes
-rw-r--r--Master/texmf-dist/doc/latex/stellenbosch/usthesis-2.2.pdfbin465524 -> 0 bytes
-rw-r--r--Master/texmf-dist/source/latex/stellenbosch/USbib-2.0-scr.zip (renamed from Master/texmf-dist/source/latex/stellenbosch/USbib-0.1c-scr.zip)bin30564 -> 32635 bytes
-rw-r--r--Master/texmf-dist/source/latex/stellenbosch/USsummary-1.0a-src.zipbin0 -> 5874 bytes
-rw-r--r--Master/texmf-dist/source/latex/stellenbosch/USthesis-2.2-src.zipbin27355 -> 0 bytes
-rw-r--r--Master/texmf-dist/source/latex/stellenbosch/USthesis-2.2a-src.zipbin0 -> 27593 bytes
-rw-r--r--Master/texmf-dist/tex/latex/stellenbosch/usbib.sty14
-rw-r--r--Master/texmf-dist/tex/latex/stellenbosch/ussummary.sty3
-rw-r--r--Master/texmf-dist/tpm/stellenbosch.tpm17
-rw-r--r--Master/texmf/lists/stellenbosch9
19 files changed, 54 insertions, 41 deletions
diff --git a/Master/texmf-dist/bibtex/bst/stellenbosch/usmeg-a.bst b/Master/texmf-dist/bibtex/bst/stellenbosch/usmeg-a.bst
index 85c75f37773..98be85449fc 100644
--- a/Master/texmf-dist/bibtex/bst/stellenbosch/usmeg-a.bst
+++ b/Master/texmf-dist/bibtex/bst/stellenbosch/usmeg-a.bst
@@ -185,12 +185,11 @@ FUNCTION {remove.dots}
while$
}
-FUNCTION {remove.spaces}
- { 'z :=
- ""
- { z empty$ not }
- { z #1 #1 substring$
- z #2 global.max$ substring$ 'z :=
+STRINGS {zstr}
+FUNCTION {remove.spaces} { 'zstr := ""
+ { zstr empty$ not }
+ { zstr #1 #1 substring$
+ zstr #2 global.max$ substring$ 'zstr :=
duplicate$ "~" =
'pop$
{ duplicate$ " " =
diff --git a/Master/texmf-dist/bibtex/bst/stellenbosch/usmeg-n.bst b/Master/texmf-dist/bibtex/bst/stellenbosch/usmeg-n.bst
index e903a18b9c9..6bc85b9649f 100644
--- a/Master/texmf-dist/bibtex/bst/stellenbosch/usmeg-n.bst
+++ b/Master/texmf-dist/bibtex/bst/stellenbosch/usmeg-n.bst
@@ -424,12 +424,11 @@ FUNCTION {write.url}
if$
}
-STRINGS {z}
-
-FUNCTION {remove.spaces} { 'z := ""
- { z empty$ not }
- { z #1 #1 substring$
- z #2 global.max$ substring$ 'z :=
+STRINGS {zstr}
+FUNCTION {remove.spaces} { 'zstr := ""
+ { zstr empty$ not }
+ { zstr #1 #1 substring$
+ zstr #2 global.max$ substring$ 'zstr :=
duplicate$ "~" =
'pop$
{ duplicate$ " " =
diff --git a/Master/texmf-dist/bibtex/bst/stellenbosch/ussagus.bst b/Master/texmf-dist/bibtex/bst/stellenbosch/ussagus.bst
index 8f9276bb4d6..1133418b48b 100644
--- a/Master/texmf-dist/bibtex/bst/stellenbosch/ussagus.bst
+++ b/Master/texmf-dist/bibtex/bst/stellenbosch/ussagus.bst
@@ -390,12 +390,12 @@ FUNCTION {write.url}
if$
}
-STRINGS {z}
+STRINGS {zstr}
-FUNCTION {remove.spaces} { 'z := ""
- { z empty$ not }
- { z #1 #1 substring$
- z #2 global.max$ substring$ 'z :=
+FUNCTION {remove.spaces} { 'zstr := ""
+ { zstr empty$ not }
+ { zstr #1 #1 substring$
+ zstr #2 global.max$ substring$ 'zstr :=
duplicate$ "~" =
'pop$
{ duplicate$ " " =
diff --git a/Master/texmf-dist/doc/latex/stellenbosch/CHANGELOG b/Master/texmf-dist/doc/latex/stellenbosch/CHANGELOG
index 361a0272db6..ee1497f8262 100644
--- a/Master/texmf-dist/doc/latex/stellenbosch/CHANGELOG
+++ b/Master/texmf-dist/doc/latex/stellenbosch/CHANGELOG
@@ -1,9 +1,21 @@
-Version 4 (2006/08/16)
+Version 05 (2006/09/14)
+
+ a) Add to USthesis docs and to templates:
+ - user defined layouts with memoir or geometry.
+ - parskip package if spacing is required between
+ paragraphs.
+
+ b) Bugfix in usmeg-n.bst in FUNCTION{remove.spaces}
+
+ c) Change default \BIBand from "\&" to "and" for usbib.sty
+ with usmeg-a and usmeg-n options.
+
+Version 04 (2006/08/16)
a) Fix typo in usthesis for "Supervisors"
- b) Add Oak leafs to logos
+
+ b) Add Oak leafs to logos
-Version 3 (2006/03/15)
+Version 03 (2006/03/15)
First CTAN release
-
diff --git a/Master/texmf-dist/doc/latex/stellenbosch/USbib-1.0c.pdf b/Master/texmf-dist/doc/latex/stellenbosch/USbib-1.0c.pdf
deleted file mode 100644
index cb2517ea226..00000000000
--- a/Master/texmf-dist/doc/latex/stellenbosch/USbib-1.0c.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/stellenbosch/USbib-2.0.pdf b/Master/texmf-dist/doc/latex/stellenbosch/USbib-2.0.pdf
new file mode 100644
index 00000000000..309ab0b1ef3
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/stellenbosch/USbib-2.0.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/stellenbosch/USsummary-1.0a.pdf b/Master/texmf-dist/doc/latex/stellenbosch/USsummary-1.0a.pdf
index 700e2fdde89..595337af5ae 100644
--- a/Master/texmf-dist/doc/latex/stellenbosch/USsummary-1.0a.pdf
+++ b/Master/texmf-dist/doc/latex/stellenbosch/USsummary-1.0a.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/stellenbosch/USthesis-2.2a.pdf b/Master/texmf-dist/doc/latex/stellenbosch/USthesis-2.2a.pdf
new file mode 100644
index 00000000000..367e41cfafe
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/stellenbosch/USthesis-2.2a.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/stellenbosch/templates/masters-sample.zip b/Master/texmf-dist/doc/latex/stellenbosch/templates/masters-sample.zip
index b37f553acc2..5978020d6df 100644
--- a/Master/texmf-dist/doc/latex/stellenbosch/templates/masters-sample.zip
+++ b/Master/texmf-dist/doc/latex/stellenbosch/templates/masters-sample.zip
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/stellenbosch/templates/report-sample.zip b/Master/texmf-dist/doc/latex/stellenbosch/templates/report-sample.zip
index b0199b36707..4c08536aa47 100644
--- a/Master/texmf-dist/doc/latex/stellenbosch/templates/report-sample.zip
+++ b/Master/texmf-dist/doc/latex/stellenbosch/templates/report-sample.zip
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/stellenbosch/usthesis-2.2.pdf b/Master/texmf-dist/doc/latex/stellenbosch/usthesis-2.2.pdf
deleted file mode 100644
index 381a248c3a2..00000000000
--- a/Master/texmf-dist/doc/latex/stellenbosch/usthesis-2.2.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/source/latex/stellenbosch/USbib-0.1c-scr.zip b/Master/texmf-dist/source/latex/stellenbosch/USbib-2.0-scr.zip
index 56d84799261..67442f51c1a 100644
--- a/Master/texmf-dist/source/latex/stellenbosch/USbib-0.1c-scr.zip
+++ b/Master/texmf-dist/source/latex/stellenbosch/USbib-2.0-scr.zip
Binary files differ
diff --git a/Master/texmf-dist/source/latex/stellenbosch/USsummary-1.0a-src.zip b/Master/texmf-dist/source/latex/stellenbosch/USsummary-1.0a-src.zip
new file mode 100644
index 00000000000..1cd58046f39
--- /dev/null
+++ b/Master/texmf-dist/source/latex/stellenbosch/USsummary-1.0a-src.zip
Binary files differ
diff --git a/Master/texmf-dist/source/latex/stellenbosch/USthesis-2.2-src.zip b/Master/texmf-dist/source/latex/stellenbosch/USthesis-2.2-src.zip
deleted file mode 100644
index 8cb8b232f23..00000000000
--- a/Master/texmf-dist/source/latex/stellenbosch/USthesis-2.2-src.zip
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/source/latex/stellenbosch/USthesis-2.2a-src.zip b/Master/texmf-dist/source/latex/stellenbosch/USthesis-2.2a-src.zip
new file mode 100644
index 00000000000..158acb7f82b
--- /dev/null
+++ b/Master/texmf-dist/source/latex/stellenbosch/USthesis-2.2a-src.zip
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/stellenbosch/usbib.sty b/Master/texmf-dist/tex/latex/stellenbosch/usbib.sty
index 994875881ad..189efdef605 100644
--- a/Master/texmf-dist/tex/latex/stellenbosch/usbib.sty
+++ b/Master/texmf-dist/tex/latex/stellenbosch/usbib.sty
@@ -1,5 +1,5 @@
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
-\ProvidesPackage{usbib}[2003/02/29 0.1 (DNJ Els)]
+\ProvidesPackage{usbib}[2006/09/14 0.2 (DNJ Els)]
\RequirePackageWithOptions{natbib}
\@ifundefined{AorE}{
@@ -20,17 +20,17 @@
\ifNAT@swa
\AorE{en}{and}%
\else
- \textit{\&}%
+ \AorE{en}{and}%\textit{\&}%
\fi
\fi}}
-
+
\@namedef{bibstyle@usmeg-n}{%
\bibpunct{[}{]}{;}{n}{,}{,}%
\gdef\BIBand{%
\ifinbibliography
\AorE{en}{and}%
\else
- \textit{\&}%
+ \AorE{en}{and}%\textit{\&}%
\fi}}
\newcommand\bibstyle@ussagus{%
@@ -40,8 +40,8 @@
\setlength{\bibhang}{1em}
-{\@listi
- \global\bibsep\itemsep
+{\@listi
+ \global\bibsep\itemsep
\global\advance\bibsep by\parsep}
\newcommand{\citenamefont}[1]{#1}
@@ -50,7 +50,7 @@
\renewcommand\bibstyle[1]{%
- \lowercase{\edef\tempa{#1}}%
+ \lowercase{\edef\tempa{#1}}%
\@ifundefined{bibstyle@\tempa}{\relax}
{\csname bibstyle@\tempa\endcsname}}
\AtBeginDocument{\global\let\bibstyle=\@gobble}
diff --git a/Master/texmf-dist/tex/latex/stellenbosch/ussummary.sty b/Master/texmf-dist/tex/latex/stellenbosch/ussummary.sty
index 14f2226e81a..3cdc9165303 100644
--- a/Master/texmf-dist/tex/latex/stellenbosch/ussummary.sty
+++ b/Master/texmf-dist/tex/latex/stellenbosch/ussummary.sty
@@ -34,7 +34,8 @@
\RequirePackage{array}
\RequirePackage{longtable}
\RequirePackage{colortbl}
- %\let\CT@cell@color\relax
+ %\AtBeginDocument{%
+ % \providecommand*{\CT@cell@color}{\relax}}
\providecommand*{\phantomsection}{}
\@ifundefined{US@AFRstr}%
{\edef\US@AFRstr{\string afrikaans}}%
diff --git a/Master/texmf-dist/tpm/stellenbosch.tpm b/Master/texmf-dist/tpm/stellenbosch.tpm
index a1d799190a4..5ee7898ad55 100644
--- a/Master/texmf-dist/tpm/stellenbosch.tpm
+++ b/Master/texmf-dist/tpm/stellenbosch.tpm
@@ -3,7 +3,7 @@
<rdf:Description about="http://texlive.dante.de/texlive/Package/stellenbosch.zip">
<TPM:Name>stellenbosch</TPM:Name>
<TPM:Type>Package</TPM:Type>
- <TPM:Date>2006/08/18 23:28:13</TPM:Date>
+ <TPM:Date>2006/09/14 16:14:00</TPM:Date>
<TPM:Version></TPM:Version>
<TPM:Creator>karl</TPM:Creator>
<TPM:Title>The stellenbosch package.</TPM:Title>
@@ -11,7 +11,7 @@
<TPM:Author></TPM:Author>
<TPM:Size>3232786</TPM:Size>
<TPM:Build/>
- <TPM:RunFiles size="1450288">
+ <TPM:RunFiles size="1457474">
texmf-dist/bibtex/bst/stellenbosch/usmeg-a.bst
texmf-dist/bibtex/bst/stellenbosch/usmeg-n.bst
texmf-dist/bibtex/bst/stellenbosch/ussagus.bst
@@ -66,23 +66,24 @@ texmf-dist/tex/latex/stellenbosch/usthesis.sty
texmf-dist/tex/latex/stellenbosch/ustitle.sty
texmf-dist/tpm/stellenbosch.tpm
</TPM:RunFiles>
- <TPM:DocFiles size="1659046">
+ <TPM:DocFiles size="1622025">
texmf-dist/doc/latex/stellenbosch/CHANGELOG
texmf-dist/doc/latex/stellenbosch/README.txt
-texmf-dist/doc/latex/stellenbosch/USbib-1.0c.pdf
+texmf-dist/doc/latex/stellenbosch/USbib-2.0.pdf
texmf-dist/doc/latex/stellenbosch/USlogos-doc-3.0.pdf
texmf-dist/doc/latex/stellenbosch/USnomencl-1.0a.pdf
texmf-dist/doc/latex/stellenbosch/USsummary-1.0a.pdf
+texmf-dist/doc/latex/stellenbosch/USthesis-2.2a.pdf
texmf-dist/doc/latex/stellenbosch/UStitle-1.0.pdf
texmf-dist/doc/latex/stellenbosch/templates/masters-sample.zip
texmf-dist/doc/latex/stellenbosch/templates/report-sample.zip
-texmf-dist/doc/latex/stellenbosch/usthesis-2.2.pdf
</TPM:DocFiles>
- <TPM:SourceFiles size="123452">
-texmf-dist/source/latex/stellenbosch/USbib-0.1c-scr.zip
+ <TPM:SourceFiles size="131635">
+texmf-dist/source/latex/stellenbosch/USbib-2.0-scr.zip
texmf-dist/source/latex/stellenbosch/USlogos-3.0-src.zip
texmf-dist/source/latex/stellenbosch/USnomencl-1.0a-src.zip
-texmf-dist/source/latex/stellenbosch/USthesis-2.2-src.zip
+texmf-dist/source/latex/stellenbosch/USsummary-1.0a-src.zip
+texmf-dist/source/latex/stellenbosch/USthesis-2.2a-src.zip
texmf-dist/source/latex/stellenbosch/UStitle-1.0-src.zip
</TPM:SourceFiles>
<TPM:Provides>Package/stellenbosch</TPM:Provides>
diff --git a/Master/texmf/lists/stellenbosch b/Master/texmf/lists/stellenbosch
index c8ec716167d..b814bb5b30b 100644
--- a/Master/texmf/lists/stellenbosch
+++ b/Master/texmf/lists/stellenbosch
@@ -1,17 +1,18 @@
texmf-dist/doc/latex/stellenbosch/CHANGELOG
texmf-dist/doc/latex/stellenbosch/README.txt
-texmf-dist/doc/latex/stellenbosch/USbib-1.0c.pdf
+texmf-dist/doc/latex/stellenbosch/USbib-2.0.pdf
texmf-dist/doc/latex/stellenbosch/USlogos-doc-3.0.pdf
texmf-dist/doc/latex/stellenbosch/USnomencl-1.0a.pdf
texmf-dist/doc/latex/stellenbosch/USsummary-1.0a.pdf
+texmf-dist/doc/latex/stellenbosch/USthesis-2.2a.pdf
texmf-dist/doc/latex/stellenbosch/UStitle-1.0.pdf
texmf-dist/doc/latex/stellenbosch/templates/masters-sample.zip
texmf-dist/doc/latex/stellenbosch/templates/report-sample.zip
-texmf-dist/doc/latex/stellenbosch/usthesis-2.2.pdf
-texmf-dist/source/latex/stellenbosch/USbib-0.1c-scr.zip
+texmf-dist/source/latex/stellenbosch/USbib-2.0-scr.zip
texmf-dist/source/latex/stellenbosch/USlogos-3.0-src.zip
texmf-dist/source/latex/stellenbosch/USnomencl-1.0a-src.zip
-texmf-dist/source/latex/stellenbosch/USthesis-2.2-src.zip
+texmf-dist/source/latex/stellenbosch/USsummary-1.0a-src.zip
+texmf-dist/source/latex/stellenbosch/USthesis-2.2a-src.zip
texmf-dist/source/latex/stellenbosch/UStitle-1.0-src.zip
texmf-dist/bibtex/bst/stellenbosch/usmeg-a.bst
texmf-dist/bibtex/bst/stellenbosch/usmeg-n.bst