-
Notifications
You must be signed in to change notification settings - Fork 524
add glossa_article() #361
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
add glossa_article() #361
Changes from all commits
Commits
Show all changes
48 commits
Select commit
Hold shift + click to select a range
652630a
a redirected URL revealed by R's URL check
yihui 72f1a33
CRAN release v0.18
yihui 468e358
disable the link to the Talyor & Francis template, because it often r…
yihui 22b1698
Update rjournal_article.Rd (#365)
39ea526
Update Copernicus publication template to version 6.2 (#366)
RLumSK 7ae2089
add jasa_article() (#364)
1b4a049
Use dev tinytex and new exported function in the skeleton
cderv ffe0f03
Copernicus template additional information on copyright statement (#368)
RLumSK 139b8a3
Update R CMD workflow (#370)
cderv 6e7af3b
add a CRAN badge
cderv ca49e94
Update the PR template about CLA assistant
cderv 871447d
add pihph_article() (#362)
228ab53
add `ims_article()` (#372)
auzaheta 646797e
homogenize use of rmarkdown::pandoc_variable_arg
cderv 54922aa
Fix issue with previous commit
cderv 78f9d10
Update documentation of articles
cderv 65bd29f
Correct draft() example in README
cderv c33d984
CRAN release v0.19
yihui 1728ea7
start the next version
yihui 952b660
add glossa_article()
dbb2681
Merge branch 'master' into glossa-article
f4a2e94
Merge branch 'rstudio:master' into glossa-article
bb5a8f2
Update README.md
37f4fc3
add content in skeleton
894164c
add explanation of class options in skeleton
09226a4
add missing longtable package in glossa template
609d53f
add figure in glossa skeleton
8a92d8e
add interlinear glosses and tables in glossa template
213e219
add figure in glossa skeleton
7835bf8
add bibliography in glossa article
beed2e2
add info on bib style in glossa
40c9e1b
add support for citeproc in glossa
8f925e4
Update inst/rmarkdown/templates/glossa/resources/template.tex
5bccb9a
fix glossa template error in citeproc code
859314f
add instructions in glossa article for bibliography
b916838
move word count in glossa article and document it
da996f3
add keywords in glossa article skeleton
87ea216
move include-before in glossa article
379552f
consolidate pandoc citeproc code and add notice
4600694
Update inst/rmarkdown/templates/glossa/resources/template.tex
cderv f8c2752
delete unused csl file a references
8518ba0
Move Pandoc's highlighting-macros position
cderv 298f2c0
Bump version
cderv 1a774cd
move output format at the end of YAML (by convention)
cderv 8f46dd2
Show how to use natbib (which is the template default)
cderv e182e87
Merge branch 'master' into glossa-article
cderv 3bca5c7
Add Author guidelines url to help page
cderv 691060a
Add NEWS bullet
cderv File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| Package: rticles | ||
| Type: Package | ||
| Title: Article Formats for R Markdown | ||
| Version: 0.20.4 | ||
| Version: 0.20.5 | ||
| Authors@R: c( | ||
| person("JJ", "Allaire", role = "aut", email = "[email protected]"), | ||
| person("Yihui", "Xie", role = c("aut", "cre"), email = "[email protected]", comment = c(ORCID = "0000-0003-0645-5666")), | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,168 @@ | ||
| % see http://info.semprag.org/basics for a full description of this template | ||
| \documentclass[$for(classoption)$$classoption$$sep$,$endfor$]{glossa} | ||
stefanocoretta marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| % possible options: | ||
| % [times] for Times font (default if no option is chosen) | ||
| % [cm] for Computer Modern font | ||
| % [lucida] for Lucida font (not freely available) | ||
| % [brill] open type font, freely downloadable for non-commercial use from http://www.brill.com/about/brill-fonts; requires xetex | ||
| % [charis] for CharisSIL font, freely downloadable from http://software.sil.org/charis/ | ||
| % for the Brill an CharisSIL fonts, you have to use the XeLatex typesetting engine (not pdfLatex) | ||
| % for headings, tables, captions, etc., Fira Sans is used: https://www.fontsquirrel.com/fonts/fira-sans | ||
| % [biblatex] for using biblatex (the default is natbib, do not load the natbib package in this file, it is loaded automatically via the document class glossa.cls) | ||
| % [linguex] loads the linguex example package | ||
| % !! a note on the use of linguex: in glossed examples, the third line of the example (the translation) needs to be prefixed with \glt. This is to allow a first line with the name of the language and the source of the example. See example (2) in the text for an illustration. | ||
| % !! a note on the use of bibtex: for PhD dissertations to typeset correctly in the references list, the Address field needs to contain the city (for US cities in the format "Santa Cruz, CA") | ||
stefanocoretta marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| %\addbibresource{sample.bib} | ||
| % the above line is for use with biblatex | ||
| % replace this by the name of your bib-file (extension .bib is required) | ||
| % comment out if you use natbib/bibtex | ||
|
|
||
| \let\B\relax %to resolve a conflict in the definition of these commands between xyling and xunicode (the latter called by fontspec, called by charis) | ||
| \let\T\relax | ||
| \usepackage{xyling} %for trees; the use of xyling with the CharisSIL font produces poor results in the branches. This problem does not arise with the packages qtree or forest. | ||
| \usepackage[linguistics]{forest} %for nice trees! | ||
| \usepackage{longtable} | ||
|
|
||
| \providecommand{\tightlist}{% | ||
| \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}} | ||
|
|
||
| \title[$if(shorttitle)$$shorttitle$$endif$]{$title$$if(wordcount)$\\ \bigskip \large Word count: $wordcount$$endif$} | ||
| % Optional short title inside square brackets, for the running headers. | ||
|
|
||
| % \author[Paul \& Vanden Wyngaerd]% short form of the author names for the running header. If no short author is given, no authors print in the headers. | ||
| % {%as many authors as you like, each separated by \AND. | ||
| % \spauthor{Waltraud Paul\\ | ||
| % \institute{CNRS, CRLAO}\\ | ||
| % \small{105, Bd. Raspail, 75005 Paris\\ | ||
| % [email protected]} | ||
| % } | ||
| % \AND | ||
| % \spauthor{Guido Vanden Wyngaerd \\ | ||
| % \institute{KU Leuven}\\ | ||
| % \small{Warmoesberg 26, 1000 Brussel\\ | ||
| % [email protected]} | ||
| % }% | ||
| % } | ||
|
|
||
| \author[$if(shortauthors)$$shortauthors$$endif$]{ | ||
| $for(author)$ | ||
| \spauthor{$author.name$\\ | ||
| \institute{$author.affiliation$}\\ | ||
| \small{$author.address$} | ||
| }% | ||
| $sep$\AND$endfor$ | ||
| } | ||
|
|
||
| $if(natbib)$ | ||
| \usepackage{natbib} | ||
| $endif$ | ||
| $if(biblatex)$ | ||
| \usepackage[$for(biblatexoptions)$$biblatexoptions$$sep$,$endfor$]{biblatex} | ||
| $for(bibliography)$ | ||
| \addbibresource{$bibliography$} | ||
| $endfor$ | ||
| $endif$ | ||
stefanocoretta marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| % Pandoc syntax highlighting | ||
| $if(highlighting-macros)$ | ||
| $highlighting-macros$ | ||
| $endif$ | ||
|
|
||
| % Note that pandoc citeproc is not supported by the template | ||
| % and we added the following code here just in case it will be supported in | ||
| % the future | ||
| $if(csl-refs)$ | ||
| \newlength{\csllabelwidth} | ||
| \setlength{\csllabelwidth}{3em} | ||
| \newlength{\cslhangindent} | ||
| \setlength{\cslhangindent}{1.5em} | ||
| % for Pandoc 2.8 to 2.10.1 | ||
| \newenvironment{cslreferences}% | ||
| {$if(csl-hanging-indent)$\setlength{\parindent}{0pt}% | ||
| \everypar{\setlength{\hangindent}{\cslhangindent}}\ignorespaces$endif$}% | ||
| {\par} | ||
| % For Pandoc 2.11+ | ||
| \newenvironment{CSLReferences}[2] % #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 | ||
| }% | ||
| {} | ||
| \usepackage{calc} % for calculating minipage widths | ||
| \newcommand{\CSLBlock}[1]{#1\hfill\break} | ||
| \newcommand{\CSLLeftMargin}[1]{\parbox[t]{\csllabelwidth}{#1}} | ||
| \newcommand{\CSLRightInline}[1]{\parbox[t]{\linewidth - \csllabelwidth}{#1}\break} | ||
| \newcommand{\CSLIndent}[1]{\hspace{\cslhangindent}#1} | ||
| $endif$ | ||
|
|
||
| $if(listings)$ | ||
| \usepackage{listings} | ||
| $endif$ | ||
| $if(lhs)$ | ||
| \lstnewenvironment{code}{\lstset{language=Haskell,basicstyle=\small\ttfamily}}{} | ||
| $endif$ | ||
|
|
||
| $if(verbatim-in-note)$ | ||
| \usepackage{fancyvrb} | ||
| \VerbatimFootnotes % allows verbatim text in footnotes | ||
| $endif$ | ||
|
|
||
stefanocoretta marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| $for(header-includes)$ | ||
| $header-includes$ | ||
| $endfor$ | ||
|
|
||
| \begin{document} | ||
|
|
||
| $for(include-before)$ | ||
| $include-before$ | ||
| $endfor$ | ||
|
|
||
| \sffamily | ||
| \maketitle | ||
|
|
||
| $if(abstract)$ | ||
| \begin{abstract} | ||
| $abstract$ | ||
| \end{abstract} | ||
| $endif$ | ||
|
|
||
| $if(keywords)$ | ||
| \begin{keywords} | ||
| $keywords$ | ||
| \end{keywords} | ||
| $endif$ | ||
stefanocoretta marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| \rmfamily | ||
|
|
||
| % Body of the article | ||
| $body$ | ||
|
|
||
| $if(natbib)$ | ||
| $if(bibliography)$ | ||
| $if(biblio-title)$ | ||
| $if(book-class)$ | ||
| \renewcommand\bibname{$biblio-title$} | ||
| $else$ | ||
| \renewcommand\refname{$biblio-title$} | ||
| $endif$ | ||
| $endif$ | ||
| \bibliography{$for(bibliography)$$bibliography$$sep$,$endfor$} | ||
| $endif$ | ||
| $endif$ | ||
| $if(biblatex)$ | ||
| \printbibliography$if(biblio-title)$[title=$biblio-title$]$endif$ | ||
| $endif$ | ||
stefanocoretta marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| $for(include-after)$ | ||
| $include-after$ | ||
|
|
||
| $endfor$ | ||
|
|
||
| \end{document} | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.