projects
/
latex-mlastyle.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More work on switch to natbib
[latex-mlastyle.git]
/
mlastyle.dtx
diff --git
a/mlastyle.dtx
b/mlastyle.dtx
index 906ed671f6903ec1aa87d177d01f8e5120f55cda..7033be8b0ee6686b7709c27bb15416c90055c73d 100644
(file)
--- a/
mlastyle.dtx
+++ b/
mlastyle.dtx
@@
-630,16
+630,15
@@
Schlegl",
% \end{macro}
% \subsection{Formatting}
% Formatting is done if the \Lopt{mla} or \Lopt{format} option is set.
% \end{macro}
% \subsection{Formatting}
% Formatting is done if the \Lopt{mla} or \Lopt{format} option is set.
-%
+% \begin{macrocode}
+\ifmlastyle@format
+% \end{macrocode}
% \begin{macro}{\mlastyle@i}
% This is the standard MLA format indent.
% \begin{macrocode}
\newdimen\mlastyle@i \mlastyle@i=.5in
% \end{macrocode}
% \end{macro}
% \begin{macro}{\mlastyle@i}
% This is the standard MLA format indent.
% \begin{macrocode}
\newdimen\mlastyle@i \mlastyle@i=.5in
% \end{macrocode}
% \end{macro}
-% \begin{macrocode}
-\ifmlastyle@format
-% \end{macrocode}
% \subsubsection{Macros}
% \begin{macro}{\maketitle}
% |\maketitle| generates a heading in MLA format.
% \subsubsection{Macros}
% \begin{macro}{\maketitle}
% |\maketitle| generates a heading in MLA format.
@@
-827,6
+826,9
@@
Schlegl",
% The definition of |\thebibliography| varies depending on the document
% class.
% \begin{macrocode}
% The definition of |\thebibliography| varies depending on the document
% class.
% \begin{macrocode}
+\ifx\@undefined\url
+ \def\url#1{{\catcode`/=13\let/=\mlastyle@slash#1}}
+\fi
\ifx\@undefined\citet
\@ifundefined{chapter}
% \end{macrocode}
\ifx\@undefined\citet
\@ifundefined{chapter}
% \end{macrocode}
@@
-840,7
+842,6
@@
Schlegl",
\itemindent-\leftmargin
\def\newblock{}
\usecounter{enumiv}
\itemindent-\leftmargin
\def\newblock{}
\usecounter{enumiv}
- %\catcode`/=13\global\let/=\mlastyle@slash
\sloppy%\sfcode`\.=\@m
}}
% \end{macrocode}
\sloppy%\sfcode`\.=\@m
}}
% \end{macrocode}
@@
-854,7
+855,6
@@
Schlegl",
\itemindent-\leftmargin
\def\newblock{}
\usecounter{enumiv}
\itemindent-\leftmargin
\def\newblock{}
\usecounter{enumiv}
- %\catcode`/=13\let/=\mlastyle@slash
\sloppy%\sfcode`\.=\@m
}}
% \end{macrocode}
\sloppy%\sfcode`\.=\@m
}}
% \end{macrocode}
@@
-875,7
+875,9
@@
Schlegl",
% This first block is the beginnings of an implementation for
% \package{natbib}.
% \begin{macrocode}
% This first block is the beginnings of an implementation for
% \package{natbib}.
% \begin{macrocode}
-\newcommand{\bibstyle@mlastyle}{\bibpunct[ ]{(}{)}{;}{a}{,}{;}
+\newcommand{\bibstyle@mlastyle}%
+{\bibpunct[ ]{(}{)}{;}{a}{\mlastyle@comma}{,}
+\gdef\mlastyle@comma{\ifx\NAT@date\space\def\NAT@date{\unskip}\else,\fi}
\@ifundefined{chapter}
{\gdef\refname{Works Cited}}
{\gdef\bibname{Works Cited}}}
\@ifundefined{chapter}
{\gdef\refname{Works Cited}}
{\gdef\bibname{Works Cited}}}
@@
-984,7
+986,7
@@
Schlegl",
{\renewcommand\bibname{Works Cited}}
\else
\let\cite\citep
{\renewcommand\bibname{Works Cited}}
\else
\let\cite\citep
- \newcommand\citepage[2][]{\cite
text
{#2}}
+ \newcommand\citepage[2][]{\cite
yearpar[\unskip #1]
{#2}}
\newcommand\citepageM[2][]{ \citetext{#2}}
\newcommand\citeindirect[2][]{\citep[#1][qtd. in]{#2}}
\newcommand\citeindirectM[2][]{ \citep[#1][qtd. in]{#2}}
\newcommand\citepageM[2][]{ \citetext{#2}}
\newcommand\citeindirect[2][]{\citep[#1][qtd. in]{#2}}
\newcommand\citeindirectM[2][]{ \citep[#1][qtd. in]{#2}}