diff --git a/inst/csas-style/res-doc.sty b/inst/csas-style/res-doc.sty index bf645f8..e146e31 100644 --- a/inst/csas-style/res-doc.sty +++ b/inst/csas-style/res-doc.sty @@ -718,59 +718,59 @@ DFO Can.\ Sci.\ Advis.\ Sec.\ Res.\ Doc. \rdYear{}/\rdNumber{}. }% End of frontmatter %% ------------------------------------------------------------------------------ -% START-PANDOC-3.1.8 -% definitions for citeproc citations -\NewDocumentCommand\citeproctext{}{} -\NewDocumentCommand\citeproc{mm}{% - \begingroup\def\citeproctext{#2}\cite{#1}\endgroup} -\makeatletter - % allow citations to break across lines - \let\@cite@ofmt\@firstofone - % avoid brackets around text for \cite: - \def\@biblabel#1{} - \def\@cite#1#2{{#1\if@tempswa , #2\fi}} -\makeatother -\newlength{\cslhangindent} -\setlength{\cslhangindent}{1.5em} -\newlength{\csllabelwidth} -\setlength{\csllabelwidth}{3em} -\newenvironment{CSLReferences}[2] % #1 hanging-indent, #2 entry-spacing - {\begin{list}{}{% - \setlength{\itemindent}{0pt} - \setlength{\leftmargin}{0pt} - \setlength{\parsep}{0pt} - % turn on hanging indent if param 1 is 1 - \ifodd #1 - \setlength{\leftmargin}{\cslhangindent} - \setlength{\itemindent}{-1\cslhangindent} - \fi - % set entry spacing - \setlength{\itemsep}{#2\baselineskip}}} - {\end{list}} -\usepackage{calc} -\newcommand{\CSLBlock}[1]{\hfill\break#1\hfill\break} -\newcommand{\CSLLeftMargin}[1]{\parbox[t]{\csllabelwidth}{\strut#1\strut}} -\newcommand{\CSLRightInline}[1]{\parbox[t]{\linewidth - \csllabelwidth}{\strut#1\strut}} -\newcommand{\CSLIndent}[1]{\hspace{\cslhangindent}#1} -% END-PANDOC-3.1.8 - -% % START-PANDOC-BEFORE-3.1.7 -% \newenvironment{CSLReferences}[3] % #1 hanging-ident, #2 entry spacing -% {% don't indent paragraphs -% \setlength{\parindent}{0pt} -% % turn on hanging indent if param 1 is 1 -% \ifodd #1 \everypar{\setlength{\hangindent}{\cslhangindent}}\ignorespaces\fi -% % set entry spacing -% \ifnum #2 > 0 -% \setlength{\parskip}{#2\baselineskip} -% \fi -% }% -% {} -% %Copied from https://github.com/rstudio/rmarkdown/issues/1649 +% % START-PANDOC-3.1.8 +% % definitions for citeproc citations +% \NewDocumentCommand\citeproctext{}{} +% \NewDocumentCommand\citeproc{mm}{% +% \begingroup\def\citeproctext{#2}\cite{#1}\endgroup} +% \makeatletter +% % allow citations to break across lines +% \let\@cite@ofmt\@firstofone +% % avoid brackets around text for \cite: +% \def\@biblabel#1{} +% \def\@cite#1#2{{#1\if@tempswa , #2\fi}} +% \makeatother % \newlength{\cslhangindent} % \setlength{\cslhangindent}{1.5em} -% \newenvironment{cslreferences}% -% {$if(csl-hanging-indent)$\setlength{\parindent}{0pt}% -% \everypar{\setlength{\hangindent}{\cslhangindent}}\ignorespaces$endif$}% -% {\par} -% % END-PANDOC-BEFORE-3.1.7 \ No newline at end of file +% \newlength{\csllabelwidth} +% \setlength{\csllabelwidth}{3em} +% \newenvironment{CSLReferences}[2] % #1 hanging-indent, #2 entry-spacing +% {\begin{list}{}{% +% \setlength{\itemindent}{0pt} +% \setlength{\leftmargin}{0pt} +% \setlength{\parsep}{0pt} +% % turn on hanging indent if param 1 is 1 +% \ifodd #1 +% \setlength{\leftmargin}{\cslhangindent} +% \setlength{\itemindent}{-1\cslhangindent} +% \fi +% % set entry spacing +% \setlength{\itemsep}{#2\baselineskip}}} +% {\end{list}} +% \usepackage{calc} +% \newcommand{\CSLBlock}[1]{\hfill\break#1\hfill\break} +% \newcommand{\CSLLeftMargin}[1]{\parbox[t]{\csllabelwidth}{\strut#1\strut}} +% \newcommand{\CSLRightInline}[1]{\parbox[t]{\linewidth - \csllabelwidth}{\strut#1\strut}} +% \newcommand{\CSLIndent}[1]{\hspace{\cslhangindent}#1} +% % END-PANDOC-3.1.8 + +% START-PANDOC-BEFORE-3.1.7 +\newenvironment{CSLReferences}[3] % #1 hanging-ident, #2 entry spacing + {% don't indent paragraphs + \setlength{\parindent}{0pt} + % turn on hanging indent if param 1 is 1 + \ifodd #1 \everypar{\setlength{\hangindent}{\cslhangindent}}\ignorespaces\fi + % set entry spacing + \ifnum #2 > 0 + \setlength{\parskip}{#2\baselineskip} + \fi + }% + {} +%Copied from https://github.com/rstudio/rmarkdown/issues/1649 +\newlength{\cslhangindent} +\setlength{\cslhangindent}{1.5em} +\newenvironment{cslreferences}% + {$if(csl-hanging-indent)$\setlength{\parindent}{0pt}% + \everypar{\setlength{\hangindent}{\cslhangindent}}\ignorespaces$endif$}% + {\par} +% END-PANDOC-BEFORE-3.1.7