summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-11-12 00:57:48 +0000
committerKarl Berry <karl@freefriends.org>2011-11-12 00:57:48 +0000
commit41b91fc8ad0ae3915624b28202663739c6213650 (patch)
treee37a7523d8ea9c2c22ff3019b6068a4a51b6b952 /Master
parent6d222109e66d259baedd48935a0eb86b7570136d (diff)
ascelike (11nov11)
git-svn-id: svn://tug.org/texlive/trunk@24568 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/bibtex/bst/ascelike/ascelike.bst2
-rw-r--r--Master/texmf-dist/doc/latex/ascelike/README2
-rw-r--r--Master/texmf-dist/doc/latex/ascelike/ascexmpl.bib2
-rw-r--r--Master/texmf-dist/doc/latex/ascelike/ascexmpl.pdfbin261152 -> 263824 bytes
-rw-r--r--Master/texmf-dist/doc/latex/ascelike/ascexmpl.tex42
-rw-r--r--Master/texmf-dist/tex/latex/ascelike/ascelike.cls6
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds1
7 files changed, 41 insertions, 14 deletions
diff --git a/Master/texmf-dist/bibtex/bst/ascelike/ascelike.bst b/Master/texmf-dist/bibtex/bst/ascelike/ascelike.bst
index d8c3f87900e..ab43483f380 100644
--- a/Master/texmf-dist/bibtex/bst/ascelike/ascelike.bst
+++ b/Master/texmf-dist/bibtex/bst/ascelike/ascelike.bst
@@ -1,6 +1,6 @@
%% File: ascelike.bst
%%
-%% August 20, 2011
+%% Version 2.1, November 7, 2011
%%
%%
%% An unofficial bibliography style-file for ASCE-like bibliographies.
diff --git a/Master/texmf-dist/doc/latex/ascelike/README b/Master/texmf-dist/doc/latex/ascelike/README
index 40a361ce479..114de2f7fc8 100644
--- a/Master/texmf-dist/doc/latex/ascelike/README
+++ b/Master/texmf-dist/doc/latex/ascelike/README
@@ -2,6 +2,8 @@ Unofficial LaTeX class and bibliography style-files for ASCE documents
(Amer. Soc. of Civil Engineers), both journal manuscripts and camera-ready
manuscripts for conference proceedings
+Version 2.1, Nov. 7, 2011
+
The two main files are
ascelike.cls - The document class file
ascelike.bst - The bibliography style file for creating bibliographic
diff --git a/Master/texmf-dist/doc/latex/ascelike/ascexmpl.bib b/Master/texmf-dist/doc/latex/ascelike/ascexmpl.bib
index 839fbc552e1..fd7a2d4cb7b 100644
--- a/Master/texmf-dist/doc/latex/ascelike/ascexmpl.bib
+++ b/Master/texmf-dist/doc/latex/ascelike/ascexmpl.bib
@@ -253,7 +253,7 @@
title = {Style files for {ASCE}-like documents},
journal = {ascelike},
year = {2011},
- month = {Aug. 20, 2011},
+ month = {Nov. 17, 2011},
url = {http://www.ctan.org/tex-archive/macros/latex/contrib/ascelike},
}
%
diff --git a/Master/texmf-dist/doc/latex/ascelike/ascexmpl.pdf b/Master/texmf-dist/doc/latex/ascelike/ascexmpl.pdf
index e9ba16eb87b..49b20ed9f19 100644
--- a/Master/texmf-dist/doc/latex/ascelike/ascexmpl.pdf
+++ b/Master/texmf-dist/doc/latex/ascelike/ascexmpl.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/ascelike/ascexmpl.tex b/Master/texmf-dist/doc/latex/ascelike/ascexmpl.tex
index dbcdea387eb..bc75627cc50 100644
--- a/Master/texmf-dist/doc/latex/ascelike/ascexmpl.tex
+++ b/Master/texmf-dist/doc/latex/ascelike/ascexmpl.tex
@@ -1,7 +1,7 @@
%
\documentclass[Proceedings]{ascelike}
%
-% Aug. 20, 2011
+% Nov. 7, 2011
%
% Some useful packages...
%
@@ -15,12 +15,12 @@
%
%
% Place hyperlinks within the pdf file (works only with pdflatex, not latex)
-% \usepackage[colorlinks=true,citecolor=red,linkcolor=black]{hyperref}
+\usepackage[colorlinks=true,citecolor=red,linkcolor=black]{hyperref}
%
%
% NOTE: Don't include the \NameTag{<your name>} if you have selected
% the NoPageNumbers option: this leads to an inconsistency.
-\NameTag{Kuhn, August 20, 2011}
+\NameTag{Kuhn, November 7, 2011}
%
%
\begin{document}
@@ -37,6 +37,10 @@ Donald P.\ Shiley School of Engrg., Univ.\ of Portland,
Portland, OR 97203. E-mail: kuhn@up.edu.},
\ Member, ASCE
%
+% Here, we add a second author with the same affiliation
+%% \\
+%% Ima Colleague,\footnotemark[1] Member, ASCE%
+%
% I have found that the \and command doesn't quite work, so just use "and"
% such as the following (and don't forget the ending curly brace `}').
%\\
@@ -96,7 +100,7 @@ The document class ``\texttt{ascelike.cls}'' requires the following
supplementary packages:
\texttt{ifthen.sty}, \texttt{setspace.sty}, and \texttt{endfloat.sty}
\emph{Without these files,} \texttt{ascelike.cls} \emph{won't work}.
-These files are typically included in \LaTeX\ distribution, such as the
+These files are typically included in \LaTeX\ distributions, such as the
\textsf{TexLive} and \textsf{MikTex} distributions.
All of these files are also freely available
from the Comprehensive \TeX\ Archive Network (CTAN) archive,
@@ -127,6 +131,9 @@ encapsulated post\-script (figure) files into the document
\texttt{amsmath.sty} and its companion files for the AMS extensions
to mathematical formatting (\texttt{amsfonts.sty}, \texttt{amssymb.sty},
and \texttt{amsbsy.sty}).
+\item
+\texttt{url.sty} can be used to embed the underscore ``\_'' and
+ampersand ``\&'' symbols with web addresses.
\end{itemize}
%
All of these packages are also freely
@@ -174,7 +181,7 @@ sections, subsections, subsubsections, appendices, and the abstract.
Pages are numbered, and the bottom left corner can be ``tagged'' with
the author's name (this can be done by inserting the command
\verb+\NameTag{<+\emph{your name}\verb+>}+ within the preamble of your
-document.
+document).
\item
Options \verb+BackFigs|InsideFigs+ can be used to override
the default placement of tables
@@ -240,24 +247,26 @@ as in ``An Example Subsection.''
No automatic capitalization occurs with subsubsections;
you will need to capitalize only the first letter of subsubsection
headings.
+\par
And now we include an example of a displayed equation (Eq.~\ref{eq:Einstein})
%
\begin{equation} \label{eq:Einstein}
E = m c^{2} \;,
\end{equation}
%
-a figure (Fig.~\ref{fig:box_fig}),
+a figure (Fig.~\ref{fig:box_fig}),%
%
\begin{figure}
\centering
\framebox[3.00in]{\rule[0in]{0in}{1.00in}}
\caption{An example figure (just a box).
This particular figure has a caption with more information
-than the figure itself, a very poor practice indeed.}
+than the figure itself, a very poor practice indeed.
+A reference here \protect\cite{Stahl:2004a}.}
\label{fig:box_fig}
\end{figure}
%
-and a table (Table~\ref{table:assembly}).
+and a table (Table~\ref{table:assembly}).%
%
\begin{table}
\caption{An example table}
@@ -284,6 +293,16 @@ Assembly size & $54D_{50} \times 54D_{50} \times 54D_{50}$ \\
\normalsize
\end{table}
%
+Notice that the caption of Fig.~\ref{fig:box_fig} contains
+a citation of a bibliographic item \cite{Stahl:2004a}.
+This can lead to the following errors:
+\begin{verbatim}
+! Illegal parameter number in definition of \reserved@a.
+! Missing control sequence inserted
+\end{verbatim}
+These errors are avoided by protecting citations within captions,
+as \verb|\protect\cite{...}|.
+%
\par
A new command \verb+\KeyWords{<your key words>}+ can be used to produce
a labeled list of key words.
@@ -407,6 +426,13 @@ online web documentation.)
\par
Authors' addresses can be placed below the title (instead of
in a footnote) by \emph{not} using the \verb+\thanks+ command.
+Multiple authors from the same institution can be handled within
+the \verb|\author{...}| command by using the \verb|\footnotemark| command:
+\begin{verbatim}
+\\
+Ima Colleague,\footnotemark[1] Member, ASCE%
+\end{verbatim}
+\pagebreak
%
%
% Now we start the appendices, with the new section name, "Appendix", and a
diff --git a/Master/texmf-dist/tex/latex/ascelike/ascelike.cls b/Master/texmf-dist/tex/latex/ascelike/ascelike.cls
index c0953c29284..48e5117a62b 100644
--- a/Master/texmf-dist/tex/latex/ascelike/ascelike.cls
+++ b/Master/texmf-dist/tex/latex/ascelike/ascelike.cls
@@ -1,6 +1,6 @@
%% File: ascelike.cls
%%
-%% Version 2.0
+%% Version 2.1
%%
%% An unofficial LaTeX class file for preparing review manuscripts and
%% camera-ready manuscripts for ASCE journals and conference proceedings
@@ -94,7 +94,7 @@
\typeout{}
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
\ProvidesClass{ascelike}
- [2002/12/29 ASCE-like manuscripts (Am. Soc. Civ. Engr.)]
+ [2011/11/07 Version 2.1 ASCE-like manuscripts (Am. Soc. Civ. Engr.)]
\typeout{}
\RequirePackage{ifthen}[1994/11/15]
%
@@ -221,7 +221,7 @@
\setlength{\marginparpush} {0.00in}}
%
% Page layout for Journal manuscripts:
-{\setlength{\topmargin} {0.60in}
+{\setlength{\topmargin} {0.00in}
\setlength{\headheight} {0.00in}
\setlength{\headsep} {0.00in}
\setlength{\textheight} {9.00in}
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 4fc529520ac..255a4c670e2 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -414,7 +414,6 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'itrans-processor', "die 'skipping, no longer maintained, too complex'",
'iwona', "&MAKEcopy",
'jadetex', "&MAKEjadetex",
- 'japanese-otf',"die 'skipping, not ready, sorry'",
'jasthesis', "die 'skipping, license is unknown'",
'javadoc', "die 'skipping, requires java and no source'",
'jflap2tikz', "die 'skipping, requires java'",