diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2021-07-17 18:10:34 +0200 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2021-07-17 18:46:16 +0200 |
| commit | 48459559a13a20083fc9b31eb523b8ea2bf0a63f (patch) | |
| tree | 1c04e75709457403110a6f8c5c90099f22369de3 /data | |
| parent | 0c39509d9b6a58958228cebf5d643598e5c98950 (diff) | |
| parent | 46099e79defe662e541b12548200caf29063c1c6 (diff) | |
| download | pandoc-48459559a13a20083fc9b31eb523b8ea2bf0a63f.tar.gz | |
Merge branch 'master' of https://github.com/jgm/pandoc
Diffstat (limited to 'data')
28 files changed, 290 insertions, 566 deletions
diff --git a/data/default.csl b/data/default.csl index 32d0cab05..9f126b305 100644 --- a/data/default.csl +++ b/data/default.csl @@ -27,6 +27,9 @@ <email>matthew.g.roth@yale.edu</email> <uri> https://orcid.org/0000-0001-7902-6331</uri> </contributor> + <contributor> + <name>Brenton M. Wiernik</name> + </contributor> <category citation-format="author-date"/> <category field="generic-base"/> <summary>The author-date variant of the Chicago style</summary> @@ -509,8 +512,15 @@ </choose> </macro> <macro name="event"> - <group> - <text term="presented at" suffix=" "/> + <group delimiter=" "> + <choose> + <if variable="genre"> + <text term="presented at"/> + </if> + <else> + <text term="presented at" text-case="capitalize-first"/> + </else> + </choose> <text variable="event"/> </group> </macro> diff --git a/data/docx/word/settings.xml b/data/docx/word/settings.xml index afa0199c9..5f5ef5bfa 100644 --- a/data/docx/word/settings.xml +++ b/data/docx/word/settings.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <w:settings xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:sl="http://schemas.openxmlformats.org/schemaLibrary/2006/main"> - <w:zoom w:percent="90" /> + <w:zoom w:percent="100" /> <w:embedSystemFonts /> <w:proofState w:spelling="clean" w:grammar="clean" /> <w:stylePaneFormatFilter w:val="0004" /> @@ -17,31 +17,21 @@ <w:characterSpacingControl w:val="doNotCompress" /> <w:savePreviewPicture /> <w:rsids> - <w:rsidRoot w:val="00590D07" /> - <w:rsid w:val="00011C8B" /> - <w:rsid w:val="004E29B3" /> - <w:rsid w:val="00590D07" /> - <w:rsid w:val="00784D58" /> - <w:rsid w:val="008D6863" /> - <w:rsid w:val="00B86B75" /> - <w:rsid w:val="00BC48D5" /> - <w:rsid w:val="00C36279" /> - <w:rsid w:val="00E315A3" /> </w:rsids> <m:mathPr> - <m:mathFont m:val="Lucida Grande" /> + <m:mathFont m:val="Cambria Math" /> <m:brkBin m:val="before" /> <m:brkBinSub m:val="--" /> - <m:smallFrac m:val="false" /> - <m:dispDef m:val="false" /> + <m:smallFrac m:val="0" /> + <m:dispDef /> <m:lMargin m:val="0" /> <m:rMargin m:val="0" /> <m:wrapRight /> <m:intLim m:val="subSup" /> - <m:naryLim m:val="subSup" /> + <m:naryLim m:val="undOvr" /> </m:mathPr> <w:themeFontLang w:val="en-US" /> <w:clrSchemeMapping w:bg1="light1" w:t1="dark1" w:bg2="light2" w:t2="dark2" w:accent1="accent1" w:accent2="accent2" w:accent3="accent3" w:accent4="accent4" w:accent5="accent5" w:accent6="accent6" w:hyperlink="hyperlink" w:followedHyperlink="followedHyperlink" /> <w:decimalSymbol w:val="." /> <w:listSeparator w:val="," /> -</w:settings>
\ No newline at end of file +</w:settings> diff --git a/data/docx/word/styles.xml b/data/docx/word/styles.xml index 6bb5a3f52..832b1b25b 100644 --- a/data/docx/word/styles.xml +++ b/data/docx/word/styles.xml @@ -350,6 +350,21 @@ <w:right w:w="108" w:type="dxa" /> </w:tblCellMar> </w:tblPr> + <w:tblStylePr w:type="firstRow"> + <w:tblPr> + <w:jc w:val="left"/> + <w:tblInd w:w="0" w:type="dxa"/> + </w:tblPr> + <w:trPr> + <w:jc w:val="left"/> + </w:trPr> + <w:tcPr> + <w:vAlign w:val="bottom"/> + <w:tcBorders> + <w:bottom w:val="single"/> + </w:tcBorders> + </w:tcPr> + </w:tblStylePr> </w:style> <w:style w:type="paragraph" w:customStyle="1" w:styleId="DefinitionTerm"> <w:name w:val="Definition Term" /> diff --git a/data/jats.csl b/data/jats.csl deleted file mode 100644 index 6972cb3f8..000000000 --- a/data/jats.csl +++ /dev/null @@ -1,203 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" default-locale="en-US"> - <info> - <title>Journal Article Tag Suite</title> - <title-short>JATS</title-short> - <id>http://www.zotero.org/styles/journal-article-tag-suite</id> - <link href="https://github.com/MartinPaulEve/JATS-CSL/blob/master/jats.csl" rel="self"/> - <link rel="documentation" href="http://jats.nlm.nih.gov/archiving/tag-library/1.0/index.html"/> - <author> - <name>Martin Paul Eve</name> - <email>martin@martineve.com</email> - </author> - <category citation-format="numeric"/> - <category field="medicine"/> - <category field="biology"/> - <summary>Use this style to generate bibliographic data in Journal Article Tagging Suite (JATS) 1.0 XML format</summary> - <updated>2014-06-21T17:41:26+00:00</updated> - <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License. Originally by Martin Fenner.</rights> - </info> - <locale xml:lang="en"> - <terms> - <term name="et-al">{{jats}}<etal/>{{/jats}}</term> - </terms> - </locale> - <macro name="citation-number"> - <text variable="citation-number" prefix="{{jats}}id="ref-{{/jats}}" suffix="{{jats}}">{{/jats}}"/> - </macro> - <macro name="author"> - <names variable="author" delimiter=" "> - <name prefix="{{jats}}<name>{{/jats}}" suffix="{{jats}}</name>{{/jats}}" name-as-sort-order="all" sort-separator=" "> - <name-part name="family" text-case="capitalize-first" prefix="{{jats}}<surname>{{/jats}}" suffix="{{jats}}</surname>{{/jats}}"/> - <name-part name="given" text-case="capitalize-first" prefix="{{jats}}<given-names>{{/jats}}" suffix="{{jats}}</given-names>{{/jats}}"/> - </name> - <substitute> - <names variable="editor"/> - </substitute> - </names> - </macro> - - <macro name="editor" delimiter=" "> - <names variable="editor" prefix="{{jats}}<person-group person-group-type="editor">{{/jats}}" suffix="{{jats}}</person-group>{{/jats}}"> - <name prefix="{{jats}}<name>{{/jats}}" suffix="{{jats}}</name>{{/jats}}" name-as-sort-order="all" sort-separator=" "> - <name-part name="family" text-case="capitalize-first" prefix="{{jats}}<surname>{{/jats}}" suffix="{{jats}}</surname>{{/jats}}"/> - <name-part name="given" text-case="capitalize-first" prefix="{{jats}}<given-names>{{/jats}}" suffix="{{jats}}</given-names>{{/jats}}"/> - </name> - <substitute> - <names variable="editor"/> - </substitute> - </names> - </macro> - - <macro name="editor"> - <group delimiter=": "> - <names variable="editor"> - <name prefix="{{jats}}<name>{{/jats}}" suffix="{{jats}}</name>{{/jats}}" name-as-sort-order="all" sort-separator=""> - <name-part name="family" text-case="capitalize-first" prefix="{{jats}}<surname>{{/jats}}" suffix="{{jats}}</surname>{{/jats}}"/> - <name-part name="given" text-case="capitalize-first" prefix="{{jats}}<given-names>{{/jats}}" suffix="{{jats}}<given-names>{{/jats}}"/> - </name> - </names> - </group> - </macro> - <macro name="title"> - <choose> - <if type="book" match="any"> - <group prefix="{{jats}}<source>{{/jats}}" suffix="{{jats}}</source>{{/jats}}"> - <text variable="title"/> - </group> - </if> - <else> - <group prefix="{{jats}}<article-title>{{/jats}}" suffix="{{jats}}</article-title>{{/jats}}"> - <text variable="title"/> - </group> - </else> - </choose> - </macro> - <macro name="container-title"> - <text variable="container-title" form="short" prefix="{{jats}}<source>{{/jats}}" suffix="{{jats}}</source>{{/jats}}"/> - </macro> - <macro name="publisher"> - <text variable="publisher" prefix="{{jats}}<publisher-name>{{/jats}}" suffix="{{jats}}</publisher-name>{{/jats}}"/> - <text variable="publisher-place" prefix="{{jats}}<publisher-loc>{{/jats}}" suffix="{{jats}}</publisher-loc>{{/jats}}"/> - </macro> - <macro name="link"> - <choose> - <if match="any" variable="DOI"> - <group prefix="{{jats}}<pub-id pub-id-type="doi">{{/jats}}" suffix="{{jats}}</pub-id>{{/jats}}"> - <text variable="DOI"/> - </group> - </if> - </choose> - <choose> - <if match="any" variable="PMID"> - <group prefix="{{jats}}<pub-id pub-id-type="pmid">{{/jats}}" suffix="{{jats}}</pub-id>{{/jats}}"> - <text variable="PMID"/> - </group> - </if> - </choose> - <choose> - <if variable="URL" match="any"> - <text variable="URL" /> - </if> - </choose> - </macro> - <macro name="date"> - <choose> - <if type="article-journal article-magazine article-newspaper report patent book" match="any"> - <group prefix="{{jats}}<date>{{/jats}}" suffix="{{jats}}</date>{{/jats}}"> - <date variable="issued"> - <date-part name="day" form="numeric-leading-zeros" prefix="{{jats}}<day>{{/jats}}" suffix="{{jats}}</day>{{/jats}}"/> - <date-part name="month" form="numeric-leading-zeros" prefix="{{jats}}<month>{{/jats}}" suffix="{{jats}}</month>{{/jats}}"/> - <date-part name="year" prefix="{{jats}}<year>{{/jats}}" suffix="{{jats}}</year>{{/jats}}"/> - </date> - </group> - </if> - <else> - <group prefix="{{jats}}<date-in-citation content-type="access-date"{{/jats}}" suffix="{{jats}}</date-in-citation>{{/jats}}"> - <date variable="accessed" prefix="{{jats}} iso-8601-date="{{/jats}}" suffix="{{jats}}">{{/jats}}"> - <date-part name="year"/> - <date-part name="month" form="numeric-leading-zeros" prefix="{{jats}}-{{/jats}}"/> - <date-part name="day" form="numeric-leading-zeros" prefix="{{jats}}-{{/jats}}"/> - </date> - <date variable="accessed"> - <date-part name="day" prefix="{{jats}}<day>{{/jats}}" suffix="{{jats}}</day>{{/jats}}"/> - <date-part name="month" form="numeric-leading-zeros" prefix="{{jats}}<month>{{/jats}}" suffix="{{jats}}</month>{{/jats}}"/> - <date-part name="year" prefix="{{jats}}<year>{{/jats}}" suffix="{{jats}}</year>{{/jats}}"/> - </date> - </group> - </else> - </choose> - </macro> - <macro name="location"> - <choose> - <if type="article-journal article-magazine" match="any"> - <text variable="volume" prefix="{{jats}}<volume>{{/jats}}" suffix="{{jats}}</volume>{{/jats}}"/> - <text variable="issue" prefix="{{jats}}<issue>{{/jats}}" suffix="{{jats}}</issue>{{/jats}}"/> - </if> - </choose> - <choose> - <if type="article-journal article-magazine article-newspaper chapter" match="any"> - <text variable="page-first" prefix="{{jats}}<fpage>{{/jats}}" suffix="{{jats}}</fpage>{{/jats}}"/> - </if> - </choose> - </macro> - <macro name="publication-type"> - <group prefix="{{jats}} publication-type="{{/jats}}" suffix="{{jats}}">{{/jats}}"> - <choose> - <if type="article-journal article-magazine article-newspaper" match="any"> - <text value="journal"/> - </if> - <else-if type="book" match="any"> - <text value="book"/> - </else-if> - <else-if type="chapter" match="any"> - <text value="bookchapter"/> - </else-if> - <else-if type="dataset" match="any"> - <text value="dataset"/> - </else-if> - <else-if type="patent" match="any"> - <text value="patent"/> - </else-if> - <else-if type="report" match="any"> - <text value="report"/> - </else-if> - <else-if type="review" match="any"> - <text value="review"/> - </else-if> - <else> - <text value="standard"/> - </else> - </choose> - </group> - </macro> - <citation collapse="citation-number"> - <sort> - <key variable="citation-number"/> - </sort> - <layout delimiter=","> - <group prefix="{{jats}}<xref ref-type="bibr" rid="{{/jats}}" suffix="{{jats}}</xref>{{/jats}}"> - <text variable="citation-number" prefix="{{jats}}ref-{{/jats}}" suffix="{{jats}}">{{/jats}}"/> - <text variable="citation-number"/> - </group> - </layout> - </citation> - <bibliography sort-separator=""> - <layout> - <group prefix="{{jats}}<ref {{/jats}}" suffix="{{jats}}</ref>{{/jats}}"> - <text macro="citation-number"/> - <group prefix="{{jats}}<element-citation{{/jats}}" suffix="{{jats}}</element-citation>{{/jats}}"> - <text macro="publication-type"/> - <text macro="author" prefix="{{jats}}<person-group person-group-type="author">{{/jats}}" suffix="{{jats}}</person-group>{{/jats}}"/> - <text macro="title" /> - <text macro="container-title"/> - <text macro="editor"/> - <text macro="publisher"/> - <text macro="date"/> - <text macro="location"/> - <text macro="link"/> - </group> - </group> - </layout> - </bibliography> -</style> diff --git a/data/make-reference-files.hs b/data/make-reference-files.hs deleted file mode 100644 index 77e518496..000000000 --- a/data/make-reference-files.hs +++ /dev/null @@ -1,27 +0,0 @@ -import System.Environment -import System.Directory -import Codec.Archive.Zip -import qualified Data.ByteString.Lazy as BS -import qualified Control.Exception as E -import System.IO.Error (isDoesNotExistError) -import System.FilePath - -mkzip :: String -> IO () -mkzip fmt = do - let dir = "data" </> fmt - output = "data" </> "reference" <.> fmt - cd <- getCurrentDirectory - setCurrentDirectory dir - archive <- addFilesToArchive [OptRecursive] emptyArchive ["."] - setCurrentDirectory cd - removeIfExists output - BS.writeFile output $ fromArchive archive - -removeIfExists :: FilePath -> IO () -removeIfExists fileName = removeFile fileName `E.catch` handleExists - where handleExists e - | isDoesNotExistError e = return () - | otherwise = E.throwIO e - -main :: IO () -main = getArgs >>= mkzip . (!!0) diff --git a/data/odt/styles.xml b/data/odt/styles.xml index d066b300b..54459de04 100644 --- a/data/odt/styles.xml +++ b/data/odt/styles.xml @@ -350,7 +350,7 @@ xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2"> </style:style> <style:style style:name="First_20_paragraph" style:display-name="First paragraph" style:family="paragraph" - style:parent-style-name="Standard" + style:parent-style-name="Text_20_body" style:next-style-name="Text_20_body" style:class="text" /> <style:style style:name="Numbering_20_Symbols" style:display-name="Numbering Symbols" style:family="text" /> diff --git a/data/templates/.github/ISSUE_TEMPLATE.md b/data/templates/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index ead4f6811..000000000 --- a/data/templates/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,3 +0,0 @@ -This repository is now maintained as a subtree of -[jgm/pandoc](https://github.com/jgm/pandoc). Please open -your issue there, not here. diff --git a/data/templates/.github/PULL_REQUEST_TEMPLATE.md b/data/templates/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index 7328f66a4..000000000 --- a/data/templates/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,4 +0,0 @@ -This repository is now maintained as a subtree of -[jgm/pandoc](https://github.com/jgm/pandoc). Please open -your pull request there, not here. - diff --git a/data/templates/README.markdown b/data/templates/README.markdown deleted file mode 100644 index 4fca1cba1..000000000 --- a/data/templates/README.markdown +++ /dev/null @@ -1,49 +0,0 @@ -The [pandoc-templates] repository contains default templates for [pandoc]. - -If you use custom templates, we recommend forking this -repository, so that you can integrate changes to the default -templates in future pandoc releases. - -This repository is a subtree of [pandoc]; it will be updated -each time there is a new pandoc release. However, changes to -templates are made first in [pandoc]; thus, issues and pull -requests should be made [pandoc]'s issue tracker rather than -here. - -[pandoc]: https://github.com/jgm/pandoc -[pandoc-templates]: https://github.com/jgm/pandoc-templates - -All of the templates in this repository are dual licensed, under both -the GPL (v2 or higher, same as pandoc) and the BSD 3-clause license -(included below). - -Copyright (c) 2014--2019, John MacFarlane - -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -* Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - -* Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - -* Neither the name of John MacFarlane nor the names of other - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/data/templates/article.jats_publishing b/data/templates/article.jats_publishing index 4bdb3f278..9bedff6af 100644 --- a/data/templates/article.jats_publishing +++ b/data/templates/article.jats_publishing @@ -30,10 +30,10 @@ $if(journal.abbrev-title)$ $endif$ </journal-title-group> $if(journal.pissn)$ -<issn pub-type="ppub">$journal.pissn$</issn> +<issn publication-format="print">$journal.pissn$</issn> $endif$ $if(journal.eissn)$ -<issn pub-type="epub">$journal.eissn$</issn> +<issn publication-format="electronic">$journal.eissn$</issn> $endif$ $-- At least one issn element is required; use empty issn as fallback $if(journal.pissn)$ @@ -86,7 +86,7 @@ $endif$ $if(author)$ <contrib-group> $for(author)$ -<contrib contrib-type="author"> +<contrib contrib-type="author"$if(author.equal-contrib)$ equal-contrib="true"$endif$> $if(author.orcid)$ <contrib-id contrib-id-type="orcid">$author.orcid$</contrib-id> $endif$ @@ -95,6 +95,8 @@ $if(author.surname)$ <surname>$author.surname$</surname> <given-names>$author.given-names$</given-names> </name> +$elseif(author.name)$ +<string-name>$author.name$</string-name> $else$ <string-name>$author$</string-name> $endif$ @@ -128,7 +130,7 @@ $endif$ </author-notes> $endif$ $if(date)$ -<pub-date pub-type="epub"$if(date.iso-8601)$ iso-8601-date="$date.iso-8601$"$endif$> +<pub-date date-type="$if(date.type)$$date.type$$else$pub$endif$" publication-format="electronic"$if(date.iso-8601)$ iso-8601-date="$date.iso-8601$"$endif$> $if(date.day)$ <day>$date.day$</day> $endif$ diff --git a/data/templates/default.biblatex b/data/templates/default.biblatex new file mode 100644 index 000000000..6bf2632d8 --- /dev/null +++ b/data/templates/default.biblatex @@ -0,0 +1,10 @@ +$for(header-includes)$ +$header-includes$ +$endfor$ +$for(include-before)$ +$include-before$ +$endfor$ +$body$ +$for(include-after)$ +$include-after$ +$endfor$ diff --git a/data/templates/default.bibtex b/data/templates/default.bibtex new file mode 100644 index 000000000..6bf2632d8 --- /dev/null +++ b/data/templates/default.bibtex @@ -0,0 +1,10 @@ +$for(header-includes)$ +$header-includes$ +$endfor$ +$for(include-before)$ +$include-before$ +$endfor$ +$body$ +$for(include-after)$ +$include-after$ +$endfor$ diff --git a/data/templates/default.context b/data/templates/default.context index 407bd1215..df39130b2 100644 --- a/data/templates/default.context +++ b/data/templates/default.context @@ -51,6 +51,7 @@ $endif$ % use microtypography \definefontfeature[default][default][script=latn, protrusion=quality, expansion=quality, itlc=yes, textitalics=yes, onum=yes, pnum=yes] +\definefontfeature[default:tnum][default][tnum=yes, pnum=no] \definefontfeature[smallcaps][script=latn, protrusion=quality, expansion=quality, smcp=yes, onum=yes, pnum=yes] \setupalign[hz,hanging] \setupitaliccorrection[global, always] @@ -97,11 +98,12 @@ $endif$ \setupitemize[autointro] % prevent orphan list intro \setupitemize[indentnext=no] +\defineitemgroup[enumerate] +\setupenumerate[each][fit][itemalign=left,distance=.5em,style={\feature[+][default:tnum]}] + \setupfloat[figure][default={here,nonumber}] \setupfloat[table][default={here,nonumber}] -\setupthinrules[width=15em] % width of horizontal rules - \setupxtable[frame=off] \setupxtable[head][topframe=on,bottomframe=on] \setupxtable[body][] @@ -162,12 +164,12 @@ $endfor$ $if(toc)$ \completecontent $endif$ -$if(lot)$ -\completelistoftables -$endif$ $if(lof)$ \completelistoffigures $endif$ +$if(lot)$ +\completelistoftables +$endif$ $body$ diff --git a/data/templates/default.dzslides b/data/templates/default.dzslides index 11103ab81..5e2749bbf 100644 --- a/data/templates/default.dzslides +++ b/data/templates/default.dzslides @@ -171,7 +171,7 @@ $if(subtitle)$ <h1 class="subtitle">$subtitle$</h1> $endif$ <footer> - $if(author)$<span class="author">$for(author)$$author$$sep$, $endfor$</span>$endif$ · $if(date)$<span class="date">$date$</span>$endif$ + $if(author)$<span class="author">$for(author)$$author$$sep$, $endfor$</span> · $endif$$if(institute)$<span class="institute">$for(institute)$$institute$$sep$, $endfor$</span> · $endif$$if(date)$<span class="date">$date$</span>$endif$ </footer> </section> $endif$ diff --git a/data/templates/default.epub2 b/data/templates/default.epub2 index f440134df..685d10208 100644 --- a/data/templates/default.epub2 +++ b/data/templates/default.epub2 @@ -48,7 +48,7 @@ $endif$ $else$ $if(coverpage)$ <div id="cover-image"> -<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="100%" height="100%" viewBox="0 0 $cover-image-width$ $cover-image-height$" preserveAspectRatio="none"> +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="100%" height="100%" viewBox="0 0 $cover-image-width$ $cover-image-height$" preserveAspectRatio="xMidYMid"> <image width="$cover-image-width$" height="$cover-image-height$" xlink:href="../media/$cover-image$" /> </svg> </div> diff --git a/data/templates/default.epub3 b/data/templates/default.epub3 index 4f5bd6641..fc4fa7620 100644 --- a/data/templates/default.epub3 +++ b/data/templates/default.epub3 @@ -49,7 +49,7 @@ $endif$ $else$ $if(coverpage)$ <div id="cover-image"> -<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="100%" height="100%" viewBox="0 0 $cover-image-width$ $cover-image-height$" preserveAspectRatio="none"> +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="100%" height="100%" viewBox="0 0 $cover-image-width$ $cover-image-height$" preserveAspectRatio="xMidYMid"> <image width="$cover-image-width$" height="$cover-image-height$" xlink:href="../media/$cover-image$" /> </svg> </div> diff --git a/data/templates/default.html4 b/data/templates/default.html4 index f0dd8880e..d54c48ee4 100644 --- a/data/templates/default.html4 +++ b/data/templates/default.html4 @@ -13,6 +13,9 @@ $endif$ $if(keywords)$ <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" /> $endif$ +$if(description-meta)$ + <meta name="description" content="$description-meta$" /> +$endif$ <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title> <style type="text/css"> $styles.html()$ diff --git a/data/templates/default.html5 b/data/templates/default.html5 index 0676215d4..9699b8504 100644 --- a/data/templates/default.html5 +++ b/data/templates/default.html5 @@ -13,6 +13,9 @@ $endif$ $if(keywords)$ <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" /> $endif$ +$if(description-meta)$ + <meta name="description" content="$description-meta$" /> +$endif$ <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title> <style> $styles.html()$ diff --git a/data/templates/default.jats_articleauthoring b/data/templates/default.jats_articleauthoring index 94c929548..60b2ca559 100644 --- a/data/templates/default.jats_articleauthoring +++ b/data/templates/default.jats_articleauthoring @@ -19,7 +19,7 @@ $endif$ $if(author)$ <contrib-group> $for(author)$ -<contrib contrib-type="author"> +<contrib contrib-type="author"$if(author.equal-contrib)$ equal-contrib="true"$endif$> $if(author.orcid)$ <contrib-id contrib-id-type="orcid">$author.orcid$</contrib-id> $endif$ @@ -28,6 +28,8 @@ $if(author.surname)$ <surname>$author.surname$</surname> <given-names>$author.given-names$</given-names> </name> +$elseif(author.name)$ +<string-name>$author.name$</string-name> $else$ <string-name>$author$</string-name> $endif$ diff --git a/data/templates/default.latex b/data/templates/default.latex index 60af51225..d06701675 100644 --- a/data/templates/default.latex +++ b/data/templates/default.latex @@ -2,7 +2,7 @@ \PassOptionsToPackage{unicode$for(hyperrefoptions)$,$hyperrefoptions$$endfor$}{hyperref} \PassOptionsToPackage{hyphens}{url} $if(colorlinks)$ -\PassOptionsToPackage{dvipsnames,svgnames*,x11names*}{xcolor} +\PassOptionsToPackage{dvipsnames,svgnames,x11names}{xcolor} $endif$ $if(dir)$ $if(latex-dir-rtl)$ @@ -98,14 +98,14 @@ $endif$ $if(linestretch)$ \usepackage{setspace} $endif$ -\usepackage{ifxetex,ifluatex} -\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex +\usepackage{iftex} +\ifPDFTeX \usepackage[$if(fontenc)$$fontenc$$else$T1$endif$]{fontenc} \usepackage[utf8]{inputenc} \usepackage{textcomp} % provide euro and other symbols \else % if luatex or xetex $if(mathspec)$ - \ifxetex + \ifXeTeX \usepackage{mathspec} \else \usepackage{unicode-math} @@ -129,7 +129,7 @@ $for(fontfamilies)$ $endfor$ $if(mathfont)$ $if(mathspec)$ - \ifxetex + \ifXeTeX \setmathfont(Digits,Latin,Greek)[$for(mathfontoptions)$$mathfontoptions$$sep$,$endfor$]{$mathfont$} \else \setmathfont[$for(mathfontoptions)$$mathfontoptions$$sep$,$endfor$]{$mathfont$} @@ -139,23 +139,42 @@ $else$ $endif$ $endif$ $if(CJKmainfont)$ - \ifxetex + \ifXeTeX \usepackage{xeCJK} \setCJKmainfont[$for(CJKoptions)$$CJKoptions$$sep$,$endfor$]{$CJKmainfont$} \fi $endif$ $if(luatexjapresetoptions)$ - \ifluatex + \ifLuaTeX \usepackage[$for(luatexjapresetoptions)$$luatexjapresetoptions$$sep$,$endfor$]{luatexja-preset} \fi $endif$ $if(CJKmainfont)$ - \ifluatex + \ifLuaTeX \usepackage[$for(luatexjafontspecoptions)$$luatexjafontspecoptions$$sep$,$endfor$]{luatexja-fontspec} \setmainjfont[$for(CJKoptions)$$CJKoptions$$sep$,$endfor$]{$CJKmainfont$} \fi $endif$ \fi +$if(zero-width-non-joiner)$ +%% Support for zero-width non-joiner characters. +\makeatletter +\def\zerowidthnonjoiner{% + % Prevent ligatures and adjust kerning, but still support hyphenating. + \texorpdfstring{% + \textormath{\nobreak\discretionary{-}{}{\kern.03em}% + \ifvmode\else\nobreak\hskip\z@skip\fi}{}% + }{}% +} +\makeatother +\ifPDFTeX + \DeclareUnicodeCharacter{200C}{\zerowidthnonjoiner} +\else + \catcode`^^^^200c=\active + \protected\def ^^^^200c{\zerowidthnonjoiner} +\fi +%% End of ZWNJ support +$endif$ $if(beamer)$ $if(theme)$ \usetheme[$for(themeoptions)$$themeoptions$$sep$,$endfor$]{$theme$} @@ -219,10 +238,10 @@ $if(keywords)$ $endif$ $if(colorlinks)$ colorlinks=true, - linkcolor=$if(linkcolor)$$linkcolor$$else$Maroon$endif$, - filecolor=$if(filecolor)$$filecolor$$else$Maroon$endif$, - citecolor=$if(citecolor)$$citecolor$$else$Blue$endif$, - urlcolor=$if(urlcolor)$$urlcolor$$else$Blue$endif$, + linkcolor={$if(linkcolor)$$linkcolor$$else$Maroon$endif$}, + filecolor={$if(filecolor)$$filecolor$$else$Maroon$endif$}, + citecolor={$if(citecolor)$$citecolor$$else$Blue$endif$}, + urlcolor={$if(urlcolor)$$urlcolor$$else$Blue$endif$}, $else$ hidelinks, $endif$ @@ -255,6 +274,9 @@ $highlighting-macros$ $endif$ $if(tables)$ \usepackage{longtable,booktabs,array} +$if(multirow)$ +\usepackage{multirow} +$endif$ \usepackage{calc} % for calculating minipage widths $if(beamer)$ \usepackage{caption} @@ -322,11 +344,36 @@ $endif$ $if(pagestyle)$ \pagestyle{$pagestyle$} $endif$ +$if(csl-refs)$ +\newlength{\cslhangindent} +\setlength{\cslhangindent}{1.5em} +\newlength{\csllabelwidth} +\setlength{\csllabelwidth}{3em} +\newlength{\cslentryspacingunit} % times entry-spacing +\setlength{\cslentryspacingunit}{\parskip} +\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 + \let\oldpar\par + \def\par{\hangindent=\cslhangindent\oldpar} + \fi + % set entry spacing + \setlength{\parskip}{#2\cslentryspacingunit} + }% + {} +\usepackage{calc} +\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$ $for(header-includes)$ $header-includes$ $endfor$ $if(lang)$ -\ifxetex +\ifXeTeX % Load polyglossia as late as possible: uses bidi with RTL langages (e.g. Hebrew, Arabic) \usepackage{polyglossia} \setmainlanguage[$for(polyglossia-lang.options)$$polyglossia-lang.options$$sep$,$endfor$]{$polyglossia-lang.name$} @@ -343,15 +390,15 @@ $if(babel-newcommands)$ $endif$ \fi $endif$ -\ifluatex +\ifLuaTeX \usepackage{selnolig} % disable illegal ligatures \fi $if(dir)$ -\ifxetex +\ifXeTeX % Load bidi as late as possible as it modifies e.g. graphicx \usepackage{bidi} \fi -\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex +\ifPDFTeX \TeXXeTstate=1 \newcommand{\RL}[1]{\beginR #1\endR} \newcommand{\LR}[1]{\beginL #1\endL} @@ -369,27 +416,11 @@ $for(bibliography)$ \addbibresource{$bibliography$} $endfor$ $endif$ -$if(csl-refs)$ -\newlength{\cslhangindent} -\setlength{\cslhangindent}{1.5em} -\newlength{\csllabelwidth} -\setlength{\csllabelwidth}{3em} -\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} -\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} +$if(nocite-ids)$ +\nocite{$for(nocite-ids)$$it$$sep$, $endfor$} +$endif$ +$if(csquotes)$ +\usepackage{csquotes} $endif$ $if(title)$ @@ -463,12 +494,12 @@ $endif$ } $endif$ $endif$ -$if(lot)$ -\listoftables -$endif$ $if(lof)$ \listoffigures $endif$ +$if(lot)$ +\listoftables +$endif$ $if(linestretch)$ \setstretch{$linestretch$} $endif$ diff --git a/data/templates/default.revealjs b/data/templates/default.revealjs index ff88a4482..203983522 100644 --- a/data/templates/default.revealjs +++ b/data/templates/default.revealjs @@ -52,6 +52,9 @@ $endif$ $for(author)$ <p class="author">$author$</p> $endfor$ +$for(institute)$ + <p class="institute">$institute$</p> +$endfor$ $if(date)$ <p class="date">$date$</p> $endif$ @@ -59,7 +62,12 @@ $endif$ $endif$ $if(toc)$ <section id="$idprefix$TOC"> +<nav role="doc-toc"> +$if(toc-title)$ +<h2 id="$idprefix$toc-title">$toc-title$</h2> +$endif$ $table-of-contents$ +</nav> </section> $endif$ @@ -69,7 +77,7 @@ $body$ <script src="$revealjs-url$/dist/reveal.js"></script> - // reveal.js plugins + <!-- reveal.js plugins --> <script src="$revealjs-url$/plugin/notes/notes.js"></script> <script src="$revealjs-url$/plugin/search/search.js"></script> <script src="$revealjs-url$/plugin/zoom/zoom.js"></script> @@ -82,252 +90,198 @@ $endif$ // Full list of configuration options available at: // https://revealjs.com/config/ Reveal.initialize({ -$if(controls)$ // Display controls in the bottom right corner controls: $controls$, -$endif$ -$if(controlsTutorial)$ + // Help the user learn the controls by providing hints, for example by // bouncing the down arrow when they first encounter a vertical slide controlsTutorial: $controlsTutorial$, -$endif$ -$if(controlsLayout)$ + // Determines where controls appear, "edges" or "bottom-right" controlsLayout: '$controlsLayout$', -$endif$ -$if(controlsBackArrows)$ + // Visibility rule for backwards navigation arrows; "faded", "hidden" // or "visible" controlsBackArrows: '$controlsBackArrows$', -$endif$ -$if(progress)$ + // Display a presentation progress bar progress: $progress$, -$endif$ -$if(slideNumber)$ + // Display the page number of the current slide slideNumber: $slideNumber$, -$endif$ -$if(showSlideNumber)$ + // 'all', 'print', or 'speaker' showSlideNumber: '$showSlideNumber$', -$endif$ -$if(hash)$ + // Add the current slide number to the URL hash so that reloading the // page/copying the URL will return you to the same slide hash: $hash$, -$endif$ -$if(hashOneBasedIndex)$ + // Start with 1 for the hash rather than 0 hashOneBasedIndex: $hashOneBasedIndex$, -$endif$ + + // Flags if we should monitor the hash and change slides accordingly + respondToHashChanges: $respondToHashChanges$, + // Push each slide change to the browser history - history: $if(history)$$history$$else$true$endif$, -$if(keyboard)$ + history: $history$, + // Enable keyboard shortcuts for navigation keyboard: $keyboard$, -$endif$ -$if(overview)$ + // Enable the slide overview mode overview: $overview$, -$endif$ -$if(center)$ + + // Disables the default reveal.js slide layout (scaling and centering) + // so that you can use custom CSS layout + disableLayout: false, + // Vertical centering of slides center: $center$, -$endif$ -$if(touch)$ + // Enables touch navigation on devices with touch input touch: $touch$, -$endif$ -$if(loop)$ + // Loop the presentation loop: $loop$, -$endif$ -$if(rtl)$ + // Change the presentation direction to be RTL rtl: $rtl$, -$endif$ -$if(navigationMode)$ + // see https://revealjs.com/vertical-slides/#navigation-mode navigationMode: '$navigationMode$', -$endif$ -$if(shuffle)$ + // Randomizes the order of slides each time the presentation loads shuffle: $shuffle$, -$endif$ -$if(fragments)$ + // Turns fragments on and off globally fragments: $fragments$, -$endif$ -$if(fragmentInURL)$ + // Flags whether to include the current fragment in the URL, // so that reloading brings you to the same fragment position fragmentInURL: $fragmentInURL$, -$endif$ -$if(embedded)$ + // Flags if the presentation is running in an embedded mode, // i.e. contained within a limited portion of the screen embedded: $embedded$, -$endif$ -$if(help)$ + // Flags if we should show a help overlay when the questionmark // key is pressed help: $help$, -$endif$ -$if(pause)$ - // Flags if it should be possible to pause the presentation (blackout) - pause: $pause$, -$endif$ -$if(showNotes)$ + + // Flags if it should be possible to pause the presentation (blackout) + pause: $pause$, + // Flags if speaker notes should be visible to all viewers showNotes: $showNotes$, -$endif$ -$if(autoPlayMedia)$ - // Global override for autoplaying embedded media (video/audio/iframe) - // - null: Media will only autoplay if data-autoplay is present - // - true: All media will autoplay, regardless of individual setting - // - false: No media will autoplay, regardless of individual setting + + // Global override for autoplaying embedded media (null/true/false) autoPlayMedia: $autoPlayMedia$, -$endif$ -$if(preloadIframes)$ - // Global override for preloading lazy-loaded iframes - // - null: Iframes with data-src AND data-preload will be loaded when within - // the viewDistance, iframes with only data-src will be loaded when visible - // - true: All iframes with data-src will be loaded when within the viewDistance - // - false: All iframes with data-src will be loaded only when visible + + // Global override for preloading lazy-loaded iframes (null/true/false) preloadIframes: $preloadIframes$, -$endif$ -$if(autoSlide)$ + // Number of milliseconds between automatically proceeding to the // next slide, disabled when set to 0, this value can be overwritten // by using a data-autoslide attribute on your slides autoSlide: $autoSlide$, -$endif$ -$if(autoSlideStoppable)$ + // Stop auto-sliding after user input autoSlideStoppable: $autoSlideStoppable$, -$endif$ -$if(autoSlideMethod)$ + // Use this method for navigation when auto-sliding autoSlideMethod: $autoSlideMethod$, -$endif$ -$if(defaultTiming)$ + // Specify the average time in seconds that you think you will spend // presenting each slide. This is used to show a pacing timer in the // speaker view defaultTiming: $defaultTiming$, -$endif$ -$if(totalTime)$ - // Specify the total time in seconds that is available to - // present. If this is set to a nonzero value, the pacing - // timer will work out the time available for each slide, - // instead of using the defaultTiming value - totalTime: $totalTime$, -$endif$ -$if(minimumTimePerSlide)$ - // Specify the minimum amount of time you want to allot to - // each slide, if using the totalTime calculation method. If - // the automated time allocation causes slide pacing to fall - // below this threshold, then you will see an alert in the - // speaker notes window - minimumTimePerSlide: $minimumTimePerSlide$, -$endif$ -$if(mouseWheel)$ + // Enable slide navigation via mouse wheel mouseWheel: $mouseWheel$, -$endif$ -$if(rollingLinks)$ - // Apply a 3D roll to links on hover - rollingLinks: $rollingLinks$, -$endif$ -$if(hideInactiveCursor)$ + + // The display mode that will be used to show slides + display: '$display$', + // Hide cursor if inactive hideInactiveCursor: $hideInactiveCursor$, -$endif$ -$if(hideCursorTime)$ + // Time before the cursor is hidden (in ms) hideCursorTime: $hideCursorTime$, -$endif$ -$if(hideAddressBar)$ - // Hides the address bar on mobile devices - hideAddressBar: $hideAddressBar$, -$endif$ -$if(previewLinks)$ + // Opens links in an iframe preview overlay previewLinks: $previewLinks$, -$endif$ -$if(transition)$ - // Transition style - transition: '$transition$', // none/fade/slide/convex/concave/zoom -$endif$ -$if(transitionSpeed)$ - // Transition speed - transitionSpeed: '$transitionSpeed$', // default/fast/slow -$endif$ -$if(backgroundTransition)$ + + // Transition style (none/fade/slide/convex/concave/zoom) + transition: '$transition$', + + // Transition speed (default/fast/slow) + transitionSpeed: '$transitionSpeed$', + // Transition style for full page slide backgrounds - backgroundTransition: '$backgroundTransition$', // none/fade/slide/convex/concave/zoom -$endif$ -$if(viewDistance)$ + // (none/fade/slide/convex/concave/zoom) + backgroundTransition: '$backgroundTransition$', + // Number of slides away from the current that are visible viewDistance: $viewDistance$, -$endif$ -$if(mobileViewDistance)$ + // Number of slides away from the current that are visible on mobile // devices. It is advisable to set this to a lower number than // viewDistance in order to save resources. mobileViewDistance: $mobileViewDistance$, -$endif$ $if(parallaxBackgroundImage)$ + // Parallax background image parallaxBackgroundImage: '$parallaxBackgroundImage$', // e.g. "'https://s3.amazonaws.com/hakim-static/reveal-js/reveal-parallax-1.jpg'" $else$ $if(background-image)$ + // Parallax background image parallaxBackgroundImage: '$background-image$', // e.g. "'https://s3.amazonaws.com/hakim-static/reveal-js/reveal-parallax-1.jpg'" $endif$ $endif$ $if(parallaxBackgroundSize)$ + // Parallax background size parallaxBackgroundSize: '$parallaxBackgroundSize$', // CSS syntax, e.g. "2100px 900px" $endif$ $if(parallaxBackgroundHorizontal)$ + // Amount to move parallax background (horizontal and vertical) on slide change // Number, e.g. 100 parallaxBackgroundHorizontal: $parallaxBackgroundHorizontal$, $endif$ $if(parallaxBackgroundVertical)$ + parallaxBackgroundVertical: $parallaxBackgroundVertical$, $endif$ $if(width)$ + // The "normal" size of the presentation, aspect ratio will be preserved // when the presentation is scaled to fit different resolutions. Can be // specified using percentage units. width: $width$, $endif$ $if(height)$ + height: $height$, $endif$ $if(margin)$ + // Factor of the display size that should remain empty around the content margin: $margin$, $endif$ $if(minScale)$ + // Bounds for smallest/largest possible scale to apply to content minScale: $minScale$, $endif$ $if(maxScale)$ + maxScale: $maxScale$, $endif$ -$if(zoomKey)$ - // Modifier key used to click-zoom to part of the slide - zoomKey: '$zoomKey$', -$endif$ -$if(display)$ - // The display mode that will be used to show slides - display: '$display$', -$endif$ $if(mathjax)$ + math: { mathjax: '$mathjaxurl$', config: 'TeX-AMS_HTML-full', diff --git a/data/templates/default.s5 b/data/templates/default.s5 index d76111284..27e681fe4 100644 --- a/data/templates/default.s5 +++ b/data/templates/default.s5 @@ -61,6 +61,9 @@ $endif$ $if(author)$ <h3 class="author">$for(author)$$author$$sep$<br/>$endfor$</h3> $endif$ +$if(institute)$ + <h3 class="institute">$for(institute)$$institute$$sep$<br/>$endfor$</h3> +$endif$ $if(date)$ <h4 class="date">$date$</h4> $endif$ diff --git a/data/templates/default.slideous b/data/templates/default.slideous index ebf582dca..70d144bc7 100644 --- a/data/templates/default.slideous +++ b/data/templates/default.slideous @@ -63,9 +63,16 @@ $if(title)$ $if(subtitle)$ <h1 class="subtitle">$subtitle$</h1> $endif$ +$if(author)$ <p class="author"> $for(author)$$author$$sep$<br/>$endfor$ </p> +$endif$ +$if(institute)$ + <p class="institute"> +$for(institute)$$institute$$sep$<br/>$endfor$ + </p> +$endif$ $if(date)$ <p class="date">$date$</p> $endif$ diff --git a/data/templates/default.slidy b/data/templates/default.slidy index 6b9776858..a4ac97f9d 100644 --- a/data/templates/default.slidy +++ b/data/templates/default.slidy @@ -52,6 +52,11 @@ $if(author)$ $for(author)$$author$$sep$<br/>$endfor$ </p> $endif$ +$if(institute)$ + <p class="institute"> +$for(institute)$$institute$$sep$<br/>$endfor$ + </p> +$endif$ $if(date)$ <p class="date">$date$</p> $endif$ diff --git a/data/templates/styles.html b/data/templates/styles.html index e744d83b8..d26a39cf9 100644 --- a/data/templates/styles.html +++ b/data/templates/styles.html @@ -14,7 +14,7 @@ body { padding-top: $if(margin-top)$$margin-top$$else$50px$endif$; padding-bottom: $if(margin-bottom)$$margin-bottom$$else$50px$endif$; hyphens: auto; - word-wrap: break-word; + overflow-wrap: break-word; text-rendering: optimizeLegibility; font-kerning: normal; } @@ -93,6 +93,7 @@ $endif$ pre code { padding: 0; overflow: visible; + overflow-wrap: normal; } .sourceCode { background-color: transparent; diff --git a/data/translations/zh-Hans.yaml b/data/translations/zh-Hans.yaml new file mode 100644 index 000000000..d44ef41e3 --- /dev/null +++ b/data/translations/zh-Hans.yaml @@ -0,0 +1,22 @@ +Abstract: 摘要 +Appendix: 附录 +Bibliography: 文献目录 +Cc: 副本 +Chapter: 章 +Contents: 目录 +Encl: 附件 +Figure: 图 +Glossary: 术语 +Index: 索引 +Listing: 列表 +ListOfFigures: 附图目录 +ListOfTables: 表格索引 +Page: 页 +Part: 段 +Preface: 序 +Proof: 校对 +References: 参考文献 +See: 见 +SeeAlso: 参见 +Table: 表 +To: 到 diff --git a/data/translations/zh-Hant.yaml b/data/translations/zh-Hant.yaml new file mode 100644 index 000000000..60be44201 --- /dev/null +++ b/data/translations/zh-Hant.yaml @@ -0,0 +1,22 @@ +Abstract: 摘要 +Appendix: 附錄 +Bibliography: 文獻目錄 +Cc: 副本 +Chapter: 章 +Contents: 目錄 +Encl: 附件 +Figure: 圖 +Glossary: 術語 +Index: 索引 +Listing: 列表 +ListOfFigures: 附圖目錄 +ListOfTables: 表格索引 +Page: 頁 +Part: 段 +Preface: 序 +Proof: 校對 +References: 參考文獻 +See: 見 +SeeAlso: 參見 +Table: 表 +To: 到 diff --git a/data/vimwiki.css b/data/vimwiki.css deleted file mode 100644 index 0a8841a32..000000000 --- a/data/vimwiki.css +++ /dev/null @@ -1,82 +0,0 @@ -pre{ - font-size: 1.5em -} - -img {vertical-align: middle} - -body {font-family: Tahoma, Geneva, sans-serif; margin: 1em 2em 1em 2em; font-size: 120%; line-height: 130%;} -h1, h2, h3, h4, h5, h6 {font-family: Trebuchet MS, Helvetica, sans-serif; font-weight: bold; line-height:100%; margin-top: 1.5em; margin-bottom: 0.5em;} -h1 {font-size: 2.6em; color: #000000;} -h2 {font-size: 2.2em; color: #404040;} -h3 {font-size: 1.8em; color: #707070;} -h4 {font-size: 1.4em; color: #909090;} -h5 {font-size: 1.3em; color: #989898;} -h6 {font-size: 1.2em; color: #9c9c9c;} -p, pre, blockquote, table, ul, ol, dl {margin-top: 1em; margin-bottom: 1em;} -ul ul, ul ol, ol ol, ol ul {margin-top: 0.5em; margin-bottom: 0.5em;} -li {margin: 0.3em auto;} -ul {margin-left: 2em; padding-left: 0.5em;} -dt {font-weight: bold;} -img {border: none;} -pre {border-left: 1px solid #ccc; margin-left: 2em; padding-left: 0.5em;} -blockquote {padding: 0.4em; background-color: #f6f5eb;} -th, td {border: 1px solid #ccc; padding: 0.3em;} -th {background-color: #f0f0f0;} -hr {border: none; border-top: 1px solid #ccc; width: 100%;} -del {text-decoration: line-through; color: #777777;} -.toc li {list-style-type: none;} -.todo {font-weight: bold; background-color: #f0ece8; color: #a03020;} -.justleft {text-align: left;} -.justright {text-align: right;} -.justcenter {text-align: center;} -.center {margin-left: auto; margin-right: auto;} -div.center > table {margin-left: auto; margin-right: auto;} -.tag {background-color: #eeeeee; font-family: monospace; padding: 2px;} - -/* classes for items of todo lists */ -.done0 { - /* list-style: none; */ - background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAYAAAA71pVKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAAxQAAAMUBHc26qAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAA7SURBVCiR7dMxEgAgCANBI3yVRzF5KxNbW6wsuH7LQ2YKQK1mkswBVERYF5Os3UV3gwd/jF2SkXy66gAZkxS6BniubAAAAABJRU5ErkJggg==); - background-repeat: no-repeat; - background-position: 0 .2em; - padding-left: 1.5em; -} -.done1 { - background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAYAAAA71pVKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAAxQAAAMUBHc26qAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAABtSURBVCiR1ZO7DYAwDER9BDmTeZQMFXmUbGYpOjrEryA0wOvO8itOslFrJYAug5BMM4BeSkmjsrv3aVTa8p48Xw1JSkSsWVUFwD05IqS1tmYzk5zzae9jnVVVzGyXb8sALjse+euRkEzu/uirFomVIdDGOLjuAAAAAElFTkSuQmCC); - background-repeat: no-repeat; - background-position: 0 .15em; - padding-left: 1.5em; -} -.done2 { - background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAYAAAA71pVKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAAxQAAAMUBHc26qAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAB1SURBVCiRzdO5DcAgDAVQGxjAYgTvxlDIu1FTIRYAp8qlFISkSH7l5kk+ZIwxKiI2mIyqWoeILYRgZ7GINDOLjnmF3VqklKCUMgTee2DmM661Qs55iI3Zm/1u5h9sm4ig9z4ERHTFzLyd4G4+nFlVrYg8+qoF/c0kdpeMsmcAAAAASUVORK5CYII=); - background-repeat: no-repeat; - background-position: 0 .15em; - padding-left: 1.5em; -} -.done3 { - background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAYAAAA71pVKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAAxQAAAMUBHc26qAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAABoSURBVCiR7dOxDcAgDATA/0DtUdiKoZC3YhLkHjkVKF3idJHiztKfvrHZWnOSE8Fx95RJzlprimJVnXktvXeY2S0SEZRSAAAbmxnGGKH2I5T+8VfxPhIReQSuuY3XyYWa3T2p6quvOgGrvSFGlewuUAAAAABJRU5ErkJggg==); - background-repeat: no-repeat; - background-position: 0 .15em; - padding-left: 1.5em; -} -.done4 { - background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAAQCAYAAAAbBi9cAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAAzgAAAM4BlP6ToAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAIISURBVDiNnZQ9SFtRFMd/773kpTaGJoQk1im4VDpWQcTNODhkFBcVTCNCF0NWyeDiIIiCm82QoIMIUkHUxcFBg1SEQoZszSat6cdTn1qNue92CMbEr9Sey+XC/Z/zu+f8h6ukUil3sVg0+M+4cFxk42/jH2wAqqqKSCSiPQdwcHHAnDHH9s/tN1h8V28ETdP+eU8fT9Nt62ancYdIPvJNtsu87bmjrJlrTDVM4RROJs1JrHPrD4Bar7A6cpc54iKOaTdJXCUI2UMVrQZ0Js7YPN18ECKkYNQcJe/OE/4dZsw7VqNXQMvHy3QZXQypQ6ycrtwDjf8aJ+PNEDSCzLpn7+m2pD8ZKHlKarYhy6XjEoCYGcN95qansQeA3fNdki+SaJZGTMQIOoL3W/Z89rxv+tokubNajlvk/vm+LFpF2XnUKZHI0I+QrI7Dw0OZTqdzUkpsM7mZTyfy5OPGyw1tK7AFSvmB/Ks8w8YwbUYbe6/3QEKv0vugfxWPnMLJun+d/kI/WLdizpNjMbAIKrhMF4OuwadBALqqs+RfInwUvuNi+fBd+wjogfogAFVRmffO02q01mZZ0HHdgXIzdz0QQLPezIQygX6llxNKKgOFARYCC49CqhoHIUTlss/Vx2phlYwjw8j1CAlfAiwQiJpiy7o1VHnsG5FISkoJu7Q/2YmmaV+i0ei7v38L2CBguSi5AAAAAElFTkSuQmCC); - background-repeat: no-repeat; - background-position: 0 .15em; - padding-left: 1.5em; -} - -*:not(pre) > code { - font-family: Monaco,"Courier New","DejaVu Sans Mono","Bitstream Vera Sans Mono",monospace; - -webkit-border-radius: 1px; - -moz-border-radius: 1px; - border-radius: 1px; - -moz-background-clip: padding; - -webkit-background-clip: padding-box; - background-clip: padding-box; - padding: 0px 3px; - display: inline-block; - color: #52595d; - border: 1px solid #ccc; - background-color: #f9f9f9; -} |