diff --git a/DESCRIPTION b/DESCRIPTION index cdd3e7366..244363fbd 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -23,7 +23,7 @@ Authors@R: c( person("Miao", "Yu", role = c("aut", "cph"), email = "yufreecas@gmail.com"), person("Daniel", "Emaasit", role = c("aut", "cph"), email = "daniel.emaasit@gmail.com"), person("Thierry", "Onkelinx", role = c("aut", "cph"), email = "thierry.onkelinx@inbo.be"), - person("Alessandro", "Gasparini", role = c("aut", "cph"), email = "ag475@leicester.ac.uk"), + person("Alessandro", "Gasparini", role = c("aut", "cph"), email = "ellessenne@gmail.com", comment = c(ORCID = "0000-0002-8319-7624")), person("Marc-Andre", "Desautels", role = c("aut", "cph"), email = "marc-andre.desautels@cstjean.qc.ca"), person("Dominik", "Leutnant", role = c("aut", "cph"), email = "leutnant@fh-muenster.de", comment = c(ORCID = "0000-0003-3293-2315")), person(family = "MDPI", role = c("aut", "cph")), diff --git a/NEWS.md b/NEWS.md index 708122737..3fadbbcd7 100644 --- a/NEWS.md +++ b/NEWS.md @@ -3,6 +3,8 @@ rticles 0.9 - Added support for Keywords in IEEE Trans template (@espinielli, #227). +- Updated Statistics in Medicine template to its latest version (@ellessenne, #231). + - Update Copernicus Publications template to version 5.3 (@nuest, #228). rticles 0.8 diff --git a/inst/rmarkdown/templates/sim_article/skeleton/WileyNJD-AMA.bst b/inst/rmarkdown/templates/sim_article/skeleton/WileyNJD-AMA.bst index c7570f064..2702ffd8a 100644 --- a/inst/rmarkdown/templates/sim_article/skeleton/WileyNJD-AMA.bst +++ b/inst/rmarkdown/templates/sim_article/skeleton/WileyNJD-AMA.bst @@ -1,40 +1,14 @@ -% -% THIS IS AN ALPHA VERSION!!! % -% USE AT YOUR OWN RISK -% -% This should work for articles...I don't know if it works well for -% books, etc (give it a try and see!). -% -% PLEASE COMPARE RESULTS WITH THE INSTRUCTIONS FOR AUTHORS FOR THE -% JOURNAL YOU ARE SUBMITTING FOR...I CANNOT ACCEPT RESPONSIBILITY -% FOR REJECTED MANUSCRIPTS (but I will try to fix it if you point out -% a bug) -% -% AMA Manual of Style (JAMA, Cancer, many others..) -% -Up to 6 authors, otherwise 3 authors et al. -% -Title in italics -% -numeric labels -% -order-of-reference. -% -% Author L, Author S, Author D, et al. Title. Journal. -% YYYY;VOL(NUM):PPP-PPP. -% -% -% History -% 9/30/85 (HWT) IEETR Original version, by Howard Trickey. -% 1/29/88 (OP&HWT) Updated for BibTeX version 0.99a, Oren Patashnik; -% 3/27/02 IEETR style used as framework. Formats heavily changed by -% Eric Kort (eric.kort@vai.org) -% -% THIS VERSION DOES NOT WORK WITH BIBTEX 0.98i. +% THIS IS AN AMA BST FILE % + ENTRY { address author booktitle chapter + doi edition editor howpublished @@ -51,6 +25,7 @@ ENTRY series title type + url volume year } @@ -133,9 +108,16 @@ FUNCTION {blank.sep} } FUNCTION {fin.entry} -{ output.state after.quoted.block = - 'skip$ - 'add.period$ +{ + doi empty$ + { + output.state after.quoted.block = + 'skip$ + 'add.period$ + if$ + } + { + } if$ write$ newline$ @@ -218,7 +200,7 @@ FUNCTION {emphasize} if$ } -INTEGERS { nameptr namesleft numnames etal} +INTEGERS {nameptr namesleft numnames etal} FUNCTION {format.names} { 's := % push the name s, pop s and author (already on stack), assign author to s @@ -238,7 +220,7 @@ FUNCTION {format.names} numnames 'namesleft := { namesleft #0 > } - {s nameptr "{ll~}{ff}" format.name$ 't := + {s nameptr "{ll }{v}{f{}}" format.name$ 't := namesleft #1 > {t * ", " * } {t} @@ -256,42 +238,6 @@ FUNCTION {format.names} * } -FUNCTION {format.editors.names} -{ 's := % push the name s, pop s and author (already on stack), assign author to s - #1 'nameptr := - #0 'etal := - - s num.names$ 'numnames := - - numnames #6 > - {#3 'numnames := - #1 'etal := - } - {} - %end if - if$ - - numnames 'namesleft := - { namesleft #0 > } - - {s nameptr "{ll~}{ff}" format.name$ 't := - namesleft #1 > - {t * ", " * } - {t} - %end if - if$ - nameptr #1 + 'nameptr := - namesleft #1 - 'namesleft := - } - while$ - - etal - {", et al. "} - {""} - if$ - * -} - FUNCTION {format.authors} { author empty$ { "" } @@ -302,10 +248,10 @@ FUNCTION {format.authors} FUNCTION {format.editors} { editor empty$ { "" } - { editor format.editors.names + { editor format.names editor num.names$ #1 > - { ", eds." * } - { ", ed." * } + { "\kern-2pt, eds." * } + { "\kern-2pt, ed." * } if$ } if$ @@ -314,21 +260,21 @@ FUNCTION {format.editors} FUNCTION {format.title} { title empty$ { "" } - { title ". " *}% modified by SPi-Global on 12Jun2017 + { title "." *} if$ } FUNCTION {format.journal} { journal empty$ { "" } - { journal ". " *} + { journal "" *} if$ } FUNCTION {format.title.p} { title empty$ { "" } - { title " " *} + { title ". " *} if$ } @@ -337,8 +283,8 @@ FUNCTION {n.dashify} "" { t empty$ not } { t #1 #1 substring$ "-" = - { t #1 #2 substring$ "--" = not - { "--" * + { t #1 #2 substring$ "-" = not + { "-" * t #2 global.max$ substring$ 't := } { { t #1 #1 substring$ "-" = } @@ -360,7 +306,7 @@ FUNCTION {n.dashify} FUNCTION {format.date} { year empty$ { "" } - { "" * year } + { " " * year } if$ } @@ -371,9 +317,15 @@ FUNCTION {inproformat.date} if$ } +FUNCTION {incollecformat.pages} +{ pages empty$ + { "" } + {" (pp. " pages * ")" *} + if$ +} + FUNCTION {format.btitle} -%%{ title emphasize -{ title % modified by SPi-Global on 12Jun2017 +{ title emphasize } FUNCTION {tie.or.space.connect} @@ -394,9 +346,10 @@ FUNCTION {either.or.check} FUNCTION {format.bvolume} { volume empty$ { "" } - { series empty$ + { ". " volume * + series empty$ 'skip$ - { " " * series * ", vol. " volume * ": " *} + { " of " * series emphasize * } if$ "volume and number" number either.or.check } @@ -455,21 +408,14 @@ FUNCTION {multi.page.check} FUNCTION {format.pages} { pages empty$ { "" } - {":" pages *} - if$ -} - -FUNCTION {incollecformat.pages} -{ pages empty$ - { "" } - {" (pp. " pages * ")" *} + {"\string: " pages *} if$ } FUNCTION {format.volume} { volume empty$ { "" } - { "" volume * } + { "\string; " volume * } if$ } @@ -489,7 +435,7 @@ FUNCTION {format.chapter.pages} if$ pages empty$ 'skip$ - { ", " * format.pages * } + { "" * format.pages * } if$ } if$ @@ -501,7 +447,7 @@ FUNCTION {format.in.ed.booktitle} { "In: " editor empty$ 'skip$ - { " " * format.editors * " " * booktitle emphasize * ", " * } + { " " * format.editors * " " * booktitle emphasize * "" * } if$ } if$ @@ -530,8 +476,7 @@ FUNCTION {empty.misc.check} FUNCTION {format.tr.number} { type empty$ - %%{ "Tech. Rep." }% modified by SPi-Global - 16Jun2017 - { "" } + { "Tech. Rep." } 'type if$ number empty$ @@ -547,19 +492,7 @@ FUNCTION {format.addr.pub} { "" } { address ": " * } if$ - publisher * " " * - } - if$ -} - -FUNCTION {format.book.addr.pub} -{ publisher empty$ - { "" } - { address empty$ - { "" } - { address ": " * } - if$ - publisher * "; " * + publisher * } if$ } @@ -578,6 +511,7 @@ FUNCTION {format.ppaddress} if$ } + FUNCTION {format.article.crossref} { key empty$ { journal empty$ @@ -660,6 +594,11 @@ FUNCTION {format.incoll.inproc.crossref} " \cite{" * crossref * "}" * } +FUNCTION {default.name.doi.prefix} +{ + "doi: " +} + FUNCTION {no.blank.or.punct} { "" * before.all 'output.state := } @@ -670,6 +609,12 @@ FUNCTION {add.semicolon} no.blank.or.punct } +FUNCTION {add.comma} +{ + "," * + no.blank.or.punct +} + FUNCTION {add.colon} { ": " * @@ -682,6 +627,71 @@ FUNCTION {add.space} no.blank.or.punct } +FUNCTION {doi.base} +{ + "http://dx.doi.org/" +} + +FUNCTION {init.bib.doi} +{ + "\providecommand \doibase [0]{" doi.base "}%" * * write$ newline$ +} + +FUNCTION {doi.base.command} +{ + "\doibase " +} + +FUNCTION {noop.command} +{ + "\href@noop " +} + +FUNCTION {href.command} +{ + "\href " +} + +FUNCTION {link.tag.open} +{ + doi duplicate$ empty$ + { + pop$ + url duplicate$ empty$ + { + pop$ "" noop.command + }{ + href.command + } + if$ + } + { + doi.base.command swap$ * + href.command + } + if$ + "{" * swap$ * "} {" * +} + +FUNCTION {link.tag.shut} +{ + "}" +} + +FUNCTION {add.doi} +{ + link.tag.open swap$ * link.tag.shut * +} + +FUNCTION {format.doi} +{ doi empty$ + { "" } + { default.name.doi.prefix doi * + link.tag.open swap$ * link.tag.shut * + } + if$ +} + FUNCTION {article} { output.bibitem format.authors "author" output.check @@ -689,7 +699,7 @@ FUNCTION {article} blank.sep crossref missing$ { format.journal emphasize "journal" output.check - format.date add.semicolon "year" output.check + format.date "year" output.check format.volume output format.number output format.pages output @@ -700,6 +710,7 @@ FUNCTION {article} if$ new.block note output + format.doi output fin.entry } @@ -714,17 +725,18 @@ FUNCTION {book} if$ } if$ - format.btitle emphasize "title" output.check + format.btitle "title" output.check crossref missing$ - { format.bvolume output + { format.bvolume output new.block format.number.series output - format.book.addr.pub "publisher" output.check + format.addr.pub "publisher" output.check } { new.block format.book.crossref output.nonnull } if$ + new.block format.edition output format.date "year" output.check new.block @@ -748,8 +760,8 @@ FUNCTION {booklet} blank.sep } if$ - howpublished output - address output + howpublished add.colon add.space output + address add.period$ add.space output format.date output new.block note output @@ -769,11 +781,13 @@ FUNCTION {inbook} if$ format.btitle "title" output.check crossref missing$ - { format.bvolume output - format.chapter.pages "chapter and pages" output.check + { format.bvolume add.period$ add.space output + new.block + format.chapter.pages add.semicolon add.space "chapter and pages" output.check new.block - format.number.series output + format.number.series add.period$ add.space output format.addr.pub "publisher" output.check + new.block } { format.chapter.pages "chapter and pages" output.check new.block @@ -794,9 +808,10 @@ FUNCTION {incollection} blank.sep crossref missing$ { format.in.ed.booktitle "booktitle" output.check + new.block format.number.series add.period$ add.space output - format.bvolume output - format.addr.pub "publisher" output.check + format.bvolume add.period$ add.space output + format.addr.pub add.period$ add.space "publisher" output.check format.edition output format.date "year" output.check %%format.chapter.pages output @@ -818,16 +833,16 @@ FUNCTION {inproceedings} blank.sep crossref missing$ { format.in.ed.booktitle "booktitle" output.check - format.bvolume output - format.number.series output - format.pages output - organization output + format.bvolume add.period$ add.space output + format.number.series add.period$ add.space output + organization add.period$ add.space output publisher output inproformat.date "year" output.check format.ppaddress output + format.pages output } { format.incoll.inproc.crossref output.nonnull - format.pages output + format.pages output } if$ new.block @@ -849,7 +864,7 @@ FUNCTION {manual} } { format.authors output.nonnull } if$ - format.btitle "title" output.check + format.btitle add.period$ add.space "title" output.check author empty$ { organization empty$ { address new.block.checka @@ -859,8 +874,8 @@ FUNCTION {manual} if$ } { organization address new.block.checkb - organization output - address output + organization add.semicolon add.space output + address add.colon output } if$ format.edition output @@ -873,24 +888,17 @@ FUNCTION {manual} FUNCTION {mastersthesis} { output.bibitem format.authors "author" output.check - format.title "title" output.check + format.title add.space "title" output.check blank.sep - "Master's thesis" format.thesis.type output.nonnull - school "school" output.check - address output + "Master's thesis" format.thesis.type add.period$ add.space output.nonnull + school add.period$ add.space "school" output.check + address add.colon add.space output format.date "year" output.check new.block note output fin.entry } -FUNCTION {format.note} -{ note empty$ - { "" } - { note "; " *} - if$ -} - FUNCTION {misc} { output.bibitem format.authors output @@ -900,15 +908,15 @@ FUNCTION {misc} month empty$ year empty$ and or { format.title.p output.nonnull } - { format.title emphasize output.nonnull } + { format.title output.nonnull } if$ blank.sep } if$ - howpublished output - format.note output - %%new.block + howpublished add.semicolon add.space output format.date output + new.block + note output fin.entry empty.misc.check } @@ -916,11 +924,11 @@ FUNCTION {misc} FUNCTION {phdthesis} { output.bibitem format.authors "author" output.check - format.btitle "title" output.check + format.btitle add.period$ add.space "title" output.check new.block - "PhD thesis" format.thesis.type output.nonnull - school "school" output.check - address output + "PhD thesis" format.thesis.type add.period$ add.space output.nonnull + school add.comma add.space "school" output.check + address add.semicolon add.space output format.date "year" output.check new.block note output @@ -931,38 +939,32 @@ FUNCTION {proceedings} { output.bibitem editor empty$ { organization output } - { format.editors output.nonnull } + { format.editors add.comma add.space output.nonnull } if$ format.btitle "title" output.check format.bvolume output - format.number.series output - format.paddress output + format.number.series add.space output + format.paddress add.semicolon add.space output editor empty$ 'skip$ - { organization output } + { organization add.comma add.space output } if$ - publisher output + publisher add.colon add.space output format.date "year" output.check new.block note output fin.entry } -FUNCTION {add.spperiod} -{ - ". " * - no.blank.or.punct -} - FUNCTION {techreport} { output.bibitem format.authors "author" output.check - format.title emphasize "title" output.check + format.title add.space "title" output.check blank.sep - format.tr.number add.colon output.nonnull - institution "institution" output.check - address output - add.semicolon add.space format.date "year" output.check + format.tr.number add.comma add.space output.nonnull + institution add.semicolon add.space "institution" output.check + address add.colon add.space output + format.date "year" output.check new.block note output fin.entry @@ -973,7 +975,7 @@ FUNCTION {unpublished} format.authors "author" output.check format.title.p "title" output.check blank.sep - note "note" output.check + note add.semicolon add.space "note" output.check format.date output fin.entry } @@ -1078,6 +1080,7 @@ FUNCTION {begin.bib} { preamble$ write$ newline$ } if$ "\begin{thebibliography}{" longest.label * "}" * write$ newline$ + init.bib.doi } EXECUTE {begin.bib} @@ -1091,4 +1094,4 @@ FUNCTION {end.bib} "\end{thebibliography}" write$ newline$ } -EXECUTE {end.bib} +EXECUTE {end.bib} \ No newline at end of file diff --git a/inst/rmarkdown/templates/sim_article/skeleton/WileyNJD-v2.cls b/inst/rmarkdown/templates/sim_article/skeleton/WileyNJD-v2.cls index 52d8e114a..11215b1d2 100644 --- a/inst/rmarkdown/templates/sim_article/skeleton/WileyNJD-v2.cls +++ b/inst/rmarkdown/templates/sim_article/skeleton/WileyNJD-v2.cls @@ -4,10 +4,10 @@ %% This file is copyright by SPi Technologies Ltd. All rights reserved. %% %% Author: SPi, LaTeX Development Team, Chennai (India) -%% Created On: +%% Created On: %% Last Modified By: %% Last Modified On: -%% Description: Class file to support authoring template in LaTeX typesetting +%% Description: Class file to support authoring template in LaTeX typesetting %% for Wiley Journals %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -27,8 +27,8 @@ \newif\if@hyperrefon \@hyperrefonfalse% \newif\ifbibunnumbered\global\bibunnumberedtrue% \newif\ifproof\global\prooffalse% -\newif\ifEqnSpan\global\EqnSpantrue% -\newif\if@dblspace\global\@dblspacefalse% +\newif\ifEqnSpan\global\EqnSpantrue% +\newif\if@dblspace\global\@dblspacefalse% \newif\if@font@stix\global\@font@stixfalse% \newif\if@large@design\global\@large@designtrue% @@ -40,6 +40,7 @@ \newif\if@AMArefstyle\global\@AMArefstylefalse% \newif\if@Vancouverrefstyle\global\@Vancouverrefstylefalse% \newif\if@Chemistryrefstyle\global\@Chemistryrefstylefalse% +\newif\if@Harvardstyle\global\@Harvardstylefalse% \newif\if@STIXLargeOneCol\global\@STIXLargeOneColfalse% \newif\if@STIXSmall\global\@STIXSmallfalse% @@ -65,6 +66,8 @@ \DeclareOption{AMA}{\global\@AMArefstyletrue} \DeclareOption{VANCOUVER}{\global\@Vancouverrefstyletrue} +\DeclareOption{HARVARD}{\global\@Harvardstyletrue} + \DeclareOption{doublespace}{\global\@dblspacetrue} \DeclareOption{draftrules}{\global\@draftrulesontrue} @@ -75,6 +78,10 @@ \DeclareOption{numbers}{\xdef\@biboptions{numbers}} \DeclareOption{EqnSpan}{\global\EqnSpantrue}%% +\DeclareRobustCommand{\foo}[1]{% + R\number\numexpr#1-1\relax% Print R +} + \DeclareOption{proof}{% \global\prooftrue% \global\@hyperrefontrue% @@ -237,8 +244,8 @@ \ProcessOptions \LoadClass[twoside,fleqn,onecolumn]{article}% -%\usepackage{etex}% -%\reserveinserts{28}% included etex package and \reserveinserts{...} to avoid no room for \newinserts, \newcounts or \newskips etc. +\usepackage{etex}% +\reserveinserts{28}% included etex package and \reserveinserts{...} to avoid no room for \newinserts, \newcounts or \newskips etc. \RequirePackage{graphicx,multicol}% \RequirePackage{multirow}% \RequirePackage{cuted}% @@ -253,7 +260,7 @@ \rotfloatpagestyle{headings}%modified from plain to headings to get header and footer for sidewaystable% \RequirePackage{dblfloatfix}% \RequirePackage[figuresright]{rotating}% -\RequirePackage{longtable}% +%\RequirePackage{longtable}% %%\RequirePackage{threeparttable}% \RequirePackage{ulem}% \RequirePackage{enumerate}% @@ -477,7 +484,7 @@ false setoverprint}} %% include array.sty again in Wileyarticle.cls anywhere; %% %% ========================================================= %% \RequirePackage{varwidth}% -\RequirePackage{dcolumn}% +\RequirePackage{dcolumn}% % %% Fonts Used % @@ -525,11 +532,11 @@ false setoverprint}} %\RequirePackage[not1,notextcomp,lcgreekalpha]{stix}% -\captionsetup[figure]{labelformat=simple, labelsep=none, skip=10pt, labelfont=bf} -\captionsetup[table]{labelformat=simple, labelsep=none, skip=10pt, labelfont=bf} -\renewcommand{\thefigure}{\arabic{figure}\enspace } +\captionsetup[figure]{labelformat=simple, labelsep=space, skip=10pt, labelfont=bf} +\captionsetup[table]{labelformat=simple, labelsep=space, skip=10pt, labelfont=bf} +\renewcommand{\thefigure}{\arabic{figure}} -\renewcommand{\thetable}{\arabic{table}\enspace } +\renewcommand{\thetable}{\arabic{table}} \renewcommand\figurename{\textbf{FIGURE}}%% \renewcommand\tablename{\textbf{TABLE}} %% @@ -965,7 +972,6 @@ false setoverprint}} % %%\renewcommand\thefootnote{\@fnsymbol\c@footnote}% - % @@ -1067,8 +1073,8 @@ false setoverprint}} \setlength\dblfloatsep{24\p@ \@plus 2.875\p@ \@minus 1.4375\p@}% \setlength\dbltextfloatsep{24\p@ \@plus 2.875\p@ \@minus 1.4375\p@}% -\hyphenation{Figure Figures Table Tables Equation Equations Section Sections Appendix Theorem Lemma Proposition Corollary}% -\hyphenation{Claim Conjecture Property Remark Problem Example Definition Algorithm Assumption Axiom Case Hypotheses Note Proof}% +\hyphenation{Figure Figures Table Tables Equation Equations Section Sections Appendix Theorem Lemma Proposition Corollary}% +\hyphenation{Claim Conjecture Property Remark Problem Example Definition Algorithm Assumption Axiom Case Hypotheses Note Proof}% %%% miscellaneous macros %%% \def\zz#1{\vphantom{#1}}% @@ -1411,9 +1417,9 @@ false setoverprint}} % \gdef\@stix@font@defn{% % - \def\infoboxfont{\fontfamily{tim}\fontsize{8}{8}\selectfont}% +% \def\infoboxfont{\fontfamily{tim}\fontsize{8}{8}\selectfont}% % - \def\watermarkfont{\reset@font\fontfamily{\ffdefault}\fontsize{45}{45}\bfseries\selectfont} +% \def\watermarkfont{\reset@font\fontfamily{\ffdefault}\fontsize{45}{45}\bfseries\selectfont} % \def\pagenumfont{\rmfamily\fontsize{7}{9}\bfseries\selectfont}% \def\cnmpagenumfont{\rmfamily\fontsize{7}{9}\selectfont\bfseries}% @@ -1426,7 +1432,7 @@ false setoverprint}} \def\pubheadfont{\reset@font\rmfamily\fontsize{7}{9}\fontseries{b}\selectfont}% \def\arttypefont{\rmfamily\fontsize{9}{9}\fontseries{b}\selectfont}% \def\SParttypefont{\rmfamily\fontsize{9}{12}\fontseries{b}\selectfont}% - \def\titlefont{\rmfamily\fontsize{18}{23}\bfseries\selectfont\leftskip\z@\rightskip\z@ plus1fil\let\mathbcal\titmathbcal}% + \def\titlefont{\rmfamily\fontsize{18}{23}\bfseries\selectfont\leftskip\z@\rightskip\z@ plus1fil}% \def\subtitlefont{\rmfamily\fontsize{16}{21}\bfseries\selectfont\leftskip\z@\rightskip\z@ plus1fil}% \def\Authorfont{\rmfamily\fontsize{12}{18}\selectfont\leftskip\z@\rightskip\z@ plus1fil}% \def\absheadfont{\hsize\abs@colii@hsize\rmfamily\fontsize{10}{10}\fontseries{b}\selectfont\bfseries\leftskip7\p@\rightskip\leftskip}% LN20FEB2016 @@ -1481,9 +1487,9 @@ false setoverprint}} }% \gdef\@lato@font@defn{% % - \def\infoboxfont{\fontfamily{tim}\fontsize{8}{8}\selectfont}% +% \def\infoboxfont{\fontfamily{tim}\fontsize{8}{8}\selectfont}% % - \def\watermarkfont{\reset@font\fontfamily{\ffdefault}\fontsize{45}{45}\bfseries\selectfont} +% \def\watermarkfont{\reset@font\fontfamily{\ffdefault}\fontsize{45}{45}\bfseries\selectfont} % \def\pagenumfont{\rmfamily\fontsize{7}{9}\bfseries\selectfont}% \def\cnmpagenumfont{\rmfamily\fontsize{7}{9}\selectfont\bfseries}% @@ -1577,7 +1583,7 @@ false setoverprint}} \fi% % \def\listfont{\reset@font\fontfamily{\rmdefault}\normalsize}% -\def\tablistfont{\tablebodyfont}% +\def\tablistfont{\tablebodyfont}% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% article front matter elements %% @@ -1589,14 +1595,14 @@ false setoverprint}} \@pubname\par% \@jname\par% Volume\ \@jvol, Article ID\ \@artid, \thepage~pages\par% -%%\if@hyperrefon\urlstyle{same}\burlalt{https://doi.org/\@doi}{https://doi.org/\@doi}\else{https://doi.org/\@doi}\fi% this line is not required in the output +%%\if@hyperrefon\urlstyle{same}\burlalt{http://dx.doi.org/\@doi}{http://dx.doi.org/\@doi}\else{http://dx.doi.org/\@doi}\fi% this line is not required in the output }} \def\nullartoprunningheaders{\vbox{\OPRHfont\raggedright% \phantom{\@pubname}\par% \phantom{\@jname}\par% \phantom{Volume\ \@jvol, Article ID\ \@artid, \thepage pages}\par% -%%\if@hyperrefon\urlstyle{same}\burlalt{https://doi.org/\@doi}{https://doi.org/\@doi}\else{https://doi.org/\@doi}\fi% +%%\if@hyperrefon\urlstyle{same}\burlalt{http://dx.doi.org/\@doi}{http://dx.doi.org/\@doi}\else{http://dx.doi.org/\@doi}\fi% }} %% article category %% @@ -1712,7 +1718,7 @@ Volume\ \@jvol, Article ID\ \@artid, \thepage~pages\par% {\expandafter\protected@xdef\csname Xname@\@@affmark\endcsname% {\csname Xname@\@@affmark\endcsname,\ \filtername#2\@nil}}% \unskip\sep\ifnum\addcount=1\else\affnum\fi\let\sep=,}}}\unhbox\authmarkbox}\fi% - \gdef\authorsep{\enspace|\enspace}%%% + \gdef\authorsep{\enspace|\enspace}%%% \global\let\sep\@empty\global\let\@corref\@empty% }}% @@ -1775,10 +1781,10 @@ Volume\ \@jvol, Article ID\ \@artid, \thepage~pages\par% \def\presentaddress#1{\gdef\@presentaddress{\hsize=\textwidth\corresfont\baselineskip11pt\textbf{Present Address}\par #1}}% % -\def\received#1{\gdef\@received{Received #1;}}\gdef\@received{}% -\def\revised#1{\gdef\@revised{Revised #1;}}\gdef\@revised{}% -\def\accepted#1{\gdef\@accepted{Accepted #1}}\gdef\@accepted{}% -\def\published#1{\gdef\@published{Published #1}}\gdef\@published{}% +\def\received#1{\gdef\@received{Received #1;}}\gdef\@received{Added at production}% +\def\revised#1{\gdef\@revised{Revised #1;}}\gdef\@revised{Added at production}% +\def\accepted#1{\gdef\@accepted{Accepted #1}}\gdef\@accepted{Added at production}% +\def\published#1{\gdef\@published{Published #1}}\gdef\@published{Added at production}% \def\xmlreceived{\gdef\@received{\ifnum\artActypcnt=1\relax Received:\ref{MSSreceiveddate}\ReceivedMONTH\nobreakspace{}\kern.5pt\ReceivedYEAR,\else Received:\ref{MSSreceiveddate}\nobreakspace{}\kern.5pt\ReceivedDATE\nobreakspace{}\kern.5pt\ReceivedMONTH\nobreakspace{}\kern.5pt\ReceivedYEAR\fi}}\gdef\@received{}% \def\xmlrevised{\gdef\@revised{Revised:\ref{MSSrevised}\nobreakspace{}\kern.5pt\RevisedDATE\nobreakspace{}\kern.5pt\RevisedMONTH\nobreakspace{}\kern.5pt\RevisedYEAR}}\gdef\@revised{}% \def\xmlaccepted{\gdef\@accepted{\ifnum\artActypcnt=1\relax in final form\ref{ACCdate}\AccMONTH\nobreakspace{}\kern.5pt\AccYEAR\else Accepted:\ref{ACCdate}\nobreakspace{}\kern.5pt\AccDATE\nobreakspace{}\kern.5pt\AccMONTH\nobreakspace{}\kern.5pt\AccYEAR\fi}}\gdef\@accepted{}% @@ -1799,15 +1805,15 @@ Volume\ \@jvol, Article ID\ \@artid, \thepage~pages\par% \def\headfootrule#1{\gdef\@headfootrule{#1}}\headfootrule{{\rule{\textwidth}{.5\p@}}}% \def\historykern#1{\gdef\history@kern{#1}}\historykern{\nobreakspace{}\kern.5pt} -\def\@dummy@received{\textcolor{red}{Received:\history@kern{}00\history@kern{}Month\history@kern{}0000}}% -\def\@dummy@revised{\textcolor{red}{Revised:\history@kern{}00\history@kern{}Month\history@kern{}0000}}% -\def\@dummy@accepted{\textcolor{red}{Accepted:\history@kern{}00\history@kern{}Month\history@kern{}0000}}% -\def\@dummy@pubdate{\textcolor{red}{Published\history@kern{}on:\history@kern{}00\history@kern{}Month\history@kern{}0000}}% +\def\@dummy@received{\textcolor{red}{Received:\history@kern{}\history@kern{}Added at production}}% +\def\@dummy@revised{\textcolor{red}{Revised:\history@kern{}\history@kern{}Added at production}}% +\def\@dummy@accepted{\textcolor{red}{Accepted:\history@kern{}\history@kern{}Added at production}}% +\def\@dummy@pubdate{\textcolor{red}{Published\history@kern{}on:\history@kern{}\history@kern{}Added at production}}% \def\historydates#1{\gdef\@history@dates{#1}}% \historydates{{\titlepageheadfont% - \ifx\@received\@empty\@dummy@received\else\@received\fi\historydatesvertbar% - \ifx\@revised\@empty\@dummy@revised\else\@revised\fi\historydatesvertbar% - \ifx\@accepted\@empty\@dummy@accepted\else\@accepted\fi%\historydatesvertbar% + \ifx\@received\@empty\@dummy@received\else\@dummy@received\fi\historydatesvertbar% + \ifx\@revised\@empty\@dummy@revised\else\@dummy@revised\fi\historydatesvertbar% + \ifx\@accepted\@empty\@dummy@accepted\else\@dummy@accepted\fi%\historydatesvertbar% % \ifx\@pubdate\@empty\@dummy@pubdate\else\@pubdate\fi% }}% % @@ -2320,9 +2326,9 @@ Volume\ \@jvol, Article ID\ \@artid, \thepage~pages\par% \def\keywords#1{\def\@keywords{{\keywordsheadfont\textbf{KEYWORDS:}\par\removelastskip\nointerlineskip\vskip6pt \keywordsfont#1\par}}}\def\@keywords{}% -\def\@fnsymbol#1{\ifcase#1\or \dagger\or \ddagger\or +\def\@fnsymbol#1{\ensuremath{\ifcase#1\or \dagger\or \ddagger\or \S\or \P\or \#\or \|\or **\or \dagger\dagger - \or \ddagger\ddagger\or \S\S\or \P\P\or \#\#\or \|\|\else\@ctrerr\fi\relax} + \or \ddagger\ddagger\or \S\S\or \P\P\or \#\#\or \|\|\else\@ctrerr\fi\relax}} \renewcommand{\maketitle}{\par% \@afterindentfalse% @@ -2623,7 +2629,7 @@ Volume\ \@jvol, Article ID\ \@artid, \thepage~pages\par% %% Regular pagestyle %% % -\def\@authormark{}% +\def\@authormark{}% \def\authormark#1{% \markboth{{{#1}}}{{{#1}}}\gdef\@authormark{\def\etal{\textit{ET AL.}}\let\AQ\AHAQ#1}\gdef\@authormarkforcite{\undefined\def\etal{\textit{et al.}}#1}}% \def\etal{\textit{et al.}}% @@ -2661,7 +2667,7 @@ Volume\ \@jvol, Article ID\ \@artid, \thepage~pages\par% %% Macros for Section headings %% -\setcounter{secnumdepth}{3}% +\setcounter{secnumdepth}{3}% % \newif\if@FTSection% @@ -2682,13 +2688,13 @@ Volume\ \@jvol, Article ID\ \@artid, \thepage~pages\par% \IfFileExists{NJDnatbib.sty}{\usepackage[numbers,super,sort&compress]{NJDnatbib}}{\usepackage[numbers,super,sort&compress]{natbib}}% \bibliographystyle{WileyNJD-VANCOUVER}% \bibpunct{}{}{, }{s}{}{}% -\renewcommand\@biblabel[1]{#1.} +\renewcommand\@biblabel[1]{#1.} % \renewcommand{\bibfont}{\reset@font\fontfamily{\rmdefault}\fontsize{8bp}{10}\selectfont\baselineskip=10\p@}% \else% \if@AMArefstyle% \IfFileExists{NJDnatbib.sty}{\usepackage[numbers,super]{NJDnatbib}}{\usepackage[numbers,super]{natbib}}% \bibliographystyle{WileyNJD-AMA}% -\renewcommand\@biblabel[1]{#1.} +\renewcommand\@biblabel[1]{#1.} % \bibpunct{(}{)}{,}{n}{}{}% % \renewcommand{\bibfont}{\reset@font\fontfamily{\rmdefault}\fontsize{8bp}{10}\selectfont\baselineskip=10\p@}% \else% @@ -2706,6 +2712,13 @@ Volume\ \@jvol, Article ID\ \@artid, \thepage~pages\par% \setcitestyle{numbers,square} % \renewcommand{\bibfont}{\reset@font\fontfamily{\rmdefault}\fontsize{8bp}{10}\selectfont\baselineskip=10\p@}% \else% +\if@Harvardstyle% + \usepackage[authoryear]{natbib}% + \bibliographystyle{WileyNJD-Harvard}% + \bibpunct{(}{)}{,}{}{}{}% +%\setcitestyle{numbers,square} + % \renewcommand{\bibfont}{\reset@font\fontfamily{\rmdefault}\fontsize{8bp}{10}\selectfont\baselineskip=10\p@}% +\else% \if@APArefstyle \usepackage[natbibapa]{NJDapacite}% \bibliographystyle{WileyNJD-APA}% @@ -2738,7 +2751,7 @@ Volume\ \@jvol, Article ID\ \@artid, \thepage~pages\par% \unskip, {#4}% pages \fi} %% -\fi\fi\fi\fi\fi% +\fi\fi\fi\fi\fi\fi% % @@ -2800,7 +2813,7 @@ Volume\ \@jvol, Article ID\ \@artid, \thepage~pages\par% \RequirePackage{booktabs}% %%%%table notes%%%% -\newenvironment{tablenotes}{\list{}{\setlength{\labelsep}{0pt}% +\newenvironment{tablenotes}{\list{}{\setlength{\labelsep}{0pt}% \setlength{\labelwidth}{0pt}% \setlength{\leftmargin}{0pt}% \setlength{\rightmargin}{0pt}% @@ -2827,11 +2840,11 @@ Volume\ \@jvol, Article ID\ \@artid, \thepage~pages\par% %% Macros for Quote %% -\renewenvironment{quote}{\list{}{\setlength{\labelsep}{0pt}% +\renewenvironment{quote}{\list{}{\setlength{\labelsep}{0pt}% \setlength{\labelwidth}{0pt}% \setlength{\leftmargin}{\parindentvalue}% \setlength{\rightmargin}{\parindentvalue}% -\setlength{\topsep}{12.5pt \@plus2pt \@minus1pt}% +\setlength{\topsep}{12.5pt \@plus2pt \@minus1pt}% \setlength{\itemsep}{0pt}% \setlength{\partopsep}{0pt}% \setlength{\listparindent}{0em}% @@ -2938,7 +2951,7 @@ Volume\ \@jvol, Article ID\ \@artid, \thepage~pages\par% {.} % Punctuation after theorem head {5\p@} % Space after theorem head {\thmname{#1}\thmnumber{ #2}\thmnote{. #3}} % Theorem head spec (can be left empty, meaning `normal') - + \newtheoremstyle{WBstylethree} {6\p@} % Space above {6\p@} % Space below @@ -3246,8 +3259,8 @@ Volume\ \@jvol, Article ID\ \@artid, \thepage~pages\par% \csname the##1\endcsname\quad} \fi \fi% - \renewcommand\thefigure{\@Alph\c@section\arabic{figure}\enspace }% - \renewcommand\thetable{\@Alph\c@section\arabic{table}\enspace }% + \renewcommand\thefigure{\@Alph\c@section\arabic{figure}}% + \renewcommand\thetable{\@Alph\c@section\arabic{table}}% \renewcommand\theequation{\@Alph\c@section\arabic{equation}}% }{% \@ppsaveapp\@pprestoresec} @@ -3454,5 +3467,3 @@ Volume\ \@jvol, Article ID\ \@artid, \thepage~pages\par% \endinput - - diff --git a/inst/rmarkdown/templates/sim_article/skeleton/bibfile.bib b/inst/rmarkdown/templates/sim_article/skeleton/bibfile.bib index 20d59fe19..f421ebcfa 100644 --- a/inst/rmarkdown/templates/sim_article/skeleton/bibfile.bib +++ b/inst/rmarkdown/templates/sim_article/skeleton/bibfile.bib @@ -1,27 +1,27 @@ -@article{Knupp1999, - author = "Knupp, PM", - title = "Winslow smoothing on two-dimensional unstructured meshes", - year = "1999", - journal = "Eng {C}omput", - volume = "15", - pages = "263--268" +@Article{Knupp1999, + Author = {Knupp, PM}, + Title = {Winslow smoothing on two-dimensional unstructured meshes}, + Year = {1999}, + Journal = {Eng {C}omput}, + Volume = {15}, + Pages = {263--268}, } -@techreport{kamm2000, - author = "Kamm, J", - title = "Evaluation of the {S}edov-von {N}eumann-{T}aylor blast wave solution", - institution = "Los {A}lamos {N}ational {L}aboratory", - year = "2000", - number = "Technical {R}eport LA-UR-00-6055" +@Techreport{kamm2000, + Author = {Kamm, J}, + Title = {Evaluation of the {S}edov-von {N}eumann-{T}aylor blast wave solution}, + Institution = {Los {A}lamos {N}ational {L}aboratory}, + Year = {2000}, + Number = {Technical {R}eport LA-UR-00-6055}, + Address = {2064 Derek Drive, Cuyahoga Falls, Ohio}, } -@article{Taylor1937, - author = "Taylor, GI and Green, AE", - title = "Mechanism of the production of small eddies from large ones", - year = "1937", - journal = "P {R}oy {S}oc {L}ond {A} {M}at", - volume = "158", - number = "895", - pages = "499--521" +@Article{Taylor1937, + Author = {Taylor, GI and Green, AE}, + Title = {Mechanism of the production of small eddies from large ones}, + Year = {1937}, + Journal = {P {R}oy {S}oc {L}ond {A} {M}at}, + Volume = {158}, + Number = {895}, + Pages = {499--521}, } -