git.iko.soy/typeable/pandoc
on master help sign in
.circleci/config.yml+64−122
since splitsnapshots
unifiedsplit
@@ -1,130 +1,72 @@
1version: "2.1"
1version: "2.1"
2−
2+jobs:
3−env: &env
3+ build:
4+ macos:
5+ xcode: 11.1.0
4 environment:
6 environment:
5− LC_ALL: "C.UTF-8"
7+ HOMEBREW_NO_AUTO_UPDATE: 1
6− docker:
7− - image: fpco/stack-build:lts-13
8−
9−#-----------------------------------------------------------------------------
10−# Common utility stuff, not to be modified usually
11−#-----------------------------------------------------------------------------
12−
13−preinstall: &preinstall
14− run: |
15− echo 'export PATH=/opt/cabal/bin:/opt/ghc/bin:$PATH' >> $BASH_ENV
16− source $BASH_ENV
17− apt-get update
18−
19−restore: &restore
20− # Needs to happen after installing ca-certificates
21− restore_cache:
22− key: v1-{{ .Environment.CIRCLE_JOB }}-{{ .Branch }}
23−
24−save: &save
25− save_cache:
26− key: v1-{{ .Environment.CIRCLE_JOB }}-{{ .Branch }}
27− paths:
28− - ~/.cabal
29− - ~/.ghc
30− - ~/.local
31− - ~/.stack
32−
33−commands:
34− cabal_build:
35− parameters:
36− ghcversion:
37− type: string
38 steps:
8 steps:
39− - checkout
9+ - checkout
40− - *preinstall
10+ - restore_cache:
41− - *restore
11+ # See https://circleci.com/docs/2.0/caching/
42− - run:
12+ name: Restore Cached Dependencies
43− name: install cabal
13+ keys:
44− command: apt-get install -y cabal-install-2.4
14+ - stack-dependencies-{{ checksum "stack.yaml" }}
45− - run:
15+ - run:
46− name: install ghc
16+ name: Install stack
47− command: |
17+ command: stack --version || (curl -sSL https://get.haskellstack.org/ | sh -s - -f)
48− apt-get install -y ghc-<< parameters.ghcversion >>
18+ - run:
49− - run:
19+ name: Resolve/Update Dependencies
50− name: build and test project
20+ command: stack --no-terminal setup
51− command: |
21+ - run:
52− set -e
22+ name: Run tests
53− cabal v2-update
23+ command: stack --no-terminal test
54− TMPDIR=`mktemp -d -t circleci.XXXXXXX`
24+ - run:
55− cabal v2-sdist --output-dir=${TMPDIR}
25+ name: Install executable
56− cd ${TMPDIR}
26+ command: stack --no-terminal install
57− tar xvzf *.tar.gz
27+ - run:
58− cd *
28+ name: Create artifacts
59− cabal v2-build -w ghc-<< parameters.ghcversion >> -j2 --disable-optimization --dependencies-only --enable-tests --enable-benchmarks
29+ command: |
60− cabal v2-build -w ghc-<< parameters.ghcversion >> -j2 --disable-optimization --enable-tests --enable-benchmarks 2>build.log
30+ export VERSION=$(grep '^[Vv]ersion:' pandoc.cabal | awk '{print $$2;}')
61− cat build.log
31+ export ARTIFACTS=macos-release-candidate
62− # fail if we had warnings in local build
32+ export RESOURCES=${ARTIFACTS}/Resources
63− # this is to work around the fact that cabal v2 doesn't allow
33+ export ROOT=${ARTIFACTS}/pandoc
64− # us to use -Werror for just local build:
34+ export DEST=${ROOT}/usr/local
65− # https://github.com/haskell/cabal/issues/4247
35+ export ME=$(whoami)
66− ! grep -q "[Ww]arning:" build.log
36+ export BASE=pandoc-$VERSION
67− cabal v2-test -w ghc-<< parameters.ghcversion >> -j2 --disable-optimization --enable-tests
37+ mkdir -p ${ARTIFACTS}
68− cabal v2-haddock -w ghc-<< parameters.ghcversion >>
38+ mkdir -p ${RESOURCES}
69− cabal check
39+ mkdir -p ${DEST}/bin
70− - *save
40+ mkdir -p ${DEST}/share/man/man1
41+ cp ~/.local/bin/pandoc ${DEST}/bin/
42+ strip ${DEST}/bin/pandoc
43+ cp man/pandoc.1 ${DEST}/share/man/man1/pandoc.1
44+ ~/.local/bin/pandoc -s COPYING.md -Vpagetitle=License -o ${RESOURCES}/license.html
45+ chown -R $ME:staff ${ROOT}
46+ sed -e "s/PANDOCVERSION/${VERSION}/" macos/distribution.xml.in > ${ARTIFACTS}/distribution.xml
47+ cp macos/Makefile ${ARTIFACTS}/
48+ echo ${VERSION} > ${ARTIFACTS}/version.txt
49+ zip -r macos-release-candidate.zip ${ARTIFACTS}
71
50
72−#-----------------------------------------------------------------------------
51+ - save_cache:
73−# Build matrix
52+ name: Cache Dependencies
74−#-----------------------------------------------------------------------------
53+ key: stack-dependencies-{{ checksum "stack.yaml" }}
54+ paths:
55+ - "/root/.stack"
56+ - ".stack-work"
57+ - "/usr/local/bin/stack"
75
58
76−jobs:
59+ - store_artifacts:
77− cabal-ghc-8_8_1:
60+ # https://circleci.com/docs/2.0/artifacts/
78− <<: *env
61+ path: macos-release-candidate.zip
79− steps:
62+ destination: macos-release-candidate.zip
80− - cabal_build:
81− ghcversion: 8.8.1
82−
83− cabal-ghc-8_6_5:
84− <<: *env
85− steps:
86− - cabal_build:
87− ghcversion: 8.6.5
88−
89− cabal-ghc-8_4_4:
90− <<: *env
91− steps:
92− - cabal_build:
93− ghcversion: 8.4.4
94−
95− cabal-ghc-8_2_2:
96− <<: *env
97− steps:
98− - cabal_build:
99− ghcversion: 8.2.2
100−
101− cabal-ghc-8_0_2:
102− <<: *env
103− steps:
104− - cabal_build:
105− ghcversion: 8.0.2
106−
107− stack-ghc-8_6:
108− <<: *env
109− steps:
110− - checkout
111− - *preinstall
112− - *restore
113− - run: |
114− set -e
115− apt-get install -y ghc-8.6.5
116− stack update
117− stack test --system-ghc --fast --ghc-options="-Werror" .
118− - *save
119
63
120workflows:
64workflows:
121− version: "2.1"
65+ version: 2
122− build:
66+ release:
123 jobs:
67 jobs:
124− - cabal-ghc-8_6_5
68+ - build:
125− - cabal-ghc-8_4_4
69+ filters:
126− - cabal-ghc-8_2_2
70+ branches:
127− - cabal-ghc-8_0_2
71+ only:
128− - stack-ghc-8_6
72+ - /rc\/.*/
129− # - cabal-ghc-8_8_1
130−
.editorconfig+8
@@ -8,6 +8,14 @@ indent_size = 2
8insert_final_newline = true
8insert_final_newline = true
9trim_trailing_whitespace = true
9trim_trailing_whitespace = true
10
10
11+[*.{zip,docx}]
12+charset =
13+end_of_line =
14+indent_style =
15+indent_size =
16+insert_final_newline =
17+trim_trailing_whitespace =
18+
11[*.{markdown,md}]
19[*.{markdown,md}]
12trim_trailing_whitespace = false
20trim_trailing_whitespace = false
13
21
.github/ISSUE_TEMPLATEdeleted−11
@@ -1,11 +0,0 @@
1−Asking a question?
2−Please use the pandoc-discuss mailing list instead:
3−https://groups.google.com/forum/#!forum/pandoc-discuss
4−This tracker is for bug reports and enhancement requests.
5−
6−Reporting a bug?
7−Please include your pandoc version and an example that allows us
8−to reproduce the problem (complete input, exact command line
9−used, expected and actual output). The smaller the example, the
10−better.
11−
.github/ISSUE_TEMPLATE/bug_report.mdnew file+25
@@ -0,0 +1,25 @@
1+---
2+name: Bug report
3+about: Create a report to help us improve
4+title: ''
5+labels: 'bug'
6+assignees: ''
7+
8+---
9+
10+<!--
11+Thank you for reporting an issue! Before you continue, please make sure that you have
12+
13+- searched the issue tracker for similar issues (including closed issues): https://github.com/jgm/pandoc/issues
14+- searched the pandoc-discuss mailing list for solutions: https://groups.google.com/forum/#!forum/pandoc-discuss
15+- reproduced your issue on the latest release of pandoc, or on https://pandoc.org/try
16+
17+Note that this bug tracker is for reporting bugs, not asking questions. For questions, use the pandoc-discuss mailing list.
18+-->
19+
20+**Explain the problem.**
21+Include the exact command line you used and all inputs necessary to reproduce the issue. Please create as minimal an example as possible, to help the maintainers isolate the problem. Explain the output you received and how it differs from what you expected.
22+
23+**Pandoc version?**
24+What version of pandoc are you using, on what OS?
25+
.github/ISSUE_TEMPLATE/config.ymlnew file+9
@@ -0,0 +1,9 @@
1+blank_issues_enabled: false
2+contact_links:
3+ - name: Ask a question
4+ url: https://groups.google.com/forum/#!forum/pandoc-discuss
5+ about: "Discussion forum for pandoc (may be used as an email list)"
6+ - name: Contributing Guidelines
7+ url: https://pandoc.org/CONTRIBUTING.html
8+ about: "Guidelines for submitting bug reports and code improvements"
9+
.github/ISSUE_TEMPLATE/feature_request.mdnew file+21
@@ -0,0 +1,21 @@
1+---
2+name: Feature request
3+about: Suggest an idea for this project
4+title: ''
5+labels: 'enhancement'
6+assignees: ''
7+
8+---
9+
10+<!--
11+Thank you for suggesting a feature! Before you continue, please make sure that you have
12+
13+- read the contributing guidelines: https://pandoc.org/CONTRIBUTING.html
14+- searched the issue tracker for similar issues (including closed issues): https://github.com/jgm/pandoc/issues
15+- searched the pandoc-discuss mailing list for relevant discussions: https://groups.google.com/forum/#!forum/pandoc-discuss
16+-->
17+
18+**Describe your proposed improvement and the problem it solves.**
19+
20+**Describe alternatives you've considered.**
21+
.github/workflows/ci.yml+102−22
@@ -45,23 +45,50 @@ jobs:
45 versions:
45 versions:
46 - ghc: '8.0.2'
46 - ghc: '8.0.2'
47 cabal: '2.4'
47 cabal: '2.4'
48+ prefix: 'v2-'
49+ cabalopts: ''
50+ testopts: ''
48 - ghc: '8.2.2'
51 - ghc: '8.2.2'
49 cabal: '2.4'
52 cabal: '2.4'
53+ prefix: 'v2-'
54+ cabalopts: ''
55+ testopts: ''
50 - ghc: '8.4.4'
56 - ghc: '8.4.4'
51 cabal: '2.4'
57 cabal: '2.4'
58+ prefix: 'v2-'
59+ cabalopts: '-f-embed_data_files'
60+ testopts: ''
52 - ghc: '8.6.5'
61 - ghc: '8.6.5'
53 cabal: '3.2'
62 cabal: '3.2'
63+ prefix: ''
64+ cabalopts: ''
65+ testopts: '--test-option=--hide-successes'
54− - ghc: '8.8.3'
66+ - ghc: '8.8.4'
55 cabal: '3.2'
67 cabal: '3.2'
68+ prefix: ''
69+ cabalopts: ''
70+ testopts: '--test-option=--hide-successes'
56− - ghc: '8.10.1'
71+ - ghc: '8.10.4'
57 cabal: '3.2'
72 cabal: '3.2'
73+ prefix: ''
74+ cabalopts: '-ftrypandoc'
75+ testopts: '--test-option=--hide-successes'
76+ - ghc: '9.0.1'
77+ cabal: '3.4'
78+ prefix: ''
79+ cabalopts: ''
80+ testopts: '--test-option=--hide-successes'
58 steps:
81 steps:
59− - uses: actions/checkout@v1
82+ - uses: actions/checkout@v2
83+
84+ # needed by memory
85+ - name: Install numa
86+ run: sudo apt-get install libnuma-dev
60
87
61 # need to install older cabal/ghc versions from ppa repository
88 # need to install older cabal/ghc versions from ppa repository
62
89
63 - name: Install recent cabal/ghc
90 - name: Install recent cabal/ghc
64− uses: actions/setup-haskell@v1.1
91+ uses: haskell/actions/setup@v1
65 with:
92 with:
66 ghc-version: ${{ matrix.versions.ghc }}
93 ghc-version: ${{ matrix.versions.ghc }}
67 cabal-version: ${{ matrix.versions.cabal }}
94 cabal-version: ${{ matrix.versions.cabal }}
@@ -88,25 +115,28 @@ jobs:
88
115
89 - name: Install dependencies
116 - name: Install dependencies
90 run: |
117 run: |
91− cabal v2-update
118+ cabal ${{ matrix.versions.prefix }}update
92− cabal v2-build --dependencies-only --enable-tests --disable-optimization
119+ cabal ${{ matrix.versions.prefix }}build ${{ matrix.versions.cabalopts }} --dependencies-only --enable-tests --disable-optimization
120+
93 - name: Build and test
121 - name: Build and test
94 run: |
122 run: |
95− cabal v2-build --enable-tests --disable-optimization 2>&1 | tee build.log
123+ cabal ${{ matrix.versions.prefix }}build ${{ matrix.versions.cabalopts }} --enable-tests --disable-optimization 2>&1 | tee build.log
96 # fail if warnings in local build
124 # fail if warnings in local build
97 ! grep -q ": *[Ww]arning:" build.log || exit 1
125 ! grep -q ": *[Ww]arning:" build.log || exit 1
98− cabal v2-test --disable-optimization
126+ cabal ${{ matrix.versions.prefix }}test ${{ matrix.versions.cabalopts }} --disable-optimization ${{ matrix.versions.testopts }}
99
127
100 windows:
128 windows:
101
129
102 runs-on: windows-2019
130 runs-on: windows-2019
103
131
104 steps:
132 steps:
105− - uses: actions/checkout@v1
133+ - uses: actions/checkout@v2
106− - name: Install stack
134+
107− shell: cmd
135+ # We should have ghc 8.10, cabal, stack pre-installed
108− run: |
136+ # - uses: haskell/actions/setup@v1
109− choco install haskell-stack
137+ # with:
138+ # enable-stack: true
139+ # stack-version: 'latest'
110
140
111 # declare/restore cached things
141 # declare/restore cached things
112 # caching doesn't work for scheduled runs yet
142 # caching doesn't work for scheduled runs yet
@@ -131,6 +161,7 @@ jobs:
131 - name: Install dependencies
161 - name: Install dependencies
132 run: |
162 run: |
133 stack update
163 stack update
164+ stack install happy
134 stack test --dependencies-only --fast
165 stack test --dependencies-only --fast
135 - name: Build and test
166 - name: Build and test
136 shell: cmd
167 shell: cmd
@@ -144,20 +175,14 @@ jobs:
144 fail-fast: true
175 fail-fast: true
145 matrix:
176 matrix:
146 versions:
177 versions:
147− - ghc: '8.10.1'
178+ - ghc: '8.8.4'
148 cabal: '3.2'
179 cabal: '3.2'
149
180
150 steps:
181 steps:
151− - uses: actions/checkout@v1
182+ - uses: actions/checkout@v2
152
183
153 - name: Install recent cabal/ghc
184 - name: Install recent cabal/ghc
154− uses: actions/setup-haskell@v1.1
155− with:
156− ghc-version: '8.10.1'
157− cabal-version: '3.2'
158−
159− - name: Install recent cabal/ghc
160− uses: actions/setup-haskell@v1.1
185+ uses: haskell/actions/setup@v1
161 with:
186 with:
162 ghc-version: ${{ matrix.versions.ghc }}
187 ghc-version: ${{ matrix.versions.ghc }}
163 cabal-version: ${{ matrix.versions.cabal }}
188 cabal-version: ${{ matrix.versions.cabal }}
@@ -193,3 +218,58 @@ jobs:
193 ! grep -q ": *[Ww]arning:" build.log || exit 1
218 ! grep -q ": *[Ww]arning:" build.log || exit 1
194 cabal v2-test --disable-optimization
219 cabal v2-test --disable-optimization
195
220
221+ benchmark:
222+
223+ runs-on: ubuntu-18.04
224+ strategy:
225+ fail-fast: true
226+ matrix:
227+ versions:
228+ - ghc: '8.8.4'
229+ cabal: '3.2'
230+ - ghc: '8.10.2'
231+ cabal: '3.2'
232+ steps:
233+ - uses: actions/checkout@v2
234+
235+ # need to install older cabal/ghc versions from ppa repository
236+
237+ - name: Install recent cabal/ghc
238+ uses: haskell/actions/setup@v1
239+ with:
240+ ghc-version: ${{ matrix.versions.ghc }}
241+ cabal-version: ${{ matrix.versions.cabal }}
242+
243+ # declare/restore cached things
244+ # caching doesn't work for scheduled runs yet
245+ # https://github.com/actions/cache/issues/63
246+
247+ - name: Cache cabal global package db
248+ id: cabal-global
249+ uses: actions/cache@v2
250+ with:
251+ path: |
252+ ~/.cabal
253+ key: benchmark-${{ runner.os }}-${{ matrix.versions.ghc }}-${{ matrix.versions.cabal }}-cabal-global-${{ hashFiles('cabal.project') }}
254+
255+ - name: Cache cabal work
256+ id: cabal-local
257+ uses: actions/cache@v2
258+ with:
259+ path: |
260+ dist-newstyle
261+ key: benchmark-${{ runner.os }}-${{ matrix.versions.ghc }}-${{ matrix.versions.cabal }}-cabal-local
262+
263+ - name: Install dependencies
264+ run: |
265+ v2=$([ "${{ matrix.versions.cabal }}" = "2.2" ] && printf 'new' || printf 'v2')
266+ cabal $v2-update
267+ cabal $v2-build --dependencies-only --enable-optimization=1 --enable-benchmarks --disable-tests
268+
269+ - name: Build and test
270+ run: |
271+ v2=$([ "${{ matrix.versions.cabal }}" = "2.2" ] && printf 'new' || printf 'v2')
272+ cabal $v2-build --enable-optimization=1 --enable-benchmarks --disable-tests 2>&1 | tee build.log
273+ # fail if warnings in local build
274+ ! grep -q ": *[Ww]arning:" build.log || exit 1
275+ cabal $v2-bench --enable-optimization=1 --benchmark-options='--timeout=6 +RTS -T -RTS'
.github/workflows/format-validation.ymlnew file+88
@@ -0,0 +1,88 @@
1+name: Format validation
2+
3+on:
4+ push:
5+ branches:
6+ - '*'
7+ - '!rc/*'
8+ paths:
9+ - 'test/writer.jats_articleauthoring'
10+ - 'test/writer.jats_publishing'
11+ - 'test/writer.jats_archiving'
12+ - 'test/tables.jats_archiving'
13+ - 'test/tables/nordics.jats_archiving'
14+ - 'test/tables/planets.jats_archiving'
15+ - 'test/tables/students.jats_archiving'
16+ pull_request:
17+ branches:
18+ - '*'
19+ - '!rc/*'
20+ paths:
21+ - 'test/writer.jats_articleauthoring'
22+ - 'test/writer.jats_publishing'
23+ - 'test/writer.jats_archiving'
24+ - 'test/tables.jats_archiving'
25+ - 'test/tables/nordics.jats_archiving'
26+ - 'test/tables/planets.jats_archiving'
27+ - 'test/tables/students.jats_archiving'
28+
29+jobs:
30+ jats:
31+ name: JATS
32+ runs-on: ubuntu-latest
33+ env:
34+ VALIDATOR_URL: "https://jats-validator.hubmed.org/dtd/"
35+ strategy:
36+ fail-fast: false
37+ matrix:
38+ tagset:
39+ - articleauthoring
40+ - publishing
41+ - archiving
42+ steps:
43+ - name: Checkout
44+ uses: actions/checkout@v2
45+
46+ - name: Validate writer output
47+ run: |
48+ filename=test/writer.jats_${{ matrix.tagset }}
49+ printf "Validating file %s\n" "$filename"
50+ json="$(curl --form "xml=@${filename}" --silent "$VALIDATOR_URL")"
51+ err_count="$(printf '%s' "$json" | jq '.errors | length')"
52+ if [ "$err_count" -eq 0 ]; then
53+ printf "File was validated successfully.\n"
54+ exit 0
55+ else
56+ printf "Validator report:\n%s" "$json"
57+ exit 1
58+ fi
59+
60+ - name: Validate tables
61+ # Archiving has the simplest template, so we only check with that.
62+ if: matrix.tagset == 'archiving'
63+ run: |
64+ tmpl="$(cat <<EOF
65+ <?xml version="1.0" encoding="utf-8" ?>
66+ <!DOCTYPE article PUBLIC "-//NLM//DTD JATS (Z39.96) Journal Archiving and Interchange DTD v1.2 20190208//EN"
67+ "JATS-archivearticle1.dtd">
68+ <article xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:xlink="http://www.w3.org/1999/xlink" dtd-version="1.2" article-type="other">
69+ <front><article-meta></article-meta></front>
70+ <body>%s</body></article>
71+ EOF
72+ )"
73+ jats_file="$(mktemp jats-tables.XXXXX)"
74+ exit_code=0
75+ for f in tables tables/nordics tables/planets tables/students; do
76+ filename=test/$f.jats_archiving
77+ printf "Validating %s...\n" "$filename"
78+ printf "$tmpl" "$(cat $filename)" > "$jats_file"
79+ json="$(curl --form "xml=@${jats_file}" --silent "$VALIDATOR_URL")"
80+ err_count="$(printf "%s" "$json" | jq '.errors | length')"
81+ if [ "$err_count" -eq 0 ]; then
82+ printf "Table output is valid when used as body content.\n"
83+ else
84+ printf "Validator report:\n%s" "$json"
85+ exit_code=1
86+ fi
87+ done
88+ exit "$exit_code"
.github/workflows/lint.ymlnew file+33
@@ -0,0 +1,33 @@
1+name: Lint
2+
3+# Trigger the workflow on push or pull request, but only for the
4+# master branch
5+on:
6+ pull_request:
7+ branch: [master]
8+ push:
9+ branch: [master]
10+ paths-ignore:
11+ - LICENSE
12+ - README.md
13+ - CHANGELOG.md
14+ - stack.yaml
15+ - .travis.yml
16+
17+jobs:
18+ lint:
19+ name: Lint
20+ runs-on: ubuntu-latest
21+ env:
22+ hlint_script: https://raw.github.com/ndmitchell/hlint/master/misc/run.sh
23+
24+ steps:
25+ - name: Checkout
26+ uses: actions/checkout@v2
27+
28+ - name: Check cabal file for missing test files
29+ run: make check-cabal
30+
31+ - name: Download and run hlint
32+ run: |
33+ curl -sSL "${hlint_script}" | sh -s .
.github/workflows/nightly.yml+18−26
@@ -2,35 +2,36 @@ name: Nightly
2
2
3on:
3on:
4 schedule:
4 schedule:
5− - cron: '53 6 * * *'
5+ - cron: '53 7 * * *'
6
6
7jobs:
7jobs:
8 linux:
8 linux:
9
9
10 runs-on: ubuntu-18.04
10 runs-on: ubuntu-18.04
11 steps:
11 steps:
12− - uses: actions/checkout@v1
12+ - uses: actions/checkout@v2
13+
14+ - name: Install recent cabal/ghc
15+ uses: haskell/actions/setup@v1
16+ with:
17+ ghc-version: '8.10.3'
18+ cabal-version: '3.2'
19+
13 - name: Install dependencies
20 - name: Install dependencies
14 run: |
21 run: |
15− export PATH=/opt/cabal/3.2/bin:/opt/ghc/8.8.3/bin:$PATH
16− ls /opt/cabal/*/bin
17− ls /opt/ghc/*/bin
18 ghc --version
22 ghc --version
19 cabal --version
23 cabal --version
20 cabal v2-update
24 cabal v2-update
21− cabal v2-build --dependencies-only . pandoc-citeproc
25+ cabal v2-build --dependencies-only
22 - name: Build
26 - name: Build
23 run: |
27 run: |
24− export PATH=/opt/cabal/3.2/bin:/opt/ghc/8.8.3/bin:$PATH
25− cabal v2-install . pandoc-citeproc
28+ cabal v2-install
26 strip $HOME/.cabal/bin/pandoc
29 strip $HOME/.cabal/bin/pandoc
27− strip $HOME/.cabal/bin/pandoc-citeproc
28 - name: Install artifact
30 - name: Install artifact
29 run: |
31 run: |
30 export ARTIFACTS=nightly-linux/pandoc-nightly-linux-$(date +%Y-%m-%d)
32 export ARTIFACTS=nightly-linux/pandoc-nightly-linux-$(date +%Y-%m-%d)
31 mkdir -p ${ARTIFACTS}
33 mkdir -p ${ARTIFACTS}
32 cp $HOME/.cabal/bin/pandoc ${ARTIFACTS}/
34 cp $HOME/.cabal/bin/pandoc ${ARTIFACTS}/
33− cp $HOME/.cabal/bin/pandoc-citeproc ${ARTIFACTS}/
34 cp COPYRIGHT ${ARTIFACTS}/
35 cp COPYRIGHT ${ARTIFACTS}/
35 echo "Built from ${GITHUB_SHA}" > ${ARTIFACTS}/README.nightly.txt
36 echo "Built from ${GITHUB_SHA}" > ${ARTIFACTS}/README.nightly.txt
36 - uses: actions/upload-artifact@master
37 - uses: actions/upload-artifact@master
@@ -43,22 +44,18 @@ jobs:
43 runs-on: windows-2019
44 runs-on: windows-2019
44
45
45 steps:
46 steps:
46− - uses: actions/checkout@v1
47+ - uses: actions/checkout@v2
47− - name: Install stack
48− shell: cmd
49− run: |
50− choco install haskell-stack
51 - name: Install dependencies
48 - name: Install dependencies
52 run: |
49 run: |
53 stack update
50 stack update
54− stack build --dependencies-only pandoc pandoc-citeproc
51+ stack build --dependencies-only pandoc
55 - name: Build artifacts
52 - name: Build artifacts
56 shell: cmd
53 shell: cmd
57 run: |
54 run: |
58 for /f %%a in ('powershell -Command "Get-Date -format yyyy-MM-dd"') do set THEDATE=%%a
55 for /f %%a in ('powershell -Command "Get-Date -format yyyy-MM-dd"') do set THEDATE=%%a
59 set ARTIFACTS=%CD%\nightly-windows\pandoc-nightly-windows-%THEDATE%
56 set ARTIFACTS=%CD%\nightly-windows\pandoc-nightly-windows-%THEDATE%
60 mkdir %ARTIFACTS%
57 mkdir %ARTIFACTS%
61− stack build pandoc pandoc-citeproc
58+ stack build pandoc
62 forfiles /P .\.stack-work\install /M pandoc*.exe /S /C "cmd /C copy @path %%ARTIFACTS%%"
59 forfiles /P .\.stack-work\install /M pandoc*.exe /S /C "cmd /C copy @path %%ARTIFACTS%%"
63 copy COPYRIGHT %ARTIFACTS%
60 copy COPYRIGHT %ARTIFACTS%
64 ren %ARTIFACTS%\COPYRIGHT COPYRIGHT.txt
61 ren %ARTIFACTS%\COPYRIGHT COPYRIGHT.txt
@@ -73,23 +70,18 @@ jobs:
73 runs-on: macOS-10.15
70 runs-on: macOS-10.15
74
71
75 steps:
72 steps:
76− - uses: actions/checkout@v1
73+ - uses: actions/checkout@v2
77− - name: Install stack
78− run: |
79− curl -L https://get.haskellstack.org/stable/osx-x86_64.tar.gz -o stack.tar.gz
80− tar xzvf stack.tar.gz --strip-components=1 'stack*/stack'
81 - name: Install dependencies
74 - name: Install dependencies
82 run: |
75 run: |
83− ./stack update
76+ stack update
84− ./stack build --dependencies-only pandoc pandoc-citeproc
77+ stack build --dependencies-only pandoc
85 - name: Build artifacts
78 - name: Build artifacts
86 run: |
79 run: |
87 export ARTIFACTS=nightly-macos/pandoc-nightly-macos-$(date +%Y-%m-%d)
80 export ARTIFACTS=nightly-macos/pandoc-nightly-macos-$(date +%Y-%m-%d)
88 mkdir -p ${ARTIFACTS}
81 mkdir -p ${ARTIFACTS}
89− ./stack build pandoc pandoc-citeproc
82+ stack build pandoc
90 for f in $(find .stack-work/install -name 'pandoc*' -perm +001 -type f); do cp $f ${ARTIFACTS}/; done
83 for f in $(find .stack-work/install -name 'pandoc*' -perm +001 -type f); do cp $f ${ARTIFACTS}/; done
91 mv ${ARTIFACTS}/pandoc ${ARTIFACTS}/pandoc
84 mv ${ARTIFACTS}/pandoc ${ARTIFACTS}/pandoc
92− mv ${ARTIFACTS}/pandoc-citeproc ${ARTIFACTS}/pandoc-citeproc
93 cp COPYRIGHT ${ARTIFACTS}/
85 cp COPYRIGHT ${ARTIFACTS}/
94 echo "Built from ${GITHUB_SHA}" > ${ARTIFACTS}/README.nightly.txt
86 echo "Built from ${GITHUB_SHA}" > ${ARTIFACTS}/README.nightly.txt
95 - uses: actions/upload-artifact@master
87 - uses: actions/upload-artifact@master
.github/workflows/release-candidate.yml+3−61
@@ -31,29 +31,18 @@ jobs:
31 versions:
31 versions:
32 - osarch: "windows-x86_64"
32 - osarch: "windows-x86_64"
33 arch: "x64"
33 arch: "x64"
34− choco_opts: ""
35 stack_opts: "-j1"
34 stack_opts: "-j1"
36− # - osarch: "windows-i386"
37− # arch: "x86"
38− # choco_opts: "--x86 --version 2.1.3.20190715"
39− # stack_opts: "-j1 --flag hslua:lua_32bits"
40− # # we use stack 2.1.3 because 2.3.1 doesn't support i386
41−
42 steps:
35 steps:
43 - uses: actions/checkout@v1
36 - uses: actions/checkout@v1
44− - name: Install stack
45− shell: cmd
46− run: |
47− choco install haskell-stack ${{ matrix.versions.choco_opts }}
48 - name: Install dependencies
37 - name: Install dependencies
49 run: |
38 run: |
50 stack update
39 stack update
51− stack build ${{ matrix.versions.stack_opts }} --dependencies-only pandoc pandoc-citeproc
40+ stack build ${{ matrix.versions.stack_opts }} --dependencies-only pandoc
52 - name: Create windows package
41 - name: Create windows package
53 shell: cmd
42 shell: cmd
54 run: |
43 run: |
55 for /f %%a in ('powershell -Command "Get-Date -format yyyy-MM-dd"') do set THEDATE=%%a
44 for /f %%a in ('powershell -Command "Get-Date -format yyyy-MM-dd"') do set THEDATE=%%a
56− stack build ${{ matrix.versions.stack_opts }} pandoc pandoc-citeproc
45+ stack build ${{ matrix.versions.stack_opts }} pandoc
57 for /f "tokens=1-2 delims= " %%a in ('stack exec pandoc -- --version') do (
46 for /f "tokens=1-2 delims= " %%a in ('stack exec pandoc -- --version') do (
58 @set VERSION=%%b
47 @set VERSION=%%b
59 goto :next
48 goto :next
@@ -67,7 +56,7 @@ jobs:
67 @set WINDOWS=%CD%\windows
56 @set WINDOWS=%CD%\windows
68 @set RELEASE=%WINDOWS%\pandoc-%VERSION%
57 @set RELEASE=%WINDOWS%\pandoc-%VERSION%
69 mkdir %RELEASE%
58 mkdir %RELEASE%
70− forfiles /P .\.stack-work\install /M pandoc*.exe /S /C "cmd /C echo @path && echo %%WINDOWS%% && copy @path %%RELEASE%%"
59+ forfiles /P .\.stack-work\install /M pandoc.exe /S /C "cmd /C echo @path && echo %%WINDOWS%% && copy @path %%RELEASE%%"
71 stack exec pandoc -- -s --toc MANUAL.txt -o %RELEASE%\MANUAL.html
60 stack exec pandoc -- -s --toc MANUAL.txt -o %RELEASE%\MANUAL.html
72 stack exec pandoc -- -s COPYING.md -t rtf -o %RELEASE%\COPYING.rtf
61 stack exec pandoc -- -s COPYING.md -t rtf -o %RELEASE%\COPYING.rtf
73 copy %RELEASE%\COPYING.rtf %WINDOWS%
62 copy %RELEASE%\COPYING.rtf %WINDOWS%
@@ -92,50 +81,3 @@ jobs:
92 with:
81 with:
93 name: windows-release-candidate
82 name: windows-release-candidate
94 path: windows-release-candidate
83 path: windows-release-candidate
95−
96−# We now build for macos on travis-ci.com
97−# macos:
98−
99−# runs-on: macOS-10.15
100−
101−# steps:
102−# - uses: actions/checkout@v1
103−# - name: Install stack
104−# run: |
105−# curl -L https://get.haskellstack.org/stable/osx-x86_64.tar.gz -o stack.tar.gz
106−# tar xzvf stack.tar.gz --strip-components=1 'stack*/stack'
107−# - name: Install dependencies
108−# run: |
109−# ./stack update
110−# ./stack build --dependencies-only pandoc pandoc-citeproc
111−# - name: Create macOS package
112−# run: |
113−# export VERSION=$(grep '^[Vv]ersion:' pandoc.cabal | awk '{print $$2;}')
114−# export BASEDIR=$(pwd)
115−# export ARTIFACTS=${BASEDIR}/macos-release-candidate
116−# export RESOURCES=${ARTIFACTS}/Resources
117−# export ROOT=${ARTIFACTS}/pandoc
118−# export DEST=${ROOT}/usr/local
119−# export ME=$(whoami)
120−# export BASE=pandoc-$VERSION
121−# mkdir -p ${ARTIFACTS}
122−# mkdir -p ${RESOURCES}
123−# mkdir -p ${DEST}/bin
124−# mkdir -p ${DEST}/share/man/man1
125−# ./stack build pandoc pandoc-citeproc
126−# for f in $(find .stack-work/install -name 'pandoc*' -perm +001 -type f); do cp $f ${DEST}/bin/; done
127−# strip ${DEST}/bin/pandoc
128−# strip ${DEST}/bin/pandoc-citeproc
129−# cp man/pandoc.1 ${DEST}/share/man/man1/pandoc.1
130−# ${DEST}/bin/pandoc-citeproc --man > \
131−# $DEST/share/man/man1/pandoc-citeproc.1
132−# ${DEST}/bin/pandoc -t html5 -s COPYING.md -Vpagetitle=License \
133−# -o ${RESOURCES}/license.html
134−# chown -R $ME:staff ${ROOT}
135−# sed -e "s/PANDOCVERSION/${VERSION}/" macos/distribution.xml.in > ${ARTIFACTS}/distribution.xml
136−# cp macos/Makefile ${ARTIFACTS}/
137−# echo ${VERSION} > ${ARTIFACTS}/version.txt
138−# - uses: actions/upload-artifact@v2
139−# with:
140−# name: macos-release-candidate
141−# path: macos-release-candidate
.gitignore+7
@@ -1,4 +1,6 @@
1*~
1*~
2+.DS_Store
3+*.orig
2deb/.vagrant
4deb/.vagrant
3dist/*
5dist/*
4MANUAL.*
6MANUAL.*
@@ -14,6 +16,10 @@ man/man?/*.html
14*.o
16*.o
15*.hi
17*.hi
16*.pyc
18*.pyc
19+.hie/
20+.policeman-evidence/
21+.projectile/
22+.vscode/
17/COPYING.rtf
23/COPYING.rtf
18/COPYRIGHT.txt
24/COPYRIGHT.txt
19/cabal-dev/
25/cabal-dev/
@@ -26,3 +32,4 @@ data/reference.odt
26/stack.yaml.lock
32/stack.yaml.lock
27cabal.project.local
33cabal.project.local
28/dist-newstyle/
34/dist-newstyle/
35+pandoc-2*/
.hlint.yaml+80−53
@@ -2,84 +2,111 @@
2# https://github.com/ndmitchell/hlint
2# https://github.com/ndmitchell/hlint
3##########################
3##########################
4
4
5−# This file contains a template configuration file, which is typically
6−# placed as .hlint.yaml in the root of your project
7−
8−
9# Specify additional command line arguments
5# Specify additional command line arguments
10#
6#
11−- arguments: [--color, --cpp-ansi]
7+- arguments: [--color=auto, --cpp-ansi]
12−
13−
14−# Control which extensions/flags/modules/functions can be used
15−#
16−# - extensions:
17−# - default: false # all extension are banned by default
18−# - name: [PatternGuards, ViewPatterns] # only these listed extensions can be used
19−# - {name: CPP, within: CrossPlatform} # CPP can only be used in a given module
20−#
21−# - flags:
22−# - {name: -w, within: []} # -w is allowed nowhere
23−#
24−# - modules:
25−# - {name: [Data.Set, Data.HashSet], as: Set} # if you import Data.Set qualified, it must be as 'Set'
26−# - {name: Control.Arrow, within: []} # Certain modules are banned entirely
27−#
28−# - functions:
29−# - {name: unsafePerformIO, within: []} # unsafePerformIO can only appear in no modules
30−
31−
32−# Add custom hints for this project
33−#
34−# Will suggest replacing "wibbleMany [myvar]" with "wibbleOne myvar"
35−# - error: {lhs: "wibbleMany [x]", rhs: wibbleOne x}
36−
37−
38−# Turn on hints that are off by default
39−#
40−# Ban "module X(module X) where", to require a real export list
41−# - warn: {name: Use explicit module export list}
42−#
43−# Replace a $ b $ c with a . b $ c
44−# - group: {name: dollar, enabled: true}
45−#
46−# Generalise map to fmap, ++ to <>
47−# - group: {name: generalise, enabled: true}
48−
49
8
50# Ignore some builtin hints
9# Ignore some builtin hints
51−# - ignore: {name: Use let}
10+#
52−# - ignore: {name: Use const, within: SpecialModule} # Only within certain modules
53−# - ignore: {name: "Use section"}
54−# - ignore: {name: "Use camelCase"}
55−# - ignore: {name: "Use list comprehension"}
56−# - ignore: {name: "Redundant if"}
57- ignore: {name: "Avoid lambda"}
11- ignore: {name: "Avoid lambda"}
12+- ignore: {name: "Use bimap"}
58- ignore: {name: "Eta reduce"}
13- ignore: {name: "Eta reduce"}
59- ignore: {name: "Evaluate"}
14- ignore: {name: "Evaluate"}
60−- ignore: {name: "Monad law, left identity", module: "Text.Pandoc.App.OutputSettings"}
15+- ignore: {name: "Reduce duplication"} # TODO: could be more fine-grained
61−- ignore: {name: "Reduce duplication", module: "Text.Pandoc.Readers.Markdown"}
62- ignore: {name: "Use &&&"}
16- ignore: {name: "Use &&&"}
63- ignore: {name: "Use String"}
17- ignore: {name: "Use String"}
18+- ignore: {name: "Use camelCase"}
64- ignore: {name: "Use fmap"} # specific for GHC 7.8 compat
19- ignore: {name: "Use fmap"} # specific for GHC 7.8 compat
65−- ignore: {name: "Use forM_", module: "Text.Pandoc.Readers.DocBook"}
66- ignore: {name: "Use isDigit"}
20- ignore: {name: "Use isDigit"}
67−- ignore: {name: "Use tuple-section", module: "Text.Pandoc.Readers.EPUB"}
21+
22+- ignore:
23+ name: "Monad law, left identity"
24+ within: Text.Pandoc.App.OutputSettings
25+
26+- ignore:
27+ name: "Move brackets to avoid $"
28+ within: Text.Pandoc.Writers.CslJson
29+
30+- ignore:
31+ name: "Redundant <$>"
32+ within:
68−- ignore: {name: "Use uncurry", module: "Text.Pandoc.Readers.Docx.Combine"}
33+ - Text.Pandoc.Readers.Docx.Parse
34+ - Text.Pandoc.Writers.MediaWiki
35+ - Text.Pandoc.Writers.OpenDocument
36+ - Text.Pandoc.Writers.Powerpoint.Output
37+ - Text.Pandoc.Writers.Powerpoint.Presentation
38+
39+- ignore:
40+ name: "Redundant return"
41+ within: Text.Pandoc.Citeproc.BibTeX
42+
43+# With recent hlint this rule has given false positives on TH
44+- ignore:
45+ name: "Redundant bracket"
46+
47+
69- ignore:
48- ignore:
70 name: "Use <$>"
49 name: "Use <$>"
71 within:
50 within:
72 - Text.Pandoc.Readers.LaTeX
51 - Text.Pandoc.Readers.LaTeX
73 - Text.Pandoc.Readers.Markdown
52 - Text.Pandoc.Readers.Markdown
53+
74- ignore:
54- ignore:
75 name: "Use camelCase"
55 name: "Use camelCase"
76 within:
56 within:
77 - Tests.Writers.Docbook
57 - Tests.Writers.Docbook
78 - Tests.Writers.Native
58 - Tests.Writers.Native
59+ - Text.Pandoc.Citeproc
79 - Text.Pandoc.Extensions
60 - Text.Pandoc.Extensions
80 - Text.Pandoc.Lua.Marshaling.Version
61 - Text.Pandoc.Lua.Marshaling.Version
62+ - Text.Pandoc.Lua.Module.Pandoc
63+ - Text.Pandoc.Lua.Module.Utils
81 - Text.Pandoc.Readers.Odt.ContentReader
64 - Text.Pandoc.Readers.Odt.ContentReader
82 - Text.Pandoc.Readers.Odt.Namespaces
65 - Text.Pandoc.Readers.Odt.Namespaces
83
66
67+- ignore:
68+ name: "Use forM_"
69+ within:
70+ - Text.Pandoc.Readers.DocBook
71+
72+- ignore:
73+ name: "Use Just"
74+ within:
75+ - Text.Pandoc.Citeproc.MetaValue
76+ - Text.Pandoc.Readers.Odt.ContentReader
77+ - Text.Pandoc.Writers.Roff
78+
79+- ignore:
80+ name: "Use list comprehension"
81+ within: Text.Pandoc.Citeproc.BibTeX
82+
83+- ignore:
84+ name: "Use list literal pattern"
85+ within: Text.Pandoc.Citeproc.MetaValue
86+
87+# TODO: check
88+- ignore:
89+ name: "Use second"
90+ within:
91+ - Text.Pandoc.Citeproc.BibTeX
92+ - Text.Pandoc.Citeproc.Locator
93+
94+# TODO: check
95+- ignore:
96+ name: "Use sortOn"
97+ within: Text.Pandoc.Writers.OpenDocument
98+
99+- ignore:
100+ name: "Use tuple-section"
101+ within:
102+ - Text.Pandoc.Readers.EPUB
103+ - Text.Pandoc.ImageSize
104+ - Text.Pandoc.Readers.Markdown
105+ - Text.Pandoc.Readers.RST
106+
107+# fromRight is only in base >= 4.10
108+- ignore:
109+ name: "Use fromRight"
110+
84# Define some custom infix operators
111# Define some custom infix operators
85# - fixity: infixr 3 ~^#^~
112# - fixity: infixr 3 ~^#^~
.travis.ymldeleted−57
@@ -1,57 +0,0 @@
1−os: osx
2−language: generic
3−cache:
4− timeout: 1000
5− directories:
6− - "$HOME/.stack/"
7− - ".stack-work/"
8−branches:
9− only:
10− - /rc\/.*/
11−install:
12−- set -e
13−- ulimit -n 4096
14−- brew install haskell-stack
15−- which stack
16−- stack --version
17−- stack setup
18−- stack exec -- ghc --version
19−- |
20− export VERSION=$(grep '^[Vv]ersion:' pandoc.cabal | awk '{print $$2;}')
21− export BASEDIR=$(pwd)
22− export ARTIFACTS=${BASEDIR}/macos-release-candidate
23− export RESOURCES=${ARTIFACTS}/Resources
24− export ROOT=${ARTIFACTS}/pandoc
25− export DEST=${ROOT}/usr/local
26− export ME=$(whoami)
27− export BASE=pandoc-$VERSION
28− mkdir -p ${ARTIFACTS}
29− mkdir -p ${RESOURCES}
30− mkdir -p ${DEST}/bin
31− mkdir -p ${DEST}/share/man/man1
32− stack build --dependencies-only pandoc pandoc-citeproc
33− stack build pandoc pandoc-citeproc
34− for f in $(find .stack-work/install -name 'pandoc*' -perm +001 -type f); do cp $f ${DEST}/bin/; done
35− strip ${DEST}/bin/pandoc
36− strip ${DEST}/bin/pandoc-citeproc
37− cp man/pandoc.1 ${DEST}/share/man/man1/pandoc.1
38− ${DEST}/bin/pandoc-citeproc --man > \
39− $DEST/share/man/man1/pandoc-citeproc.1
40− ${DEST}/bin/pandoc -t html5 -s COPYING.md -Vpagetitle=License \
41− -o ${RESOURCES}/license.html
42− chown -R $ME:staff ${ROOT}
43− sed -e "s/PANDOCVERSION/${VERSION}/" macos/distribution.xml.in > ${ARTIFACTS}/distribution.xml
44− cp macos/Makefile ${ARTIFACTS}/
45− echo ${VERSION} > ${ARTIFACTS}/version.txt
46−deploy:
47− on:
48− all_branches: true
49− provider: s3
50− bucket: travis-jgm-pandoc
51− region: us-west-1
52− edge: true
53− local_dir: macos-release-candidate
54− access_key_id:
55− secure: ohEst8EP8Z3r/bPMlYgPATo3B/ye48Z0aGp4W1pEhDZjqufLUVTFBIoicvPApCkTrbKMNTdG+KmasrO/leHpju0uFKYQHDtJmHZe3avIOIdbGnOqn97+mmLZBN5skiJWNtrxnN/TuAM+wlePz1dQpohPt6J3S70ct8DsOdZOaGI=
56− secret_access_key:
57− secure: qZ2RN4Bx4WRcVz9H8ae4S6a3AA85kcca0RdMimIREdGSx4ewMYa8lSdcKDvRbPwXRy8H3SeviqL2tTZw3+ej1jccAHowMj8Zvde5EJwX0+qO4Sr0zdWjnsvMeUmx9pO1oL3L/09KTWiMTT+d4XNpE8eqiY08qN8oMj0EPeR/AS4=
AUTHORS.md+40
@@ -1,11 +1,13 @@
1# Contributors
1# Contributors
2
2
3- Anabra
3- Anabra
4+- Aner Lucero
4- Arata Mizuki
5- Arata Mizuki
5- Arfon Smith
6- Arfon Smith
6- Aaron Wolen
7- Aaron Wolen
7- Albert Krewinkel
8- Albert Krewinkel
8- Alex Ivkin
9- Alex Ivkin
10+- Alex Toldaiev
9- Alex Vong
11- Alex Vong
10- Alexander Kondratskiy
12- Alexander Kondratskiy
11- Alexander Krotov
13- Alexander Krotov
@@ -17,6 +19,8 @@
17- Anders Waldenborg
19- Anders Waldenborg
18- Andreas Lööw
20- Andreas Lööw
19- Andrew Dunning
21- Andrew Dunning
22+- Andy Morris
23+- Anti-Distinctlyminty
20- Antoine Latter
24- Antoine Latter
21- Antonio Terceiro
25- Antonio Terceiro
22- Arata Mizuki
26- Arata Mizuki
@@ -31,6 +35,8 @@
31- Beni Cherniavsky-Paskin
35- Beni Cherniavsky-Paskin
32- Benoit Schweblin
36- Benoit Schweblin
33- Bjorn Buckwalter
37- Bjorn Buckwalter
38+- Blake Eryx
39+- Bodigrim
34- Bradley Kuhn
40- Bradley Kuhn
35- Brent Yorgey
41- Brent Yorgey
36- Brian Leung
42- Brian Leung
@@ -41,6 +47,7 @@
41- Carlos Sosa
47- Carlos Sosa
42- Cécile Chemin
48- Cécile Chemin
43- Cédric Couralet
49- Cédric Couralet
50+- Charanjit Singh
44- Chris Black
51- Chris Black
45- Christian Conkle
52- Christian Conkle
46- Christian Despres
53- Christian Despres
@@ -58,17 +65,23 @@
58- Daniele D'Orazio
65- Daniele D'Orazio
59- David A Roberts
66- David A Roberts
60- David Lazar
67- David Lazar
68+- David Martschenko
61- David Röthlisberger
69- David Röthlisberger
62- Denis Laxalde
70- Denis Laxalde
63- Denis Maier
71- Denis Maier
64- Derek Chen-Becker
72- Derek Chen-Becker
73+- Diego Balseiro
74+- Dimitri Sabadie
65- Dmitry Pogodin
75- Dmitry Pogodin
76+- Dmitry Volodin
66- Douglas Calvert
77- Douglas Calvert
67- Eigil Rischel
78- Eigil Rischel
68- Emanuel Evans
79- Emanuel Evans
69- Emerson Harkin
80- Emerson Harkin
81+- Emily Bourke
70- Emily Eisenberg
82- Emily Eisenberg
71- Eric Kow
83- Eric Kow
84+- Erik Rask
72- Eric Seidel
85- Eric Seidel
73- Eric Schrijver
86- Eric Schrijver
74- Ethan Riley
87- Ethan Riley
@@ -78,6 +91,7 @@
78- Florian Beeres
91- Florian Beeres
79- Florian Eitel
92- Florian Eitel
80- Florian Klink
93- Florian Klink
94+- Florian Kohrt
81- Francesco Occhipinti
95- Francesco Occhipinti
82- François Gannaz
96- François Gannaz
83- Frederik Elwert
97- Frederik Elwert
@@ -100,6 +114,7 @@
100- Hubert Plociniczak
114- Hubert Plociniczak
101- Ian Max Andolina
115- Ian Max Andolina
102- Igor Khorlo
116- Igor Khorlo
117+- Igor Pashev
103- Ilya V. Portnov
118- Ilya V. Portnov
104- Ivan Trubach
119- Ivan Trubach
105- Ivo Clarysse
120- Ivo Clarysse
@@ -113,6 +128,7 @@
113- Jamie F. Olson
128- Jamie F. Olson
114- Jan Larres
129- Jan Larres
115- Jan Schulz
130- Jan Schulz
131+- Jan Tojnar
116- Jan-Otto Kröpke
132- Jan-Otto Kröpke
117- Jason Ronallo
133- Jason Ronallo
118- Jeff Arnold
134- Jeff Arnold
@@ -120,6 +136,7 @@
120- Jens Getreu
136- Jens Getreu
121- Jens Petersen
137- Jens Petersen
122- Jeroen de Haas
138- Jeroen de Haas
139+- Jerry Sky
123- Jesse Rosenthal
140- Jesse Rosenthal
124- Joe Hermaszewski
141- Joe Hermaszewski
125- Joe Hillenbrand
142- Joe Hillenbrand
@@ -135,6 +152,7 @@
135- Josef Svenningsson
152- Josef Svenningsson
136- Joseph C. Sible
153- Joseph C. Sible
137- Julien Cretel
154- Julien Cretel
155+- Julien Dutant
138- Juliette Fourcot
156- Juliette Fourcot
139- Juliusz Gonera
157- Juliusz Gonera
140- Justin Bogner
158- Justin Bogner
@@ -150,7 +168,10 @@
150- Lars-Dominik Braun
168- Lars-Dominik Braun
151- Laurent P. René de Cotret
169- Laurent P. René de Cotret
152- Leif Metcalf
170- Leif Metcalf
171+- Leonard Rosenthol
153- Lila
172- Lila
173+- Loïc Grobol
174+- Lorenzo
154- Lucas Escot
175- Lucas Escot
155- Luke Plant
176- Luke Plant
156- Marc Schreiber
177- Marc Schreiber
@@ -173,6 +194,7 @@
173- Merijn Verstraaten
194- Merijn Verstraaten
174- Michael Beaumont
195- Michael Beaumont
175- Michael Chladek
196- Michael Chladek
197+- Michael Hoffmann
176- Michael Peyton Jones
198- Michael Peyton Jones
177- Michael Reed
199- Michael Reed
178- Michael Snoyman
200- Michael Snoyman
@@ -183,10 +205,12 @@
183- Nathan Gass
205- Nathan Gass
184- Neil Mayhew
206- Neil Mayhew
185- Nick Bart
207- Nick Bart
208+- Nick Berendsen
186- Nick Fleisher
209- Nick Fleisher
187- Nicolas Kaiser
210- Nicolas Kaiser
188- Nikolay Yakimov
211- Nikolay Yakimov
189- Nils Carlson
212- Nils Carlson
213+- Nixon Enraght-Moony
190- Nokome Bentley
214- Nokome Bentley
191- Ole Martin Ruud
215- Ole Martin Ruud
192- Oliver Matthews
216- Oliver Matthews
@@ -211,6 +235,7 @@
211- Raymond Ehlers
235- Raymond Ehlers
212- Recai Oktaş
236- Recai Oktaş
213- Roland Hieber
237- Roland Hieber
238+- Roman Beránek
214- RyanGlScott
239- RyanGlScott
215- Salim B
240- Salim B
216- Sascha Wilde
241- Sascha Wilde
@@ -221,12 +246,14 @@
221- Shahbaz Youssefi
246- Shahbaz Youssefi
222- Shaun Attfield
247- Shaun Attfield
223- Shim Myeongseob
248- Shim Myeongseob
249+- Shin Sang-jae
224- Sidarth Kapur
250- Sidarth Kapur
225- Sidharth Kapur
251- Sidharth Kapur
226- Simon Hengel
252- Simon Hengel
227- Stefan Dresselhaus
253- Stefan Dresselhaus
228- Sumit Sahrawat
254- Sumit Sahrawat
229- Tarik Graba
255- Tarik Graba
256+- Tatiana Porras
230- Thenaesh Elango
257- Thenaesh Elango
231- Thomas Hodgson
258- Thomas Hodgson
232- Thomas Weißschuh
259- Thomas Weißschuh
@@ -257,11 +284,15 @@
257- Yoan Blanc
284- Yoan Blanc
258- Yuchen Pei
285- Yuchen Pei
259- Zihang Chen
286- Zihang Chen
287+- a-vrma
260- andrebauer
288- andrebauer
289+- argent0
290+- badumont
261- blmage
291- blmage
262- bucklereed
292- bucklereed
263- bumper314
293- bumper314
264- chinapedia
294- chinapedia
295+- cholonam
265- csforste
296- csforste
266- dbecher-ito
297- dbecher-ito
267- d-dorazio
298- d-dorazio
@@ -272,8 +303,11 @@
272- kaizshang91
303- kaizshang91
273- lux-lth
304- lux-lth
274- lwolfsonkin
305- lwolfsonkin
306+- mbrackeantidot
275- nkalvi
307- nkalvi
276- niszet
308- niszet
309+- nuew
310+- obcat
277- oltolm
311- oltolm
278- oquechy
312- oquechy
279- quasicomputational
313- quasicomputational
@@ -284,7 +318,13 @@
284- rski
318- rski
285- shreevatsa.public
319- shreevatsa.public
286- takahashim
320- takahashim
321+- taotieren
322+- tecosaur
323+- TEC
287- tgkokk
324- tgkokk
325+- the-solipsist
326+- timo-a
288- thsutton
327- thsutton
289- vijayphoenix
328- vijayphoenix
290- wiefling
329- wiefling
330+- wuffi
CONTRIBUTING.md+123−24
@@ -1,6 +1,64 @@
1Contributing to pandoc
1Contributing to pandoc
2======================
2======================
3
3
4+Welcome to pandoc! Very soon after its beginnings in 2006, pandoc
5+has been influenced, improved, and modified, by users, devs, and
6+newcomers alike. The project thrives on its active community. It is
7+great to have you here.
8+
9+How can I help?
10+---------------
11+
12+There are many ways in which you can support pandoc. Here are a few
13+ideas:
14+
15+ * Participate in online discussions. The [pandoc-discuss] mailing
16+ list is a good place for this. This gives valuable input and
17+ makes it easier to improve the program.
18+
19+ * Help with questions. Every request that is answered by the wider
20+ community frees time for programming contributors. This will
21+ speed up development of new features and issue fixes. Don't
22+ underestimate your knowledge, please share it!
23+
24+ Good places to help are the [pandoc-discuss] mailing list, Q/A
25+ sites like StackOverflow, community forums (e.g.
26+ [RStudio][RStudio Community], [Zettlr][Zettlr Forum]), and, for
27+ technical questions, the GitHub [issue tracker].
28+
29+ * Write or improve documentation. If you ran into a problem which
30+ took more time to figure out than expected, please consider to
31+ save other users from the same experience. People writing the
32+ documentation tend to lack an outside view, so please help
33+ provide one. Good documentation is both difficult and extremely
34+ important.
35+
36+ The official docs are not the only place for documentation.
37+ Pandoc also has a [Wiki][pandoc wiki]. Private blogs can serve
38+ as documentation just as the official manual can.
39+
40+ * Contribute code. No matter whether it's a small fix in a format
41+ template or a huge lump of Haskell code: help is welcome. It's
42+ usually a good idea to talk about the plans early, as this can
43+ prevent unnecessary work. See below for more information.
44+
45+ * Last but not least: consider funding the development and
46+ maintenance of pandoc financially. You can find sponsor buttons
47+ on the [pandoc website] and the [GitHub repository][GitHub
48+ repo].
49+
50+A rich ecosystem of libraries, editors, filters, and templates has
51+developed around pandoc; conversely, pandoc builds and depends on a
52+large number of libraries. Contributing to any of these projects is
53+another way that can help to ensure stability, and to keep pushing
54+the boundaries of what is possible with pandoc.
55+
56+[RStudio Community]: https://community.rstudio.com/
57+[Zettlr Forum]: https://forum.zettlr.com/
58+[pandoc wiki]: https://github.com/jgm/pandoc/wiki
59+[pandoc website]: https://pandoc.org
60+[GitHub repo]: https://github.com/jgm/pandoc
61+
4Have a question?
62Have a question?
5----------------
63----------------
6
64
@@ -105,7 +163,12 @@ Explain the rationale for the feature you're requesting. Why would this
105feature be useful? Consider also any possible drawbacks, including backwards
163feature be useful? Consider also any possible drawbacks, including backwards
106compatibility, new library dependencies, and performance issues.
164compatibility, new library dependencies, and performance issues.
107
165
166+Features are very rarely "implement and forget", as all code must be
167+maintained. This is especially relevant for large or complex
168+contributions. It is helpful to be sympathetic to that fact, and to
169+communicate future plans and availability clearly.
170+
108−It is best to discuss a potential new feature on [pandoc-discuss]
171+Any potential new feature is best discussed on [pandoc-discuss]
109before opening an issue.
172before opening an issue.
110
173
111Patches and pull requests
174Patches and pull requests
@@ -181,9 +244,16 @@ Or with stack:
181
244
182 stack test --test-arguments='-p markdown'
245 stack test --test-arguments='-p markdown'
183
246
184−It is often helpful to add `-j4` (run tests in parallel)
247+It is often helpful to add `-j4` (run tests in parallel) and
185−and `--hide-successes` (don't clutter output with successes)
248+`--hide-successes` (don't clutter output with successes) to the test
186−to the test arguments as well.
249+arguments as well. Collecting all options in a `cabal.project.local`
250+file in the project's root directory can help to keep `cabal`
251+commands short. E.g.:
252+
253+ flags: +embed_data_files
254+ tests: True
255+ test-show-details: direct
256+ test-options: -j4 --hide-successes
187
257
188If you add a new feature to pandoc, please add tests as well, following
258If you add a new feature to pandoc, please add tests as well, following
189the pattern of the existing tests. The test suite code is in
259the pattern of the existing tests. The test suite code is in
@@ -206,6 +276,35 @@ or Powerpoint to ensure that they weren't corrupted and that
206they had the expected result, and mention the Word/Powerpoint
276they had the expected result, and mention the Word/Powerpoint
207version and OS in your commit comment.
277version and OS in your commit comment.
208
278
279+Code style
280+----------
281+
282+Pandoc uses [hlint] to identify opportunities for code improvements
283+like redundant brackets or unnecessary `Language` extensions.
284+However, sometimes there are cases where there are good reasons to
285+use code different from what hlint proposes. In these cases, the
286+respective warning should be disabled in the file `.hlint.yaml`.
287+
288+There should be no errors when running `hlint .`; this is checked by
289+the continuous integration (CI) setup. It is recommended that
290+contributors check their code with a local hlint installation, but
291+relying on the CI is fine, too.
292+
293+A good way to ensure no new warnings are introduced is to use a Git
294+[pre-commit hook] which runs hlint on all updated Haskell files
295+before creating a commit:
296+
297+ #!/bin/sh
298+ git diff --diff-filter=MA --cached --name-only | grep '\.hs$' | \
299+ xargs hlint --hint .hlint.yaml
300+
301+(If you are using GNU `xargs`, add the `-r` option immediately
302+after `xargs`.)
303+
304+Saving this to `.git/hooks/pre-commit`, and making the script
305+executable, will prevent accidental introduction of potentially
306+problematic code.
307+
209Benchmarks
308Benchmarks
210----------
309----------
211
310
@@ -219,9 +318,6 @@ With stack:
219
318
220 stack bench
319 stack bench
221
320
222−You can also build `weigh-pandoc` (`stack build pandoc:weigh-pandoc`)
223−to get some statistics on memory usage. (Eventually this should
224−be incorporated into the benchmark suite.)
225
321
226Using the REPL
322Using the REPL
227--------------
323--------------
@@ -233,10 +329,10 @@ a ghci REPL for working with pandoc. With [stack], use
233We recommend using the following `.ghci` file (which can be
329We recommend using the following `.ghci` file (which can be
234placed in the source directory):
330placed in the source directory):
235
331
236− :set -fobject-code
332+ :set -fobject-code
237− :set -XTypeSynonymInstances
333+ :set -XTypeSynonymInstances
238− :set -XScopedTypeVariables
334+ :set -XScopedTypeVariables
239− :set -XOverloadedStrings
335+ :set -XOverloadedStrings
240
336
241Profiling
337Profiling
242---------
338---------
@@ -280,7 +376,7 @@ The code
280--------
376--------
281
377
282Pandoc has a publicly accessible git repository on
378Pandoc has a publicly accessible git repository on
283−GitHub: <http://github.com/jgm/pandoc>. To get a local copy of the source:
379+GitHub: <https://github.com/jgm/pandoc>. To get a local copy of the source:
284
380
285 git clone https://github.com/jgm/pandoc.git
381 git clone https://github.com/jgm/pandoc.git
286
382
@@ -290,7 +386,7 @@ the pandoc library is in `src/`, the source for the tests is in
290
386
291The modules `Text.Pandoc.Definition`, `Text.Pandoc.Builder`, and
387The modules `Text.Pandoc.Definition`, `Text.Pandoc.Builder`, and
292`Text.Pandoc.Generic` are in a separate library `pandoc-types`. The code can
388`Text.Pandoc.Generic` are in a separate library `pandoc-types`. The code can
293−be found in <http://github.com/jgm/pandoc-types>.
389+be found in <https://github.com/jgm/pandoc-types>.
294
390
295To build pandoc, you will need a working installation of the
391To build pandoc, you will need a working installation of the
296[Haskell platform].
392[Haskell platform].
@@ -310,11 +406,11 @@ The library is structured as follows:
310 tree automatically.
406 tree automatically.
311 - `Text.Pandoc.Readers.*` are the readers, and `Text.Pandoc.Writers.*`
407 - `Text.Pandoc.Readers.*` are the readers, and `Text.Pandoc.Writers.*`
312 are the writers.
408 are the writers.
313− - `Text.Pandoc.Biblio` is a utility module for formatting citations
409+ - `Text.Pandoc.Citeproc.*` contain the code for citation handling,
314− using citeproc-hs.
410+ including an interface to the [citeproc] library.
315 - `Text.Pandoc.Data` is used to embed data files when the `embed_data_files`
411 - `Text.Pandoc.Data` is used to embed data files when the `embed_data_files`
316− cabal flag is used. It is generated from `src/Text/Pandoc/Data.hsb` using
412+ cabal flag is used.
317− the preprocessor [hsb2hs].
413+ - `Text.Pandoc.Emoji` is a thin wrapper around [emojis].
318 - `Text.Pandoc.Highlighting` contains the interface to the
414 - `Text.Pandoc.Highlighting` contains the interface to the
319 skylighting library, which is used for code syntax highlighting.
415 skylighting library, which is used for code syntax highlighting.
320 - `Text.Pandoc.ImageSize` is a utility module containing functions for
416 - `Text.Pandoc.ImageSize` is a utility module containing functions for
@@ -325,7 +421,6 @@ The library is structured as follows:
325 - `Text.Pandoc.PDF` contains functions for producing a PDF from a
421 - `Text.Pandoc.PDF` contains functions for producing a PDF from a
326 LaTeX source.
422 LaTeX source.
327 - `Text.Pandoc.Parsing` contains parsing functions used in multiple readers.
423 - `Text.Pandoc.Parsing` contains parsing functions used in multiple readers.
328− - `Text.Pandoc.Pretty` is a pretty-printing library specialized to
329 the needs of pandoc.
424 the needs of pandoc.
330 - `Text.Pandoc.SelfContained` contains functions for making an HTML
425 - `Text.Pandoc.SelfContained` contains functions for making an HTML
331 file "self-contained," by importing remotely linked images, CSS,
426 file "self-contained," by importing remotely linked images, CSS,
@@ -353,13 +448,17 @@ you may want to consider submitting a pull request to the
353[closed issues]: https://github.com/jgm/pandoc/issues?q=is%3Aissue+is%3Aclosed
448[closed issues]: https://github.com/jgm/pandoc/issues?q=is%3Aissue+is%3Aclosed
354[latest released version]: https://github.com/jgm/pandoc/releases/latest
449[latest released version]: https://github.com/jgm/pandoc/releases/latest
355[Nightly builds]: https://github.com/jgm/pandoc/actions?query=workflow%3ANightly
450[Nightly builds]: https://github.com/jgm/pandoc/actions?query=workflow%3ANightly
356−[pandoc-discuss]: http://groups.google.com/group/pandoc-discuss
451+[pandoc-discuss]: https://groups.google.com/group/pandoc-discuss
357[issue tracker]: https://github.com/jgm/pandoc/issues
452[issue tracker]: https://github.com/jgm/pandoc/issues
358−[User's Guide]: http://pandoc.org/MANUAL.html
453+[User's Guide]: https://pandoc.org/MANUAL.html
359−[FAQs]: http://pandoc.org/faqs.html
454+[FAQs]: https://pandoc.org/faqs.html
360−[EditorConfig]: http://editorconfig.org/
455+[EditorConfig]: https://editorconfig.org/
361−[Haskell platform]: http://www.haskell.org/platform/
456+[Haskell platform]: https://www.haskell.org/platform/
457+[hlint]: https://hackage.haskell.org/package/hlint
458+[citeproc]: https://hackage.haskell.org/package/citeproc
459+[emojis]: https://hackage.haskell.org/package/emojis
362−[hsb2hs]: http://hackage.haskell.org/package/hsb2hs
460+[hsb2hs]: https://hackage.haskell.org/package/hsb2hs
461+[pre-commit hook]: https://git-scm.com/book/en/v2/Customizing-Git-Git-Hooks
363[GitHub labels]: https://github.com/jgm/pandoc/labels
462[GitHub labels]: https://github.com/jgm/pandoc/labels
364[good first issue]:https://github.com/jgm/pandoc/labels/good%20first%20issue
463[good first issue]:https://github.com/jgm/pandoc/labels/good%20first%20issue
365[enhancement]: https://github.com/jgm/pandoc/labels/enhancement
464[enhancement]: https://github.com/jgm/pandoc/labels/enhancement
COPYING.md+1−1
@@ -357,5 +357,5 @@ into proprietary programs. If your program is a subroutine library,
357you may consider it more useful to permit linking proprietary
357you may consider it more useful to permit linking proprietary
358applications with the library. If this is what you want to do, use the
358applications with the library. If this is what you want to do, use the
359[GNU Lesser General Public
359[GNU Lesser General Public
360−License](http://www.gnu.org/licenses/lgpl.html) instead of this
360+License](https://www.gnu.org/licenses/lgpl.html) instead of this
361License.
361License.
COPYRIGHT+17−26
@@ -1,5 +1,5 @@
1Pandoc
1Pandoc
2−Copyright (C) 2006-2020 John MacFarlane <jgm at berkeley dot edu>
2+Copyright (C) 2006-2021 John MacFarlane <jgm at berkeley dot edu>
3
3
4With the exceptions noted below, this code is released under the [GPL],
4With the exceptions noted below, this code is released under the [GPL],
5version 2 or later:
5version 2 or later:
@@ -22,11 +22,11 @@ The GNU General Public License is available in the file COPYING.md in
22the source distribution. On Debian systems, the complete text of the
22the source distribution. On Debian systems, the complete text of the
23GPL can be found in `/usr/share/common-licenses/GPL`.
23GPL can be found in `/usr/share/common-licenses/GPL`.
24
24
25−[GPL]: http://www.gnu.org/copyleft/gpl.html
25+[GPL]: https://www.gnu.org/copyleft/gpl.html
26
26
27Pandoc's complete source code is available from the [Pandoc home page].
27Pandoc's complete source code is available from the [Pandoc home page].
28
28
29−[Pandoc home page]: http://pandoc.org
29+[Pandoc home page]: https://pandoc.org
30
30
31Pandoc includes some code with different copyrights, or subject to different
31Pandoc includes some code with different copyrights, or subject to different
32licenses. The copyright and license statements for these sources are included
32licenses. The copyright and license statements for these sources are included
@@ -37,7 +37,7 @@ The modules in the `pandoc-types` repository (Text.Pandoc.Definition,
37Text.Pandoc.Builder, Text.Pandoc.Generics, Text.Pandoc.JSON,
37Text.Pandoc.Builder, Text.Pandoc.Generics, Text.Pandoc.JSON,
38Text.Pandoc.Walk) are licensed under the BSD 3-clause license:
38Text.Pandoc.Walk) are licensed under the BSD 3-clause license:
39
39
40−Copyright (c) 2006-2020, John MacFarlane
40+Copyright (c) 2006-2021, John MacFarlane
41
41
42All rights reserved.
42All rights reserved.
43
43
@@ -73,7 +73,7 @@ Pandoc's templates (in `data/templates`) are dual-licensed as either
73GPL (v2 or higher, same as pandoc) or (at your option) the BSD
73GPL (v2 or higher, same as pandoc) or (at your option) the BSD
743-clause license.
743-clause license.
75
75
76−Copyright (c) 2014--2020, John MacFarlane
76+Copyright (c) 2014--2021, John MacFarlane
77
77
78----------------------------------------------------------------------
78----------------------------------------------------------------------
79src/Text/Pandoc/Writers/Muse.hs
79src/Text/Pandoc/Writers/Muse.hs
@@ -83,19 +83,19 @@ Released under the GNU General Public License version 2 or later.
83
83
84----------------------------------------------------------------------
84----------------------------------------------------------------------
85src/Text/Pandoc/Writers/Texinfo.hs
85src/Text/Pandoc/Writers/Texinfo.hs
86−Copyright (C) 2008-2020 John MacFarlane and Peter Wang
86+Copyright (C) 2008-2021 John MacFarlane and Peter Wang
87
87
88Released under the GNU General Public License version 2 or later.
88Released under the GNU General Public License version 2 or later.
89
89
90----------------------------------------------------------------------
90----------------------------------------------------------------------
91src/Text/Pandoc/Writers/OpenDocument.hs
91src/Text/Pandoc/Writers/OpenDocument.hs
92−Copyright (C) 2008-2020 Andrea Rossato and John MacFarlane
92+Copyright (C) 2008-2021 Andrea Rossato and John MacFarlane
93
93
94Released under the GNU General Public License version 2 or later.
94Released under the GNU General Public License version 2 or later.
95
95
96----------------------------------------------------------------------
96----------------------------------------------------------------------
97src/Text/Pandoc/Writers/Org.hs
97src/Text/Pandoc/Writers/Org.hs
98−Copyright (C) 2010-2020 Puneeth Chaganti, John MacFarlane, and
98+Copyright (C) 2010-2021 Puneeth Chaganti, John MacFarlane, and
99 Albert Krewinkel
99 Albert Krewinkel
100
100
101Released under the GNU General Public License version 2 or later.
101Released under the GNU General Public License version 2 or later.
@@ -115,7 +115,7 @@ Released under the GNU General Public License version 2 or later.
115
115
116----------------------------------------------------------------------
116----------------------------------------------------------------------
117src/Text/Pandoc/Readers/Textile.hs
117src/Text/Pandoc/Readers/Textile.hs
118−Copyright (C) 2010-2020 Paul Rivier and John MacFarlane
118+Copyright (C) 2010-2021 Paul Rivier and John MacFarlane
119
119
120Released under the GNU General Public License version 2 or later.
120Released under the GNU General Public License version 2 or later.
121
121
@@ -133,7 +133,7 @@ Released under the GNU General Public License version 2 or later.
133
133
134----------------------------------------------------------------------
134----------------------------------------------------------------------
135src/Text/Pandoc/Readers/EPUB.hs
135src/Text/Pandoc/Readers/EPUB.hs
136−Copyright (C) 2014-2020 Matthew Pickering and John MacFarlane
136+Copyright (C) 2014-2021 Matthew Pickering and John MacFarlane
137
137
138Released under the GNU General Public License version 2 or later.
138Released under the GNU General Public License version 2 or later.
139
139
@@ -141,7 +141,7 @@ Released under the GNU General Public License version 2 or later.
141src/Text/Pandoc/Readers/Org.hs
141src/Text/Pandoc/Readers/Org.hs
142src/Text/Pandoc/Readers/Org/*
142src/Text/Pandoc/Readers/Org/*
143test/Tests/Readers/Org/*
143test/Tests/Readers/Org/*
144−Copyright (C) 2014-2020 Albert Krewinkel
144+Copyright (C) 2014-2021 Albert Krewinkel
145
145
146Released under the GNU General Public License version 2 or later.
146Released under the GNU General Public License version 2 or later.
147
147
@@ -149,7 +149,7 @@ Released under the GNU General Public License version 2 or later.
149src/Text/Pandoc/Lua.hs
149src/Text/Pandoc/Lua.hs
150src/Text/Pandoc/Lua/*
150src/Text/Pandoc/Lua/*
151test/lua/*
151test/lua/*
152−Copyright (C) 2017--2020 Albert Krewinkel and John MacFarlane
152+Copyright (C) 2017--2021 Albert Krewinkel and John MacFarlane
153
153
154Released under the GNU General Public License version 2 or later.
154Released under the GNU General Public License version 2 or later.
155
155
@@ -157,7 +157,7 @@ Released under the GNU General Public License version 2 or later.
157src/Text/Pandoc/Readers/Jira.hs
157src/Text/Pandoc/Readers/Jira.hs
158src/Text/Pandoc/Writers/Jira.hs
158src/Text/Pandoc/Writers/Jira.hs
159test/Tests/Readers/Jira.hs
159test/Tests/Readers/Jira.hs
160−Copyright (C) 2019--2020 Albert Krewinkel
160+Copyright (C) 2019--2021 Albert Krewinkel
161
161
162Released under the GNU General Public License version 2 or later.
162Released under the GNU General Public License version 2 or later.
163
163
@@ -169,21 +169,21 @@ Released under the GNU General Public License version 2 or later.
169
169
170----------------------------------------------------------------------
170----------------------------------------------------------------------
171data/pandoc.lua
171data/pandoc.lua
172−Copyright (C) 2017-2020 Albert Krewinkel
172+Copyright (C) 2017-2021 Albert Krewinkel
173
173
174Released under the GNU General Public License version 2 or later.
174Released under the GNU General Public License version 2 or later.
175
175
176----------------------------------------------------------------------
176----------------------------------------------------------------------
177The dzslides template contains JavaScript and CSS from Paul Rouget's
177The dzslides template contains JavaScript and CSS from Paul Rouget's
178dzslides template.
178dzslides template.
179−http://github.com/paulrouget/dzslides
179+https://github.com/paulrouget/dzslides
180
180
181Released under the Do What the Fuck You Want To Public License.
181Released under the Do What the Fuck You Want To Public License.
182
182
183------------------------------------------------------------------------
183------------------------------------------------------------------------
184−Pandoc embeds a lua interpreter (via hslua).
184+Pandoc embeds a Lua interpreter (via hslua).
185
185
186−Copyright © 1994–2019 Lua.org, PUC-Rio.
186+Copyright © 1994–2020 Lua.org, PUC-Rio.
187
187
188Permission is hereby granted, free of charge, to any person obtaining
188Permission is hereby granted, free of charge, to any person obtaining
189a copy of this software and associated documentation files (the
189a copy of this software and associated documentation files (the
@@ -203,12 +203,3 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
203LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
203LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
204OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
204OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
205WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
205WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
206−
207−------------------------------------------------------------------------
208−The template pandoc.jats is Copyright 2013--2015 Martin Fenner,
209−released under GPL version 2 or later.
210−
211−The file data/jats.csl is derived from a csl file by Martin Fenner,
212−revised by Martin Paul Eve and then John MacFarlane.
213−"This work is licensed under a Creative Commons Attribution-ShareAlike 3.0
214−License. Originally by Martin Fenner."
INSTALL.md+27−38
@@ -34,6 +34,10 @@ without SVG support), [Python] (to use Pandoc filters), and
34
34
35 choco install rsvg-convert python miktex
35 choco install rsvg-convert python miktex
36
36
37+Using multiple installation methods can result in two separate
38+installations of pandoc; it is recommended to properly uninstall
39+pandoc before switching to an alternative installation method.
40+
37By default, Pandoc creates PDFs using LaTeX.
41By default, Pandoc creates PDFs using LaTeX.
38We recommend installing it via [MiKTeX].
42We recommend installing it via [MiKTeX].
39
43
@@ -45,14 +49,10 @@ by downloading [this script][uninstaller]
45and running it with `perl uninstall-pandoc.pl`.
49and running it with `perl uninstall-pandoc.pl`.
46
50
47Alternatively, you can install pandoc using
51Alternatively, you can install pandoc using
48−[Homebrew](http://brew.sh):
52+[Homebrew](https://brew.sh):
49
53
50 brew install pandoc
54 brew install pandoc
51
55
52−To include pandoc's citation parser:
53−
54− brew install pandoc-citeproc
55−
56Homebrew can also install other software that integrates with Pandoc.
56Homebrew can also install other software that integrates with Pandoc.
57For example, to install [librsvg] (its `rsvg-convert` covers formats
57For example, to install [librsvg] (its `rsvg-convert` covers formats
58without SVG support), [Python] (to use Pandoc filters), and
58without SVG support), [Python] (to use Pandoc filters), and
@@ -86,9 +86,8 @@ not outdated. Pandoc is in the [Debian], [Ubuntu], [Slackware],
86To get the latest release, we provide a binary package for amd64
86To get the latest release, we provide a binary package for amd64
87architecture on the **[download page]**.
87architecture on the **[download page]**.
88
88
89−This provides both `pandoc` and `pandoc-citeproc`.
90−The executables are statically linked and
89+The executable is statically linked and
91−have no dynamic dependencies or dependencies on external
90+has no dynamic dependencies or dependencies on external
92data files. Note: because of the static
91data files. Note: because of the static
93linking, the pandoc binary from this package cannot use lua
92linking, the pandoc binary from this package cannot use lua
94filters that require external lua modules written in C.
93filters that require external lua modules written in C.
@@ -98,8 +97,7 @@ Both a tarball and a deb installer are provided. To install the deb:
98 sudo dpkg -i $DEB
97 sudo dpkg -i $DEB
99
98
100where `$DEB` is the path to the downloaded deb. This will
99where `$DEB` is the path to the downloaded deb. This will
101−install the `pandoc` and `pandoc-citeproc` executables and
100+install the `pandoc` executable and man page.
102−man pages.
103
101
104If you use an RPM-based distro, you may be able to install
102If you use an RPM-based distro, you may be able to install
105the deb from our download page using `alien`.
103the deb from our download page using `alien`.
@@ -122,7 +120,7 @@ package repositories. For example, on Debian/Ubuntu,
122you can install it with `apt-get install haskell-platform`.
120you can install it with `apt-get install haskell-platform`.
123
121
124For PDF output, you'll need LaTeX. We recommend installing
122For PDF output, you'll need LaTeX. We recommend installing
125−[TeX Live](http://www.tug.org/texlive/) via your package
123+[TeX Live](https://www.tug.org/texlive/) via your package
126manager. (On Debian/Ubuntu, `apt-get install texlive`.)
124manager. (On Debian/Ubuntu, `apt-get install texlive`.)
127
125
128## Chrome OS
126## Chrome OS
@@ -149,7 +147,7 @@ The official Docker images for pandoc can be found at
149[dockerhub](https://hub.docker.com/).
147[dockerhub](https://hub.docker.com/).
150
148
151The [pandoc/core](https://hub.docker.com/r/pandoc/core)
149The [pandoc/core](https://hub.docker.com/r/pandoc/core)
152−image contains `pandoc` and `pandoc-citeproc`.
150+image contains `pandoc`.
153
151
154The [pandoc/latex](https://hub.docker.com/r/pandoc/latex)
152The [pandoc/latex](https://hub.docker.com/r/pandoc/latex)
155image also contains the minimal LaTeX installation needed
153image also contains the minimal LaTeX installation needed
@@ -244,28 +242,22 @@ The easiest way to build pandoc from source is to use [stack][stack]:
244
242
245 pandoc --help
243 pandoc --help
246
244
247− [Not sure where `$CABALDIR` is?](http://www.haskell.org/haskellwiki/Cabal-Install#The_cabal-install_configuration_file)
245+ [Not sure where `$CABALDIR` is?](https://wiki.haskell.org/Cabal-Install#The_cabal-install_configuration_file)
248
246
249−5. If you want to process citations with pandoc, you will also need to
250− install a separate package, `pandoc-citeproc`. This can be installed
251− using cabal:
252−
253− cabal install pandoc-citeproc
254−
255− By default `pandoc-citeproc` uses the "i;unicode-casemap" method
247+5. By default `pandoc` uses the "i;unicode-casemap" method
256 to sort bibliography entries (RFC 5051). If you would like to
248 to sort bibliography entries (RFC 5051). If you would like to
257 use the locale-sensitive unicode collation algorithm instead,
249 use the locale-sensitive unicode collation algorithm instead,
258− specify the `unicode_collation` flag:
250+ specify the `icu` flag (which affects the dependency `citeproc`):
259
251
260− cabal install pandoc-citeproc -funicode_collation
252+ cabal install pandoc -ficu
261
253
262 Note that this requires the `text-icu` library, which in turn
254 Note that this requires the `text-icu` library, which in turn
263 depends on the C library `icu4c`. Installation directions
255 depends on the C library `icu4c`. Installation directions
264 vary by platform. Here is how it might work on macOS with Homebrew:
256 vary by platform. Here is how it might work on macOS with Homebrew:
265
257
266 brew install icu4c
258 brew install icu4c
267− stack install pandoc-citeproc \
259+ stack install pandoc \
268− --flag "pandoc-citeproc:unicode_collation" \
260+ --flag "citeproc:icu" \
269 --extra-lib-dirs=/usr/local/opt/icu4c/lib \
261 --extra-lib-dirs=/usr/local/opt/icu4c/lib \
270 --extra-include-dirs=/usr/local/opt/icu4c/include
262 --extra-include-dirs=/usr/local/opt/icu4c/include
271
263
@@ -274,8 +266,6 @@ The easiest way to build pandoc from source is to use [stack][stack]:
274 accordingly. If `MANUAL.txt` has been modified, the man page can be
266 accordingly. If `MANUAL.txt` has been modified, the man page can be
275 rebuilt: `make man/pandoc.1`.
267 rebuilt: `make man/pandoc.1`.
276
268
277− The `pandoc-citeproc.1` man page will also be installed automatically.
278−
279
269
280### Custom cabal method
270### Custom cabal method
281
271
@@ -397,30 +387,29 @@ To run just the markdown benchmarks:
397
387
398
388
399[Arch]: https://www.archlinux.org/packages/community/x86_64/pandoc/
389[Arch]: https://www.archlinux.org/packages/community/x86_64/pandoc/
400−[Cabal User's Guide]: http://www.haskell.org/cabal/release/latest/doc/users-guide/builders.html#setup-configure-paths
390+[Cabal User's Guide]: https://cabal.readthedocs.io/
401[Debian]: https://packages.debian.org/pandoc
391[Debian]: https://packages.debian.org/pandoc
402[Fedora]: https://apps.fedoraproject.org/packages/pandoc
392[Fedora]: https://apps.fedoraproject.org/packages/pandoc
403−[FreeBSD ports]: http://www.freshports.org/textproc/hs-pandoc/
393+[FreeBSD ports]: https://www.freshports.org/textproc/hs-pandoc/
404−[GHC]: http://www.haskell.org/ghc/
394+[GHC]: https://www.haskell.org/ghc/
405−[GPL]: http://www.gnu.org/copyleft/gpl.html
406−[Haskell platform]: http://hackage.haskell.org/platform/
395+[Haskell platform]: https://hackage.haskell.org/platform/
407−[MacPorts]: http://trac.macports.org/browser/trunk/dports/textproc/pandoc/Portfile
396+[MacPorts]: https://trac.macports.org/browser/trunk/dports/textproc/pandoc/Portfile
408[MacTeX]: https://tug.org/mactex/
397[MacTeX]: https://tug.org/mactex/
409−[BasicTeX]: http://www.tug.org/mactex/morepackages.html
398+[BasicTeX]: https://www.tug.org/mactex/morepackages.html
410[LaTeX]: https://www.latex-project.org
399[LaTeX]: https://www.latex-project.org
411−[MiKTeX]: http://miktex.org/
400+[MiKTeX]: https://miktex.org/
412[librsvg]: https://wiki.gnome.org/Projects/LibRsvg
401[librsvg]: https://wiki.gnome.org/Projects/LibRsvg
413[Python]: https://www.python.org
402[Python]: https://www.python.org
414−[NetBSD]: http://pkgsrc.se/wip/pandoc
403+[NetBSD]: https://pkgsrc.se/wip/pandoc
415[NixOS]: https://nixos.org/nixos/packages.html
404[NixOS]: https://nixos.org/nixos/packages.html
416[Slackware]: https://www.slackbuilds.org/result/?search=pandoc&sv=
405[Slackware]: https://www.slackbuilds.org/result/?search=pandoc&sv=
417[Ubuntu]: https://packages.ubuntu.com/pandoc
406[Ubuntu]: https://packages.ubuntu.com/pandoc
418[download page]: https://github.com/jgm/pandoc/releases/latest
407[download page]: https://github.com/jgm/pandoc/releases/latest
419−[gentoo]: http://packages.gentoo.org/package/app-text/pandoc
408+[gentoo]: https://packages.gentoo.org/package/app-text/pandoc
420[haskell repository]: https://wiki.archlinux.org/index.php/Haskell_Package_Guidelines#.5Bhaskell.5D
409[haskell repository]: https://wiki.archlinux.org/index.php/Haskell_Package_Guidelines#.5Bhaskell.5D
421[openSUSE]: https://software.opensuse.org/package/pandoc
410[openSUSE]: https://software.opensuse.org/package/pandoc
422−[source tarball]: http://hackage.haskell.org/package/pandoc
411+[source tarball]: https://hackage.haskell.org/package/pandoc
423[stack]: https://docs.haskellstack.org/en/stable/install_and_upgrade.html
412[stack]: https://docs.haskellstack.org/en/stable/install_and_upgrade.html
424−[cabal-install]: http://hackage.haskell.org/package/cabal-install
413+[cabal-install]: https://hackage.haskell.org/package/cabal-install
425[Void]: https://voidlinux.org/
414[Void]: https://voidlinux.org/
426[uninstaller]: https://raw.githubusercontent.com/jgm/pandoc/master/macos/uninstall-pandoc.pl
415[uninstaller]: https://raw.githubusercontent.com/jgm/pandoc/master/macos/uninstall-pandoc.pl
MANUAL.txt+905−387
@@ -1,7 +1,7 @@
1---
1---
2title: Pandoc User's Guide
2title: Pandoc User's Guide
3author: John MacFarlane
3author: John MacFarlane
4−date: July 23, 2020
4+date: June 20, 2021
5---
5---
6
6
7# Synopsis
7# Synopsis
@@ -136,22 +136,22 @@ to output the generated LaTeX. You can then test it with `pdflatex test.tex`.
136When using LaTeX, the following packages need to be available
136When using LaTeX, the following packages need to be available
137(they are included with all recent versions of [TeX Live]):
137(they are included with all recent versions of [TeX Live]):
138[`amsfonts`], [`amsmath`], [`lm`], [`unicode-math`],
138[`amsfonts`], [`amsmath`], [`lm`], [`unicode-math`],
139−[`ifxetex`], [`ifluatex`], [`listings`] (if the
139+[`iftex`], [`listings`] (if the
140`--listings` option is used), [`fancyvrb`], [`longtable`],
140`--listings` option is used), [`fancyvrb`], [`longtable`],
141[`booktabs`], [`graphicx`] (if the document
141[`booktabs`], [`graphicx`] (if the document
142contains images), [`hyperref`], [`xcolor`],
142contains images), [`hyperref`], [`xcolor`],
143[`ulem`], [`geometry`] (with the `geometry` variable set),
143[`ulem`], [`geometry`] (with the `geometry` variable set),
144[`setspace`] (with `linestretch`), and
144[`setspace`] (with `linestretch`), and
145[`babel`] (with `lang`). The use of `xelatex` or `lualatex` as
145[`babel`] (with `lang`). The use of `xelatex` or `lualatex` as
146−the PDF engine requires [`fontspec`]. `xelatex` uses
146+the PDF engine requires [`fontspec`]. `lualatex` uses
147−[`polyglossia`] (with `lang`), [`xecjk`], and [`bidi`] (with the
147+[`selnolig`]. `xelatex` uses [`polyglossia`] (with `lang`),
148−`dir` variable set). If the `mathspec` variable is set,
148+[`xecjk`], and [`bidi`] (with the `dir` variable set). If the
149−`xelatex` will use [`mathspec`] instead of [`unicode-math`].
149+`mathspec` variable is set, `xelatex` will use [`mathspec`]
150−The [`upquote`] and [`microtype`] packages are used if
150+instead of [`unicode-math`]. The [`upquote`] and [`microtype`]
151−available, and [`csquotes`] will be used for [typography]
151+packages are used if available, and [`csquotes`] will be used
152−if the `csquotes` variable or metadata field is set to a
152+for [typography] if the `csquotes` variable or metadata field is
153−true value. The [`natbib`], [`biblatex`], [`bibtex`], and
153+set to a true value. The [`natbib`], [`biblatex`], [`bibtex`],
154−[`biber`] packages can optionally be used for [citation
154+and [`biber`] packages can optionally be used for [citation
155rendering]. The following packages will be used to improve
155rendering]. The following packages will be used to improve
156output quality if present, but pandoc does not require them to
156output quality if present, but pandoc does not require them to
157be present: [`upquote`] (for straight quotes in verbatim
157be present: [`upquote`] (for straight quotes in verbatim
@@ -180,8 +180,7 @@ footnotes in tables).
180[`graphicx`]: https://ctan.org/pkg/graphicx
180[`graphicx`]: https://ctan.org/pkg/graphicx
181[`grffile`]: https://ctan.org/pkg/grffile
181[`grffile`]: https://ctan.org/pkg/grffile
182[`hyperref`]: https://ctan.org/pkg/hyperref
182[`hyperref`]: https://ctan.org/pkg/hyperref
183−[`ifluatex`]: https://ctan.org/pkg/ifluatex
184−[`ifxetex`]: https://ctan.org/pkg/ifxetex
183+[`iftex`]: https://ctan.org/pkg/iftex
185[`listings`]: https://ctan.org/pkg/listings
184[`listings`]: https://ctan.org/pkg/listings
186[`lm`]: https://ctan.org/pkg/lm
185[`lm`]: https://ctan.org/pkg/lm
187[`longtable`]: https://ctan.org/pkg/longtable
186[`longtable`]: https://ctan.org/pkg/longtable
@@ -200,6 +199,7 @@ footnotes in tables).
200[`xcolor`]: https://ctan.org/pkg/xcolor
199[`xcolor`]: https://ctan.org/pkg/xcolor
201[`xecjk`]: https://ctan.org/pkg/xecjk
200[`xecjk`]: https://ctan.org/pkg/xecjk
202[`xurl`]: https://ctan.org/pkg/xurl
201[`xurl`]: https://ctan.org/pkg/xurl
202+[`selnolig`]: https://ctan.org/pkg/selnolig
203
203
204
204
205
205
@@ -225,9 +225,12 @@ header when requesting a document from a URL:
225: Specify input format. *FORMAT* can be:
225: Specify input format. *FORMAT* can be:
226
226
227 ::: {#input-formats}
227 ::: {#input-formats}
228+ - `bibtex` ([BibTeX] bibliography)
229+ - `biblatex` ([BibLaTeX] bibliography)
228 - `commonmark` ([CommonMark] Markdown)
230 - `commonmark` ([CommonMark] Markdown)
229 - `commonmark_x` ([CommonMark] Markdown with extensions)
231 - `commonmark_x` ([CommonMark] Markdown with extensions)
230 - `creole` ([Creole 1.0])
232 - `creole` ([Creole 1.0])
233+ - `csljson` ([CSL JSON] bibliography)
231 - `csv` ([CSV] table)
234 - `csv` ([CSV] table)
232 - `docbook` ([DocBook])
235 - `docbook` ([DocBook])
233 - `docx` ([Word docx])
236 - `docx` ([Word docx])
@@ -277,9 +280,12 @@ header when requesting a document from a URL:
277 ::: {#output-formats}
280 ::: {#output-formats}
278 - `asciidoc` ([AsciiDoc]) or `asciidoctor` ([AsciiDoctor])
281 - `asciidoc` ([AsciiDoc]) or `asciidoctor` ([AsciiDoctor])
279 - `beamer` ([LaTeX beamer][`beamer`] slide show)
282 - `beamer` ([LaTeX beamer][`beamer`] slide show)
283+ - `bibtex` ([BibTeX] bibliography)
284+ - `biblatex` ([BibLaTeX] bibliography)
280 - `commonmark` ([CommonMark] Markdown)
285 - `commonmark` ([CommonMark] Markdown)
281 - `commonmark_x` ([CommonMark] Markdown with extensions)
286 - `commonmark_x` ([CommonMark] Markdown with extensions)
282 - `context` ([ConTeXt])
287 - `context` ([ConTeXt])
288+ - `csljson` ([CSL JSON] bibliography)
283 - `docbook` or `docbook4` ([DocBook] 4)
289 - `docbook` or `docbook4` ([DocBook] 4)
284 - `docbook5` (DocBook 5)
290 - `docbook5` (DocBook 5)
285 - `docx` ([Word docx])
291 - `docx` ([Word docx])
@@ -355,15 +361,15 @@ header when requesting a document from a URL:
355 will be used. On \*nix and macOS systems this will be the `pandoc`
361 will be used. On \*nix and macOS systems this will be the `pandoc`
356 subdirectory of the XDG data directory (by default,
362 subdirectory of the XDG data directory (by default,
357 `$HOME/.local/share`, overridable by setting the `XDG_DATA_HOME`
363 `$HOME/.local/share`, overridable by setting the `XDG_DATA_HOME`
358− environment variable). If that directory does not exist,
364+ environment variable). If that directory does not exist and
359− `$HOME/.pandoc` will be used (for backwards compatibility).
365+ `$HOME/.pandoc` exists, it will be used (for backwards compatibility).
360− In Windows the default user data directory is
366+ On Windows the default user data directory is
361 `C:\Users\USERNAME\AppData\Roaming\pandoc`.
367 `C:\Users\USERNAME\AppData\Roaming\pandoc`.
362 You can find the default user data directory on your system by
368 You can find the default user data directory on your system by
363 looking at the output of `pandoc --version`.
369 looking at the output of `pandoc --version`.
370+ Data files placed in this directory (for example, `reference.odt`,
364− A `reference.odt`, `reference.docx`, `epub.css`, `templates`,
371+ `reference.docx`, `epub.css`, `templates`) will override
365− `slidy`, `slideous`, or `s5` directory
366− placed in this directory will override pandoc's normal defaults.
372+ pandoc's normal defaults.
367
373
368`-d` *FILE*, `--defaults=`*FILE*
374`-d` *FILE*, `--defaults=`*FILE*
369
375
@@ -480,7 +486,7 @@ header when requesting a document from a URL:
480[Emacs Org mode]: https://orgmode.org
486[Emacs Org mode]: https://orgmode.org
481[AsciiDoc]: https://www.methods.co.nz/asciidoc/
487[AsciiDoc]: https://www.methods.co.nz/asciidoc/
482[AsciiDoctor]: https://asciidoctor.org/
488[AsciiDoctor]: https://asciidoctor.org/
483−[DZSlides]: http://paulrouget.com/dzslides/
489+[DZSlides]: https://paulrouget.com/dzslides/
484[Word docx]: https://en.wikipedia.org/wiki/Office_Open_XML
490[Word docx]: https://en.wikipedia.org/wiki/Office_Open_XML
485[PDF]: https://www.adobe.com/pdf/
491[PDF]: https://www.adobe.com/pdf/
486[reveal.js]: https://revealjs.com/
492[reveal.js]: https://revealjs.com/
@@ -491,6 +497,9 @@ header when requesting a document from a URL:
491[Muse]: https://amusewiki.org/library/manual
497[Muse]: https://amusewiki.org/library/manual
492[PowerPoint]: https://en.wikipedia.org/wiki/Microsoft_PowerPoint
498[PowerPoint]: https://en.wikipedia.org/wiki/Microsoft_PowerPoint
493[Vimwiki]: https://vimwiki.github.io
499[Vimwiki]: https://vimwiki.github.io
500+[CSL JSON]: https://citeproc-js.readthedocs.io/en/latest/csl-json/markup.html
501+[BibTeX]: https://ctan.org/pkg/bibtex
502+[BibLaTeX]: https://ctan.org/pkg/biblatex
494
503
495## Reader options {.options}
504## Reader options {.options}
496
505
@@ -580,13 +589,13 @@ header when requesting a document from a URL:
580
589
581 3. `$PATH` (executable only)
590 3. `$PATH` (executable only)
582
591
583− Filters and Lua-filters are applied in the order specified
592+ Filters, Lua-filters, and citeproc processing are applied in
584− on the command line.
593+ the order specified on the command line.
585
594
586`-L` *SCRIPT*, `--lua-filter=`*SCRIPT*
595`-L` *SCRIPT*, `--lua-filter=`*SCRIPT*
587
596
588: Transform the document in a similar fashion as JSON filters (see
597: Transform the document in a similar fashion as JSON filters (see
589− `--filter`), but use pandoc's build-in Lua filtering system. The given
598+ `--filter`), but use pandoc's built-in Lua filtering system. The given
590 Lua script is expected to return a list of Lua filters which will be
599 Lua script is expected to return a list of Lua filters which will be
591 applied in order. Each Lua filter must contain element-transforming
600 applied in order. Each Lua filter must contain element-transforming
592 functions indexed by the name of the AST element on which the filter
601 functions indexed by the name of the AST element on which the filter
@@ -595,26 +604,17 @@ header when requesting a document from a URL:
595 The `pandoc` Lua module provides helper functions for element
604 The `pandoc` Lua module provides helper functions for element
596 creation. It is always loaded into the script's Lua environment.
605 creation. It is always loaded into the script's Lua environment.
597
606
598− The following is an example Lua script for macro-expansion:
607+ See the [Lua filters documentation] for further details.
599−
600− function expand_hello_world(inline)
601− if inline.c == '{{helloworld}}' then
602− return pandoc.Emph{ pandoc.Str "Hello, World" }
603− else
604− return inline
605− end
606− end
607−
608− return {{Str = expand_hello_world}}
609
608
610 In order of preference, pandoc will look for Lua filters in
609 In order of preference, pandoc will look for Lua filters in
611
610
612− 1. a specified full or relative path (executable or
611+ 1. a specified full or relative path
613− non-executable)
614
612
615− 2. `$DATADIR/filters` (executable or non-executable)
616− where `$DATADIR` is the user data directory (see
613+ 2. `$DATADIR/filters` where `$DATADIR` is the user data
617− `--data-dir`, above).
614+ directory (see `--data-dir`, above).
615+
616+ Filters, Lua filters, and citeproc processing are applied in
617+ the order specified on the command line.
618
618
619`-M` *KEY*[`=`*VAL*], `--metadata=`*KEY*[`:`*VAL*]
619`-M` *KEY*[`=`*VAL*], `--metadata=`*KEY*[`:`*VAL*]
620
620
@@ -657,30 +657,30 @@ header when requesting a document from a URL:
657
657
658: Specifies what to do with insertions, deletions, and comments
658: Specifies what to do with insertions, deletions, and comments
659 produced by the MS Word "Track Changes" feature. `accept` (the
659 produced by the MS Word "Track Changes" feature. `accept` (the
660− default), inserts all insertions, and ignores all
660+ default) processes all the insertions and deletions.
661− deletions. `reject` inserts all deletions and ignores
662− insertions. Both `accept` and `reject` ignore comments. `all` puts
661+ `reject` ignores them. Both `accept` and `reject` ignore comments.
663− in insertions, deletions, and comments, wrapped in spans with
662+ `all` includes all insertions, deletions, and comments, wrapped
664− `insertion`, `deletion`, `comment-start`, and `comment-end`
663+ in spans with `insertion`, `deletion`, `comment-start`, and
665− classes, respectively. The author and time of change is
664+ `comment-end` classes, respectively. The author and time of
666− included. `all` is useful for scripting: only accepting changes
665+ change is included. `all` is useful for scripting: only
667− from a certain reviewer, say, or before a certain date. If a
666+ accepting changes from a certain reviewer, say, or before a
668− paragraph is inserted or deleted, `track-changes=all` produces a
667+ certain date. If a paragraph is inserted or deleted,
668+ `track-changes=all` produces a span with the class
669− span with the class `paragraph-insertion`/`paragraph-deletion`
669+ `paragraph-insertion`/`paragraph-deletion` before the
670− before the affected paragraph break. This option only affects the
670+ affected paragraph break. This option only affects the docx
671− docx reader.
671+ reader.
672
672
673`--extract-media=`*DIR*
673`--extract-media=`*DIR*
674
674
675: Extract images and other media contained in or linked from
675: Extract images and other media contained in or linked from
676 the source document to the path *DIR*, creating it if
676 the source document to the path *DIR*, creating it if
677 necessary, and adjust the images references in the document
677 necessary, and adjust the images references in the document
678− so they point to the extracted files. If the source format is
678+ so they point to the extracted files. Media are downloaded,
679− a binary container (docx, epub, or odt), the media is
679+ read from the file system, or extracted from a binary
680− extracted from the container and the original
680+ container (e.g. docx), as needed. The original file paths
681− filenames are used. Otherwise the media is read from the
681+ are used if they are relative paths not containing `..`.
682− file system or downloaded, and new filenames are constructed
682+ Otherwise filenames are constructed from the SHA1 hash of
683− based on SHA1 hashes of the contents.
683+ the contents.
684
684
685`--abbreviations=`*FILE*
685`--abbreviations=`*FILE*
686
686
@@ -691,14 +691,15 @@ header when requesting a document from a URL:
691 system default, use
691 system default, use
692 `pandoc --print-default-data-file=abbreviations`. The only
692 `pandoc --print-default-data-file=abbreviations`. The only
693 use pandoc makes of this list is in the Markdown reader.
693 use pandoc makes of this list is in the Markdown reader.
694− Strings ending in a period that are found in this list will
694+ Strings found in this list will be followed by a nonbreaking
695− be followed by a nonbreaking space, so that the period will
696− not produce sentence-ending space in formats like LaTeX.
695+ space, and the period will not produce sentence-ending space
696+ in formats like LaTeX. The strings may not contain spaces.
697
697
698[`pandocfilters`]: https://github.com/jgm/pandocfilters
698[`pandocfilters`]: https://github.com/jgm/pandocfilters
699[PHP]: https://github.com/vinai/pandocfilters-php
699[PHP]: https://github.com/vinai/pandocfilters-php
700[perl]: https://metacpan.org/pod/Pandoc::Filter
700[perl]: https://metacpan.org/pod/Pandoc::Filter
701[JavaScript/node.js]: https://github.com/mvhenderson/pandoc-filter-node
701[JavaScript/node.js]: https://github.com/mvhenderson/pandoc-filter-node
702+[Lua filters documentation]: https://pandoc.org/lua-filters.html
702
703
703## General writer options {.options}
704## General writer options {.options}
704
705
@@ -890,11 +891,11 @@ header when requesting a document from a URL:
890 will not be searched. For example:
891 will not be searched. For example:
891 `--resource-path=.:test` will search the working directory
892 `--resource-path=.:test` will search the working directory
892 and the `test` subdirectory, in that order.
893 and the `test` subdirectory, in that order.
893−
894+ This option can be used repeatedly. Search path components
894− `--resource-path` only has an effect if (a) the output
895+ that come later on the command line will be searched before
895− format embeds images (for example, `docx`, `pdf`, or `html`
896+ those that come earlier, so
896− with `--self-contained`) or (b) it is used together with
897+ `--resource-path foo:bar --resource-path baz:bim` is
897− `--extract-media`.
898+ equivalent to `--resource-path baz:bim:foo:bar`.
898
899
899`--request-header=`*NAME*`:`*VAL*
900`--request-header=`*NAME*`:`*VAL*
900
901
@@ -906,7 +907,7 @@ header when requesting a document from a URL:
906
907
907`--no-check-certificate`
908`--no-check-certificate`
908
909
909−: Disable the certificate verification to allow access to
910+: Disable the certificate verification to allow access to
910 unsecure HTTP resources (for example when the certificate
911 unsecure HTTP resources (for example when the certificate
911 is no longer valid or self signed).
912 is no longer valid or self signed).
912
913
@@ -935,7 +936,9 @@ header when requesting a document from a URL:
935
936
936`--html-q-tags`
937`--html-q-tags`
937
938
938−: Use `<q>` tags for quotes in HTML.
939+: Use `<q>` tags for quotes in HTML. (This option only has an
940+ effect if the `smart` extension is enabled for the input
941+ format used.)
939
942
940`--ascii`
943`--ascii`
941
944
@@ -953,37 +956,45 @@ header when requesting a document from a URL:
953 placement of link references is affected by the
956 placement of link references is affected by the
954 `--reference-location` option.
957 `--reference-location` option.
955
958
956−`--reference-location = block`|`section`|`document`
959+`--reference-location=block`|`section`|`document`
957
960
958: Specify whether footnotes (and references, if `reference-links` is
961: Specify whether footnotes (and references, if `reference-links` is
959 set) are placed at the end of the current (top-level) block, the
962 set) are placed at the end of the current (top-level) block, the
960 current section, or the document. The default is
963 current section, or the document. The default is
961 `document`. Currently only affects the markdown writer.
964 `document`. Currently only affects the markdown writer.
962
965
966+`--markdown-headings=setext`|`atx`
967+
968+: Specify whether to use ATX-style (`#`-prefixed) or
969+ Setext-style (underlined) headings for level 1 and 2
970+ headings in Markdown output. (The default is `atx`.)
971+ ATX-style headings are always used for levels 3+.
972+ This option also affects Markdown cells in `ipynb` output.
973+
963`--atx-headers`
974`--atx-headers`
964
975
965−: Use ATX-style headings in Markdown output. The default is
976+: *Deprecated synonym for `--markdown-headings=atx`.*
966− to use setext-style headings for levels 1 to 2, and then ATX headings.
967− (Note: for `gfm` output, ATX headings are always used.)
968− This option also affects markdown cells in `ipynb` output.
969
977
970−`--top-level-division=[default|section|chapter|part]`
978+`--top-level-division=default`|`section`|`chapter`|`part`
971
979
972−: Treat top-level headings as the given division type in LaTeX, ConTeXt,
980+: Treat top-level headings as the given division type in
973− DocBook, and TEI output. The hierarchy order is part, chapter, then section;
981+ LaTeX, ConTeXt, DocBook, and TEI output. The hierarchy
982+ order is part, chapter, then section; all headings are
974− all headings are shifted such that the top-level heading becomes the specified
983+ shifted such that the top-level heading becomes the
975− type. The default behavior is to determine the best division type via
984+ specified type. The default behavior is to determine the
976− heuristics: unless other conditions apply, `section` is chosen. When the
985+ best division type via heuristics: unless other conditions
986+ apply, `section` is chosen. When the `documentclass`
977− `documentclass` variable is set to `report`, `book`, or `memoir` (unless the
987+ variable is set to `report`, `book`, or `memoir` (unless the
978− `article` option is specified), `chapter` is implied as the setting for this
988+ `article` option is specified), `chapter` is implied as the
979− option. If `beamer` is the output format, specifying either `chapter` or
989+ setting for this option. If `beamer` is the output format,
990+ specifying either `chapter` or `part` will cause top-level
980− `part` will cause top-level headings to become `\part{..}`, while
991+ headings to become `\part{..}`, while second-level headings
981− second-level headings remain as their default type.
992+ remain as their default type.
982
993
983`-N`, `--number-sections`
994`-N`, `--number-sections`
984
995
985−: Number section headings in LaTeX, ConTeXt, HTML, Docx, or EPUB output.
996+: Number section headings in LaTeX, ConTeXt, HTML, Docx, ms, or EPUB
986− By default, sections are not numbered. Sections with class
997+ output. By default, sections are not numbered. Sections with class
987 `unnumbered` will never be numbered, even if `--number-sections`
998 `unnumbered` will never be numbered, even if `--number-sections`
988 is specified.
999 is specified.
989
1000
@@ -1292,50 +1303,77 @@ header when requesting a document from a URL:
1292
1303
1293## Citation rendering {.options}
1304## Citation rendering {.options}
1294
1305
1306+`-C`, `--citeproc`
1307+
1308+: Process the citations in the file, replacing them with
1309+ rendered citations and adding a bibliography.
1310+ Citation processing will not take place unless bibliographic
1311+ data is supplied, either through an external file specified
1312+ using the `--bibliography` option or the `bibliography`
1313+ field in metadata, or via a `references` section in metadata
1314+ containing a list of citations in CSL YAML format with
1315+ Markdown formatting. The style is controlled by a [CSL]
1316+ stylesheet specified using the `--csl` option or the `csl`
1317+ field in metadata. (If no stylesheet is specified,
1318+ the `chicago-author-date` style will be used by default.)
1319+ The citation processing transformation may be applied before
1320+ or after filters or Lua filters (see `--filter`,
1321+ `--lua-filter`): these transformations are applied in the
1322+ order they appear on the command line. For more
1323+ information, see the section on [Citations].
1324+
1295`--bibliography=`*FILE*
1325`--bibliography=`*FILE*
1296
1326
1297: Set the `bibliography` field in the document's metadata to *FILE*,
1327: Set the `bibliography` field in the document's metadata to *FILE*,
1298− overriding any value set in the metadata, and process citations
1328+ overriding any value set in the metadata. If you supply
1299− using `pandoc-citeproc`. (This is equivalent to
1300− `--metadata bibliography=FILE --filter pandoc-citeproc`.)
1301− If `--natbib` or `--biblatex` is also supplied, `pandoc-citeproc` is not
1302− used, making this equivalent to `--metadata bibliography=FILE`.
1303− If you supply this argument multiple times, each *FILE* will be added
1329+ this argument multiple times, each *FILE* will be added to
1304− to bibliography.
1330+ bibliography. If *FILE* is a URL, it will be fetched
1331+ via HTTP. If *FILE* is not found relative to the
1332+ working directory, it will be sought in the resource path
1333+ (see `--resource-path`).
1305
1334
1306`--csl=`*FILE*
1335`--csl=`*FILE*
1307
1336
1308: Set the `csl` field in the document's metadata to *FILE*,
1337: Set the `csl` field in the document's metadata to *FILE*,
1309 overriding any value set in the metadata. (This is equivalent to
1338 overriding any value set in the metadata. (This is equivalent to
1310− `--metadata csl=FILE`.)
1339+ `--metadata csl=FILE`.) If *FILE* is a URL, it will be
1311− This option is only relevant with `pandoc-citeproc`.
1340+ fetched via HTTP. If *FILE* is not found relative to the
1341+ working directory, it will be sought in the resource path
1342+ (see `--resource-path`) and finally in the `csl`
1343+ subdirectory of the pandoc user data directory.
1312
1344
1313`--citation-abbreviations=`*FILE*
1345`--citation-abbreviations=`*FILE*
1314
1346
1315: Set the `citation-abbreviations` field in the document's metadata to
1347: Set the `citation-abbreviations` field in the document's metadata to
1316 *FILE*, overriding any value set in the metadata. (This is equivalent to
1348 *FILE*, overriding any value set in the metadata. (This is equivalent to
1317 `--metadata citation-abbreviations=FILE`.)
1349 `--metadata citation-abbreviations=FILE`.)
1318− This option is only relevant with `pandoc-citeproc`.
1350+ If *FILE* is a URL, it will be fetched via HTTP. If *FILE* is not
1351+ found relative to the working directory, it will be sought
1352+ in the resource path (see `--resource-path`) and finally in
1353+ the `csl` subdirectory of the pandoc user data directory.
1319
1354
1320`--natbib`
1355`--natbib`
1321
1356
1322−: Use [`natbib`] for citations in LaTeX output. This option is not for use
1357+: Use [`natbib`] for citations in LaTeX output. This option
1323− with the `pandoc-citeproc` filter or with PDF output. It is intended for
1358+ is not for use with the `--citeproc` option or with PDF
1359+ output. It is intended for use in producing a LaTeX file
1324− use in producing a LaTeX file that can be processed with [`bibtex`].
1360+ that can be processed with [`bibtex`].
1325
1361
1326`--biblatex`
1362`--biblatex`
1327
1363
1328−: Use [`biblatex`] for citations in LaTeX output. This option is not for use
1364+: Use [`biblatex`] for citations in LaTeX output. This option
1329− with the `pandoc-citeproc` filter or with PDF output. It is intended for
1365+ is not for use with the `--citeproc` option or with PDF
1366+ output. It is intended for use in producing a LaTeX file
1330− use in producing a LaTeX file that can be processed with [`bibtex`] or [`biber`].
1367+ that can be processed with [`bibtex`] or [`biber`].
1331
1368
1332## Math rendering in HTML {.options}
1369## Math rendering in HTML {.options}
1333
1370
1334−The default is to render TeX math as far as possible using Unicode characters.
1371+The default is to render TeX math as far as possible using
1372+Unicode characters. Formulas are put inside a `span` with
1335−Formulas are put inside a `span` with `class="math"`, so that they may be styled
1373+`class="math"`, so that they may be styled differently from the
1336−differently from the surrounding text if needed. However, this gives acceptable
1374+surrounding text if needed. However, this gives acceptable
1337−results only for basic math, usually you will want to use `--mathjax` or another
1375+results only for basic math, usually you will want to use
1338−of the following options.
1376+`--mathjax` or another of the following options.
1339
1377
1340`--mathjax`[`=`*URL*]
1378`--mathjax`[`=`*URL*]
1341
1379
@@ -1349,10 +1387,11 @@ of the following options.
1349
1387
1350`--mathml`
1388`--mathml`
1351
1389
1352−: Convert TeX math to [MathML] (in `epub3`, `docbook4`, `docbook5`, `jats`,
1390+: Convert TeX math to [MathML] (in `epub3`, `docbook4`,
1391+ `docbook5`, `jats`, `html4` and `html5`). This is the
1353− `html4` and `html5`). This is the default in `odt` output. Note that
1392+ default in `odt` output. Note that currently only Firefox
1354− currently only Firefox and Safari (and select e-book readers) natively
1393+ and Safari (and select e-book readers) natively support
1355− support MathML.
1394+ MathML.
1356
1395
1357`--webtex`[`=`*URL*]
1396`--webtex`[`=`*URL*]
1358
1397
@@ -1376,13 +1415,12 @@ of the following options.
1376`--gladtex`
1415`--gladtex`
1377
1416
1378: Enclose TeX math in `<eq>` tags in HTML output. The resulting HTML
1417: Enclose TeX math in `<eq>` tags in HTML output. The resulting HTML
1379− can then be processed by [GladTeX] to produce images of the typeset
1418+ can then be processed by [GladTeX] to produce SVG images of the typeset
1380− formulas and an HTML file with links to these images.
1419+ formulas and an HTML file with these images embedded.
1381− So, the procedure is:
1382
1420
1383 pandoc -s --gladtex input.md -o myfile.htex
1421 pandoc -s --gladtex input.md -o myfile.htex
1384− gladtex -d myfile-images myfile.htex
1422+ gladtex -d image_dir myfile.htex
1385− # produces myfile.html and images in myfile-images
1423+ # produces myfile.html and images in image_dir
1386
1424
1387[MathML]: https://www.w3.org/Math/
1425[MathML]: https://www.w3.org/Math/
1388[MathJax]: https://www.mathjax.org
1426[MathJax]: https://www.mathjax.org
@@ -1427,8 +1465,10 @@ Nonzero exit codes have the following meanings:
1427 21 PandocUnknownReaderError
1465 21 PandocUnknownReaderError
1428 22 PandocUnknownWriterError
1466 22 PandocUnknownWriterError
1429 23 PandocUnsupportedExtensionError
1467 23 PandocUnsupportedExtensionError
1468+ 24 PandocCiteprocError
1430 31 PandocEpubSubdirectoryError
1469 31 PandocEpubSubdirectoryError
1431 43 PandocPDFError
1470 43 PandocPDFError
1471+ 44 PandocXMLError
1432 47 PandocPDFProgramNotFoundError
1472 47 PandocPDFProgramNotFoundError
1433 61 PandocHttpError
1473 61 PandocHttpError
1434 62 PandocShouldNeverHappenError
1474 62 PandocShouldNeverHappenError
@@ -1441,6 +1481,7 @@ Nonzero exit codes have the following meanings:
1441 91 PandocMacroLoop
1481 91 PandocMacroLoop
1442 92 PandocUTF8DecodingError
1482 92 PandocUTF8DecodingError
1443 93 PandocIpynbDecodingError
1483 93 PandocIpynbDecodingError
1484+ 94 PandocUnsupportedCharsetError
1444 97 PandocCouldNotFindDataFileError
1485 97 PandocCouldNotFindDataFileError
1445 99 PandocResourceNotFound
1486 99 PandocResourceNotFound
1446----- ------------------------------------
1487----- ------------------------------------
@@ -1465,6 +1506,16 @@ input-files:
1465- content.md
1506- content.md
1466# or you may use input-file: with a single value
1507# or you may use input-file: with a single value
1467
1508
1509+# Include options from the specified defaults files.
1510+# The files will be searched for first in the working directory
1511+# and then in the defaults subdirectory of the user data directory.
1512+# The files are included in the same order in which they appear in
1513+# the list. Options specified in this defaults file always have
1514+# priority over the included ones.
1515+defaults:
1516+- defsA
1517+- defsB
1518+
1468template: letter
1519template: letter
1469standalone: true
1520standalone: true
1470self-contained: false
1521self-contained: false
@@ -1492,11 +1543,24 @@ include-after-body: []
1492include-in-header: []
1543include-in-header: []
1493resource-path: ["."]
1544resource-path: ["."]
1494
1545
1546+# turn on built-in citation processing. Note that if you need
1547+# control over when the citeproc processing is done relative
1548+# to other filters, you should instead use `citeproc` in the
1549+# list of `filters` (see below).
1550+citeproc: true
1551+csl: ieee
1552+bibliography:
1553+- foobar.bib
1554+- barbaz.json
1555+citation-abbreviations: abbrevs.json
1556+
1495−# filters will be assumed to be Lua filters if they have
1557+# Filters will be assumed to be Lua filters if they have
1496# the .lua extension, and json filters otherwise. But
1558# the .lua extension, and json filters otherwise. But
1497−# the filter type can also be specified explicitly, as shown:
1559+# the filter type can also be specified explicitly, as shown.
1560+# Filters are run in the order specified.
1561+# To include the built-in citeproc filter, use either `citeproc`
1562+# or `{type: citeproc}`.
1498filters:
1563filters:
1499−- pandoc-citeproc
1500- wordcount.lua
1564- wordcount.lua
1501- type: json
1565- type: json
1502 path: foo.lua
1566 path: foo.lua
@@ -1509,8 +1573,11 @@ data-dir:
1509verbosity: INFO
1573verbosity: INFO
1510log-file: log.json
1574log-file: log.json
1511
1575
1512−# citeproc, natbib, or biblatex
1576+# citeproc, natbib, or biblatex. This only affects LaTeX
1577+# output. If you want to use citeproc to format citations,
1578+# you should also set 'citeproc: true' (see above).
1513cite-method: citeproc
1579cite-method: citeproc
1580+
1514# part, chapter, section, or default:
1581# part, chapter, section, or default:
1515top-level-division: chapter
1582top-level-division: chapter
1516abbreviations:
1583abbreviations:
@@ -1579,7 +1646,7 @@ epub-cover-image: cover.jpg
1579reference-links: true
1646reference-links: true
1580# block, section, or document
1647# block, section, or document
1581reference-location: block
1648reference-location: block
1582−atx-headers: false
1649+markdown-headings: setext
1583
1650
1584# accept, reject, or all
1651# accept, reject, or all
1585track-changes: accept
1652track-changes: accept
@@ -1609,6 +1676,34 @@ one line:
1609verbosity: INFO
1676verbosity: INFO
1610```
1677```
1611
1678
1679+In fields that expect a file path (or list of file paths), the
1680+following syntax may be used to interpolate environment variables:
1681+
1682+``` yaml
1683+csl: ${HOME}/mycsldir/special.csl
1684+```
1685+
1686+`${USERDATA}` may also be used; this will always resolve to the
1687+user data directory that is current when the defaults file is
1688+parsed, regardless of the setting of the environment
1689+variable `USERDATA`.
1690+
1691+`${.}` will resolve to the directory containing the default
1692+file itself. This allows you to refer to resources contained
1693+in that directory:
1694+
1695+``` yaml
1696+epub-cover-image: ${.}/cover.jpg
1697+epub-metadata: ${.}/meta.xml
1698+resource-path:
1699+- . # the working directory from which pandoc is run
1700+- ${.}/images # the images subdirectory of the directory
1701+ # containing this defaults file
1702+```
1703+
1704+This environment variable interpolation syntax *only* works in
1705+fields that expect file paths.
1706+
1612Default files can be placed in the `defaults` subdirectory of
1707Default files can be placed in the `defaults` subdirectory of
1613the user data directory and used from any directory. For
1708the user data directory and used from any directory. For
1614example, one could create a file specifying defaults for writing
1709example, one could create a file specifying defaults for writing
@@ -1836,7 +1931,8 @@ ${ styles.html() }
1836```
1931```
1837
1932
1838(If a partial is not found in the directory of the
1933(If a partial is not found in the directory of the
1934+template and the template path is given as a relative
1839−template, it will also be sought in the `templates`
1935+path, it will also be sought in the `templates`
1840subdirectory of the user data directory.)
1936subdirectory of the user data directory.)
1841
1937
1842Partials may optionally be applied to variables using
1938Partials may optionally be applied to variables using
@@ -2054,7 +2150,8 @@ Currently the following pipes are predefined:
2054 including a title block in the document itself, you can
2150 including a title block in the document itself, you can
2055 set the `title-meta`, `author-meta`, and `date-meta`
2151 set the `title-meta`, `author-meta`, and `date-meta`
2056 variables. (By default these are set automatically, based
2152 variables. (By default these are set automatically, based
2057− on `title`, `author`, and `date`.)
2153+ on `title`, `author`, and `date`.) The page title in HTML
2154+ is set by `pagetitle`, which is equal to `title` by default.
2058
2155
2059`subtitle`
2156`subtitle`
2060: document subtitle, included in HTML, EPUB, LaTeX, ConTeXt, and docx
2157: document subtitle, included in HTML, EPUB, LaTeX, ConTeXt, and docx
@@ -2128,15 +2225,16 @@ ODT or pptx.
2128: the base script direction, either `rtl` (right-to-left)
2225: the base script direction, either `rtl` (right-to-left)
2129 or `ltr` (left-to-right).
2226 or `ltr` (left-to-right).
2130
2227
2131− For bidirectional documents, native pandoc `span`s and `div`s
2228+ For bidirectional documents, native pandoc `span`s and
2132− with the `dir` attribute (value `rtl` or `ltr`) can be used to
2229+ `div`s with the `dir` attribute (value `rtl` or `ltr`) can
2133− override the base direction in some output formats.
2230+ be used to override the base direction in some output
2134− This may not always be necessary if the final renderer
2231+ formats. This may not always be necessary if the final
2135− (e.g. the browser, when generating HTML) supports the
2232+ renderer (e.g. the browser, when generating HTML) supports
2136− [Unicode Bidirectional Algorithm].
2233+ the [Unicode Bidirectional Algorithm].
2137
2234
2138− When using LaTeX for bidirectional documents, only the `xelatex` engine
2235+ When using LaTeX for bidirectional documents, only the
2236+ `xelatex` engine is fully supported (use
2139− is fully supported (use `--pdf-engine=xelatex`).
2237+ `--pdf-engine=xelatex`).
2140
2238
2141[BCP 47]: https://tools.ietf.org/html/bcp47
2239[BCP 47]: https://tools.ietf.org/html/bcp47
2142[Unicode Bidirectional Algorithm]: https://www.w3.org/International/articles/inline-bidi-markup/uba-basics
2240[Unicode Bidirectional Algorithm]: https://www.w3.org/International/articles/inline-bidi-markup/uba-basics
@@ -2145,7 +2243,7 @@ ODT or pptx.
2145### Variables for HTML
2243### Variables for HTML
2146
2244
2147`document-css`
2245`document-css`
2148−: Enables inclusion of most of the CSS in the `styles.html`
2246+: Enables inclusion of most of the [CSS] in the `styles.html`
2149 [partial](#partials) (have a look with
2247 [partial](#partials) (have a look with
2150 `pandoc --print-default-data-file=templates/styles.html`).
2248 `pandoc --print-default-data-file=templates/styles.html`).
2151 Unless you use [`--css`](#option--css), this variable
2249 Unless you use [`--css`](#option--css), this variable
@@ -2169,6 +2267,10 @@ ODT or pptx.
2169`monofont`
2267`monofont`
2170: sets the CSS `font-family` property on `code` elements.
2268: sets the CSS `font-family` property on `code` elements.
2171
2269
2270+`monobackgroundcolor`
2271+: sets the CSS `background-color` property on `code` elements
2272+ and adds extra padding.
2273+
2172`linestretch`
2274`linestretch`
2173: sets the CSS `line-height` property on the `html` element,
2275: sets the CSS `line-height` property on the `html` element,
2174 which is preferred to be unitless.
2276 which is preferred to be unitless.
@@ -2179,18 +2281,41 @@ ODT or pptx.
2179`margin-left`, `margin-right`, `margin-top`, `margin-bottom`
2281`margin-left`, `margin-right`, `margin-top`, `margin-bottom`
2180: sets the corresponding CSS `padding` properties on the `body` element.
2282: sets the corresponding CSS `padding` properties on the `body` element.
2181
2283
2284+To override or extend some [CSS] for just one document, include for example:
2285+
2286+ ---
2287+ header-includes: |
2288+ <style>
2289+ blockquote {
2290+ font-style: italic;
2291+ }
2292+ tr.even {
2293+ background-color: #f0f0f0;
2294+ }
2295+ td, th {
2296+ padding: 0.5em 2em 0.5em 0.5em;
2297+ }
2298+ tbody {
2299+ border-bottom: none;
2300+ }
2301+ </style>
2302+ ---
2303+
2304+[CSS]: https://developer.mozilla.org/en-US/docs/Learn/CSS
2305+
2182### Variables for HTML math
2306### Variables for HTML math
2183
2307
2184`classoption`
2308`classoption`
2185−: when using [KaTeX](#option--katex), you can render display math equations
2309+: when using [KaTeX](#option--katex), you can render display
2186− flush left using [YAML metadata](#layout) or with `-M classoption=fleqn`.
2310+math equations flush left using [YAML metadata](#layout) or with
2311+`-M classoption=fleqn`.
2187
2312
2188### Variables for HTML slides
2313### Variables for HTML slides
2189
2314
2190These affect HTML output when [producing slide shows with pandoc].
2315These affect HTML output when [producing slide shows with pandoc].
2191
2316
2192−All [reveal.js configuration options] are available as variables.
2317+`institute`
2193−To turn off boolean flags that default to true in reveal.js, use `0`.
2318+: author affiliations: can be a list when there are multiple authors
2194
2319
2195`revealjs-url`
2320`revealjs-url`
2196: base URL for reveal.js documents (defaults to
2321: base URL for reveal.js documents (defaults to
@@ -2210,6 +2335,9 @@ To turn off boolean flags that default to true in reveal.js, use `0`.
2210: additional attributes for the title slide of reveal.js slide shows.
2335: additional attributes for the title slide of reveal.js slide shows.
2211 See [background in reveal.js and beamer] for an example.
2336 See [background in reveal.js and beamer] for an example.
2212
2337
2338+All [reveal.js configuration options] are available as variables.
2339+To turn off boolean flags that default to true in reveal.js, use `0`.
2340+
2213[reveal.js configuration options]: https://revealjs.com/config/
2341[reveal.js configuration options]: https://revealjs.com/config/
2214
2342
2215### Variables for Beamer slides
2343### Variables for Beamer slides
@@ -2295,9 +2423,10 @@ Pandoc uses these variables when [creating a PDF] with a LaTeX engine.
2295 ...
2423 ...
2296
2424
2297`documentclass`
2425`documentclass`
2298−: document class: usually one of the standard classes, [`article`], [`book`],
2426+: document class: usually one of the standard classes,
2427+ [`article`], [`book`], and [`report`]; the [KOMA-Script]
2299− and [`report`]; the [KOMA-Script] equivalents, `scrartcl`, `scrbook`,
2428+ equivalents, `scrartcl`, `scrbook`, and `scrreprt`, which
2300− and `scrreprt`, which default to smaller margins; or [`memoir`]
2429+ default to smaller margins; or [`memoir`]
2301
2430
2302`geometry`
2431`geometry`
2303: option for [`geometry`] package, e.g. `margin=1in`;
2432: option for [`geometry`] package, e.g. `margin=1in`;
@@ -2322,8 +2451,9 @@ Pandoc uses these variables when [creating a PDF] with a LaTeX engine.
2322 ...
2451 ...
2323
2452
2324`indent`
2453`indent`
2454+: if true, pandoc will use document class settings for
2325−: uses document class settings for indentation (the default LaTeX template
2455+ indentation (the default LaTeX template otherwise removes
2326− otherwise removes indentation and adds space between paragraphs)
2456+ indentation and adds space between paragraphs)
2327
2457
2328`linestretch`
2458`linestretch`
2329: adjusts line spacing using the [`setspace`]
2459: adjusts line spacing using the [`setspace`]
@@ -2348,8 +2478,8 @@ Pandoc uses these variables when [creating a PDF] with a LaTeX engine.
2348#### Fonts
2478#### Fonts
2349
2479
2350`fontenc`
2480`fontenc`
2351−: allows font encoding to be specified through `fontenc` package (with `pdflatex`);
2481+: allows font encoding to be specified through `fontenc` package (with
2352− default is `T1` (see [LaTeX font encodings guide])
2482+ `pdflatex`); default is `T1` (see [LaTeX font encodings guide])
2353
2483
2354`fontfamily`
2484`fontfamily`
2355: font package for use with `pdflatex`:
2485: font package for use with `pdflatex`:
@@ -2419,7 +2549,8 @@ Pandoc uses these variables when [creating a PDF] with a LaTeX engine.
2419: contents of acknowledgments footnote after document title
2549: contents of acknowledgments footnote after document title
2420
2550
2421`toc`
2551`toc`
2422−: include table of contents (can also be set using `--toc/--table-of-contents`)
2552+: include table of contents (can also be set using
2553+ `--toc/--table-of-contents`)
2423
2554
2424`toc-depth`
2555`toc-depth`
2425: level of section to include in table of contents
2556: level of section to include in table of contents
@@ -2461,12 +2592,12 @@ Pandoc uses these variables when [creating a PDF] with ConTeXt.
2461: font size for body text (e.g. `10pt`, `12pt`)
2592: font size for body text (e.g. `10pt`, `12pt`)
2462
2593
2463`headertext`, `footertext`
2594`headertext`, `footertext`
2464−: text to be placed in running header or footer (see [ConTeXt Headers and Footers]);
2595+: text to be placed in running header or footer (see [ConTeXt Headers and
2465− repeat up to four times for different placement
2596+ Footers]); repeat up to four times for different placement
2466
2597
2467`indenting`
2598`indenting`
2468−: controls indentation of paragraphs, e.g. `yes,small,next` (see [ConTeXt Indentation]);
2599+: controls indentation of paragraphs, e.g. `yes,small,next` (see
2469− repeat for multiple options
2600+ [ConTeXt Indentation]); repeat for multiple options
2470
2601
2471`interlinespace`
2602`interlinespace`
2472: adjusts line spacing, e.g. `4ex` (using [`setupinterlinespace`]);
2603: adjusts line spacing, e.g. `4ex` (using [`setupinterlinespace`]);
@@ -2477,16 +2608,19 @@ Pandoc uses these variables when [creating a PDF] with ConTeXt.
2477 repeat for multiple options
2608 repeat for multiple options
2478
2609
2479`linkcolor`, `contrastcolor`
2610`linkcolor`, `contrastcolor`
2480−: color for links outside and inside a page, e.g. `red`, `blue` (see [ConTeXt Color])
2611+: color for links outside and inside a page, e.g. `red`, `blue` (see
2612+ [ConTeXt Color])
2481
2613
2482`linkstyle`
2614`linkstyle`
2483−: typeface style for links, e.g. `normal`, `bold`, `slanted`, `boldslanted`, `type`, `cap`, `small`
2615+: typeface style for links, e.g. `normal`, `bold`, `slanted`, `boldslanted`,
2616+ `type`, `cap`, `small`
2484
2617
2485`lof`, `lot`
2618`lof`, `lot`
2486: include list of figures, list of tables
2619: include list of figures, list of tables
2487
2620
2488`mainfont`, `sansfont`, `monofont`, `mathfont`
2621`mainfont`, `sansfont`, `monofont`, `mathfont`
2489−: font families: take the name of any system font (see [ConTeXt Font Switching])
2622+: font families: take the name of any system font (see
2623+ [ConTeXt Font Switching])
2490
2624
2491`margin-left`, `margin-right`, `margin-top`, `margin-bottom`
2625`margin-left`, `margin-right`, `margin-top`, `margin-bottom`
2492: sets margins, if `layout` is not used (otherwise `layout`
2626: sets margins, if `layout` is not used (otherwise `layout`
@@ -2501,16 +2635,18 @@ Pandoc uses these variables when [creating a PDF] with ConTeXt.
2501 repeat for multiple options
2635 repeat for multiple options
2502
2636
2503`pdfa`
2637`pdfa`
2504−: adds to the preamble the setup necessary to generate PDF/A of the type
2638+: adds to the preamble the setup necessary to generate PDF/A
2505− specified, e.g. `1a:2005`, `2a`. If no type is specified (i.e. the value
2639+ of the type specified, e.g. `1a:2005`, `2a`. If no type is
2640+ specified (i.e. the value is set to True, by e.g.
2506− is set to True, by e.g. `--metadata=pdfa` or `pdfa: true` in a YAML metadata
2641+ `--metadata=pdfa` or `pdfa: true` in a YAML metadata block),
2507− block), `1b:2005` will be used as default, for reasons of backwards
2642+ `1b:2005` will be used as default, for reasons of backwards
2508− compatibility. Using `--variable=pdfa` without specified value is not supported.
2643+ compatibility. Using `--variable=pdfa` without specified value
2509− To successfully generate PDF/A the required ICC color profiles have to
2644+ is not supported. To successfully generate PDF/A the required
2510− be available and the content and all included files (such as images)
2645+ ICC color profiles have to be available and the content and all
2646+ included files (such as images) have to be standard conforming.
2511− have to be standard conforming. The ICC profiles and output intent
2647+ The ICC profiles and output intent may be specified using the
2512− may be specified using the variables `pdfaiccprofile` and `pdfaintent`.
2648+ variables `pdfaiccprofile` and `pdfaintent`. See also [ConTeXt
2513− See also [ConTeXt PDFA] for more details.
2649+ PDFA] for more details.
2514
2650
2515`pdfaiccprofile`
2651`pdfaiccprofile`
2516: when used in conjunction with `pdfa`, specifies the ICC profile to use
2652: when used in conjunction with `pdfa`, specifies the ICC profile to use
@@ -2525,10 +2661,12 @@ Pandoc uses these variables when [creating a PDF] with ConTeXt.
2525 If left unspecified, `sRGB IEC61966-2.1` is used as default.
2661 If left unspecified, `sRGB IEC61966-2.1` is used as default.
2526
2662
2527`toc`
2663`toc`
2528−: include table of contents (can also be set using `--toc/--table-of-contents`)
2664+: include table of contents (can also be set using
2665+ `--toc/--table-of-contents`)
2529
2666
2530`whitespace`
2667`whitespace`
2531−: spacing between paragraphs, e.g. `none`, `small` (using [`setupwhitespace`])
2668+: spacing between paragraphs, e.g. `none`, `small` (using
2669+ [`setupwhitespace`])
2532
2670
2533`includesource`
2671`includesource`
2534: include all source documents as file attachments in the PDF file
2672: include all source documents as file attachments in the PDF file
@@ -2819,7 +2957,7 @@ their respective sections of [Pandoc's Markdown]:
2819 for the following formats (in addition to `markdown`):
2957 for the following formats (in addition to `markdown`):
2820
2958
2821 input formats
2959 input formats
2822− : `latex`, `org`, `textile`, `html` (environments, `\ref`, and
2960+ : `latex`, `textile`, `html` (environments, `\ref`, and
2823 `\eqref` only), `ipynb`
2961 `\eqref` only), `ipynb`
2824
2962
2825 output formats
2963 output formats
@@ -2931,6 +3069,43 @@ This extension can be enabled/disabled for the following formats:
2931output formats
3069output formats
2932: `odt`, `opendocument`
3070: `odt`, `opendocument`
2933
3071
3072+#### Extension: `xrefs_name` ####
3073+
3074+Links to headings, figures and tables inside the document are
3075+substituted with cross-references that will use the name or caption
3076+of the referenced item. The original link text is replaced once
3077+the generated document is refreshed. This extension can be combined
3078+with `xrefs_number` in which case numbers will appear before the
3079+name.
3080+
3081+Text in cross-references is only made consistent with the referenced
3082+item once the document has been refreshed.
3083+
3084+This extension can be enabled/disabled for the following formats:
3085+
3086+output formats
3087+: `odt`, `opendocument`
3088+
3089+#### Extension: `xrefs_number` ####
3090+
3091+Links to headings, figures and tables inside the document are
3092+substituted with cross-references that will use the number
3093+of the referenced item. The original link text is discarded.
3094+This extension can be combined with `xrefs_name` in which case
3095+the name or caption numbers will appear after the number.
3096+
3097+For the `xrefs_number` to be useful heading numbers must be enabled
3098+in the generated document, also table and figure captions must be enabled
3099+using for example the `native_numbering` extension.
3100+
3101+Numbers in cross-references are only visible in the final document once
3102+it has been refreshed.
3103+
3104+This extension can be enabled/disabled for the following formats:
3105+
3106+output formats
3107+: `odt`, `opendocument`
3108+
2934#### Extension: `styles` #### {#ext-styles}
3109#### Extension: `styles` #### {#ext-styles}
2935
3110
2936When converting from docx, read all docx styles as divs (for
3111When converting from docx, read all docx styles as divs (for
@@ -2952,13 +3127,20 @@ extensions to Emacs Muse markup.
2952In the `ipynb` input format, this causes Markdown cells
3127In the `ipynb` input format, this causes Markdown cells
2953to be included as raw Markdown blocks (allowing lossless
3128to be included as raw Markdown blocks (allowing lossless
2954round-tripping) rather than being parsed. Use this only
3129round-tripping) rather than being parsed. Use this only
2955−when you are targetting `ipynb` or a markdown-based
3130+when you are targeting `ipynb` or a markdown-based
2956output format.
3131output format.
2957
3132
2958#### Extension: `citations` {#org-citations}
3133#### Extension: `citations` {#org-citations}
2959
3134
2960−Some aspects of [Pandoc's Markdown citation syntax](#citations) are also accepted
3135+Some aspects of [Pandoc's Markdown citation syntax](#citations)
2961−in `org` input.
3136+are also accepted in `org` input.
3137+
3138+#### Extension: `element_citations` ####
3139+
3140+In the `jats` output formats, this causes reference items to
3141+be replaced with `<element-citation>` elements. These
3142+elements are not influenced by CSL styles, but all information
3143+on the item is included in tags.
2962
3144
2963#### Extension: `ntb` ####
3145#### Extension: `ntb` ####
2964
3146
@@ -3066,7 +3248,8 @@ pandoc does require the space.
3066
3248
3067### Heading identifiers ###
3249### Heading identifiers ###
3068
3250
3251+See also the [`auto_identifiers`
3069−See also the [`auto_identifiers` extension](#extension-auto_identifiers) above.
3252+extension](#extension-auto_identifiers) above.
3070
3253
3071#### Extension: `header_attributes` ####
3254#### Extension: `header_attributes` ####
3072
3255
@@ -3188,11 +3371,12 @@ block in a block quote, you need five spaces after the `>`:
3188
3371
3189#### Extension: `blank_before_blockquote` ####
3372#### Extension: `blank_before_blockquote` ####
3190
3373
3191−Standard Markdown syntax does not require a blank line before a block
3374+Standard Markdown syntax does not require a blank line before a
3192−quote. Pandoc does require this (except, of course, at the beginning of the
3375+block quote. Pandoc does require this (except, of course, at
3193−document). The reason for the requirement is that it is all too easy for a
3376+the beginning of the document). The reason for the requirement
3377+is that it is all too easy for a `>` to end up at the beginning
3194−`>` to end up at the beginning of a line by accident (perhaps through line
3378+of a line by accident (perhaps through line wrapping). So,
3195−wrapping). So, unless the `markdown_strict` format is used, the following does
3379+unless the `markdown_strict` format is used, the following does
3196not produce a nested block quote in pandoc:
3380not produce a nested block quote in pandoc:
3197
3381
3198 > This is a block quote.
3382 > This is a block quote.
@@ -3261,14 +3445,16 @@ this syntax:
3261 qsort (filter (>= x) xs)
3445 qsort (filter (>= x) xs)
3262 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3446 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3263
3447
3264−Here `mycode` is an identifier, `haskell` and `numberLines` are classes, and
3448+Here `mycode` is an identifier, `haskell` and `numberLines` are
3265−`startFrom` is an attribute with value `100`. Some output formats can use this
3449+classes, and `startFrom` is an attribute with value `100`. Some
3450+output formats can use this information to do syntax
3266−information to do syntax highlighting. Currently, the only output formats
3451+highlighting. Currently, the only output formats that uses this
3267−that uses this information are HTML, LaTeX, Docx, Ms, and PowerPoint. If
3452+information are HTML, LaTeX, Docx, Ms, and PowerPoint. If
3268−highlighting is supported for your output format and language, then the code
3453+highlighting is supported for your output format and language,
3269−block above will appear highlighted, with numbered lines. (To see which
3454+then the code block above will appear highlighted, with numbered
3270−languages are supported, type `pandoc --list-highlight-languages`.) Otherwise,
3455+lines. (To see which languages are supported, type `pandoc
3456+--list-highlight-languages`.) Otherwise, the code block above
3271−the code block above will appear as follows:
3457+will appear as follows:
3272
3458
3273 <pre id="mycode" class="haskell numberLines" startFrom="100">
3459 <pre id="mycode" class="haskell numberLines" startFrom="100">
3274 <code>
3460 <code>
@@ -3331,6 +3517,9 @@ line must begin with a space.
3331 | 200 Main St.
3517 | 200 Main St.
3332 | Berkeley, CA 94718
3518 | Berkeley, CA 94718
3333
3519
3520+Inline formatting (such as emphasis) is allowed in the content,
3521+but not block-level formatting (such as block quotes or lists).
3522+
3334This syntax is borrowed from [reStructuredText].
3523This syntax is borrowed from [reStructuredText].
3335
3524
3336## Lists
3525## Lists
@@ -3534,11 +3723,12 @@ a blank line, and must be followed by one or more definitions.
3534A definition begins with a colon or tilde, which may be indented one
3723A definition begins with a colon or tilde, which may be indented one
3535or two spaces.
3724or two spaces.
3536
3725
3537−A term may have multiple definitions, and each definition may consist of one or
3726+A term may have multiple definitions, and each definition may
3538−more block elements (paragraph, code block, list, etc.), each indented four
3727+consist of one or more block elements (paragraph, code block,
3728+list, etc.), each indented four spaces or one tab stop. The
3539−spaces or one tab stop. The body of the definition (including the first line,
3729+body of the definition (including the first line, aside from the
3540−aside from the colon or tilde) should be indented four spaces. However,
3730+colon or tilde) should be indented four spaces. However, as with
3541−as with other Markdown lists, you can "lazily" omit indentation except
3731+other Markdown lists, you can "lazily" omit indentation except
3542at the beginning of a paragraph or other block element:
3732at the beginning of a paragraph or other block element:
3543
3733
3544 Term 1
3734 Term 1
@@ -3564,9 +3754,10 @@ definition:
3564Note that space between items in a definition list is required.
3754Note that space between items in a definition list is required.
3565(A variant that loosens this requirement, but disallows "lazy"
3755(A variant that loosens this requirement, but disallows "lazy"
3566hard wrapping, can be activated with `compact_definition_lists`: see
3756hard wrapping, can be activated with `compact_definition_lists`: see
3567−[Non-pandoc extensions], below.)
3757+[Non-default extensions], below.)
3568
3758
3759+[^3]: I have been influenced by the suggestions of [David
3569−[^3]: I have been influenced by the suggestions of [David Wheeler](https://justatheory.com/2009/02/modest-markdown-proposal/).
3760+ Wheeler](https://justatheory.com/2009/02/modest-markdown-proposal/).
3570
3761
3571### Numbered example lists ###
3762### Numbered example lists ###
3572
3763
@@ -3988,10 +4179,12 @@ option is used. All of the metadata will appear in a single block
3988at the beginning of the document.
4179at the beginning of the document.
3989
4180
3990Note that [YAML] escaping rules must be followed. Thus, for example,
4181Note that [YAML] escaping rules must be followed. Thus, for example,
3991−if a title contains a colon, it must be quoted. The pipe character
4182+if a title contains a colon, it must be quoted, and if it contains a
4183+backslash escape, then it must be ensured that it is not treated as a
4184+[YAML escape sequence]. The pipe character (`|`) can be used to begin
3992−(`|`) can be used to begin an indented block that will be interpreted
4185+an indented block that will be interpreted literally, without need for
3993−literally, without need for escaping. This form is necessary
4186+escaping. This form is necessary when the field contains blank lines
3994−when the field contains blank lines or block-level formatting:
4187+or block-level formatting:
3995
4188
3996 ---
4189 ---
3997 title: 'This is the title: it contains a colon'
4190 title: 'This is the title: it contains a colon'
@@ -4005,6 +4198,12 @@ when the field contains blank lines or block-level formatting:
4005 It consists of two paragraphs.
4198 It consists of two paragraphs.
4006 ...
4199 ...
4007
4200
4201+The literal block after the `|` must be indented relative to the
4202+line containing the `|`. If it is not, the YAML will be invalid
4203+and pandoc will not interpret it as metadata. For an overview
4204+of the complex rules governing YAML, see the [Wikipedia entry on
4205+YAML syntax].
4206+
4008Template variables will be set automatically from the metadata. Thus, for
4207Template variables will be set automatically from the metadata. Thus, for
4009example, in writing HTML, the variable `abstract` will be set to the HTML
4208example, in writing HTML, the variable `abstract` will be set to the HTML
4010equivalent of the Markdown in the `abstract` field:
4209equivalent of the Markdown in the `abstract` field:
@@ -4051,6 +4250,24 @@ will be interpreted as markdown. For example:
4051 \renewcommand{\section}[1]{\clearpage\oldsection{#1}}
4250 \renewcommand{\section}[1]{\clearpage\oldsection{#1}}
4052 ```
4251 ```
4053
4252
4253+Note: the `yaml_metadata_block` extension works with
4254+`commonmark` as well as `markdown` (and it is enabled by default
4255+in `gfm` and `commonmark_x`). However, in these formats the
4256+following restrictions apply:
4257+
4258+- The YAML metadata block must occur at the beginning of the
4259+ document (and there can be only one). If multiple files are
4260+ given as arguments to pandoc, only the first can be a YAML
4261+ metadata block.
4262+
4263+- The leaf nodes of the YAML structure are parsed in isolation from
4264+ each other and from the rest of the document. So, for
4265+ example, you can't use a reference link in these contexts
4266+ if the link definition is somewhere else in the document.
4267+
4268+[YAML escape sequence]: https://yaml.org/spec/1.2/spec.html#id2776092
4269+[Wikipedia entry on YAML syntax]: https://en.m.wikipedia.org/wiki/YAML#Syntax
4270+
4054## Backslash escapes
4271## Backslash escapes
4055
4272
4056#### Extension: `all_symbols_escapable` ####
4273#### Extension: `all_symbols_escapable` ####
@@ -4208,7 +4425,8 @@ you need to enclose text in literal `$` characters, backslash-escape
4208them and they won't be treated as math delimiters.
4425them and they won't be treated as math delimiters.
4209
4426
4210For display math, use `$$` delimiters. (In this case, the delimiters
4427For display math, use `$$` delimiters. (In this case, the delimiters
4211−may be separated from the formula by whitespace.)
4428+may be separated from the formula by whitespace. However, there can be
4429+no blank lines betwen the opening and closing `$$` delimiters.)
4212
4430
4213TeX math will be printed in all output formats. How it is rendered
4431TeX math will be printed in all output formats. How it is rendered
4214depends on the output format:
4432depends on the output format:
@@ -4326,8 +4544,8 @@ into
4326
4544
4327whereas `Markdown.pl` will preserve it as is.
4545whereas `Markdown.pl` will preserve it as is.
4328
4546
4329−There is one exception to this rule: text between `<script>` and
4547+There is one exception to this rule: text between `<script>`,
4330−`<style>` tags is not interpreted as Markdown.
4548+`<style>`, and `<textarea>` tags is not interpreted as Markdown.
4331
4549
4332This departure from standard Markdown should make it easier to mix
4550This departure from standard Markdown should make it easier to mix
4333Markdown with HTML block elements. For example, one can surround
4551Markdown with HTML block elements. For example, one can surround
@@ -4738,142 +4956,72 @@ they cannot contain multiple paragraphs). The syntax is as follows:
4738
4956
4739Inline and regular footnotes may be mixed freely.
4957Inline and regular footnotes may be mixed freely.
4740
4958
4741−## Citations
4959+## Citation syntax
4742
4960
4743#### Extension: `citations` ####
4961#### Extension: `citations` ####
4744
4962
4745−Using an external filter, `pandoc-citeproc`, pandoc can automatically generate
4963+To cite a bibliographic item with an identifier foo, use the
4746−citations and a bibliography in a number of styles. Basic usage is
4964+syntax `@foo`. Normal citations should be included in square
4965+brackets, with semicolons separating distinct items:
4747
4966
4748− pandoc --filter pandoc-citeproc myinput.txt
4967+ Blah blah [@doe99; @smith2000; @smith2004].
4749
4968
4750−In order to use this feature, you will need to specify a bibliography file
4969+How this is rendered depends on the citation style. In an
4751−using the `bibliography` metadata field in a YAML metadata section, or
4970+author-date style, it might render as
4752−`--bibliography` command line argument. You can supply multiple `--bibliography`
4753−arguments or set `bibliography` metadata field to YAML array, if you want to
4754−use multiple bibliography files. The bibliography may have any of these
4755−formats:
4756
4971
4757− Format File extension
4972+ Blah blah (Doe 1999, Smith 2000, 2004).
4758− ------------ --------------
4759− BibLaTeX .bib
4760− BibTeX .bibtex
4761− Copac .copac
4762− CSL JSON .json
4763− CSL YAML .yaml
4764− EndNote .enl
4765− EndNote XML .xml
4766− ISI .wos
4767− MEDLINE .medline
4768− MODS .mods
4769− RIS .ris
4770
4973
4771−Note that `.bib` can be used with both BibTeX and BibLaTeX files;
4974+In a footnote style, it might render as
4772−use `.bibtex` to force BibTeX.
4773
4975
4774−Note that `pandoc-citeproc --bib2json` and `pandoc-citeproc --bib2yaml`
4976+ Blah blah.[^1]
4775−can produce `.json` and `.yaml` files from any of the supported formats.
4776
4977
4777−In-field markup: In BibTeX and BibLaTeX databases,
4978+ [^1]: John Doe, "Frogs," *Journal of Amphibians* 44 (1999);
4778−pandoc-citeproc parses a subset of LaTeX markup; in CSL YAML
4979+ Susan Smith, "Flies," *Journal of Insects* (2000);
4779−databases, pandoc Markdown; and in CSL JSON databases, an
4980+ Susan Smith, "Bees," *Journal of Insects* (2004).
4780−[HTML-like markup][CSL markup specs]:
4781
4981
4782−`<i>...</i>`
4982+See the [CSL user documentation] for more information about CSL
4783−: italics
4983+styles and how they affect rendering.
4784
4984
4785−`<b>...</b>`
4985+Unless a citation key start with a letter, digit, or `_`,
4786−: bold
4986+and contains only alphanumerics and internal punctuation
4987+characters (`:.#$%&-+?<>~/`), it must be surrounded
4988+by curly braces, which are not considered part of the key.
4989+In `@Foo_bar.baz.`, the key is `Foo_bar.baz`. The final
4990+period is not *internal* punctuation, so it is not included in
4991+the key. In `@{Foo_bar.baz.}`, the key is `Foo_bar.baz.`, including
4992+the final period. The curly braces are recommended if you use URLs as
4993+keys: `[@{https://example.com/bib?name=foobar&date=2000}, p. 33]`.
4787
4994
4788−`<span style="font-variant:small-caps;">...</span>` or `<sc>...</sc>`
4995+Citation items may optionally include a prefix, a locator, and
4789−: small capitals
4996+a suffix. In
4790−
4791−`<sub>...</sub>`
4792−: subscript
4793
4997
4794−`<sup>...</sup>`
4998+ Blah blah [see @doe99, pp. 33-35 and *passim*; @smith04, chap. 1].
4795−: superscript
4796
4999
4797−`<span class="nocase">...</span>`
5000+The first item (`doe99`) has prefix `see `, locator `pp. 33-35`,
4798−: prevent a phrase from being capitalized as title case
5001+and suffix `and *passim*`. The second item (`smith04`) has
5002+locator `chap. 1` and no prefix or suffix.
4799
5003
4800−`pandoc-citeproc -j` and `-y` interconvert the CSL JSON
5004+Pandoc uses some heuristics to separate the locator from the
4801−and CSL YAML formats as far as possible.
5005+rest of the subject. It is sensitive to the locator terms
4802−
5006+defined in the [CSL locale files]. Either abbreviated or
4803−As an alternative to specifying a bibliography file using `--bibliography`
4804−or the YAML metadata field `bibliography`, you can include
4805−the citation data directly in the `references` field of the
4806−document's YAML metadata. The field should contain an array of
4807−YAML-encoded references, for example:
4808−
4809− ---
4810− references:
4811− - type: article-journal
4812− id: WatsonCrick1953
4813− author:
4814− - family: Watson
4815− given: J. D.
4816− - family: Crick
4817− given: F. H. C.
4818− issued:
4819− date-parts:
4820− - - 1953
4821− - 4
4822− - 25
4823− title: 'Molecular structure of nucleic acids: a structure for deoxyribose
4824− nucleic acid'
4825− title-short: Molecular structure of nucleic acids
4826− container-title: Nature
4827− volume: 171
4828− issue: 4356
4829− page: 737-738
4830− DOI: 10.1038/171737a0
4831− URL: https://www.nature.com/articles/171737a0
4832− language: en-GB
4833− ...
4834−
4835−(`pandoc-citeproc --bib2yaml` can produce these from a bibliography file in one
4836−of the supported formats.)
4837−
4838−Citations and references can be formatted using any style supported by the
4839−[Citation Style Language], listed in the [Zotero Style Repository].
4840−These files are specified using the `--csl` option or the `csl` metadata field.
4841−By default, `pandoc-citeproc` will use the [Chicago Manual of Style] author-date
4842−format. The CSL project provides further information on [finding and editing styles].
4843−
4844−To make your citations hyperlinks to the corresponding bibliography
4845−entries, add `link-citations: true` to your YAML metadata.
4846−
4847−Citations go inside square brackets and are separated by semicolons.
4848−Each citation must have a key, composed of '@' + the citation
4849−identifier from the database, and may optionally have a prefix,
4850−a locator, and a suffix. The citation key must begin with a letter, digit,
4851−or `_`, and may contain alphanumerics, `_`, and internal punctuation
4852−characters (`:.#$%&-+?<>~/`). Here are some examples:
4853−
4854− Blah blah [see @doe99, pp. 33-35; also @smith04, chap. 1].
4855−
4856− Blah blah [@doe99, pp. 33-35, 38-39 and *passim*].
4857−
4858− Blah blah [@smith04; @doe99].
4859−
4860−`pandoc-citeproc` detects locator terms in the [CSL locale files].
4861−Either abbreviated or unabbreviated forms are accepted. In the `en-US`
5007+unabbreviated forms are accepted. In the `en-US` locale, locator
4862−locale, locator terms can be written in either singular or plural forms,
5008+terms can be written in either singular or plural forms, as
4863−as `book`, `bk.`/`bks.`; `chapter`, `chap.`/`chaps.`; `column`,
5009+`book`, `bk.`/`bks.`; `chapter`, `chap.`/`chaps.`; `column`,
4864−`col.`/`cols.`; `figure`, `fig.`/`figs.`; `folio`, `fol.`/`fols.`;
5010+`col.`/`cols.`; `figure`, `fig.`/`figs.`; `folio`,
4865−`number`, `no.`/`nos.`; `line`, `l.`/`ll.`; `note`, `n.`/`nn.`; `opus`,
5011+`fol.`/`fols.`; `number`, `no.`/`nos.`; `line`, `l.`/`ll.`;
5012+`note`, `n.`/`nn.`; `opus`, `op.`/`opp.`; `page`, `p.`/`pp.`;
4866−`op.`/`opp.`; `page`, `p.`/`pp.`; `paragraph`, `para.`/`paras.`; `part`,
5013+`paragraph`, `para.`/`paras.`; `part`, `pt.`/`pts.`; `section`,
4867−`pt.`/`pts.`; `section`, `sec.`/`secs.`; `sub verbo`, `s.v.`/`s.vv.`;
5014+`sec.`/`secs.`; `sub verbo`, `s.v.`/`s.vv.`; `verse`,
4868−`verse`, `v.`/`vv.`; `volume`, `vol.`/`vols.`; `¶`/`¶¶`; `§`/`§§`. If no
5015+`v.`/`vv.`; `volume`, `vol.`/`vols.`; `¶`/`¶¶`; `§`/`§§`. If no
4869locator term is used, "page" is assumed.
5016locator term is used, "page" is assumed.
4870
5017
4871−`pandoc-citeproc` will use heuristics to distinguish the locator
5018+In complex cases, you can force something to be treated as
4872−from the suffix. In complex cases, the locator can be enclosed
5019+a locator by enclosing it in curly braces or prevent parsing
4873−in curly braces (using `pandoc-citeproc` 0.15 and higher only):
5020+the suffix as locator by prepending curly braces:
4874
5021
4875 [@smith{ii, A, D-Z}, with a suffix]
5022 [@smith{ii, A, D-Z}, with a suffix]
4876 [@smith, {pp. iv, vi-xi, (xv)-(xvii)} with suffix here]
5023 [@smith, {pp. iv, vi-xi, (xv)-(xvii)} with suffix here]
5024+ [@smith{}, 99 years later]
4877
5025
4878A minus sign (`-`) before the `@` will suppress mention of
5026A minus sign (`-`) before the `@` will suppress mention of
4879the author in the citation. This can be useful when the
5027the author in the citation. This can be useful when the
@@ -4881,82 +5029,72 @@ author is already mentioned in the text:
4881
5029
4882 Smith says blah [-@smith04].
5030 Smith says blah [-@smith04].
4883
5031
4884−You can also write an in-text citation, as follows:
5032+You can also write an author-in-text citation, by omitting the
5033+square brackets:
4885
5034
4886 @smith04 says blah.
5035 @smith04 says blah.
4887
5036
4888 @smith04 [p. 33] says blah.
5037 @smith04 [p. 33] says blah.
4889
5038
4890−If the style calls for a list of works cited, it will be placed
5039+This will cause the author's name to be rendered, followed by
4891−in a div with id `refs`, if one exists:
5040+the bibliographical details. Use this form when you want to
4892−
5041+make the citation the subject of a sentence.
4893− ::: {#refs}
4894− :::
4895−
4896−Otherwise, it will be placed at the end of the document.
4897−Generation of the bibliography can be suppressed by setting
4898−`suppress-bibliography: true` in the YAML metadata.
4899−
4900−If you wish the bibliography to have a section heading, you can
4901−set `reference-section-title` in the metadata, or put the heading
4902−at the beginning of the div with id `refs` (if you are using it)
4903−or at the end of your document:
4904−
4905− last paragraph...
4906−
4907− # References
4908−
4909−The bibliography will be inserted after this heading. Note that
4910−the `unnumbered` class will be added to this heading, so that the
4911−section will not be numbered.
4912−
4913−If you want to include items in the bibliography without actually
4914−citing them in the body text, you can define a dummy `nocite` metadata
4915−field and put the citations there:
4916−
4917− ---
4918− nocite: |
4919− @item1, @item2
4920− ...
4921
5042
4922− @item3
5043+When you are using a note style, it is usually better to let
4923−
5044+citeproc create the footnotes from citations rather than writing
4924−In this example, the document will contain a citation for `item3`
5045+an explicit note. If you do write an explicit note that
4925−only, but the bibliography will contain entries for `item1`, `item2`, and
5046+contains a citation, note that normal citations will be put in
4926−`item3`.
5047+parentheses, while author-in-text citations will not. For
4927−
5048+this reason, it is sometimes preferable to use the
4928−It is possible to create a bibliography with all the citations,
5049+author-in-text style inside notes when using a note style.
4929−whether or not they appear in the document, by using a wildcard:
4930−
4931− ---
4932− nocite: |
4933− @*
4934− ...
4935−
4936−For LaTeX output, you can also use [`natbib`] or [`biblatex`] to
4937−render the bibliography. In order to do so, specify bibliography
4938−files as outlined above, and add `--natbib` or `--biblatex`
4939−argument to `pandoc` invocation. Bear in mind that bibliography
4940−files have to be in respective format (either BibTeX or
4941−BibLaTeX).
4942−
4943−For more information, see the [pandoc-citeproc man page].
4944
5050
5051+[CSL user documentation]: https://citationstyles.org/authors/
5052+[CSL]: https://docs.citationstyles.org/en/stable/specification.html
4945[CSL markup specs]: https://docs.citationstyles.org/en/1.0/release-notes.html#rich-text-markup-within-fields
5053[CSL markup specs]: https://docs.citationstyles.org/en/1.0/release-notes.html#rich-text-markup-within-fields
4946[Chicago Manual of Style]: https://chicagomanualofstyle.org
5054[Chicago Manual of Style]: https://chicagomanualofstyle.org
4947[Citation Style Language]: https://citationstyles.org
5055[Citation Style Language]: https://citationstyles.org
4948[Zotero Style Repository]: https://www.zotero.org/styles
5056[Zotero Style Repository]: https://www.zotero.org/styles
4949[finding and editing styles]: https://citationstyles.org/authors/
5057[finding and editing styles]: https://citationstyles.org/authors/
4950[CSL locale files]: https://github.com/citation-style-language/locales
5058[CSL locale files]: https://github.com/citation-style-language/locales
4951−[pandoc-citeproc man page]: https://github.com/jgm/pandoc-citeproc/blob/master/man/pandoc-citeproc.1.md
4952
5059
4953−## Non-pandoc extensions
5060+## Non-default extensions
4954
5061
4955The following Markdown syntax extensions are not enabled by default
5062The following Markdown syntax extensions are not enabled by default
4956in pandoc, but may be enabled by adding `+EXTENSION` to the format
5063in pandoc, but may be enabled by adding `+EXTENSION` to the format
4957name, where `EXTENSION` is the name of the extension. Thus, for
5064name, where `EXTENSION` is the name of the extension. Thus, for
4958example, `markdown+hard_line_breaks` is Markdown with hard line breaks.
5065example, `markdown+hard_line_breaks` is Markdown with hard line breaks.
4959
5066
5067+#### Extension: `rebase_relative_paths` ####
5068+
5069+Rewrite relative paths for Markdown links and images, depending
5070+on the path of the file containing the link or image link. For
5071+each link or image, pandoc will compute the directory of the
5072+containing file, relative to the working directory, and prepend
5073+the resulting path to the link or image path.
5074+
5075+The use of this extension is best understood by example.
5076+Suppose you have a a subdirectory for each chapter of a book,
5077+`chap1`, `chap2`, `chap3`. Each contains a file `text.md` and a
5078+number of images used in the chapter. You would like to have
5079+`![image](spider.jpg)` in `chap1/text.md` refer to
5080+`chap1/spider.jpg` and `![image](spider.jpg)` in `chap2/text.md`
5081+refer to `chap2/spider.jpg`. To do this, use
5082+
5083+ pandoc chap*/*.md -f markdown+rebase_relative_paths
5084+
5085+Without this extension, you would have to use
5086+`![image](chap1/spider.jpg)` in `chap1/text.md` and
5087+`![image](chap2/spider.jpg)` in `chap2/text.md`. Links with
5088+relative paths will be rewritten in the same way as images.
5089+
5090+Absolute paths and URLs are not changed. Neither are empty
5091+paths or paths consisting entirely of a fragment, e.g., `#foo`.
5092+
5093+Note that relative paths in reference links and images will
5094+be rewritten relative to the file containing the link
5095+reference definition, not the file containing the reference link
5096+or image itself, if these differ.
5097+
4960#### Extension: `attributes` ####
5098#### Extension: `attributes` ####
4961
5099
4962Allows attributes to be attached to any inline or block-level
5100Allows attributes to be attached to any inline or block-level
@@ -5143,6 +5281,13 @@ for regular emphasis, add extra blank space around headings.
5143
5281
5144 [Project Gutenberg]: https://www.gutenberg.org
5282 [Project Gutenberg]: https://www.gutenberg.org
5145
5283
5284+#### Extension: `sourcepos` ####
5285+
5286+Include source position attributes when parsing `commonmark`.
5287+For elements that accept attributes, a `data-pos` attribute
5288+is added; other elements are placed in a surrounding
5289+Div or Span elemnet with a `data-pos` attribute.
5290+
5146## Markdown variants
5291## Markdown variants
5147
5292
5148In addition to pandoc's extended Markdown, the following Markdown
5293In addition to pandoc's extended Markdown, the following Markdown
@@ -5169,7 +5314,349 @@ commonmark. So, for example, `backtick_code_blocks`
5169does not appear as an extension, since it is enabled by
5314does not appear as an extension, since it is enabled by
5170default and cannot be disabled.
5315default and cannot be disabled.
5171
5316
5172−# Producing slide shows with pandoc
5317+# Citations
5318+
5319+When the `--citeproc` option is used, pandoc can automatically generate
5320+citations and a bibliography in a number of styles. Basic usage is
5321+
5322+ pandoc --citeproc myinput.txt
5323+
5324+To use this feature, you will need to have
5325+
5326+- a document containing citations (see [Extension: `citations`]);
5327+- a source of bibliographic data: either an external bibliography
5328+ file or a list of `references` in the document's YAML metadata
5329+- optionally, a [CSL] citation style.
5330+
5331+## Specifying bibliographic data
5332+
5333+You can specify an external bibliography using the
5334+`bibliography` metadata field in a YAML metadata section or the
5335+`--bibliography` command line argument. If you want to use
5336+multiple bibliography files, you can supply multiple
5337+`--bibliography` arguments or set `bibliography` metadata field
5338+to YAML array. A bibliography may have any of these formats:
5339+
5340+ Format File extension
5341+ ------------ --------------
5342+ BibLaTeX .bib
5343+ BibTeX .bibtex
5344+ CSL JSON .json
5345+ CSL YAML .yaml
5346+
5347+Note that `.bib` can be used with both BibTeX and BibLaTeX files;
5348+use the extension `.bibtex` to force interpretation as BibTeX.
5349+
5350+In BibTeX and BibLaTeX databases, pandoc parses LaTeX markup
5351+inside fields such as `title`; in CSL YAML databases, pandoc
5352+Markdown; and in CSL JSON databases, an [HTML-like markup][CSL
5353+markup specs]:
5354+
5355+`<i>...</i>`
5356+: italics
5357+
5358+`<b>...</b>`
5359+: bold
5360+
5361+`<span style="font-variant:small-caps;">...</span>` or `<sc>...</sc>`
5362+: small capitals
5363+
5364+`<sub>...</sub>`
5365+: subscript
5366+
5367+`<sup>...</sup>`
5368+: superscript
5369+
5370+`<span class="nocase">...</span>`
5371+: prevent a phrase from being capitalized as title case
5372+
5373+As an alternative to specifying a bibliography file using
5374+`--bibliography` or the YAML metadata field `bibliography`, you
5375+can include the citation data directly in the `references` field
5376+of the document's YAML metadata. The field should contain an
5377+array of YAML-encoded references, for example:
5378+
5379+ ---
5380+ references:
5381+ - type: article-journal
5382+ id: WatsonCrick1953
5383+ author:
5384+ - family: Watson
5385+ given: J. D.
5386+ - family: Crick
5387+ given: F. H. C.
5388+ issued:
5389+ date-parts:
5390+ - - 1953
5391+ - 4
5392+ - 25
5393+ title: 'Molecular structure of nucleic acids: a structure for
5394+ deoxyribose nucleic acid'
5395+ title-short: Molecular structure of nucleic acids
5396+ container-title: Nature
5397+ volume: 171
5398+ issue: 4356
5399+ page: 737-738
5400+ DOI: 10.1038/171737a0
5401+ URL: https://www.nature.com/articles/171737a0
5402+ language: en-GB
5403+ ...
5404+
5405+If both an external bibliography and inline (YAML metadata)
5406+references are provided, both will be used. In case of
5407+conflicting `id`s, the inline references will take precedence.
5408+
5409+Note that `pandoc` can be used to produce such a YAML metadata
5410+section from a BibTeX, BibLaTeX, or CSL JSON bibliography:
5411+
5412+ pandoc chem.bib -s -f biblatex -t markdown
5413+ pandoc chem.json -s -f csljson -t markdown
5414+
5415+Indeed, `pandoc` can convert between any of these
5416+citation formats:
5417+
5418+ pandoc chem.bib -s -f biblatex -t csljson
5419+ pandoc chem.yaml -s -f markdown -t biblatex
5420+
5421+Running pandoc on a bibliography file with the `--citeproc`
5422+option will create a formatted bibliography in the format
5423+of your choice:
5424+
5425+ pandoc chem.bib -s --citeproc -o chem.html
5426+ pandoc chem.bib -s --citeproc -o chem.pdf
5427+
5428+### Capitalization in titles
5429+
5430+If you are using a bibtex or biblatex bibliography, then observe
5431+the following rules:
5432+
5433+ - English titles should be in title case. Non-English titles should
5434+ be in sentence case, and the `langid` field in biblatex should be
5435+ set to the relevant language. (The following values are treated
5436+ as English: `american`, `british`, `canadian`, `english`,
5437+ `australian`, `newzealand`, `USenglish`, or `UKenglish`.)
5438+
5439+ - As is standard with bibtex/biblatex, proper names should be
5440+ protected with curly braces so that they won't be lowercased
5441+ in styles that call for sentence case. For example:
5442+
5443+ title = {My Dinner with {Andre}}
5444+
5445+ - In addition, words that should remain lowercase (or camelCase)
5446+ should be protected:
5447+
5448+ title = {Spin Wave Dispersion on the {nm} Scale}
5449+
5450+ Though this is not necessary in bibtex/biblatex, it is necessary
5451+ with citeproc, which stores titles internally in sentence case,
5452+ and converts to title case in styles that require it. Here we
5453+ protect "nm" so that it doesn't get converted to "Nm" at this stage.
5454+
5455+If you are using a CSL bibliography (either JSON or YAML), then observe
5456+the following rules:
5457+
5458+ - All titles should be in sentence case.
5459+
5460+ - Use the `language` field for non-English titles to prevent their
5461+ conversion to title case in styles that call for this. (Conversion
5462+ happens only if `language` begins with `en` or is left empty.)
5463+
5464+ - Protect words that should not be converted to title case using
5465+ this syntax:
5466+
5467+ Spin wave dispersion on the <span class="nocase">nm</span> scale
5468+
5469+### Conference Papers, Published vs. Unpublished
5470+
5471+For a formally published conference paper, use the biblatex entry type
5472+`inproceedings` (which will be mapped to CSL `paper-conference`).
5473+
5474+For an unpublished manuscript, use the biblatex entry type
5475+`unpublished` without an `eventtitle` field (this entry type
5476+will be mapped to CSL `manuscript`).
5477+
5478+For a talk, an unpublished conference paper, or a poster
5479+presentation, use the biblatex entry type `unpublished` with an
5480+`eventtitle` field (this entry type will be mapped to CSL
5481+`speech`). Use the biblatex `type` field to indicate the type,
5482+e.g. "Paper", or "Poster". `venue` and `eventdate` may be useful
5483+too, though `eventdate` will not be rendered by most CSL styles.
5484+Note that `venue` is for the event's venue, unlike `location`
5485+which describes the publisher's location; do not use the latter
5486+for an unpublished conference paper.
5487+
5488+
5489+## Specifying a citation style
5490+
5491+Citations and references can be formatted using any style supported by the
5492+[Citation Style Language], listed in the [Zotero Style Repository].
5493+These files are specified using the `--csl` option or the `csl`
5494+(or `citation-style`) metadata field. By default, pandoc will
5495+use the [Chicago Manual of Style] author-date format. (You can
5496+override this default by copying a CSL style of your choice
5497+to `default.csl` in your user data directory.)
5498+The CSL project provides further information on [finding and
5499+editing styles].
5500+
5501+The `--citation-abbreviations` option (or the
5502+`citation-abbreviations` metadata field) may be used to specify
5503+a JSON file containing abbreviations of journals that should be
5504+used in formatted bibliographies when `form="short"` is
5505+specified. The format of the file can be illustrated with an
5506+example:
5507+
5508+
5509+ { "default": {
5510+ "container-title": {
5511+ "Lloyd's Law Reports": "Lloyd's Rep",
5512+ "Estates Gazette": "EG",
5513+ "Scots Law Times": "SLT"
5514+ }
5515+ }
5516+ }
5517+
5518+
5519+## Citations in note styles
5520+
5521+Pandoc's citation processing is designed to allow you to
5522+move between author-date, numerical, and note styles without
5523+modifying the markdown source. When you're using a note
5524+style, avoid inserting footnotes manually. Instead, insert
5525+citations just as you would in an author-date style---for
5526+example,
5527+
5528+ Blah blah [@foo, p. 33].
5529+
5530+The footnote will be created automatically. Pandoc will take
5531+care of removing the space and moving the note before or
5532+after the period, depending on the setting of
5533+`notes-after-punctuation`, as described below in [Other relevant
5534+metadata fields].
5535+
5536+In some cases you may need to put a citation inside a regular
5537+footnote. Normal citations in footnotes (such as `[@foo, p.
5538+33]`) will be rendered in parentheses. In-text citations (such
5539+as `@foo [p. 33]`) will be rendered without parentheses. (A
5540+comma will be added if appropriate.) Thus:
5541+
5542+ [^1]: Some studies [@foo; @bar, p. 33] show that
5543+ frubulicious zoosnaps are quantical. For a survey
5544+ of the literature, see @baz [chap. 1].
5545+
5546+## Raw content in a style
5547+
5548+To include raw content in a prefix, suffix, delimiter, or term,
5549+surround it with these tags indicating the format:
5550+
5551+ {{jats}}&lt;ref&gt;{{/jats}}
5552+
5553+Without the tags, the string will be interpreted as a string
5554+and escaped in the output, rather than being passed through raw.
5555+
5556+This feature allows stylesheets to be customized to give
5557+different output for different output formats. However,
5558+stylesheets customized in this way will not be usable
5559+by other CSL implementations.
5560+
5561+
5562+
5563+## Placement of the bibliography
5564+
5565+If the style calls for a list of works cited, it will be placed
5566+in a div with id `refs`, if one exists:
5567+
5568+ ::: {#refs}
5569+ :::
5570+
5571+Otherwise, it will be placed at the end of the document.
5572+Generation of the bibliography can be suppressed by setting
5573+`suppress-bibliography: true` in the YAML metadata.
5574+
5575+If you wish the bibliography to have a section heading, you can
5576+set `reference-section-title` in the metadata, or put the heading
5577+at the beginning of the div with id `refs` (if you are using it)
5578+or at the end of your document:
5579+
5580+ last paragraph...
5581+
5582+ # References
5583+
5584+The bibliography will be inserted after this heading. Note that
5585+the `unnumbered` class will be added to this heading, so that the
5586+section will not be numbered.
5587+
5588+## Including uncited items in the bibliography
5589+
5590+If you want to include items in the bibliography without actually
5591+citing them in the body text, you can define a dummy `nocite` metadata
5592+field and put the citations there:
5593+
5594+ ---
5595+ nocite: |
5596+ @item1, @item2
5597+ ...
5598+
5599+ @item3
5600+
5601+In this example, the document will contain a citation for `item3`
5602+only, but the bibliography will contain entries for `item1`, `item2`, and
5603+`item3`.
5604+
5605+It is possible to create a bibliography with all the citations,
5606+whether or not they appear in the document, by using a wildcard:
5607+
5608+ ---
5609+ nocite: |
5610+ @*
5611+ ...
5612+
5613+For LaTeX output, you can also use [`natbib`] or [`biblatex`] to
5614+render the bibliography. In order to do so, specify bibliography
5615+files as outlined above, and add `--natbib` or `--biblatex`
5616+argument to `pandoc` invocation. Bear in mind that bibliography
5617+files have to be in either BibTeX (for `--natbib`)
5618+or BibLaTeX (for `--biblatex`) format.
5619+
5620+## Other relevant metadata fields
5621+
5622+A few other metadata fields affect bibliography formatting:
5623+
5624+`link-citations`
5625+: If true, citations will be
5626+ hyperlinked to the corresponding bibliography entries
5627+ (for author-date and numerical styles only).
5628+
5629+`lang`
5630+: The `lang` field will affect how the style is localized,
5631+ for example in the translation of labels, the use
5632+ of quotation marks, and the way items are sorted.
5633+ (For backwards compatibility, `locale` may be used instead
5634+ of `lang`, but this use is deprecated.)
5635+
5636+ A BCP 47 language tag is expected: for example, `en`,
5637+ `de`, `en-US`, `fr-CA`, `ug-Cyrl`. The unicode extension
5638+ syntax (after `-u-`) may be used to specify options for
5639+ collation (sorting) more precisely. Here are some examples:
5640+
5641+ - `zh-u-co-pinyin` -- Chinese with the Pinyin collation.
5642+ - `es-u-co-trad` -- Spanish with the traditional collation
5643+ (with `Ch` sorting after `C`).
5644+ - `fr-u-kb` -- French with "backwards" accent sorting
5645+ (with `coté` sorting after `côte`).
5646+ - `en-US-u-kf-upper` -- English with uppercase letters sorting
5647+ before lower (default is lower before upper).
5648+
5649+`notes-after-punctuation`
5650+: If true (the default), pandoc will put footnote citations
5651+ after following punctuation. For example, if the source
5652+ contains `blah blah [@jones99].`, the result will look like
5653+ `blah blah.[^1]`, with the note moved after the period and
5654+ the space collapsed. If false, the space will still be
5655+ collapsed, but the footnote will not be moved after the
5656+ punctuation.
5657+
5658+
5659+# Slide shows
5173
5660
5174You can use pandoc to produce an HTML + JavaScript slide presentation
5661You can use pandoc to produce an HTML + JavaScript slide presentation
5175that can be viewed via a web browser. There are five ways to do this,
5662that can be viewed via a web browser. There are five ways to do this,
@@ -5217,18 +5704,21 @@ To produce an HTML/JavaScript slide show, simply type
5217
5704
5218where `FORMAT` is either `s5`, `slidy`, `slideous`, `dzslides`, or `revealjs`.
5705where `FORMAT` is either `s5`, `slidy`, `slideous`, `dzslides`, or `revealjs`.
5219
5706
5220−For Slidy, Slideous, reveal.js, and S5, the file produced by pandoc with the
5707+For Slidy, Slideous, reveal.js, and S5, the file produced by
5221−`-s/--standalone` option embeds a link to JavaScript and CSS files, which are
5708+pandoc with the `-s/--standalone` option embeds a link to
5709+JavaScript and CSS files, which are assumed to be available at
5222−assumed to be available at the relative path `s5/default` (for S5), `slideous`
5710+the relative path `s5/default` (for S5), `slideous` (for
5223−(for Slideous), `reveal.js` (for reveal.js), or at the Slidy website at
5711+Slideous), `reveal.js` (for reveal.js), or at the Slidy website
5224−`w3.org` (for Slidy). (These paths can be changed by setting the `slidy-url`,
5712+at `w3.org` (for Slidy). (These paths can be changed by setting
5713+the `slidy-url`, `slideous-url`, `revealjs-url`, or `s5-url`
5225−`slideous-url`, `revealjs-url`, or `s5-url` variables; see [Variables for HTML slides],
5714+variables; see [Variables for HTML slides], above.) For
5226−above.) For DZSlides, the (relatively short) JavaScript and CSS are included in
5715+DZSlides, the (relatively short) JavaScript and CSS are included
5227−the file by default.
5716+in the file by default.
5228−
5717+
5229−With all HTML slide formats, the `--self-contained` option can be used to
5718+With all HTML slide formats, the `--self-contained` option can
5230−produce a single file that contains all of the data necessary to display the
5719+be used to produce a single file that contains all of the data
5720+necessary to display the slide show, including linked scripts,
5231−slide show, including linked scripts, stylesheets, images, and videos.
5721+stylesheets, images, and videos.
5232
5722
5233To produce a PDF slide show using beamer, type
5723To produce a PDF slide show using beamer, type
5234
5724
@@ -5258,7 +5748,11 @@ rules:
5258 * A heading at the slide level always starts a new slide.
5748 * A heading at the slide level always starts a new slide.
5259
5749
5260 * Headings *below* the slide level in the hierarchy create
5750 * Headings *below* the slide level in the hierarchy create
5261− headings *within* a slide.
5751+ headings *within* a slide. (In beamer, a "block" will be
5752+ created. If the heading has the class `example`, an
5753+ `exampleblock` environment will be used; if it has the class
5754+ `alert`, an `alertblock` will be used; otherwise a regular
5755+ `block` will be used.)
5262
5756
5263 * Headings *above* the slide level in the hierarchy create
5757 * Headings *above* the slide level in the hierarchy create
5264 "title slides," which just contain the section title
5758 "title slides," which just contain the section title
@@ -5511,7 +6005,7 @@ Slide 1 has background_image.png as its background.
5511Slide 2 has a special image for its background, even though the heading has no content.
6005Slide 2 has a special image for its background, even though the heading has no content.
5512```
6006```
5513
6007
5514−# Creating EPUBs with pandoc
6008+# EPUBs
5515
6009
5516## EPUB Metadata
6010## EPUB Metadata
5517
6011
@@ -5591,6 +6085,15 @@ The following fields are recognized:
5591
6085
5592`rights`
6086`rights`
5593 ~ A string value.
6087 ~ A string value.
6088+
6089+`belongs-to-collection`
6090+ ~ A string value. identifies the name of a collection to which
6091+ the EPUB Publication belongs.
6092+
6093+`group-position`
6094+ ~ The `group-position` field indicates the numeric position in which
6095+ the EPUB Publication belongs relative to other works belonging to
6096+ the same `belongs-to-collection` field.
5594
6097
5595`cover-image`
6098`cover-image`
5596 ~ A string value (path to cover image).
6099 ~ A string value (path to cover image).
@@ -5674,7 +6177,7 @@ with the `src` attribute. For example:
5674 </source>
6177 </source>
5675 </audio>
6178 </audio>
5676
6179
5677−# Creating Jupyter notebooks with pandoc
6180+# Jupyter notebooks
5678
6181
5679When creating a [Jupyter notebook], pandoc will try to infer the
6182When creating a [Jupyter notebook], pandoc will try to infer the
5680notebook structure. Code blocks with the class `code` will be
6183notebook structure. Code blocks with the class `code` will be
@@ -5827,7 +6330,7 @@ Then edit `my.theme` and use it like this:
5827If you are not satisfied with the built-in highlighting, or you
6330If you are not satisfied with the built-in highlighting, or you
5828want highlight a language that isn't supported, you can use the
6331want highlight a language that isn't supported, you can use the
5829`--syntax-definition` option to load a [KDE-style XML syntax definition
6332`--syntax-definition` option to load a [KDE-style XML syntax definition
5830−file](https://docs.kde.org/stable5/en/applications/katepart/highlight.html).
6333+file](https://docs.kde.org/stable5/en/kate/katepart/highlight.html).
5831Before writing your own, have a look at KDE's [repository of syntax
6334Before writing your own, have a look at KDE's [repository of syntax
5832definitions](https://github.com/KDE/syntax-highlighting/tree/master/data/syntax).
6335definitions](https://github.com/KDE/syntax-highlighting/tree/master/data/syntax).
5833
6336
@@ -5958,6 +6461,21 @@ subdirectory of your user data directory (see [Templates]).
5958
6461
5959[Lua]: https://www.lua.org
6462[Lua]: https://www.lua.org
5960
6463
6464+# Reproducible builds
6465+
6466+Some of the document formats pandoc targets (such as EPUB,
6467+docx, and ODT) include build timestamps in the generated document.
6468+That means that the files generated on successive builds will
6469+differ, even if the source does not. To avoid this, set the
6470+`SOURCE_DATE_EPOCH` environment variable, and the timestamp will
6471+be taken from it instead of the current time.
6472+`SOURCE_DATE_EPOCH` should contain an integer unix timestamp
6473+(specifying the number of second since midnight UTC January 1, 1970).
6474+
6475+Some document formats also include a unique identifier. For
6476+EPUB, this can be set explicitly by setting the `identifier`
6477+metadata field (see [EPUB Metadata], above).
6478+
5961# A note on security
6479# A note on security
5962
6480
5963If you use pandoc to convert user-contributed content in a web
6481If you use pandoc to convert user-contributed content in a web
@@ -5986,13 +6504,13 @@ application, here are some things to keep in mind:
59864. The HTML generated by pandoc is not guaranteed to be safe.
65044. The HTML generated by pandoc is not guaranteed to be safe.
5987 If `raw_html` is enabled for the Markdown input, users can
6505 If `raw_html` is enabled for the Markdown input, users can
5988 inject arbitrary HTML. Even if `raw_html` is disabled,
6506 inject arbitrary HTML. Even if `raw_html` is disabled,
5989− users can include dangerous content in attributes for
6507+ users can include dangerous content in URLs and attributes.
5990− headings, spans, and code blocks. To be safe, you should
5991− run all the generated HTML through an HTML sanitizer.
6508+ To be safe, you should run all the generated HTML through
6509+ an HTML sanitizer.
5992
6510
5993# Authors
6511# Authors
5994
6512
5995−Copyright 2006--2020 John MacFarlane (jgm@berkeley.edu). Released
6513+Copyright 2006--2021 John MacFarlane (jgm@berkeley.edu). Released
5996under the [GPL], version 2 or greater. This software carries no
6514under the [GPL], version 2 or greater. This software carries no
5997warranty of any kind. (See COPYRIGHT for full copyright and
6515warranty of any kind. (See COPYRIGHT for full copyright and
5998warranty notices.) For a full list of contributors, see the file
6516warranty notices.) For a full list of contributors, see the file
Makefile+47−19
@@ -2,17 +2,31 @@ version?=$(shell grep '^[Vv]ersion:' pandoc.cabal | awk '{print $$2;}')
2pandoc=$(shell find dist -name pandoc -type f -exec ls -t {} \; | head -1)
2pandoc=$(shell find dist -name pandoc -type f -exec ls -t {} \; | head -1)
3SOURCEFILES?=$(shell git ls-tree -r master --name-only | grep "\.hs$$")
3SOURCEFILES?=$(shell git ls-tree -r master --name-only | grep "\.hs$$")
4BRANCH?=master
4BRANCH?=master
5−RESOLVER?=lts-13
5+ARCH=$(shell uname -m)
6+DOCKERIMAGE=registry.gitlab.b-data.ch/ghc/ghc4pandoc:8.10.4
7+COMMIT=$(shell git rev-parse --short HEAD)
8+TIMESTAMP=$(shell date "+%Y%m%d_%H%M")
9+LATESTBENCH=$(word 1,$(shell ls -t bench_*.csv 2>/dev/null))
10+BASELINE?=$(LATESTBENCH)
11+ifeq ($(BASELINE),)
12+BASELINECMD=
13+else
14+BASELINECMD=--baseline $(BASELINE)
15+endif
6−GHCOPTS=-fdiagnostics-color=always
16+GHCOPTS=-fdiagnostics-color=always -j4 +RTS -A8m -RTS
7WEBSITE=../../web/pandoc.org
17WEBSITE=../../web/pandoc.org
8REVISION?=1
18REVISION?=1
19+# For gauge:
20+# BENCHARGS?=--small --ci=0.90 --match=pattern $(PATTERN)
21+# For tasty-bench:
22+BENCHARGS?=--csv bench_$(TIMESTAMP).csv $(BASELINECMD) --timeout=6 +RTS -T -RTS $(if $(PATTERN),--pattern "$(PATTERN)",)
9
23
10quick:
24quick:
11− stack install --ghc-options='$(GHCOPTS)' --install-ghc --flag 'pandoc:embed_data_files' --fast --test --ghc-options='-j +RTS -A64m -RTS' --test-arguments='-j4 --hide-successes $(TESTARGS)'
25+ stack install --ghc-options='$(GHCOPTS)' --install-ghc --flag 'pandoc:embed_data_files' --fast --test --ghc-options='$(GHCOPTS)' --test-arguments='-j4 --hide-successes $(TESTARGS)'
12
26
13quick-cabal:
27quick-cabal:
14 cabal new-configure . --ghc-options '$(GHCOPTS)' --disable-optimization --enable-tests
28 cabal new-configure . --ghc-options '$(GHCOPTS)' --disable-optimization --enable-tests
15− cabal new-build . --disable-optimization
29+ cabal new-build -j4 . --disable-optimization
16 cabal new-run test-pandoc --disable-optimization -- --hide-successes $(TESTARGS)
30 cabal new-run test-pandoc --disable-optimization -- --hide-successes $(TESTARGS)
17
31
18full-cabal:
32full-cabal:
@@ -21,7 +35,7 @@ full-cabal:
21 cabal new-run test-pandoc --disable-optimization -- --hide-successes $(TESTARGS)
35 cabal new-run test-pandoc --disable-optimization -- --hide-successes $(TESTARGS)
22
36
23full:
37full:
24− stack install --flag 'pandoc:embed_data_files' --flag 'pandoc:trypandoc' --bench --no-run-benchmarks --test --test-arguments='-j4 --hide-successes' --ghc-options '-Wall -Werror -fno-warn-unused-do-bind -O0 -j4 $(GHCOPTS)'
38+ stack install --flag 'pandoc:embed_data_files' --flag 'pandoc:trypandoc' --bench --no-run-benchmarks --test --test-arguments='-j4 --hide-successes' --ghc-options '-Wall -Werror -fno-warn-unused-do-bind -O0 $(GHCOPTS)'
25
39
26ghci:
40ghci:
27 stack ghci --flag 'pandoc:embed_data_files'
41 stack ghci --flag 'pandoc:embed_data_files'
@@ -37,11 +51,14 @@ test:
37ghcid:
51ghcid:
38 ghcid -c "stack repl --flag 'pandoc:embed_data_files'"
52 ghcid -c "stack repl --flag 'pandoc:embed_data_files'"
39
53
40−bench:
54+ghcid-test:
41− stack bench --benchmark-arguments='$(BENCHARGS)' --ghc-options '$(GHCOPTS)'
55+ ghcid -c "stack repl --ghc-options=-XNoImplicitPrelude --flag 'pandoc:embed_data_files' --ghci-options=-fobject-code pandoc:lib pandoc:test-pandoc"
42
56
43−weigh:
57+bench:
58+ stack bench \
44− stack build --ghc-options '$(GHCOPTS)' pandoc:weigh-pandoc && stack exec weigh-pandoc
59+ --ghc-options '$(GHCOPTS)' \
60+ --benchmark-arguments='$(BENCHARGS)' 2>&1 | \
61+ tee "bench_latest.txt"
45
62
46reformat:
63reformat:
47 for f in $(SOURCEFILES); do echo $$f; stylish-haskell -i $$f ; done
64 for f in $(SOURCEFILES); do echo $$f; stylish-haskell -i $$f ; done
@@ -65,21 +82,22 @@ dist: man/pandoc.1
65 cd pandoc-${version}
82 cd pandoc-${version}
66 stack setup && stack test && cd .. && rm -rf "pandoc-${version}"
83 stack setup && stack test && cd .. && rm -rf "pandoc-${version}"
67
84
85+check: checkdocs check-cabal
86+
68−checkdocs: README.md
87+checkdocs:
69− ! grep -n -e "\t" MANUAL.txt changelog
88+ ! grep -q -n -e "\t" MANUAL.txt changelog.md
70
89
71debpkg: man/pandoc.1
90debpkg: man/pandoc.1
72 docker run -v `pwd`:/mnt \
91 docker run -v `pwd`:/mnt \
73 -v `pwd`/linux/artifacts:/artifacts \
92 -v `pwd`/linux/artifacts:/artifacts \
93+ --user $(id -u):$(id -g) \
74 -e REVISION=$(REVISION) \
94 -e REVISION=$(REVISION) \
75 -w /mnt \
95 -w /mnt \
76− utdemir/ghc-musl:v12-libgmp-ghc8101 bash \
96+ --memory=0 \
97+ --rm \
98+ $(DOCKERIMAGE) \
99+ bash \
77− /mnt/linux/make_artifacts.sh
100+ /mnt/linux/make_artifacts.sh 2>&1 > docker.log
78−
79−macospkg:
80− rm -rf macos-release-candidate
81− aws s3 sync s3://travis-jgm-pandoc macos-release-candidate
82− make -C macos-release-candidate
83
101
84man/pandoc.1: MANUAL.txt man/pandoc.1.before man/pandoc.1.after
102man/pandoc.1: MANUAL.txt man/pandoc.1.before man/pandoc.1.after
85 pandoc $< -f markdown -t man -s \
103 pandoc $< -f markdown -t man -s \
@@ -117,4 +135,14 @@ update-website:
117clean:
135clean:
118 stack clean
136 stack clean
119
137
138+check-cabal: git-files.txt sdist-files.txt
139+ echo "Checking to see if all committed test/data files are in sdist."
140+ diff -u $^
141+
142+sdist-files.txt: .FORCE
143+ cabal sdist --list-only | sed 's/\.\///' | grep '^\(test\|data\)\/' | sort > $@
144+
145+git-files.txt: .FORCE
146+ git ls-tree -r --name-only HEAD | grep '^\(test\|data\)\/' | sort > $@
147+
120−.PHONY: deps quick full haddock install clean test bench changes_github macospkg dist prof download_stats reformat lint weigh doc/lua-filters.md pandoc-templates trypandoc update-website debpkg macospkg checkdocs ghcid ghci fix_spacing hlint
148+.PHONY: .FORCE deps quick full haddock install clean test bench changes_github dist prof download_stats reformat lint weigh doc/lua-filters.md pandoc-templates trypandoc update-website debpkg checkdocs ghcid ghci fix_spacing hlint check check-cabal
README.md+23−19
@@ -3,35 +3,38 @@ README.template and MANUAL.txt via the command:
3pandoc --lua-filter tools/update-readme.lua README.template -o README.md
3pandoc --lua-filter tools/update-readme.lua README.template -o README.md
4-->
4-->
5
5
6−Pandoc
6+# Pandoc
7−======
8
7
9[![github
8[![github
10release](https://img.shields.io/github/release/jgm/pandoc.svg?label=current+release)](https://github.com/jgm/pandoc/releases)
9release](https://img.shields.io/github/release/jgm/pandoc.svg?label=current+release)](https://github.com/jgm/pandoc/releases)
11[![hackage
10[![hackage
12−release](https://img.shields.io/hackage/v/pandoc.svg?label=hackage)](http://hackage.haskell.org/package/pandoc)
11+release](https://img.shields.io/hackage/v/pandoc.svg?label=hackage)](https://hackage.haskell.org/package/pandoc)
13−[![homebrew](https://img.shields.io/homebrew/v/pandoc.svg)](http://brewformulas.org/Pandoc)
12+[![homebrew](https://img.shields.io/homebrew/v/pandoc.svg)](https://formulae.brew.sh/formula/pandoc)
14[![stackage LTS
13[![stackage LTS
15−package](http://stackage.org/package/pandoc/badge/lts)](http://stackage.org/lts/package/pandoc)
14+package](https://stackage.org/package/pandoc/badge/lts)](https://www.stackage.org/lts/package/pandoc-types)
16[![CI
15[![CI
17tests](https://github.com/jgm/pandoc/workflows/CI%20tests/badge.svg)](https://github.com/jgm/pandoc/actions)
16tests](https://github.com/jgm/pandoc/workflows/CI%20tests/badge.svg)](https://github.com/jgm/pandoc/actions)
18[![license](https://img.shields.io/badge/license-GPLv2+-lightgray.svg)](https://www.gnu.org/licenses/gpl.html)
17[![license](https://img.shields.io/badge/license-GPLv2+-lightgray.svg)](https://www.gnu.org/licenses/gpl.html)
19[![pandoc-discuss on google
18[![pandoc-discuss on google
20groups](https://img.shields.io/badge/pandoc-discuss-red.svg?style=social)](https://groups.google.com/forum/#!forum/pandoc-discuss)
19groups](https://img.shields.io/badge/pandoc-discuss-red.svg?style=social)](https://groups.google.com/forum/#!forum/pandoc-discuss)
21
20
22−The universal markup converter
21+## The universal markup converter
23−------------------------------
24
22
25−Pandoc is a [Haskell](http://haskell.org) library for converting from
23+Pandoc is a [Haskell](https://haskell.org) library for converting from
26one markup format to another, and a command-line tool that uses this
24one markup format to another, and a command-line tool that uses this
27library. It can convert *from*
25library. It can convert *from*
28
26
29<div id="input-formats">
27<div id="input-formats">
30
28
29+- `bibtex` ([BibTeX](https://ctan.org/pkg/bibtex) bibliography)
30+- `biblatex` ([BibLaTeX](https://ctan.org/pkg/biblatex) bibliography)
31- `commonmark` ([CommonMark](https://commonmark.org) Markdown)
31- `commonmark` ([CommonMark](https://commonmark.org) Markdown)
32- `commonmark_x` ([CommonMark](https://commonmark.org) Markdown with
32- `commonmark_x` ([CommonMark](https://commonmark.org) Markdown with
33 extensions)
33 extensions)
34- `creole` ([Creole 1.0](http://www.wikicreole.org/wiki/Creole1.0))
34- `creole` ([Creole 1.0](http://www.wikicreole.org/wiki/Creole1.0))
35+- `csljson` ([CSL
36+ JSON](https://citeproc-js.readthedocs.io/en/latest/csl-json/markup.html)
37+ bibliography)
35- `csv` ([CSV](https://tools.ietf.org/html/rfc4180) table)
38- `csv` ([CSV](https://tools.ietf.org/html/rfc4180) table)
36- `docbook` ([DocBook](https://docbook.org))
39- `docbook` ([DocBook](https://docbook.org))
37- `docx` ([Word docx](https://en.wikipedia.org/wiki/Office_Open_XML))
40- `docx` ([Word docx](https://en.wikipedia.org/wiki/Office_Open_XML))
@@ -92,10 +95,15 @@ It can convert *to*
92- `asciidoc` ([AsciiDoc](https://www.methods.co.nz/asciidoc/)) or
95- `asciidoc` ([AsciiDoc](https://www.methods.co.nz/asciidoc/)) or
93 `asciidoctor` ([AsciiDoctor](https://asciidoctor.org/))
96 `asciidoctor` ([AsciiDoctor](https://asciidoctor.org/))
94- `beamer` ([LaTeX beamer](https://ctan.org/pkg/beamer) slide show)
97- `beamer` ([LaTeX beamer](https://ctan.org/pkg/beamer) slide show)
98+- `bibtex` ([BibTeX](https://ctan.org/pkg/bibtex) bibliography)
99+- `biblatex` ([BibLaTeX](https://ctan.org/pkg/biblatex) bibliography)
95- `commonmark` ([CommonMark](https://commonmark.org) Markdown)
100- `commonmark` ([CommonMark](https://commonmark.org) Markdown)
96- `commonmark_x` ([CommonMark](https://commonmark.org) Markdown with
101- `commonmark_x` ([CommonMark](https://commonmark.org) Markdown with
97 extensions)
102 extensions)
98- `context` ([ConTeXt](https://www.contextgarden.net/))
103- `context` ([ConTeXt](https://www.contextgarden.net/))
104+- `csljson` ([CSL
105+ JSON](https://citeproc-js.readthedocs.io/en/latest/csl-json/markup.html)
106+ bibliography)
99- `docbook` or `docbook4` ([DocBook](https://docbook.org) 4)
107- `docbook` or `docbook4` ([DocBook](https://docbook.org) 4)
100- `docbook5` (DocBook 5)
108- `docbook5` (DocBook 5)
101- `docx` ([Word docx](https://en.wikipedia.org/wiki/Office_Open_XML))
109- `docx` ([Word docx](https://en.wikipedia.org/wiki/Office_Open_XML))
@@ -167,7 +175,7 @@ It can convert *to*
167 and JavaScript slide show)
175 and JavaScript slide show)
168- `slidy` ([Slidy](https://www.w3.org/Talks/Tools/Slidy2/) HTML and
176- `slidy` ([Slidy](https://www.w3.org/Talks/Tools/Slidy2/) HTML and
169 JavaScript slide show)
177 JavaScript slide show)
170−- `dzslides` ([DZSlides](http://paulrouget.com/dzslides/) HTML5 +
178+- `dzslides` ([DZSlides](https://paulrouget.com/dzslides/) HTML5 +
171 JavaScript slide show),
179 JavaScript slide show),
172- `revealjs` ([reveal.js](https://revealjs.com/) HTML5 + JavaScript
180- `revealjs` ([reveal.js](https://revealjs.com/) HTML5 + JavaScript
173 slide show)
181 slide show)
@@ -209,13 +217,11 @@ While conversions from pandoc’s Markdown to all formats aspire to be
209perfect, conversions from formats more expressive than pandoc’s Markdown
217perfect, conversions from formats more expressive than pandoc’s Markdown
210can be expected to be lossy.
218can be expected to be lossy.
211
219
212−Installing
220+## Installing
213−----------
214
221
215Here’s [how to install pandoc](INSTALL.md).
222Here’s [how to install pandoc](INSTALL.md).
216
223
217−Documentation
224+## Documentation
218−-------------
219
225
220Pandoc’s website contains a full [User’s
226Pandoc’s website contains a full [User’s
221Guide](https://pandoc.org/MANUAL.html). It is also available
227Guide](https://pandoc.org/MANUAL.html). It is also available
@@ -224,17 +230,15 @@ contains some [examples of the use of
224pandoc](https://pandoc.org/demos.html) and a limited [online
230pandoc](https://pandoc.org/demos.html) and a limited [online
225demo](https://pandoc.org/try).
231demo](https://pandoc.org/try).
226
232
227−Contributing
233+## Contributing
228−------------
229
234
230Pull requests, bug reports, and feature requests are welcome. Please
235Pull requests, bug reports, and feature requests are welcome. Please
231make sure to read [the contributor guidelines](CONTRIBUTING.md) before
236make sure to read [the contributor guidelines](CONTRIBUTING.md) before
232opening a new issue.
237opening a new issue.
233
238
234−License
239+## License
235−-------
236
240
237−© 2006-2020 John MacFarlane (jgm@berkeley.edu). Released under the
241+© 2006-2021 John MacFarlane (jgm@berkeley.edu). Released under the
238−[GPL](http://www.gnu.org/copyleft/gpl.html "GNU General Public License"),
242+[GPL](https://www.gnu.org/licenses/old-licenses/gpl-2.0.html "GNU General Public License"),
239version 2 or greater. This software carries no warranty of any kind.
243version 2 or greater. This software carries no warranty of any kind.
240(See COPYRIGHT for full copyright and warranty notices.)
244(See COPYRIGHT for full copyright and warranty notices.)
README.template+6−6
@@ -7,9 +7,9 @@ Pandoc
7======
7======
8
8
9[![github release](https://img.shields.io/github/release/jgm/pandoc.svg?label=current+release)](https://github.com/jgm/pandoc/releases)
9[![github release](https://img.shields.io/github/release/jgm/pandoc.svg?label=current+release)](https://github.com/jgm/pandoc/releases)
10−[![hackage release](https://img.shields.io/hackage/v/pandoc.svg?label=hackage)](http://hackage.haskell.org/package/pandoc)
10+[![hackage release](https://img.shields.io/hackage/v/pandoc.svg?label=hackage)](https://hackage.haskell.org/package/pandoc)
11−[![homebrew](https://img.shields.io/homebrew/v/pandoc.svg)](http://brewformulas.org/Pandoc)
11+[![homebrew](https://img.shields.io/homebrew/v/pandoc.svg)](https://formulae.brew.sh/formula/pandoc)
12−[![stackage LTS package](http://stackage.org/package/pandoc/badge/lts)](http://stackage.org/lts/package/pandoc)
12+[![stackage LTS package](https://stackage.org/package/pandoc/badge/lts)](https://www.stackage.org/lts/package/pandoc-types)
13[![CI tests](https://github.com/jgm/pandoc/workflows/CI%20tests/badge.svg)](https://github.com/jgm/pandoc/actions)
13[![CI tests](https://github.com/jgm/pandoc/workflows/CI%20tests/badge.svg)](https://github.com/jgm/pandoc/actions)
14[![license](https://img.shields.io/badge/license-GPLv2+-lightgray.svg)](https://www.gnu.org/licenses/gpl.html)
14[![license](https://img.shields.io/badge/license-GPLv2+-lightgray.svg)](https://www.gnu.org/licenses/gpl.html)
15[![pandoc-discuss on google groups](https://img.shields.io/badge/pandoc-discuss-red.svg?style=social)](https://groups.google.com/forum/#!forum/pandoc-discuss)
15[![pandoc-discuss on google groups](https://img.shields.io/badge/pandoc-discuss-red.svg?style=social)](https://groups.google.com/forum/#!forum/pandoc-discuss)
@@ -81,9 +81,9 @@ new issue.
81License
81License
82-------
82-------
83
83
84−© 2006-2020 John MacFarlane (jgm@berkeley.edu). Released under the
84+© 2006-2021 John MacFarlane (jgm@berkeley.edu). Released under the
85[GPL], version 2 or greater. This software carries no warranty of
85[GPL], version 2 or greater. This software carries no warranty of
86any kind. (See COPYRIGHT for full copyright and warranty notices.)
86any kind. (See COPYRIGHT for full copyright and warranty notices.)
87
87
88−[GPL]: http://www.gnu.org/copyleft/gpl.html "GNU General Public License"
88+[GPL]: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html "GNU General Public License"
89−[Haskell]: http://haskell.org
89+[Haskell]: https://haskell.org
RELEASE-CHECKLIST+3−1
@@ -1,9 +1,11 @@
1+[ ] use 'policeman' to check API changes and version update
1[ ] make README.md and commit if needed
2[ ] make README.md and commit if needed
2[ ] make man/pandoc.1 and commit if needed
3[ ] make man/pandoc.1 and commit if needed
3[ ] Finalize changelog
4[ ] Finalize changelog
4− tools/changelog-helper.sh
5[ ] push release candidate branch rc/VERSION and (if it builds
5[ ] push release candidate branch rc/VERSION and (if it builds
6 successfully) download artifacts
6 successfully) download artifacts
7+[ ] run tools/build-arm.sh to create and download arm64 linux package
8+[ ] download macos artifacts from CircleCI
7[ ] Use 'make' in macos and windows artifacts to sign code
9[ ] Use 'make' in macos and windows artifacts to sign code
8[ ] make update-website
10[ ] make update-website
9[ ] make trypandoc
11[ ] make trypandoc
SECURITY.mdnew file+12
@@ -0,0 +1,12 @@
1+# Security Policy
2+
3+## Supported Versions
4+
5+Only the most recent version of pandoc is supported with security updates.
6+
7+## Reporting a Vulnerability
8+
9+To report a vulnerability, email the maintainer, jgm@berkeley.edu.
10+But first please read the section of the manual entitled
11+[A note on security](https://pandoc.org/MANUAL.html#a-note-on-security),
12+which describes some security guarantees pandoc does NOT make.
pandoc.hs → app/pandoc.hsrenamed+1−3
@@ -1,7 +1,6 @@
1−{-# LANGUAGE NoImplicitPrelude #-}
2{- |
1{- |
3 Module : Main
2 Module : Main
4− Copyright : Copyright (C) 2006-2020 John MacFarlane
3+ Copyright : Copyright (C) 2006-2021 John MacFarlane
5 License : GNU GPL, version 2 or above
4 License : GNU GPL, version 2 or above
6
5
7 Maintainer : John MacFarlane <jgm@berkeley@edu>
6 Maintainer : John MacFarlane <jgm@berkeley@edu>
@@ -12,7 +11,6 @@ Parses command-line options and calls the appropriate readers and
12writers.
11writers.
13-}
12-}
14module Main where
13module Main where
15−import Prelude
16import qualified Control.Exception as E
14import qualified Control.Exception as E
17import Text.Pandoc.App (convertWithOpts, defaultOpts, options, parseOptions)
15import Text.Pandoc.App (convertWithOpts, defaultOpts, options, parseOptions)
18import Text.Pandoc.Error (handleError)
16import Text.Pandoc.Error (handleError)
benchmark/benchmark-pandoc.hs+65−84
@@ -1,7 +1,6 @@
1−{-# LANGUAGE NoImplicitPrelude #-}
2{-# LANGUAGE OverloadedStrings #-}
1{-# LANGUAGE OverloadedStrings #-}
3{-
2{-
4−Copyright (C) 2012-2019 John MacFarlane <jgm@berkeley.edu>
3+Copyright (C) 2012-2021 John MacFarlane <jgm@berkeley.edu>
5
4
6This program is free software; you can redistribute it and/or modify
5This program is free software; you can redistribute it and/or modify
7it under the terms of the GNU General Public License as published by
6it under the terms of the GNU General Public License as published by
@@ -17,106 +16,88 @@ You should have received a copy of the GNU General Public License
17along with this program; if not, write to the Free Software
16along with this program; if not, write to the Free Software
18Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19-}
18-}
20−import Prelude
21import Text.Pandoc
19import Text.Pandoc
22import Text.Pandoc.MIME
20import Text.Pandoc.MIME
21+import Control.DeepSeq (force)
23−import Control.Monad.Except (throwError, liftIO)
22+import Control.Monad.Except (throwError)
24import qualified Text.Pandoc.UTF8 as UTF8
23import qualified Text.Pandoc.UTF8 as UTF8
25import qualified Data.ByteString as B
24import qualified Data.ByteString as B
26import qualified Data.Text as T
25import qualified Data.Text as T
27−import Criterion.Main
26+import Test.Tasty.Bench
28−import Criterion.Types (Config(..))
27+-- import Gauge
29−import Data.List (intersect)
30−import Data.Maybe (mapMaybe, catMaybes)
31−import System.Environment (getArgs)
32import qualified Data.ByteString.Lazy as BL
28import qualified Data.ByteString.Lazy as BL
33−
29+import Data.Maybe (mapMaybe)
34−data Input = InputText {unInputText :: T.Text}
30+import Data.List (sortOn)
35− | InputBS {unInputBS :: BL.ByteString}
36
31
37readerBench :: Pandoc
32readerBench :: Pandoc
38 -> T.Text
33 -> T.Text
39− -> IO (Maybe Benchmark)
34+ -> Maybe Benchmark
40−readerBench doc name = do
35+readerBench _ name
41− let (rdr, rexts) = either (error . show) id . runPure $ getReader name
36+ | name `elem` ["bibtex", "biblatex", "csljson"] = Nothing
42− res <- runIO $ do
37+readerBench doc name = either (const Nothing) Just $
38+ runPure $ do
39+ (rdr, rexts) <- getReader name
43− (wtr, wexts) <- getWriter name
40+ (wtr, wexts) <- getWriter name
44− case (rdr, wtr) of
41+ case (rdr, wtr) of
45− (TextReader r, TextWriter w) -> do
42+ (TextReader r, TextWriter w) -> do
46− setResourcePath ["./test"]
47− inp <- w def{ writerWrapText = WrapAuto
43+ inp <- w def{ writerWrapText = WrapAuto
48− , writerExtensions = wexts } doc
44+ , writerExtensions = wexts } doc
49− return (r def{ readerExtensions = rexts } . unInputText, InputText inp)
45+ return $ bench (T.unpack name) $
46+ nf (either (error . show) id . runPure . r def) inp
50− (ByteStringReader r, ByteStringWriter w) -> do
47+ (ByteStringReader r, ByteStringWriter w) -> do
51− setResourcePath ["./test"]
52− tmpl <- Just <$> compileDefaultTemplate name
48+ tmpl <- Just <$> compileDefaultTemplate name
53− inp <- w def{ writerWrapText = WrapAuto
49+ inp <- w def{ writerWrapText = WrapAuto
54− , writerExtensions = wexts
50+ , writerExtensions = wexts
55− , writerTemplate = tmpl } doc
51+ , writerTemplate = tmpl } doc
56− liftIO $ BL.writeFile "/tmp/test.odt" inp
52+ return $ bench (T.unpack name) $
53+ nf (either (error . show) id .
57− return (r def{ readerExtensions = rexts } . unInputBS, InputBS inp)
54+ runPure . r def{readerExtensions = rexts}) inp
58− _ -> throwError $ PandocSomeError $ "text/bytestring format mismatch: "
55+ _ -> throwError $ PandocSomeError $ "text/bytestring format mismatch: "
59− <> name
56+ <> name
60− return $ case res of
61− Right (readerFun, inp) ->
62− Just $ bench (T.unpack $ name <> " reader")
63− $ nf (\i -> either (error . show) id $ runPure (readerFun i))
64− inp
65− Left _ -> Nothing
66
57
67getImages :: IO [(FilePath, MimeType, BL.ByteString)]
58getImages :: IO [(FilePath, MimeType, BL.ByteString)]
68getImages = do
59getImages = do
69− ll <- BL.readFile "test/lalune.jpg"
60+ ll <- B.readFile "test/lalune.jpg"
70− mv <- BL.readFile "test/movie.jpg"
61+ mv <- B.readFile "test/movie.jpg"
71− return [("lalune.jpg", "image/jpg", ll)
62+ return [("lalune.jpg", "image/jpg", BL.fromStrict ll)
72− ,("movie.jpg", "image/jpg", mv)]
63+ ,("movie.jpg", "image/jpg", BL.fromStrict mv)]
73
64
65+writerBench :: [(FilePath, MimeType, BL.ByteString)]
74−writerBench :: Pandoc
66+ -> Pandoc
75 -> T.Text
67 -> T.Text
76 -> Maybe Benchmark
68 -> Maybe Benchmark
77−writerBench doc name =
69+writerBench _ _ name
70+ | name `elem` ["bibtex", "biblatex", "csljson"] = Nothing
71+writerBench imgs doc name = either (const Nothing) Just $
72+ runPure $ do
73+ (wtr, wexts) <- getWriter name
78− case res of
74+ case wtr of
79− Right writerFun ->
75+ TextWriter writerFun ->
80− Just $ env getImages $ \imgs ->
76+ return $ bench (T.unpack name)
77+ $ nf (\d -> either (error . show) id $
78+ runPure $ do
79+ mapM_ (\(fp,mt,bs) -> insertMedia fp (Just mt) bs) imgs
80+ writerFun def{ writerExtensions = wexts} d)
81+ doc
82+ ByteStringWriter writerFun ->
81− bench (T.unpack $ name <> " writer")
83+ return $ bench (T.unpack name)
82 $ nf (\d -> either (error . show) id $
84 $ nf (\d -> either (error . show) id $
83− runPure (do mapM_
85+ runPure $ do
84− (\(fp, mt, bs) ->
85− insertMedia fp (Just mt) bs)
86+ mapM_ (\(fp,mt,bs) -> insertMedia fp (Just mt) bs) imgs
86− imgs
87− writerFun d)) doc
88− Left _ -> Nothing
89− where res = runPure $ do
90− (wtr, wexts) <- getWriter name
91− case wtr of
92− TextWriter w ->
93− return $ w def{ writerExtensions = wexts }
87+ writerFun def{ writerExtensions = wexts} d)
94− _ -> throwError $ PandocSomeError
88+ doc
95− $ "could not get text writer for " <> name
96
89
97main :: IO ()
90main :: IO ()
98main = do
91main = do
99− args <- filter (\x -> T.take 1 x /= "-") . fmap T.pack <$> getArgs
100− print args
101− let matchReader (n, _) =
102− null args || ("reader" `elem` args && n `elem` args)
103− matchWriter (n, TextWriter _) =
104− null args || ("writer" `elem` args && n `elem` args)
105− matchWriter _ = False
106− allWriters = map fst (writers :: [(T.Text, Writer PandocPure)])
107− matchedReaders = map fst (filter matchReader readers
108− :: [(T.Text, Reader PandocPure)])
109− matchedWriters = map fst (filter matchWriter writers
110− :: [(T.Text, Writer PandocPure)])
111 inp <- UTF8.toText <$> B.readFile "test/testsuite.txt"
92 inp <- UTF8.toText <$> B.readFile "test/testsuite.txt"
112 let opts = def
93 let opts = def
113− let doc = either (error . show) id $ runPure $ readMarkdown opts inp
94+ let doc = either (error . show) force $ runPure $ readMarkdown opts inp
114− readerBs <- fmap catMaybes
95+ defaultMain
96+ [ env getImages $ \imgs ->
97+ bgroup "writers" $ mapMaybe (writerBench imgs doc . fst)
98+ (sortOn fst
99+ writers :: [(T.Text, Writer PandocPure)])
115− $ mapM (readerBench doc)
100+ , bgroup "readers" $ mapMaybe (readerBench doc . fst)
116− $ filter (/="haddock")
101+ (sortOn fst
117− (matchedReaders `intersect` allWriters)
102+ readers :: [(T.Text, Reader PandocPure)])
118− -- we need the corresponding writer to generate
103+ ]
119− -- input for the reader
120− let writerBs = mapMaybe (writerBench doc) matchedWriters
121− defaultMainWith defaultConfig{ timeLimit = 6.0 }
122− (writerBs ++ readerBs)
benchmark/weigh-pandoc.hsdeleted−50
@@ -1,50 +0,0 @@
1−{-# LANGUAGE NoImplicitPrelude #-}
2−{-# LANGUAGE OverloadedStrings #-}
3−{- |
4− Module : Main
5− Copyright : © 2016-2019 John MacFarlane <jgm@berkeley.edu>
6− License : GNU GPL, version 2 or above
7−
8− Maintainer : John MacFarlane <jgm@berkeley.edu>
9− Stability : alpha
10− Portability : portable
11−
12−Benchmarks to determine resource use of readers and writers.
13−-}
14−import Prelude
15−import Weigh
16−import Text.Pandoc
17−import Data.Text (Text, unpack)
18−
19−main :: IO ()
20−main = do
21− doc <- read <$> readFile "test/testsuite.native"
22− mainWith $ do
23− func "Pandoc document" id doc
24− mapM_
25− (\(n,r) -> weighReader doc n (either (error . show) id . runPure . r def{readerExtensions = pandocExtensions}))
26− [("markdown", readMarkdown)
27− ,("html", readHtml)
28− ,("docbook", readDocBook)
29− ,("latex", readLaTeX)
30− ,("commonmark", readCommonMark)
31− ]
32− mapM_
33− (\(n,w) -> weighWriter doc n (either (error . show) id . runPure . w def))
34− [("markdown", writeMarkdown)
35− ,("html", writeHtml5String)
36− ,("docbook", writeDocbook5)
37− ,("latex", writeLaTeX)
38− ,("commonmark", writeCommonMark)
39− ]
40−
41−weighWriter :: Pandoc -> String -> (Pandoc -> Text) -> Weigh ()
42−weighWriter doc name writer = func (name ++ " writer") writer doc
43−
44−weighReader :: Pandoc -> Text -> (Text -> Pandoc) -> Weigh ()
45−weighReader doc name reader =
46− case lookup name writers of
47− Just (TextWriter writer) ->
48− let inp = either (error . show) id $ runPure $ writer def{ writerWrapText = WrapAuto} doc
49− in func (unpack $ name <> " reader") reader inp
50− _ -> return () -- no writer for reader
cabal.project+9−10
@@ -1,14 +1,13 @@
1packages: pandoc.cabal
1packages: pandoc.cabal
2+tests: True
3+flags: +embed_data_files
2
4
3−package pandoc
5+source-repository-package
4− flags: +embed_data_files -trypandoc
6+ type: git
5− ghc-options: -j +RTS -A64m -RTS
7+ location: https://github.com/jgm/doctemplates
6−
8+ tag: 428c26d5303cf7a2b1051fe1ffd9aafe9ba71c81
7−package pandoc-citeproc
8− flags: +embed_data_files +bibutils -unicode_collation -test_citeproc -debug
9− ghc-options: -j +RTS -A64m -RTS
10
9
11source-repository-package
10source-repository-package
12− type: git
11+ type: git
13− location: https://github.com/jgm/pandoc-citeproc
12+ location: https://github.com/jgm/citeproc
14− tag: 0.17.0.2
13+ tag: 4ce0501cd6f9c86eee087afcf878c256e49b9615
changelog.md+2510−22
@@ -1,5 +1,2493 @@
1# Revision history for pandoc
1# Revision history for pandoc
2
2
3+## pandoc 2.14.0.3 (2021-06-22)
4+
5+ * Text.Pandoc.MediaBag `insertMediaBag`: ensure we get a sane mediaPath
6+ for URLs (#7391). In earlier 2.14.x versions, we'd get
7+ incorrect paths for resources downloaded from URLs when the
8+ media are extracted (including in PDF production).
9+ * Text.Pandoc.Parsing: improve `emailAddress` (#7398).
10+ Previously the parser would accept characters in domains
11+ that are illegal in domains, and this sometimes caused it
12+ to gobble bits of the following text.
13+ * txt2tags reader: modify the email address parser so
14+ it still includes form parameters, even after the change to
15+ `emailAddress` in Text.Pandoc.Parsing.
16+ * Text.Pandoc.Readers.Metadata: Fix regression with comment-only YAML
17+ metadata blocks (#7400).
18+ * reveal.js writer and template: better handling of options. Previously
19+ it was impossible to specify false values for options that default to
20+ true (e.g. `center`); setting the option to false just caused the portion
21+ of the template setting the option to be omitted. Now we prepopulate
22+ all the variables with their default values, including them all
23+ unconditionally and allowing them to be overridden.
24+ * Markdown writer: Fix regression in code blocks with attributes (#7397).
25+ Code blocks with a single class but nonempty attributes
26+ were having attributes drop as a result of #7242.
27+ * LaTeX writer:
28+ + Add strut at end of minipage if it contains line breaks.
29+ Without them, the last line is not as tall as it should be in
30+ some cases.
31+ + Always use a minipage for cells with line breaks, when
32+ width information is available (#7393). Otherwise the way we treat them
33+ can lead to content that overflows a cell.
34+ + Use `\strut` instead of `~` before `\\` in empty line.
35+ * Use lts-18.0 stack resolver.
36+ * Require skylighting 0.10.5.2 (adding support for Swift).
37+ * Require commonmark 0.2.1.
38+ * Rephrase section on unsafe HTML in manual.
39+ * Create SECURITY.md
40+
41+## pandoc 2.14.0.2 (2021-06-13)
42+
43+ * Fix MediaBag regressions (#7345). iIn the 2.14 release `--extract-media`
44+ stopped working as before; there could be mismatches between the
45+ paths in the rendered document and the extracted media.
46+ This patch makes several changes that restore the earlier behavior
47+ (while keeping the same API). The `mediaPath` in 2.14 was always
48+ constructed from the SHA1 hash of the media contents. Now, we
49+ preserve the original path unless it's an absolute path or contains
50+ `..` segments (in that case we use a path based on the SHA1 hash of
51+ the contents).
52+
53+ In Text.Pandoc.MediaBag, `mediaDirectory` and `mediaItems` now use the
54+ `mediaPath`, rather than the mediabag key, for the first component of the
55+ tuple. This makes more sense, I think, and fits with the documentation of
56+ these functions; eventually, though, we should rework the API so that
57+ `mediaItems` returns both the keys and the MediaItems.
58+
59+ In Text.Pandoc.Class.IO, rewriting of source paths in `extractMedia` has
60+ been fixed.
61+
62+ In Text.Pandoc.Class.PandocMonad, `fillMediaBag` has been modified so that
63+ it doesn't modify image paths (that was part of the problem in #7345).
64+
65+ We now do path normalization (e.g. `\` separators on Windows) in
66+ writing the media.
67+
68+ * Text.Pandoc.PDF:
69+
70+ + Text.Pandoc.PDF: Fix regression in 2.14 for generation of PDFs with
71+ SVGs (#7344).
72+ + Only print relevant part of environment on `--verbose`. Since
73+ `--verbose` output might be put in an issue, we want to avoid
74+ spilling out secrets in environment variables.
75+
76+ * Markdown reader: fix pipe table regression in 2.11.4 (#7343).
77+ Previously pipe tables with empty headers (that is, a header
78+ line with all empty cells) would be rendered as headerless
79+ tables. This broke in 2.11.4. The fix here is to produce an
80+ AST with an empty table head when a pipe table has all empty
81+ header cells.
82+
83+ * LaTeX reader: don't allow optional `*` on symbol control sequences
84+ (#7340). Generally we allow optional starred variants of LaTeX commands
85+ (since many allow them, and if we don't accept these explicitly,
86+ ignoring the star usually gives acceptable results). But we
87+ don't want to do this for `\(*\)` and similar cases.
88+
89+ * Docx reader: handle absolute URIs in Relationship Target (#7374).
90+
91+ * Docx writer: fix handling of empty table headers (Albert Krewinkel,
92+ #7369). A table header which does not contain any cells is now treated as
93+ an empty header.
94+
95+ * LaTeX writer: Fix regression in table header position (#7347).
96+ In recent versions the table headers were no longer bottom-aligned
97+ (if more than one line). This patch fixes that by using minipages
98+ for table headers in non-simple tables.
99+
100+ * CommonMark writer:
101+
102+ + Do not use simple class for fenced-divs (Jan Tojnar, amends #7242.)
103+ + Do not throw away attributes when `Ext_attributes` is enabled.
104+ `Ext_attributes` covers at least the following:
105+ `Ext_fenced_code_attributes`, `Ext_header_attributes`,
106+ `Ext_inline_code_attributes`, `Ext_link_attributes`.
107+
108+ * Markdown writer:
109+
110+ + Allow `pipe_tables` to be disabled for commonmark formats
111+ (`commonmark_x`, `gfm`) (#7375).
112+ + Re-use functions from Text.Pandoc.Markdown.Inline (Jan Tojnar).
113+
114+ * DocBook writer: Remove non-existent admonitions (Jan Tojnar).
115+ `attention`, `error` and `hint` are reStructuredText specific.
116+
117+ * HTML writer: Don't omit width attribute on div (#7342).
118+
119+ * Text.Pandoc.MIME, `extensionFromMimeType`: add a few special cases.
120+ When we do a reverse lookup in the MIME table, we just get the
121+ last match, so when the same mime type is associated with several
122+ different extensions, we sometimes got weird results, e.g. `.vs`
123+ for `text/plain`. These special cases help us get the most standard
124+ extensions for mime types like `text/plain`.
125+
126+ * Lua utils: fix handling of table headers in `from_simple_table` (Albert
127+ Krewinkel, #7369). Passing an empty list of header cells now results
128+ in an empty table header.
129+
130+ * Text.Pandoc.Citeproc:
131+
132+ + Avoid duplicate classes and attributes on references div.
133+ + Fix regression in citeproc processing (#7376). If inline
134+ references are used (in the metadata `references` field), we
135+ should still only include in the bibliography items that are
136+ actually cited (unless `nocite` is used).
137+
138+ * Require citeproc 0.4.0.1. This fixes a bug which led to doubled
139+ "et al." in some (rare) circumstances.
140+
141+ * MANUAL.txt:
142+
143+ + Mention GladTeX for EPUB export (Sebastian Humenda).
144+ This updates the manual and the web site about the GladTeX usage.
145+ + More details and a useful link for YAML syntax.
146+
147+ * CONTRIBUTING.md: update modules overview (Albert Krewinkel).
148+
149+ * using-the-pandoc-api.md: switch from String to Text (Albert Krewinkel).
150+
151+
152+## pandoc 2.14.0.1 (2021-06-01)
153+
154+ * Commonmark reader: Fix regression in 2.14 with YAML metdata block parsing,
155+ which could cause the document body to be omitted after metadata (#7339).
156+
157+ * HTML reader: fix column width regression in 2.14 (#7334).
158+ Column widths specified with a style attribute were off by a factor of 100.
159+
160+ * Markdown reader: in `rebasePaths`, check for both Windows and Posix
161+ absolute paths. Previously Windows pandoc was treating
162+ `/foo/bar.jpg` as non-absolute.
163+
164+ * Text.Pandoc.Logging: In rendering `LoadedResource`, use relative paths.
165+
166+ * Docx writer: fix regression on captions (#7328). The "Table Caption"
167+ style was no longer getting applied. (It was overwritten by "Compact.")
168+
169+ * Use commonmark-extensions 0.2.1.2
170+
171+## pandoc 2.14 (2021-05-28)
172+
173+ * Change reader types, allowing better tracking of source positions
174+ [API change]. Previously, when multiple file arguments were provided,
175+ pandoc simply concatenated them and passed the contents to the readers,
176+ which took a Text argument. As a result, the readers had no way of knowing
177+ which file was the source of any particular bit of text. This meant that
178+ we couldn't report accurate source positions on errors or include accurate
179+ source positions as attributes in the AST. More seriously, it meant that
180+ we couldn't resolve resource paths relative to the files containing them
181+ (see e.g. #5501, #6632, #6384, #3752).
182+
183+ * Add `rebase_relative_paths` extension (#3752). When enabled, this
184+ extension rewrites relative image and link paths by prepending
185+ the (relative) directory of the containing file. This
186+ behavior is useful when your input sources are split
187+ into multiple files, across several directories, with files
188+ referring to images stored in the same directory. The
189+ extension can be enabled for all markdown and commonmark-based formats.
190+
191+ * Add Text.Pandoc.Sources (exported module), with a `Sources` type and a
192+ `ToSources` class. A `Sources` wraps a list of `(SourcePos, Text)` pairs
193+ [API change]. A parsec `Stream` instance is provided for `Sources`. The
194+ module also exports versions of parsec's `satisfy` and other Char parsers
195+ that track source positions accurately from a `Sources` stream (or any
196+ instance of the new `UpdateSourcePos` class).
197+
198+ * Text.Pandoc.Parsing
199+
200+ + Export the modified Char parsers defined in Text.Pandoc.Sources
201+ instead of the ones parsec provides. Modified parsers to use a
202+ `Sources` as stream [API change].
203+ + Improve include file functions [API change]. Remove old
204+ `insertIncludedFileF`. Give `insertIncludedFile` a more general type,
205+ allowing it to be used where `insertIncludedFileF` was.
206+ + Add parameter to the `citeKey` parser from
207+ Text.Pandoc.Parsing, which controls whether the `@{..}`
208+ syntax is allowed [API change].
209+
210+ * Text.Pandoc.Error: Modified the constructor `PandocParsecError` to take a
211+ `Sources` rather than a `Text` as first argument, so parse error locations
212+ can be accurately reported.
213+
214+ * Fix source position reporting for YAML bibliographies (#7273).
215+
216+ * Issue error message when reader or writer format is malformed
217+ (#7231). Previously we exited with an error status but (due to a bug)
218+ no message.
219+
220+ * Smarter smart quotes (#7216, #2103). Treat a leading `"` with no
221+ closing `"` as a left curly quote. This supports the practice, in
222+ fiction, of continuing paragraphs quoting the same speaker without an
223+ end quote. It also helps with quotes that break over lines in line blocks.
224+
225+ * Markdown reader:
226+
227+ + Use MetaInlines not MetaBlocks for multimarkdown metadata fields.
228+ This gives better results in converting to e.g. pandoc markdown.
229+ + Implement curly-brace syntax for Markdown citation keys (#6026).
230+ The change provides a way to use citation keys that contain
231+ special characters not usable with the standard citation key syntax.
232+ Example: `@{foo_bar{x}'}` for the key `foo_bar{x}`. It also allows
233+ separating citation keys from immediately following text, e.g. `@{foo}A`.
234+
235+ * RST reader:
236+
237+ + Seek include files in the directory of the file
238+ containing the include directive, as RST requires (#6632).
239+ + Use `insertIncludedFile` from Text.Pandoc.Parsing
240+ instead of reproducing much of its code.
241+
242+ * Org reader: Resolve org includes relative to the directory containing the
243+ file containing the INCLUDE directive (#5501).
244+
245+ * ODT reader: Treat tabs as spaces (#7185, niszet).
246+
247+ * Docx reader:
248+
249+ + Add handling of vml image objects (#7257, mbrackeantidot).
250+ + Support new table features (Emily Bourke, #6316): column
251+ spans, row spans, multiple header rows, table description
252+ (parsed as a simple caption), captions, column widths.
253+
254+ * LaTeX reader:
255+
256+ + Improved siunitx support (#6658, #6620).
257+ + Better support for `\xspace` (#7299).
258+ + Improve parsing of `\def` macros. We previously set "verbatim mode"
259+ even for parsing the initial `\def`; this caused problems
260+ for `\def` nested inside another `\def`.
261+ + Implement `\newif`.
262+
263+ * ConTeXt writer: improve ordered lists (#5016, Denis Maier).
264+ Change ordered list from itemize to enumerate. Add new
265+ itemgroup for ordered lists. Remove manual insertion of
266+ width attributes. Use tabular figures in ordered list
267+ enumerators.
268+
269+ * HTML reader:
270+
271+ + Don't fail on unmatched closing "script" tag (Albert Krenkel, #7282).
272+ + Keep h1 tags as normal headers (#2293, Albert Krewinkel).
273+ The tags `<title>` and `<h1 class="title">` often contain the same
274+ information, so the latter was dropped from the document. However, as
275+ this can lead to loss of information, the heading is now always
276+ retained. Use `--shift-heading-level-by=-1` to turn the `<h1>`
277+ into the document title, or a filter to restore the previous behavior.
278+ + Handle relative lengths (e.g. `2*`) in HTML column widths (#4063).
279+ See <https://www.w3.org/TR/html4/types.html#h-6.6>.
280+
281+ * DocBook/JATS readers:
282+
283+ + Fix mathml regression caused by the switch in XML libraries (#7173).
284+ + Fix "phrase" in DocBook: take classes from "role" not "class" (#7195).
285+
286+ * DocBook reader: ensure that first and last names are separated (#6541).
287+
288+ * Jira reader (Albert Krewinkel, #7218):
289+
290+ + Support "smart" links: `[alias|https://example.com|smart-card]` syntax.
291+ + Allow spaces and most unicode characters in attachment links.
292+ + No longer require a newline character after `{noformat}`.
293+ + Only allow URI path segment characters in bare links.
294+ + The `file:` schema is no longer allowed in bare links; these
295+ rarely make sense.
296+
297+ * Plain writer: handle superscript unicode minus (#7276).
298+
299+ * LaTeX writer:
300+
301+ + Better handling of line breaks in simple tables (#7272).
302+ Now we also handle the case where they're embedded in other elements,
303+ e.g. spans.
304+ + For beamer output, support `exampleblock` and `alertblock` (#7278).
305+ A block will be rendered as an `exampleblock` if the heading
306+ has class `example` and an `alertblock` if it has class `alert`.
307+ + Separate successive quote chars with thin space (#6958,
308+ Albert Krewinkel). Successive quote characters are separated with
309+ a thin space to improve readability and to prevent unwanted ligatures.
310+ Detection of these quotes sometimes had failed if the second quote
311+ was nested in a span element.
312+ + Separate successive quote chars with thin space (#6958, Albert
313+ Krewinkel).
314+
315+ * EPUB Writer: Fix belongs-to-collection XML id choice (#7267, nuew).
316+ The epub writer previously used the same XML id for both the book
317+ identifier and the epub collection. This causes an error on epubcheck.
318+
319+ * BibTeX/BibLaTeX writer: Handle `annote` field (#7266).
320+
321+ * ZimWiki writer: allow links and emphasis in headers (#6605,
322+ Albert Krewinkel).
323+
324+ * ConTeXt writer:
325+
326+ + Support blank lines in line blocks (#6564, Albert Krewinkel,
327+ thanks to @denismaier).
328+ + Use span identifiers as reference anchors (#7246, Albert Krewinkel).
329+
330+ * HTML writer:
331+
332+ + Keep attributes from code nested below `pre` tag (#7221,
333+ Albert Krewinkel). If a code block is defined with `<pre><code
334+ class="language-x">…</code></pre>`, where the `<pre>` element has no
335+ attributes, then the attributes from the `<code>` element are used
336+ instead. Any leading `language-` prefix is dropped in the code's
337+ `class` attribute are dropped to improve syntax highlighting.
338+ + Ensure headings only have valid attribs in HTML4 (#5944, Albert
339+ Krewinkel).
340+ + Parse `<header>` as a Div (Albert Krewinkel).
341+
342+ * Org writer:
343+
344+ + Inline latex envs need newlines (#7252, tecosaur).
345+ As specified in https://orgmode.org/manual/LaTeX-fragments.html, an
346+ inline \begin{}...\end{} LaTeX block must start on a new line.
347+ + Use LaTeX style maths deliminators (#7196, tecosaur).
348+
349+ * JATS writer (Albert Krewinkel):
350+
351+ + Use either styled-content or named-content for spans (#7211).
352+ If the element has a content-type attribute, or at least one class,
353+ then that value is used as `content-type` and the span is put inside
354+ a `<named-content>` element. Otherwise a `<styled-content>` element
355+ is used instead.
356+ + Reduce unnecessary use of `<p>` elements for wrapping (#7227).
357+ The `<p>` element is used for wrapping in cases were the contents
358+ would otherwise not be allowed in a certain context. Unnecessary
359+ wrapping is avoided, especially around quotes (`<disp-quote>` elements).
360+ + Convert spans to `<named-content>` elements (#7211). Spans with
361+ attributes are converted to `<named-content>` elements instead of
362+ being wrapped with `<milestone-start/>` and `<milestone-end>`
363+ elements. Milestone elements are not allowed in documents using the
364+ articleauthoring tag set, so this change ensures the creation of valid
365+ documents.
366+ + Add footnote number as label in backmatter (#7210). Footnotes in the
367+ backmatter are given the footnote's number as a label. The
368+ articleauthoring output is unaffected from this change, as footnotes
369+ are placed inline there.
370+ + Escape disallows chars in identifiers. XML identifiers must start
371+ with an underscore or letter, and can contain only a limited set
372+ of punctuation characters. Any IDs not adhering to these rules are
373+ rewritten by writing the offending characters as `Uxxxx`,
374+ where `xxxx` is the character's hex code.
375+
376+ * Jira writer: use `{color}` when span has a color attribute
377+ (Albert Krewinkel, tarleb/jira-wiki-markup#10).
378+
379+ * Docx writer:
380+
381+ + Autoset table width if no column has an explicit width (Albert
382+ Krewinkel).
383+ + Extract Table handling into separate module (Albert Krewinkel).
384+ + Support colspans and rowspans in tables (Albert Krewinkel, #6315).
385+ + Support multirow table headers (Albert Krewinkel).
386+ + Improve integration of settings from reference.docx (#1209).
387+ This change allows users to create a reference.docx that
388+ sets `w:proofState` for spelling or grammar to `dirty`,
389+ so that spell/grammar checking will be triggered on the
390+ generated docx.
391+ + Copy over more settings from reference.docx (#7240). From settings.xml
392+ in the reference-doc, we now include: `zoom`, `embedSystemFonts`,
393+ `doNotTrackMoves`, `defaultTabStop`, `drawingGridHorizontalSpacing`,
394+ `drawingGridVerticalSpacing`, `displayHorizontalDrawingGridEvery`,
395+ `displayVerticalDrawingGridEvery`, `characterSpacingControl`,
396+ `savePreviewPicture`, `mathPr`, `themeFontLang`, `decimalSymbol`,
397+ `listSeparator`, `autoHyphenation`, `compat`.
398+ + Set zoom to 100% by default in settings.xml.
399+ + Align math options more with current Word defaults (e.g. Cambria Math
400+ font).
401+ + Remove `rsid`s from default settings.xml. Word will add these
402+ when revisions are made.
403+
404+ * Ms writer: Handle tables with multiple paragraphs (#7288).
405+ Previously they overflowed the table cell width. We now set line lengths
406+ per-cell and restore them after the table has been written.
407+
408+ * Markdown writer:
409+
410+ + Use cleaner braceless syntax for code blocks with a
411+ single class (#7242, Jan Tojnar).
412+ + Add quotes properly in markdown YAML metadata fields (#7245).
413+ This fixes a bug, which caused the writer to look at the *last*
414+ rather than the *first* character in determining whether quotes
415+ were needed. So we got spurious quotes in some cases and
416+ didn't get necessary quotes in others.
417+ + Use `@{..}` syntax for citations when needed.
418+ + Use fewer unneeded escapes for `#` (see #6259).
419+ + Improve escaping of `@`. We need to escape literal `@` before
420+ `{` because of the new citation syntax.
421+
422+ * Commonmark writer: Use backslash escapes for `<` and `|`...
423+ instead of entities (#7208).
424+
425+ * Powerpoint writer: allow `monofont` to be specified in metadata
426+ (#7187).
427+
428+ * LaTeX template:
429+
430+ + Use non-starred names for xcolor color names (#6109).
431+ This should make svgnames and x11names work properly.
432+ + Fix bad vertical spacing after bibliography (#7234, badumont).
433+ + List of figures before list of tables (#7235, Julien Dutant).
434+ + Move CSL macro definitions before header-includes so they can be
435+ overridden (#7286).
436+ + Improve treatment of CSL `entry-spacing` (#7296).
437+ Previously with the default template settings (`indent` variable
438+ not set), we would get interparagraph spaces separating bib
439+ entries even with `entry-spacing="0"`. On the other hand,
440+ setting `entry-spacing="2"` gave ridiculously large spacing.
441+ This change makes the spacing caused by `entry-spacing` a multiple
442+ of `\parskip` by default, which gives aesthetically reasonable
443+ output. Those who want a larger or smaller unit (e.g. because
444+ they use `indent` which sets `\parskip` to 0) may
445+ `\setlength{\cslentryspacingunit}{10pt}` in header-includes
446+ to override the defaults.
447+ + Move title, author, date up to top of preamble (#7295).
448+ This allows header-includes to use them, and puts them
449+ in a position where you can see them immediately.
450+ + Define commands for zero width non-joiner character
451+ (#6639, Albert Krewinkel). The zero-width non-joiner character
452+ is used to avoid ligatures (e.g. in German).
453+
454+ * ConTeXt template:
455+
456+ + Define `enumerate` itemgroup (#5016, Denis Maier).
457+ + List of figures before list of tables (#7235, Julien Dutant).
458+
459+ * reveal.js template:
460+
461+ + Support `toc-title` (#7171, Florian Kohrt).
462+ + Use `hash: true` by default rather than `history: true` (#6968).
463+
464+ * HTML-based slide shows: add support for `institute` (#7289, Thomas
465+ Hodgson).
466+
467+ * Text.Pandoc.Extensions: Add constructor `Ext_rebase_relative_paths` to
468+ `Extensions` [API change].
469+
470+ * Text.Pandoc.XML.Light: add Eq, Ord instances for Content,
471+ Element, Attr, CDataKind [API change].
472+
473+ * Text.Pandoc.MediaBag:
474+
475+ + Change type to use a `Text` key instead of `[FilePath]`.
476+ We normalize the path and use `/` separators for consistency.
477+ + Export `MediaItem` type [API change].
478+ + Change `MediaBag` type to a map from Text to MediaItem [API change].
479+ + `lookupMedia` now returns a `MediaItem` [API change].
480+ + Change `insertMedia` so it sets the `mediaPath` to a filename based on
481+ the SHA1 hash of the contents. This will be used when contents
482+ are extracted.
483+
484+ * Text.Pandoc.Class.PandocMonad:
485+
486+ + Remove `fetchMediaResource` [API change]. Use `fetchItem` to get
487+ resources in `fillMediaBag`.
488+ + Add informational message in `downloadOrRead` indicating what path
489+ local resources have been loaded from.
490+
491+ * Text.Pandoc.Logging:
492+
493+ + Remove single quotes around paths in messages.
494+ + Add LoadedResource constructor to LogMessage [API change].
495+ This is for INFO-level messages telling where image data has been
496+ loaded from. (This can vary because of the resource path.)
497+
498+ * Text.Pandoc.Asciify: simplify code and export `toAsciiText` [API change].
499+ Instead of encoding a giant (and incomplete) map, we now
500+ just use unicode-transforms to normalize the text to
501+ a canonical decomposition, and manipulate the result.
502+
503+ * App: allow tabs expansion even if file-scope is used (Albert Krewinkel,
504+ #6709). Tabs in plain-text inputs are now handled correctly, even if
505+ the `--file-scope` flag is used.
506+
507+ * Add new internal module Text.Pandoc.Writers.GridTable (Albert Krewinkel).
508+
509+ * Text.Pandoc.Highlighting: Change type of `languagesByExtension`, adding
510+ a parameter for a `SyntaxMap` [API change] (Jan Tojnar, #7241).
511+ Languages defined using `--syntax-definition` were not recognized by
512+ `languagesByExtension`. This patch corrects that, allowing the writers
513+ to see all custom definitions. The LaTeX writer still uses the default
514+ syntax map, but that's okay in that context, since
515+ `--syntax-definition` won't create new listings styles.
516+
517+ * Text.Pandoc.Citeproc:
518+
519+ + Ensure that CSL-related attributes are passed on to a Div with id
520+ 'refs'. Otherwise things like `entry-spacing` won't work when
521+ such Divs are used.
522+ + Use metadata's `lang` for the lang parameter of citeproc, overriding
523+ `localeLanguage`.
524+ + Recognize locators spelled with a capital letter (#7323).
525+ + Add a comma and a space in front of the suffix if it doesn't start
526+ with space or punctuation (#7324).
527+ + Don't detect math elements as locators (#7321).
528+
529+ * Remove Text.Pandoc.BCP47 module [API change]. Use types and functions
530+ from UnicodeCollation.Lang instead. This is a richer implementation
531+ of BCP 47.
532+
533+ * Text.Pandoc.Shared:
534+
535+ + Fix regression in grid tables for wide characters (#7214).
536+ In the translation from String to Text, a char-width-sensitive
537+ `splitAt'` was dropped. This commit reinstates it and uses it to make
538+ `splitTextByInstances` char-width sensitive.
539+ + Add `getLang` (formerly in the now-removed BCP47) [API change].
540+
541+ * Text.Pandoc.SelfContained: use `application/octet-stream`
542+ for unknown mime types instead of halting with an error (#7202).
543+
544+ * Lua filters: respect Inlines/Blocks filter functions in `pandoc.walk_*`
545+ (Albert Krewinkel).
546+
547+ * Add text as build-depend for trypandoc (#7193, Roman Beránek).
548+
549+ * Bump upper-bounds for network-uri, time, attoparsec.
550+
551+ * Use citeproc 0.4.
552+
553+ * Use texmath 0.12.3.
554+
555+ * Use jira-wiki-markup 1.3.5 (Albert Krewinkel).
556+
557+ * Require latest skylighting (fixes a bug in XML syntax highlighting).
558+
559+ * Use latest xml-conduit.
560+
561+ * Use latest commonmark, commonmark-extensions, commonmark-pandoc.
562+
563+ * Use haddock-library-1.10.0 (Albert Krewinkel).
564+
565+ * Allow compilation with base 4.15 (Albert Krewinkel).
566+
567+ * MANUAL:
568+
569+ + Add information about `lang` and bibliography sorting.
570+ + Add info about YAML escape sequences, link to spec (#7152,
571+ Albert Krewinkel).
572+ + Note that `institute` variable works for HTML-based slides.
573+ + Update documentation on citation syntax.
574+ + Add citation example for locators and suffixes (Tristan Stenner)
575+
576+ * Updated and fixed typos in documentation (Charanjit Singh,
577+ Anti-Distinctlyminty, Tatiana Porras, obcat).
578+
579+ * Add instructions for installing pandoc-types before compiling filter.
580+
581+ * INSTALL: add note that parallel installations should be avoided
582+ (#6865).
583+
584+ * Remove `biblatex-nussbaum.md` test. It is basically the same
585+ as `biblaetx-quotes.md`.
586+
587+ * Command tests: fail if a file contains no tests---and fix a
588+ test that failed in that way!
589+
590+ * Use smaller images in tests, reducing the size of the source tarball by 8 MB.
591+
592+
593+## pandoc 2.13 (2021-03-21)
594+
595+ * Support `yaml_metadata_block` extension for `commonmark`, `gfm` (#6537).
596+ This supported is a bit more limited than with pandoc's
597+ `markdown`. The YAML block must be the first thing in the input,
598+ and the leaf notes are parsed in isolation from the rest of
599+ the document. So, for example, you can't use reference
600+ links if the references are defined later in the document.
601+
602+ * Fix fallback to default partials when custom templates are used.
603+ If the directory containing a template does not contain the partial,
604+ it should be sought in the default templates, but this was not
605+ working properly (#7164).
606+
607+ * Handle `nocite` better with `--biblatex` and `--natbib` (#4585).
608+ Previously the nocite metadata field was ignored with these formats.
609+ Now it populates a `nocite-ids` template variable and causes a
610+ `\nocite` command to be issued.
611+
612+ * Text.Pandoc.Citeproc: apply `fixLinks` correctly (#7130). This is code
613+ that incorporates a prefix like `https://doi.org/` into a following link
614+ when appropriate.
615+
616+ * Text.Pandoc.Shared:
617+
618+ + Remove `backslashEscapes`, `escapeStringUsing` [API change]. Replace
619+ these inefficient association list lookups with more efficient escaping
620+ functions in the writers that used them (for a 10-25% performance boost
621+ in org, haddock, rtf, texinfo writers).
622+ + Remove `ToString`, `ToText` typeclasses [API change]. These were needed
623+ for the transition from String to Text, but they are no longer used and
624+ may clash with other things.
625+ + Simplify `compactDL`.
626+
627+ * Text.Pandoc.Parsing:
628+
629+ + Change type of `readWithM` so that it is no longer polymorphic
630+ [API change]. The `ToText` class has been removed, and now that we've
631+ completed the transition to Text we no longer need this to operate
632+ on Strings.
633+ + Remove `F` type synonym [API change]. Muse and Org were defining their
634+ own `F` anyway.
635+
636+ * Text.Pandoc.Readers.Metadata:
637+
638+ + Export `yamlMetaBlock` [API change].
639+ + Make `yamlBsToMeta`, `yamlBsToRefs` polymorphic on the parser state
640+ [API change].
641+
642+ * Markdown reader: Fix regression with `tex_math_backslash` (#7155).
643+
644+ * MediaWiki reader: Allow block-level content in notes (ref) (#7145).
645+
646+ * Jira reader (Albert Krewinkel):
647+
648+ + Fixed parsing of autolinks (i.e., of bare URLs in the text).
649+ Previously an autolink would take up the rest of a line, as spaces
650+ were allowed characters in these items.
651+ + Emoji character sequences no longer cause parsing failures. This was
652+ due to missing backtracking when emoji parsing fails.
653+ + Mark divs created from panels with class "panel".
654+
655+ * RST reader: fix logic for ending comments (#7134). Previously comments
656+ sometimes got extended too far.
657+
658+ * DocBook writer: include Header attributes as XML attributes on
659+ section (Erik Rask). Attributes with key names that are not allowed
660+ as XML attributes are dropped, as are attributes with invalid values
661+ and `xml:id` (DocBook 5) and `id` (DocBook 4).
662+
663+ * Docx writer:
664+
665+ + Make `nsid` in `abstractNum` deterministic. Previously we assigned
666+ a random number, but we don't need random values, so now we just
667+ assign a value based on the list marker.
668+ + Use integral values for `w:tblW` (#7141).
669+
670+ * Jira writer (Albert Krewinkel):
671+
672+ + Block quotes are only rendered as `bq.` if they do not contain a
673+ linebreak.
674+ + Jira writer: improve div/panel handling. Include div attributes in
675+ panels, always render divs with class `panel` as panels, and
676+ avoid nesting of panels.
677+
678+ * HTML writer: Add warnings on duplicate attribute values.
679+ This prevents emitting invalid HTML. Ultimately it would be good to
680+ prevent this in the types themselves, but this is better for now.
681+
682+ * Org writer: Prevent unintended creation of ordered list items (#7132,
683+ Albert Krewinkel). Adjust line wrapping if default wrapping would cause
684+ a line to be read as an ordered list item.
685+
686+ * JATS templates: support 'equal-contrib' attrib for authors (Albert
687+ Krewinkel). Authors who contributed equally to a paper may be marked
688+ with `equal-contrib`.
689+
690+ * reveal.js template: replace JS comment with HTML (#7154, Florian Kohrt).
691+
692+ * Text.Pandoc.Logging: Add `DuplicateAttribute` constructor to `LogMessage`.
693+ [API change]
694+
695+ * Use `-j4` for linux release build. This speeds up the build dramatically
696+ on arm.
697+
698+ * cabal.project: remove ghcoptions. Move flags to top level, so they can
699+ be set differently on the command line.
700+
701+ * Require latest texmath, skylighting, citeproc, jira-wiki-markup.
702+ (The latest skylighting fixes a bad bug with Haskell syntax highlighting.)
703+ Narrow version bounds for texmath, skylighting, and citeproc, since
704+ the test output depend on them.
705+
706+ * Use doclayout 0.3.0.2. This significantly reduces the time and memory
707+ needed to compile pandoc.
708+
709+ * Use `foldl'` instead of `foldl` everywhere.
710+
711+ * Update bounds for random (#7156, Alexey Kuleshevich).
712+
713+ * Remove uses of some partial functions.
714+
715+ * Don't bake in a larger stack size for the executable.
716+
717+ * Test improvements:
718+
719+ + Use `getExecutablePath` from base, avoiding the dependency on
720+ `executable-path`.
721+ + Factor out `setupEnvironment` in Helpers, to avoid code duplication.
722+ + Fix finding of data files by setting teh `pandoc_datadir` environment
723+ variable when we shell out to pandoc. This avoids the need to use
724+ `--data-dir` for the tests, which caused problems finding `pandoc.lua`
725+ when compiling without the `embed_data_files` flag (#7163).
726+
727+ * Benchmark improvements:
728+
729+ + Build `+RTS -A8m -RTS` into default ghc-options for benchmark.
730+ This is necessary to get accurate benchmark results; otherwise we
731+ are largely measuring garbage collecting, some not related to the
732+ current benchmark.
733+ + Allow specifying BASELINE file in 'make bench' for comparison
734+ (otherwise the latest benchmark is chosen by default).
735+ + Force `readFile` in benchmarks early (Bodigrim).
736+
737+ * CONTRIBUTING: suggest using a `cabal.project.local` file (#7153,
738+ Albert Krewinkel).
739+
740+ * Add ghcid-test to Makefile. This loads the test suite in ghcid.
741+
742+
743+## pandoc 2.12 (2021-03-08)
744+
745+ * `--resource-path` now accumulates if specified multiple
746+ times (#6152). Resource paths specified later on the command line are
747+ prepended to those specified earlier. Thus,
748+ `--resource-path foo --resource-path bar:baz` is equivalent to
749+ `--resource-path bar:bas:foo`. (The previous behavior was
750+ for the last `--resource-path` to replace all the rest.)
751+ `resource-path` in defaults files behaves the same way: it
752+ will be prepended to the resource path set by earlier
753+ command line options or defaults files. This change
754+ facilitates the use of multiple defaults files: each can
755+ specify a directory containing resources it refers to
756+ without clobbering the resource paths set by the others.
757+
758+ * Allow defaults files to refer to the home directory, the
759+ user data directory, and the directory containing the defaults file
760+ itself (#5871, #5982, #5977). In fields that expect file paths
761+ (and only in these fields),
762+
763+ + `${VARIABLE}` will expand to the value of the environment variable
764+ `VARIABLE` (and in particular `${HOME}` will expand to the path
765+ of the home directory). A warning will be raised for undefined
766+ variables.
767+ + `${USERDATA}` will expand to the path of the user data
768+ directory in force when the defaults file is being processed.
769+ + `${.}` will expand to the directory containing the defaults file.
770+ (This allows default files to be placed in a directory containing
771+ resources they make use of.)
772+
773+ * When downloading content from URL arguments, be sensitive to
774+ the character encoding (#5600). We can properly handle UTF-8 and latin1
775+ (ISO-8859-1); for others we raise an error. Fall back to latin1 if
776+ no charset is given in the mime type and UTF-8 decoding fails.
777+
778+ * Allow abbreviations that don't end in a period to be
779+ specified using `--abbreviations` (#7124).
780+
781+ * Add new unexported module Text.Pandoc.XML.Light, as well
782+ as Text.Pandoc.XML.Light.Types, Text.Pantoc.XML.Light.Proc,
783+ Text.Pandoc.XML.Light.Output. (Closes #6001, #6565, #7091).
784+
785+ This module exports definitions of `Element` and `Content`
786+ that are isomorphic to xml-light's, but with Text
787+ instead of String. This allows us to keep most of the code in existing
788+ readers that use xml-light, but avoid lots of unnecessary allocation.
789+
790+ We also add versions of the functions from xml-light's
791+ Text.XML.Light.Output and Text.XML.Light.Proc that operate on our
792+ modified XML types, and functions that convert xml-light types to our
793+ types (since some of our dependencies, like texmath, use xml-light).
794+
795+ We export functions that use xml-conduit's parser to produce an
796+ `Element` or `[Content]`. This allows existing pandoc code to use
797+ a better parser without much modification.
798+
799+ The new parser is used in all places where xml-light's parser was
800+ previously used. Benchmarks show a significant performance improvement
801+ in parsing XML-based formats (with docbook, opml, jats, and docx
802+ almost twice as fast, odt and fb2 more than twice as fast).
803+
804+ In addition, the new parser gives us better error reporting than
805+ xml-light. We report XML errors, when possible, using the new
806+ `PandocXMLError` constructor in `PandocError`.
807+
808+ These changes revealed the need for some changes in the tests. The
809+ docbook-reader.docbook test lacked definitions for the entities it used;
810+ these have been added. And the docx golden tests have been updated,
811+ because the new parser does not preserve the order of attributes.
812+
813+ * DocBook reader:
814+
815+ + Avoid expensive tree normalization step, as it is not necessary
816+ with the new XML parser.
817+ + Support `informalfigure` (#7079) (Nils Carlson).
818+
819+ * Docx reader:
820+
821+ + Use Map instead of list for Namespaces. This gives a speedup of
822+ about 5-10%. With this and the XML parsing changes, the docx reader
823+ is now about twice as fast as in the previous release.
824+
825+ * HTML reader:
826+
827+ + Small performance tweaks.
828+ + Also, remove exported class `NamedTag(..)` [API change]. This was just
829+ intended to smooth over the transition from String to Text and is no
830+ longer needed.
831+ + As a result, the functions `isInlineTag` and `isBlockTag`
832+ are no longer polymorphic; they apply to a `Tag Text` [API change].
833+ + Do a lookahead to find the right parser to use. This takes
834+ benchmarks from 34ms to 23ms, with less allocation.
835+ + Fix bad handling of empty `src` attribute in `iframe` (#7099).
836+ If `src` is empty, we simply skip the `iframe`.
837+ If `src` is invalid or cannot be fetched, we issue a warning
838+ nd skip instead of failing with an error.
839+
840+ * JATS reader:
841+
842+ + Avoid tree normalization, which is no longer necessary given the
843+ new XML parser.
844+
845+ * LaTeX reader:
846+
847+ + Don't export `tokenize`, `untokenize` [API change]. These are internal
848+ implementation details, which were only exported for testing.
849+ They don't belong in the public API.
850+ + Improved efficiency of the parser. With these changes the reader
851+ is almost twice as fast as in the last release in our benchmarks.
852+ + Code cleanup, removing some unnecessary things.
853+ + Rewrite `withRaw` so it doesn't rely on fragile assumptions
854+ about token positions (which break when macros are expanded)
855+ (#7092). This requires the addition of `sEnableWithRaw` and
856+ `sRawTokens` in `LaTeXState`, and a new combinator `disablingWithRaw`
857+ to disable collecting of raw tokens in certain contexts.
858+ Add `parseFromToks` to Text.Pandoc.Readers.LaTeX.Parsing.
859+ Fix parsing of single character tokens so it doesn't mess
860+ up the new raw token collecting. These changes slightly increase
861+ allocations and have a small performance impact.
862+ + Handle some bibtex/biblatex-specific commands that used to be
863+ dealt with in pandoc-citeproc (#7049).
864+ + Optimize `satisfyTok`, avoiding unnecessary macro expansion steps.
865+ Benchmarks after this change show 2/3 of the run time and 2/3 of the
866+ allocation of the Feb. 10 benchmarks.
867+ + Removed `sExpanded` in state. This isn't actually needed and checking
868+ it doesn't change anything.
869+ + Improve `braced'`. Remove the parameter, have it parse the
870+ opening brace, and make it more efficient.
871+ + Factor out pieces of the LaTeX reader to make the module smaller.
872+ This reduces memory demands when compiling. Created
873+ Text.Pandoc.Readers.{LaTeX,Math,Citation,Table,Macro,Inline}.
874+ Changed Text.Pandoc.Readers.LaTeX.SIunitx to export a command map
875+ instead of individual commands.
876+ + Handle table cells containing `&` in `\verb` (#7129).
877+
878+ * Make Text.Pandoc.Readers.LaTeX.Types an unexported module [API change].
879+
880+ * Markdown reader:
881+
882+ + Improved handling of mmd link attributes in references (#7080).
883+ Previously they only worked for links that had titles.
884+ + Improved efficiency of the parser (benchmarks show a 15% speedup).
885+
886+ * OPML reader:
887+
888+ + Avoid tree normalization, which is no longer necessary with the
889+ new XML parser.
890+
891+ * ODT reader:
892+
893+ + Finer-grained errors on parse failure (#7091).
894+ + Give more information if the zip container can't be unpacked.
895+
896+ * Org reader:
897+
898+ + Support `task_lists` extension (Albert Krewinkel, #6336).
899+ + Fix bug in org-ref citation parsing (Albert Krewinkel, #7101).
900+ The org-ref syntax allows to list multiple citations separated by
901+ comma. Previously commas were accepted as part of the citation id,
902+ so all citation lists were parsed as one single citation.
903+
904+ * RST reader:
905+
906+ + Use `getTimestamp` instead of `getCurrentTime` to fetch timestamp.
907+ Setting `SOURCE_DATE_EPOCH` will allow reproducible builds.
908+ + RST reader: fix handling of header in CSV tables (#7064).
909+ The interpretation of this line is not affected by the delim option.
910+
911+ * Jira reader:
912+
913+ + Modified the Doc parser to skip leading blank lines. This fixes
914+ parsing of documents which start with multiple blank lines (Albert
915+ Krewinkel, #7095).
916+ + Prevent URLs within link aliases to be treated as autolinks (Albert
917+ Krewinkel, #6944).
918+
919+ * Text.Pandoc.Shared
920+
921+ + Remove formerly exported functions that are no longer used in the
922+ code base: `splitByIndices`, `splitStringByIndicies`, `substitute`,
923+ and `underlineSpan` (which had been deprecated in April 2020)
924+ [API change].
925+ + Export `handleTaskListItem` (Albert Krewinkel) [API change].
926+ + Change `defaultUserDataDirs` to `defaultUserDataDir` [API
927+ change]. We determine what is the default user data directory
928+ by seeing whether the XDG directory and/or legacy
929+ directory exist.
930+
931+ * BibTeX writer:
932+
933+ + BibTeX writer: use doclayout and doctemplate. This change allows
934+ bibtex/biblatex output to wrap as other formats do,
935+ depending on the settings of `--wrap` and `--columns` (#7068).
936+
937+ * CSL JSON writer:
938+
939+ + Output `[]` if no references in input, instead of raising a
940+ PandocAppError as before.
941+
942+ * Docx writer:
943+
944+ + Use `getTimestamp` instead of `getCurrentTime` for timestamp.
945+ Setting `SOURCE_DATE_EPOCH` will allow reproducible builds.
946+
947+ * EPUB writer:
948+
949+ + Use `getTimestamp` instead of `getCurrentTime` for timestamp.
950+ Setting `SOURCE_DATE_EPOCH` will allow reproducible builds (#7093).
951+ This does not suffice to fully enable reproducible in EPUB, since
952+ a unique id is still being generated for each build.
953+ + Support `belongs-to-collection` metadata (#7063) (Nick Berendsen).
954+
955+ * JATS writer:
956+
957+ + Escape special chars in reference elements (Albert Krewinkel).
958+ Prevents the generation of invalid markup if a citation element
959+ contains an ampersand or another character with a special meaning
960+ in XML.
961+
962+ * Jira writer:
963+
964+ + Use Span identifiers as anchors (Albert Krewinkel).
965+ + Use `{noformat}` instead of `{code}` for unknown languages (Albert
966+ Krewinkel). Code blocks which are not marked as a language supported
967+ by Jira are rendered as preformatted text via `{noformat}` blocks.
968+
969+ * LaTeX writer:
970+
971+ + Adjust hypertargets to beginnings of paragraphs (#7078).
972+ Use `\vadjust pre` so that the hypertarget takes you to the beginning
973+ of the paragraph rather than one line down.
974+ This makes a particular difference for links to citations using
975+ `--citeproc` and `link-citations: true`.
976+ + Change BCP47 lang tag from `jp` to `ja` (Mauro Bieg, #7047).
977+ + Use function instead of map for accent lookup (should be
978+ more efficient).
979+ + Split the module to make it easier to compile on low-memory
980+ systems: added Text.Pandoc.Writers.LaTeX.{Util,Citation,Lang}.
981+
982+ * Markdown writer:
983+
984+ + Handle math right before digit. We insert an HTML comment to
985+ avoid a `$` right before a digit, which pandoc will not recognize
986+ as a math delimiter.
987+ + Split the module to make it easier to compile on low-memory
988+ systems: added Text.Pandoc.Writers.Markdown.{Types,Inline}.
989+
990+ * ODT writer:
991+
992+ + Use `getTimestamp` instead of `getCurrentTime` for timestamp.
993+ Setting `SOURCE_DATE_EPOCH` will allow reproducible builds.
994+ + Update default ODT style (Lorenzo). Previously, the "First paragraph"
995+ style inherited from "Standard" but not from "Text body." Now
996+ it is adjusted to inherit from "Text body", to avoid some ugly
997+ spacing issues. It may be necessary to update a custom `reference.odt`
998+ in light of this change.
999+
1000+ * Org writer:
1001+
1002+ + Support `task_lists` extension (Albert Krewinkel, #6336).
1003+
1004+ * Pptx writer:
1005+
1006+ + Use `getTimestamp` instead of `getCurrentTime` for timestamp.
1007+ Setting `SOURCE_DATE_EPOCH` will allow reproducible builds.
1008+
1009+ * JATS templates: tag `author.name` as `string-name` (Albert Krewinkel).
1010+ The partitioning the components of a name into surname, given names,
1011+ etc. is not always possible or not available. Using `author.name`
1012+ allows to give the full name as a fallback to be used when
1013+ `author.surname` is not available.
1014+
1015+ * Add default templates for bibtex and biblatex, so that
1016+ the variables `header-include`, `include-before`, `include-after`
1017+ (or alternatively the command line options
1018+ `--include-in-header`, `--include-before-body`, `--include-after-body`)
1019+ may be used.
1020+
1021+ * LaTeX template:
1022+
1023+ + Update to iftex package (#7073) (Andrew Dunning)
1024+ + Wrap url colours in braces (#7121) (Loïc Grobol).
1025+
1026+ * revealjs template: Add 'center' option for vertical slide centering.
1027+ (maurerle, #7104).
1028+
1029+ * Text.Pandoc.XML: Improve efficiency of `fromEntities`.
1030+
1031+ * Text.Pandoc.MIME
1032+
1033+ + Add exported function `getCharset` [API change].
1034+
1035+ * Text.Pandoc.UTF8: change IO functions to return Text, not String
1036+ [API change]. This affects `readFile`, `getContents`, `writeFileWith`,
1037+ `writeFile`, `putStrWith`, `putStr`, `putStrLnWith`, `putStrLn`.
1038+ `hPutStrWith`, `hPutStr`, `hPutStrLnWith`, `hPutStrLn`, `hGetContents`.
1039+ This avoids the need to uselessly create a linked list of characters
1040+ when emiting output.
1041+
1042+ * Text.Pandoc.App
1043+
1044+ + Add `parseOptionsFromArgs` [API change, new exported function].
1045+ + Add fields for CSL options to `Opt` [API change]:
1046+ `optCSL`, `optbibliography`, `optCitationAbbreviations`.
1047+
1048+ * Text.Pandoc.Citeproc.BibTeX
1049+
1050+ + `Text.Pandoc.Citeproc.writeBibTeXString` now returns
1051+ `Doc Text` instead of `Text` (#7068).
1052+ + Correctly handle `pages` (= `page` in CSL) (#7067).
1053+ + Correctly handle BibLaTeX `langid` (= `language` in CSL, #7067).
1054+ + In BibTeX output, protect foreign titles since there's no language
1055+ field (#7067).
1056+ + Clean up BibTeX parsing (#7049). Previously there was a messy code
1057+ path that gave strange results in some cases, not passing through raw
1058+ tex but trying to extract a string content. This was an artefact of
1059+ trying to handle some special bibtex-specific commands in the BibTeX
1060+ reader. Now we just handle these in the LaTeX reader and simplify
1061+ parsing in the BibTeX reader. This does mean that more raw tex will
1062+ be passed through (and currently this is not sensitive to the
1063+ `raw_tex` extension; this should be fixed).
1064+
1065+ * Text.Pandoc.Citeproc.MetaValue
1066+
1067+ + Correctly parse "raw" date value in markdown references metadata.
1068+ (See jgm/citeproc#53.)
1069+
1070+ * Text.Pandoc.Citeproc
1071+
1072+ + Use https URLs for links (Salim B, #7122).
1073+
1074+ * Text.Pandoc.Class
1075+
1076+ + Add `getTimestamp` [API change]. This attempts to read the
1077+ `SOURCE_DATE_EPOCH` environment variable and parse a UTC time
1078+ from it (treating it as a unix date stamp, see
1079+ https://reproducible-builds.org/specs/source-date-epoch/). If the
1080+ variable is not set or can't be parsed as a unix date stamp, then the
1081+ function returns the current date.
1082+
1083+ * Text.Pandoc.Error
1084+
1085+ + Add `PandocUnsupportedCharsetError` constructor for
1086+ `PandocError` [API change].
1087+ + Export `renderError` [API change].
1088+ + Refactor `handleError` to use `renderError`. This allows us render
1089+ error messages without exiting.
1090+
1091+ * Text.Pandoc.Extensions
1092+
1093+ + `Ext_task_lists` is now supported by org (and turned
1094+ on by default) (Albert Krewinkel, #6336).
1095+ + Remove `Ext_fenced_code_attributes` from allowed commonmark attributes
1096+ (#7097). This attribute was listed as allowed, but it didn't actually
1097+ do anything. Use `attributes` for code attributes and more.
1098+
1099+ * Lua subsystem:
1100+
1101+ + Always load built-in Lua scripts from default data-dir (Albert
1102+ Krewinkel). The Lua modules `pandoc` and `pandoc.List` are now always
1103+ loaded from the system's default data directory. Loading from a
1104+ different directory by overriding the default path, e.g. via
1105+ `--data-dir`, is no longer supported to avoid unexpected behavior
1106+ and to address security concerns.
1107+ + Add module "pandoc.path" (Albert Krewinkel, #6001, #6565).
1108+ The module allows to work with file paths in a convenient and
1109+ platform-independent manner.
1110+ + Use strict evaluation when retrieving AST value from the stack
1111+ (Albert Krewinkel, #6674).
1112+
1113+ * Text.Pandoc.PDF
1114+
1115+ + Disable `smart` extension when building PDF via LaTeX.
1116+ This is to prevent accidental creation of ligatures like
1117+ `` ?` `` and `` !` `` (especially in languages with quotations like
1118+ German), and similar ligature issues. (See jgm/citeproc#54.)
1119+
1120+ * Text.Pandoc.CSV:
1121+
1122+ + Fix parsing of unquoted values (#7112). Previously we didn't allow
1123+ unescaped quotes in unquoted values, but they are allowed
1124+ in CSV.
1125+
1126+ * Test suite:
1127+
1128+ + Use a more robust method for testing the executable. Many
1129+ of our tests require running the pandoc executable. This
1130+ is problematic for a few different reasons. First,
1131+ cabal-install will sometimes run the test suite after
1132+ building the library but before building the executable,
1133+ which means the executable isn't in place for the tests.
1134+ One can work around that by first building, then building
1135+ and running the tests, but that's fragile. Second, we
1136+ have to find the executable. So far, we've done that using
1137+ a function `findPandoc` that attempts to locate it
1138+ relative to the test executable (which can be located
1139+ using findExecutablePath). But the logic here is delicate
1140+ and work with every combination of options. To solve both
1141+ problems, we add an `--emulate` option to the
1142+ `test-pandoc` executable. When `--emulate` occurs as the
1143+ first argument passed to `test-pandoc`, the program simply
1144+ emulates the regular pandoc executable, using the rest of
1145+ the arguments (after `--emulate`). Thus, `test-pandoc
1146+ --emulate -f markdown -t latex` is just like `pandoc -f
1147+ markdown -t latex`. Since all the work is done by library
1148+ functions, implementing this emulation just takes a couple
1149+ lines of code and should be entirely reliable. With this
1150+ change, we can test the pandoc executable by running the
1151+ test program itself (locatable using `findExecutablePath`)
1152+ with the `--emulate` option. This removes the need for the
1153+ fragile `findPandoc` step, and it means we can run our
1154+ integration tests even when we're just building the
1155+ library, not the executable. [Note: part of this change
1156+ involved simplifying some complex handling to set
1157+ environment variables for dynamic library paths. I have
1158+ tested a build with `--enable-dynamic-executable`, and it
1159+ works, but further testing may be needed.]
1160+ + Print accurate location if a test fails (Albert
1161+ Krewinkel). Ensures that tasty-hunit reports the location
1162+ of the failing test instead of the location of the helper
1163+ `test` function.
1164+
1165+ * Documentation: Update URLs and use `https` where possible (#7122,
1166+ Salim B).
1167+
1168+ * Add `doc/libraries.md`, a description of libraries that support pandoc.
1169+
1170+ * MANUAL.txt
1171+
1172+ + MANUAL: block-level formatting is not allowed in line blocks (#7107).
1173+ + Clarify `tex_math_dollars` extension. Note that no blank lines
1174+ are allowed between the delimiters in display math.
1175+ + Add MANUAL section on reproducible builds.
1176+ + Document no template fallback for absolute path (#7077, Nixon
1177+ Enraght-Moony.)
1178+ + Improve docs for cite-method.
1179+ + Update README and man page.
1180+
1181+ * Makefile: in `make bench`, create CSV files for comparison and compare
1182+ against previous benchmark run. Add timestamp to CSV filenames.
1183+
1184+ * cabal.project: don't explicitly set -trypandoc.
1185+ If we do, this can't be overridden on the cabal command line.
1186+
1187+ * doc/lua-filters.md: improve documentation for
1188+ `pandoc.mediabag.insert`, `pandoc.mediabag.fetch`,
1189+ `directory`, `normalize` (Albert Krewinkel).
1190+
1191+ * Allow base64-bytestring-1.2.* (Dmitrii Kovanikov)
1192+
1193+ * Require jira-wiki-markup 1.3.3 (Albert Krewinkel)
1194+
1195+ * Require citeproc 0.3.0.8, which correctly titlecases when titles
1196+ contain non-ASCII characters.
1197+
1198+ * Use skylighting 0.10.4. This version of skylighting uses xml-conduit
1199+ rather than hxt. This speeds up parsing of XML syntax definitions
1200+ fourfold, and removes four packages from pandoc's dependency graph:
1201+ hxt-charproperties, hxt-unicode, hxt-regex-xmlschema, hxt.
1202+
1203+ * Add script `tools/parseTimings.pl` to help pin down which
1204+ modules take the most time and memory to compile.
1205+
1206+ * Avoid unnecessary use of NoImplicitPrelude pragma (#7089) (Albert
1207+ Krewinkel)
1208+
1209+ * Benchmarks
1210+
1211+ + Use the lighter-weight tasty-bench instead of criterion.
1212+ + Run writer benchmarks for binary formats too.
1213+ + Alphabetize benchmarks.
1214+ + Don't run benchmarks for bibliography formats
1215+ (yet; we need a special input for them).
1216+ + Show allocation data
1217+ + Clean up benchmark code.
1218+ + Allow specifying patterns using `-p blah'.
1219+
1220+ * trypandoc: add 2 second timeout.
1221+
1222+ * Use `-split-sections` in creating linux release binary.
1223+ This reduces executable size significantly (by about 30%).
1224+
1225+ * Remove `weigh-pandoc`. It's not really useful any more, now that our
1226+ regular benchmarks include data on allocation.
1227+
1228+ * Improve linux package build process and add script to
1229+ automate building an arm64 binary package.
1230+
1231+
1232+## pandoc 2.11.4 (2021-01-22)
1233+
1234+ * Add `biblatex`, `bibtex` as output formats (closes #7040).
1235+
1236+ * Recognize more extensions as markdown by default (#7034):
1237+ `mkdn`, `mkd`, `mdwn`, `mdown`, `Rmd`.
1238+
1239+ * Implement defaults file inheritance (#6924, David Martschenko).
1240+ Allow defaults files to inherit options from other defaults files by
1241+ specifying them with the following syntax:
1242+ `defaults: [list of defaults files or single defaults file]`.
1243+
1244+ * Fix infinite HTTP requests when writing epubs from URL source (#7013).
1245+ Due to a bug in code added to avoid overwriting the cover image
1246+ if it had the form `fileX.YYY`, pandoc made an endless sequence
1247+ of HTTP requests when writing epub with input from a URL.
1248+
1249+ * Org reader:
1250+
1251+ + Allow multiple pipe chars in todo sequences (Albert Krewinkel, #7014).
1252+ Additional pipe chars, used to separate "action" state from "no further
1253+ action" states, are ignored. E.g., for the following sequence, both
1254+ `DONE` and `FINISHED` are states with no further action required:
1255+ `#+TODO: UNFINISHED | DONE | FINISHED`.
1256+ + Restructure output of captioned code blocks (Albert Krewinkel, #6977).
1257+ The Div wrapper of code blocks with captions now has the class
1258+ "captioned-content". The caption itself is added as a Plain block
1259+ inside a Div of class "caption". This makes it easier to write filters
1260+ which match on captioned code blocks. Existing filters will need to be
1261+ updated.
1262+ + Mark verbatim code with class `verbatim` (Dimitri Sabadie, #6998).
1263+
1264+ * LaTeX reader:
1265+
1266+ + Handle `filecontents` environment (#7003).
1267+ + Put contents of unknown environments in a Div when `raw_tex` is not
1268+ enabled (#6997). (When `raw_tex` is enabled, the whole environment is
1269+ parsed as a raw block.) The class name is the name of the environment.
1270+ Previously, we just included the contents without the surrounding Div,
1271+ but having a record of the environment's boundaries and name can be
1272+ useful.
1273+
1274+ * Mediawiki reader:
1275+
1276+ + Allow space around storng/emph delimiters (#6993).
1277+
1278+ * New module Text.Pandoc.Writers.BibTeX, exporting
1279+ writeBibTeX and writeBibLaTeX. [API change]
1280+
1281+ * LaTeX writer:
1282+
1283+ + Revert table line height increase in 2.11.3 (#6996).
1284+ In 2.11.3 we started adding `\addlinespace`, which produced less dense
1285+ tables. This wasn't an intentional change; I misunderstood a comment in
1286+ the discussion leading up to the change. This commit restores the earlier
1287+ default table appearance. Note that if you want a less dense table, you
1288+ can use something like `\def\arraystretch{1.5}` in your header.
1289+
1290+ * EPUB writer:
1291+
1292+ + Adjust internal links to identifiers defined in raw HTML sections
1293+ after splitting into chapters (#7000).
1294+ + Recognize `Format "html4"`, `Format "html5"` as raw HTML.
1295+ + Adjust internal links to images, links, and tables after splitting into
1296+ chapters. Previously we only did this for Div and Span and Header
1297+ elements (see #7000).
1298+
1299+ * Ms writer:
1300+
1301+ + Don't justify text inside table cells.
1302+
1303+ * JATS writer:
1304+
1305+ + Use `<element-citation>` if `element_citations`
1306+ extension is enabled (Albert Krewinkel).
1307+ + Fix citations (Albert Krewinkel, #7018). By default
1308+ we use formatted citations.
1309+ + Ensure that `<disp-quote>` is always wrapped in `<p>` (#7041).
1310+
1311+ * Markdown writer:
1312+
1313+ + Cleaned up raw formats. We now react appropriately
1314+ to `gfm`, `commonmark`, and `commonmark_x` as raw formats.
1315+
1316+ * RST writer:
1317+
1318+ + Fix bug with dropped content from inside spans with a class in
1319+ some cases (#7039).
1320+
1321+ * Docx writer:
1322+
1323+ + Handle table header using styles (#7008). Instead of hard-coding
1324+ the border and header cell vertical alignment, we now let this
1325+ be determined by the Table style, making use of Word's
1326+ "conditional formatting" for the table's first row. For
1327+ headerless tables, we use the tblLook element to tell Word
1328+ not to apply conditional first-row formatting.
1329+
1330+ * Commonmark writer:
1331+
1332+ + Implement start number on ordered lists (#7009). Previously they always
1333+ started at 1, but according to the spec the start number is respected.
1334+
1335+ * HTML writer:
1336+
1337+ + Fix implicit_figure at end of footnotes (#7006).
1338+
1339+ * ConTeXt template: Remove `\setupthinrules` from default template.
1340+ The width parameter this used is not actually supported,
1341+ and the command didn't do anything.
1342+
1343+ * Text.Pandoc.Extensions:
1344+
1345+ + Add `Ext_element_citations` constructor (Albert Krewinkel).
1346+
1347+ * Text.Pandoc.Citeproc.BibTeX: New unexported function
1348+ `writeBibtexString`.
1349+
1350+ * Text.Pandoc.Citeproc:
1351+
1352+ + Use finer grained imports (Albert Krewinkel).
1353+ + Factor out and export `getStyle` [API change].
1354+ + Export `getReferences` [API change, #7106].
1355+ + Factor out getLang.
1356+
1357+ * Text.Pandoc.Parsing: modify `gridTableWith'` for headerless tables.
1358+ If the table lacks a header, the header row should be an empty
1359+ list. Previously we got a list of empty cells, which caused
1360+ an empty header to be emitted instead of no header. In LaTeX/PDF
1361+ output that meant we got a double top line with space between.
1362+
1363+ * ImageSize: use `viewBox` for SVG if no length, width attributes (#7045).
1364+ This change allows pandoc to extract size information from more SVGs.
1365+
1366+ * Add simple default.nix.
1367+
1368+ * Use commonmark 0.1.1.3.
1369+
1370+ * Use citeproc 0.3.0.5.
1371+
1372+ * Update default CSL to use latest chicago-author-date.csl.
1373+
1374+ * CONTRIBUTING.md: add note on GNU xargs.
1375+
1376+ * MANUAL.txt:
1377+
1378+ + Update description of `-L`/`--lua-filter`.
1379+ + Document use of citations in note styles (#6828).
1380+
1381+## pandoc 2.11.3.2 (2020-12-29)
1382+
1383+ * HTML reader: use renderTags' from Text.Pandoc.Shared (Albert Krewinkel).
1384+ A side effect of this change is that empty `<col>` elements are written
1385+ as self-closing tags in raw HTML blocks.
1386+
1387+ * Asciidoc writer: Add support for writing nested tables (#6972, timo-a).
1388+ Asciidoc supports one level of nesting. If deeper tables are to be
1389+ written, they are omitted and a warning is issued.
1390+
1391+ * Docx writer: fix nested tables with captions (#6983).
1392+ Previously we got unreadable content, because docx seems
1393+ to want a `<w:p>` element (even an empty one) at the end of
1394+ every table cell.
1395+
1396+ * Powerpoint writer: allow arbitrary OOXML in raw inline elements
1397+ (Albert Krewinkel). The raw text is now included verbatim in the
1398+ output. Previously is was parsed into XML elements, which prevented
1399+ the inclusion of partial XML snippets.
1400+
1401+ * LaTeX writer: support colspans and rowspans in tables (#6950,
1402+ Albert Krewinkel). Note that the multirow package is needed for
1403+ rowspans. It is included in the latex template under a variable,
1404+ so that it won't be used unless needed for a table.
1405+
1406+ * HTML writer: don't include p tags in CSL bibliography entries
1407+ (#6966). Fixes a regression in 2.11.3.
1408+
1409+ * Add `meta-description` variable to HTML templates (#6982). This
1410+ is populated by the writer by stringifying the `description`
1411+ field of metadata (Jerry Sky). The `description` meta tag will
1412+ make the generated HTML documents more complete and SEO-friendly.
1413+
1414+ * Citeproc: fix handling of empty URL variables (`DOI`, etc.).
1415+ The `linkifyVariables` function was changing these to links
1416+ which then got treated as non-empty by citeproc, leading
1417+ to wrong results (e.g. ignoring nonempty URL when empty DOI is present).
1418+ See jgm/citeproc#41.
1419+
1420+ * Use citeproc 0.3.0.3. Fixes an issue in author-only citations when
1421+ both an author and translator are present, and an issue with
1422+ citation group delimiters.
1423+
1424+ * Require texmath 0.12.1. This improves siunitx support in math,
1425+ fixes bugs with `\*mod` family operators and arrays, and avoids
1426+ italicizing symbols and operator names in docx output.
1427+
1428+ * Ensure that the perl interpreter used for filters with `.pl`
1429+ extension (wuffi).
1430+
1431+ * MANUAL: note that textarea content is never parsed as Markdown
1432+ (Albert Krewinkel).
1433+
1434+
1435+## pandoc 2.11.3.1 (2020-12-18)
1436+
1437+ * Added some missing files to extra-source-files and data
1438+ files, so they are included in the sdist tarball. Closes #6961.
1439+ Cleaned up some extraneous data and test files, and added
1440+ a CI check to ensure that the test and data files included
1441+ in the sdist match what is in the git repository.
1442+
1443+ * Use citeproc 0.3.0.1, which avoids removing nonbreaking
1444+ space at the end of the `initialize-with` attribute. (Some
1445+ journals require nonbreaking space after initials, and this
1446+ makes that possible.)
1447+
1448+## pandoc 2.11.3 (2020-12-17)
1449+
1450+ * With `--bibliography` (or `bibliography` in metadata), a
1451+ URL may now be provided, and pandoc will fetch the resource.
1452+ In addition, if a file path is provided and it is not
1453+ found relative to the working directory, the resource
1454+ path will be searched (#6940).
1455+
1456+ * Add `sourcepos` extension for `commonmark`, `gfm`, `commonmark_x`
1457+ (#4565). With the `sourcepos` extension set set, `data-pos`
1458+ attributes are added to the AST by the commonmark reader. No other
1459+ readers are affected. The `data-pos` attributes are put on elements
1460+ that accept attributes; for other elements, an enlosing Div or Span
1461+ is added to hold the attributes.
1462+
1463+ * Change extensions for `commonmark_x`: replace `auto_identifiers`
1464+ with `gfm_auto_identifiers` (#6863). `commonmark_x` never actually
1465+ supported `auto_identifiers` (it didn't do anything), because the
1466+ underlying library implements gfm-style identifiers only. Attempts
1467+ to add the `auto_identifiers` extension to `commonmark` will now
1468+ fail with an error.
1469+
1470+ * HTML reader:
1471+
1472+ + Split module into several submodules (Albert Krewinkel). Reducing
1473+ module size should reduce memory use during compilation.
1474+ + Support advanced table features (Albert Krewinkel):
1475+ block level content in captions, row and colspans,
1476+ body headers, row head columns, footers, attributes.
1477+ + Disable round-trip testing for tables. Information for cell
1478+ alignment in a column is not preserved during round-trips (Albert
1479+ Krewinkel).
1480+ + Allow finer grained options for tag omission (Albert Krewinkel).
1481+ + Simplify list attribute handling (Albert Krewinkel).
1482+ + Pay attention to `lang` attributes on body element (#6938).
1483+ These (as well as `lang` attributes on the html element) should update
1484+ lang in metadata.
1485+ + Retain attribute prefixes and avoid duplicates (#6938).
1486+ Previously we stripped attribute prefixes, reading `xml:lang` as
1487+ `lang` for example. This resulted in two duplicate `lang`
1488+ attributes when `xml:lang` and `lang` were both used. This commit
1489+ causes the prefixes to be retained, and also avoids invald
1490+ duplicate attributes.
1491+
1492+ * Commonmark reader:
1493+
1494+ + Refactor `specFor`.
1495+ + Set input name to `""` to avoid clutter in sourcepos output.
1496+
1497+ * Org reader:
1498+
1499+ + Parse `#+LANGUAGE` into `lang` metadata field (#6845, Albert
1500+ Krewinkel).
1501+ + Preserve targets of spurious links (#6916, Albert
1502+ Krewinkel). Links with (internal) targets that the reader doesn't
1503+ know about are converted into emphasized text. Information on the
1504+ link target is now preserved by wrapping the text in a Span of class
1505+ `spurious-link`, with an attribute `target` set to the link's
1506+ original target. This allows to recover and fix broken or unknown
1507+ links with filters.
1508+
1509+ * DocBook reader:
1510+
1511+ + Table text width support (#6791, Nils Carlson).
1512+ Table width in relation to text width is not natively supported
1513+ by docbook but is by the docbook `fo` stylesheets through an XML
1514+ processing instruction, `<?dbfo table-width="50%"?>`.
1515+
1516+ * LaTeX reader:
1517+
1518+ + Improve parsing of command options (#6869, #6873).
1519+ In cases where we run into trouble parsing inlines til the
1520+ closing `]`, e.g. quotes, we return a plain string with the
1521+ option contents. Previously we mistakenly included the brackets
1522+ in this string.
1523+ + Preserve center environment (#6852, Igor Pashev).
1524+ The contents of the `center` environment are put in a `Div`
1525+ with class `center`.
1526+ + Don't parse `\rule` with width 0 as horizontal rule. These are
1527+ sometimes used as spacers in LaTeX.
1528+ + Don't apply theorem default styling to a figure inside (#6925).
1529+ If we put an image in italics, then when rendering to Markdown
1530+ we no longer get an implicit figure.
1531+
1532+ * Dokuwiki reader:
1533+
1534+ + Handle unknown interwiki links better (#6932).
1535+ DokuWiki lets the user define his own Interwiki links. Previously
1536+ pandoc reacted to these by emitting a google search link, which is
1537+ not helpful. Instead, we now just emit the full URL including the
1538+ wikilink prefix, e.g. `faquk>FAQ-mathml`. This at least gives users
1539+ the ability to modify the links using filters.
1540+
1541+ * Markdown writer:
1542+
1543+ + Properly handle boolean values in writing YAML metadata (#6388).
1544+ + Ensure that a new csl-block begins on a new line (#6921).
1545+ This just looks better and doesn't affect the semantics.
1546+
1547+ * RST writer:
1548+
1549+ + Better image handling (#6948). An image alone in its paragraph
1550+ (but not a figure) is now rendered as an independent image, with an
1551+ `alt` attribute if a description is supplied. An inline image that
1552+ is not alone in its paragraph will be rendered, as before, using a
1553+ substitution. Such an image cannot have a "center", "left", or
1554+ "right" alignment, so the classes `align-center`, `align-left`, or
1555+ `align-right` are ignored. However, `align-top`, `align-middle`,
1556+ `align-bottom` will generate a corresponding `align` attribute.
1557+
1558+ * Docx writer:
1559+
1560+ + Keep raw openxml strings verbatim (#6933, Albert Krewinkel).
1561+ + Use Content instead of Element. This allows us to inject
1562+ raw OpenXML into the document without reparsing it into an
1563+ Element, which is necessary if you want to inject an open
1564+ tag or close tag.
1565+ + Fix bullets/lists indentation, so that the first level is slightly
1566+ indented to the right instead of right on the margin (cholonam).
1567+ + Support bold and italic in "complex script" (#6911).
1568+ Previously bold and italics didn't work properly in LTR
1569+ text. This commit causes the w:bCs and w:iCs attributes
1570+ to be used, in addition to w:b and w:i, for bold and
1571+ italics respectively.
1572+
1573+ * ICML writer:
1574+
1575+ + Fix image bounding box for custom widths/heighta (Mauro Bieg, #6936).
1576+
1577+ * LaTeX writer:
1578+
1579+ + Improve table spacing (#6842, #6860).
1580+ Remove the `\strut` that was added at the end of minipage
1581+ environments in cells. Replace `\tabularnewline` with
1582+ `\\ \addlinespace`.
1583+ + Improve calculation of column spacing (#6883).
1584+ + Extract table handling into separate module (Albert Krewinkel).
1585+ + Fix bug with nested `csl-` display Spans (#6921).
1586+ + Improve longtable output (#6883). Don't create minipages for
1587+ regular paragraphs. Put width and alignment information in the
1588+ longtable column descriptors.
1589+
1590+ * OpenDocument writer:
1591+
1592+ + Support for table width as a percentage of text width
1593+ (#6792, Nils Carson).
1594+ + Implement Div and Span ident support (#6755, Nils Carson).
1595+ Spans and Divs containing an ident in the Attr will become bookmarks
1596+ or sections with idents in OpenDocument format.
1597+ + Add two extensions, `xrefs_name` and `xrefs_number` (#6774, Nils
1598+ Carlson). Links to headings, figures and tables inside the
1599+ document are substituted with cross-references that will use the
1600+ name or caption of the referenced item for `xrefs_name` or the
1601+ number for `xrefs_number`. For the `xrefs_number` to be useful
1602+ heading numbers must be enabled in the generated document and
1603+ table and figure captions must be enabled using for example the
1604+ `native_numbering` extension. In order for numbers and reference
1605+ text to be updated the generated document must be refreshed.
1606+
1607+ * JATS writer:
1608+
1609+ + Support advanced table features (Albert Krewinkel).
1610+ + Support author affiliations (#6687, Albert Krewinkel).
1611+
1612+ * Docbook writer:
1613+
1614+ + Use correct id attribute consistently (Jan Tojnar).
1615+ DocBook5 should always use `xml:id` instead of `id`.
1616+ + Handle admonition titles better (Jan Tojnar).
1617+ Docbook reader produces a `Div` with `title` class for `<title>`
1618+ element within an “admonition” element. Markdown writer then turns
1619+ this into a fenced div with `title` class attribute. Since fenced
1620+ divs are block elements, their content is recognized as a
1621+ paragraph by the Markdown reader. This is an issue for Docbook
1622+ writer because it would produce an invalid DocBook document from
1623+ such AST – the `<title>` element can only contain “inline”
1624+ elements. Handle this special case separately by unwrapping
1625+ the paragraph before creating the `<title>` element.
1626+ + Add XML namespaces to top-level elements (#6923, Jan Tojnar).
1627+ Previously, we only added `xmlns` attributes to chapter
1628+ elements, even when running with `--top-level-division=section`.
1629+ These namespaces are now added to part and section elements too,
1630+ when they are the selected top-level divisions.
1631+ We do not need to add namespaces to documents produced with
1632+ `--standalone` flag, since those will already have xmlns attribute on
1633+ the root element in the template.
1634+
1635+ * HTML writer:
1636+
1637+ + Fix handling of nested `csl-` display spans (#6921).
1638+ Previously inner Spans used to represent CSL display attributes were
1639+ not rendered as div tags as intended.
1640+
1641+ * EPUB writer:
1642+
1643+ + Include title page in landmarks (#6919).
1644+ Note that the toc is also included if `--toc` is specified.
1645+ + Add frontmatter type on body element for nav.xhtml (#6918).
1646+
1647+ * EPUB templates: use preserveAspectRatio="xMidYMid" for cover image (#6895,
1648+ Shin Sang-jae). This change affects both the epub2 and the epub3
1649+ templates. It avoids distortion of the cover image by requiring that the
1650+ aspect ratio be preserved.
1651+
1652+ * LaTeX template:
1653+
1654+ + Include `csquotes` package if `csquotes` variable set.
1655+ + Put back `amssymb`. We need it for checkboxes in todo lists,
1656+ and maybe for other things. In this location it seems compatible
1657+ with the cases that prompted #6469 and PR #6762.
1658+ + Disable language-specific shorthands in babel (#6817, #6887).
1659+ Babel defines "shorthands" for some languages, and these can
1660+ produce unexpected results. For example, in Spanish, `1.22`
1661+ gets rendered as `122`, and `et~al.` as `etal`.
1662+ One would think that babel's `shorthands=off` option (which
1663+ we were using) would disable these, but it doesn't. So we
1664+ remove `shorthands=off` and add some code that redefines
1665+ the shorthands macro. Eventually this will be fixed in babel,
1666+ I hope, and we can revert to something simpler.
1667+
1668+ * JATS template: allow array of persistent institute ids in `pid`
1669+ (Albert Krewinkel).
1670+
1671+ * Text.Pandoc.Parsing: minor code and efficiency improvements.
1672+
1673+ * Text.Pandoc.Extension:
1674+
1675+ + Add `Ext_sourcepos` constructor for `Extension` [API change].
1676+ + Add `Ext_xrefs_name` and `Ext_xrefs_number` constructors for
1677+ `Extension` (Nils Carson) [API change].
1678+
1679+ * Text.Pandoc.Citeproc:
1680+
1681+ + Fix truncation of `[Citation]` list in `Cite` inside footnotes (#6890).
1682+ This affected author-in-text citations in footnotes. It didn't cause
1683+ problems for the printed output, but for filters that expected the
1684+ citation id and other information.
1685+ + Allow the use of both inline and external references (#6951),
1686+ as with pandoc-citeproc. References defined in the document's
1687+ metadata take priority over references with the same id defined in
1688+ an external bibliography.
1689+ + Use `fetchItem` to get external bibliography (#6940).
1690+ + Ensure that BCP47 lang codes can be used. We ignore the variants
1691+ and just use the base lang code and country code when passing off
1692+ to citeproc.
1693+ + Citeproc BibTeX parser: revert change in `getRawField`
1694+ which was made (for reasons forgotten) when transferring
1695+ this code from pandoc-citeproc. The change led to `--` in
1696+ URLs being interpreted as en-dashes, which is unwanted (#6874).
1697+
1698+ * Text.Pandoc.ImageSize:
1699+
1700+ + Default to DPI 72 if the format specifies DPI of 0 (#6880).
1701+ This shouldn't happen, in general, but it can happen with
1702+ JPEGs that don't conform to the spec. Having a DPI of 0
1703+ will blow up size calculations (division by 0).
1704+ + ImageSize: use JuicyPixels to determine size for png, jpeg, and
1705+ gif, instead of doing our own binary parsing (#6936). This
1706+ gives more reliable results.
1707+
1708+ * Text.Pandoc.CSS:
1709+
1710+ + Remove `foldOrElse` (internal module) (Albert Krewinkel).
1711+
1712+ * Use skylighting 0.10.2 (#6625).
1713+
1714+ * Use citeproc 0.3. This fixes issues with references with
1715+ duplicate ids (jgm/citeproc#36).
1716+
1717+ * Use doctemplates 0.9. This fixes issues with boolean
1718+ metadata values in the Markdown writer (#6388)
1719+ and in `meta-json` (#6650). It also fixes
1720+ issues with nested for loops in templates.
1721+
1722+ * Add translations zh-Hans.yaml and zh-Hant.yaml (#6904, #6909,
1723+ Kolen Cheung, taotieren).
1724+
1725+ * Add tests: True to cabal.project.
1726+ This fixes some CI failures for cabal.
1727+
1728+ * Normalize test/tables/*.native (#6888, Kolen Cheung).
1729+
1730+ * Move executable to `app` directory to avoid problems with cabal repl.
1731+
1732+ * CONTRIBUTING: add section "How can I help?" (#6892, Albert Krewinkel).
1733+ Also adds a paragraph aimed at highlighting the importance of feature
1734+ maintenance.
1735+
1736+ * MANUAL: Document that --number-sections works in `ms` (#6935).
1737+
1738+
1739+## pandoc 2.11.2 (2020-11-19)
1740+
1741+ * Default to using ATX (`##`-style) headings for Markdown output
1742+ (#6662, Aner Lucero). Previously we used Setext (underlined) headings
1743+ by default for levels 1--2.
1744+
1745+ * Add option `--markdown-headings=atx|setext`, and deprecate
1746+ `--atx-headers` (#6662, Aner Lucero).
1747+
1748+ * Support `markdown-headings` in defaults files.
1749+
1750+ * Fix corner case in YAML metadata parsing (#6823). Previously YAML
1751+ metadata would sometimes not get recognized if a field ended with a
1752+ newline followed by spaces.
1753+
1754+ * `--self-contained`: increase coverage (#6854).
1755+ Previously we only self-contained attributes for certain tag names
1756+ (`img`, `embed`, `video`, `input`, `audio`, `source`, `track`,
1757+ `section`). Now we self-contain any occurrence of `src`,
1758+ `data-src`, `poster`, or `data-background-image`, on any tag; and
1759+ also `href` on `link` tags.
1760+
1761+ * Markdown reader:
1762+
1763+ + Fix detection of locators following in-text citations.
1764+ Prevously, if we had `@foo [p. 33; @bar]`, the `p. 33` would be
1765+ incorrectly parsed as a prefix of `@bar` rather than a suffix of
1766+ `@foo`.
1767+ + Improve period suppression algorithm for citations in notes
1768+ in note citation styles (#6835).
1769+ + Don't increment `stateNoteNumber` for example list references.
1770+ This helps with #6836 (a bug in which example list references
1771+ disturb calculation of citation note number and affect when
1772+ `ibid` is triggered).
1773+
1774+ * LaTeX reader:
1775+
1776+ + Move `getNextNumber` from Readers.LaTeX to Readers.LaTeX.Parsing.
1777+ + Fix negative numbers in siunitx commands. A change in pandoc 2.11
1778+ broke negative numbers, e.g. `\SI{-33}{\celcius}` or `\num{-3}`.
1779+ This fixes the regression.
1780+
1781+ * DocBook reader: drop period in formalpara title
1782+ and put it in a div with class `formalpara-title`, so that
1783+ people can reformat with filters (#6562).
1784+
1785+ * Man reader: improve handling of `.IP` (#6858). We now better handle
1786+ `.IP` when it is used with non-bullet, non-numbered lists, creating a
1787+ definition list. We also skip blank lines like groff itself.
1788+
1789+ * Bibtex reader: fall back on `en-US` if locale for LANG not found.
1790+ This reproduces earlier pandoc-citeproc behavior (jgm/citeproc#26).
1791+
1792+ * JATS writer:
1793+
1794+ + Wrap all tables (Albert Krewinkel).
1795+ All `<table>` elements are put inside `<table-wrap>` elements, as the
1796+ former are not valid as immediate child elements of `<body>`.
1797+ + Move Table handling to separate module (Albert Krewinkel).
1798+ Adds two new unexported modules:
1799+ Text.Pandoc.Writers.JATS.Types, Text.Pandoc.Writers.JATS.Table.
1800+
1801+ * Org writer:
1802+
1803+ + Replace org #+KEYWORDS with #+keywords (TEC).
1804+ As of ~2 years ago, lower case keywords became the standard (though
1805+ they are handled case insensitive, as always).
1806+ + Update org supported languages and identifiers according to the
1807+ current list contained in
1808+ <https://orgmode.org/worg/org-contrib/babel/languages/index.html>
1809+ (TEC).
1810+
1811+ * Only use `filterIpynbOutput` if input format is ipynb (#6841).
1812+ Before this change content could go missing from divs with class
1813+ `output`, even when non-ipynb was being converted.
1814+
1815+ * When checking reader/writer name, check base name now that we permit
1816+ extensions on formats other than markdown.
1817+
1818+ * Text.Pandoc.PDF: Fix `changePathSeparators` for Windows (#6173).
1819+ Previously a path beginning with a drive, like `C:\foo\bar`, was
1820+ translated to `C:\/foo/bar`, which caused problems.
1821+ With this fix, the backslashes are removed.
1822+
1823+ * Text.Pandoc.Logging:
1824+
1825+ + Add constructor `ATXHeadingInLHS` to `LogMessage` [API change].
1826+ + Add constructor `EnvironmentVariableUndefined` to
1827+ `LogMessage` [API change].
1828+
1829+ * Fix error that is given when people specify `doc` output (#6834,
1830+ gison93).
1831+
1832+ * LaTeX template: add a `\break` after parbox in `CSLRightInline`.
1833+ This should fix spacing problems between entries with numeric styles.
1834+ Also fix number of params on `CSLReferences`.
1835+
1836+ * reveal.js template: Put quotes around `controlsLayout`,
1837+ `controlsBackArrows`, and `display`, since these require strings.
1838+ Add `showSlideNumber`, `hashOneBasedIndex`, `pause`.
1839+
1840+ * Use citeproc 0.2. This fixes a bug with title case around parentheses.
1841+
1842+ * pandoc.cabal: remove 'static' flag.
1843+ This isn't really necessary and can be misleading (e.g. on macOS,
1844+ where a fully static build isn't possible). cabal's new option
1845+ `--enable-executable-static` does the same. On stack you can add
1846+ something like this to the options for your executable in package.yaml:
1847+
1848+ ld-options: -static -pthread
1849+
1850+ * Remove obsolete bibutils flag setting in `linux/make_artifacts.sh`.
1851+
1852+ * Manual:
1853+
1854+ + Correct `link-citation` -> `link-citations`.
1855+ + Add a sentence about `pagetitle` for HTML (#6843, Alex Toldaiev).
1856+
1857+ * INSTALL.md: Remove references to `pandoc-citeproc` (#6857).
1858+
1859+ * CONTRIBUTING: describe hlint and how it's used (#6840, Albert
1860+ Krewinkel).
1861+
1862+## pandoc 2.11.1.1 (2020-11-07)
1863+
1864+ * Citeproc: improve punctuation in in-text note citations (#6813).
1865+ Previously in-text note citations inside a footnote would sometimes have
1866+ the final period stripped, even if it was needed (e.g. on the end of
1867+ 'ibid').
1868+
1869+ * Use citeproc 0.1.1.1. This improves the decision about when
1870+ to use `ibid` in cases where citations are used inside
1871+ a footnote (#6813).
1872+
1873+ * Support `nocase` spans for `csljson` output.
1874+
1875+ * Require latest commonmark, commonmark-extensions.
1876+ This fixes a bug with `autolink_bare_uris` and commonmark.
1877+
1878+ * LaTeX reader: better handling of `\\` inside math in table cells (#6811).
1879+
1880+ * DokuWiki writer: translate language names for code elements
1881+ and improve whitespace (#6807).
1882+
1883+ * MediaWiki writer: use `syntaxhighlight` tag instead of deprecated
1884+ `source` for highlighted code (#6810). Also support `startFrom`
1885+ attribute and `numberLines`.
1886+
1887+ * Lint code in PRs and when committing to master (#6790,
1888+ Albert Krewinkel).
1889+
1890+ * doc/filters.md: describe technical details of filter invocations (#6815,
1891+ Albert Krewinkel).
1892+
1893+
1894+## pandoc 2.11.1 (2020-11-03)
1895+
1896+ * DocBook Reader: fix duplicate bibliography bug (#6773, Nils Carlson).
1897+
1898+ * HTML reader:
1899+
1900+ + Parse contents of iframes (#6770).
1901+ + Parse inline svg as image unless `raw_html` is set in the reader (in
1902+ which case the svg is passed through as raw HTML) (#6770).
1903+
1904+ * LaTeX reader:
1905+
1906+ + Fix bug parsing macro arguments (#6796). If `\cL` is
1907+ defined as `\mathcal{L}`, and `\til` as `\tilde{#1}`, then
1908+ `\til\cL` should expand to `\tilde{\mathcal{L}}`, but
1909+ pandoc was expanding it to `\tilde\mathcal{L}`. This is
1910+ fixed by parsing the arguments in "verbatim mode" when the
1911+ macro expands arguments at the point of use.
1912+ + Properly support optional (cite) argument for
1913+ `\blockquote` from `csquotes` (#6802).
1914+
1915+ * LaTeX writer: Improved calculation of table column widths.
1916+ We now have LaTeX do the calculation, using `\tabcolsep`.
1917+ So we should now have accurate relative column widths no
1918+ matter what the text width. The default template has been modified to load
1919+ the calc package if tables are used.
1920+
1921+ * HTML writer: Fix duplicate "class" attribute for table
1922+ rows (Andy Morris).
1923+
1924+ * Text.Pandoc.Filter: allow shorter YAML representation of Citeproc
1925+ (Albert Krewinkel). The map-based YAML representation of filters expects
1926+ `type` and `path` fields. The path field had to be present for all filter
1927+ types, but is not used for citeproc filters. The field can now be omitted
1928+ when type is "citeproc", as described in the MANUAL.
1929+
1930+ * Text.Pandoc.Error: Add `PandocBibliographyError` constructor
1931+ for `PandocError` [API change]. This ensures that bibliography parsing
1932+ errors generate messages that include the bibliography file name --
1933+ otherwise it can be quite mysterious where it is coming from.
1934+
1935+ * Citeproc: properly handle `csl` field with `data:` URI (#6783).
1936+ This is used with the JATS writer, so this fixes a regression
1937+ in pandoc 2.11 with JATS output and citeproc.
1938+
1939+ * Allow `citation-abbreviations` in defaults file.
1940+
1941+ * JATS templates: ensure `jats_publishing` output is valid
1942+ (Albert Krewinkel).
1943+
1944+ * LaTeX template: Fix `CSLRightInline`, so that it does not
1945+ run over the right margin.
1946+
1947+ * HTML template: default CSS tweaks (Mauro Bieg and John
1948+ MacFarlane).
1949+
1950+ - Fix margin before codeblock
1951+ - Add `monobackgroundcolor` variable, making the background color
1952+ and padding of code optional.
1953+ - Ensure that backgrounds from highlighting styles take precedence over
1954+ monobackgroundcolor
1955+ - Remove list markers from TOC
1956+ - Add margin-bottom where needed
1957+ - Remove italics from blockquote styling
1958+ - Change borders and spacing in tables to be more consistent with other
1959+ output formats
1960+ - Style h5, h6
1961+ - Set font-size for print media to 12pt.
1962+ - Reduce interline space.
1963+ - Reduce interparagraph space.
1964+ - Reduce line width.
1965+ - Remove the special `line-height: 1` for table cells.
1966+ - Remove the special line-height for pre.
1967+ - Ensure that there is a bit more space before a heading
1968+ than after.
1969+ - Slightly reduced space after title header.
1970+ - Add CSS example to MANUAL
1971+
1972+ * man template: Change comment that triggers `tbl` from
1973+ `.\"t` to `'\" t`, as specified in groff_man(7) (#6803).
1974+
1975+ * Use latest commonmark, commonmark-extensions.
1976+ This fixes a bug with nested blocks in footnotes with the
1977+ `footnote` extension to `commonmark`. See jgm/commonmark-hs#63.
1978+
1979+ * Citeproc: use comma for in-text citations inside footnotes.
1980+ When an author-in-text citation like `@foo` occurs in a footnote,
1981+ we now render it with: `AUTHOR NAME + COMMA + SPACE + REST`.
1982+ Previously we rendered: `AUTHOR NAME + SPACE + "(" + REST + ")"`.
1983+ This gives better results. Note that normal citations are still
1984+ rendered in parentheses.
1985+
1986+ * Use latest citeproc:
1987+
1988+ + citeproc no longer capitalizes notes, so we do it
1989+ in pandoc when appropriate.
1990+ + Closes #6783.
1991+
1992+ * Clarify manual on `--track-changes` (#6801).
1993+
1994+ * Add `doc/jats.md` to document pandoc's handling of JATS
1995+ (#6794, Albert Krewinkel).
1996+
1997+ * Fix code example in lua-filters.md (#6795).
1998+
1999+## pandoc 2.11.0.4 (2020-10-21)
2000+
2001+ * Commonmark writer: fix regression with fenced divs (#6768).
2002+ Starting with 2.10.1, fenced divs no longer render with
2003+ HTML div tags in commonmark output. This is a regression
2004+ due to our transition from cmark-gfm. This commit fixes it.
2005+
2006+ * Use released version of citeproc. (This fixes a mis-step
2007+ in the 2.11.0.3 release, which is now deprecated.)
2008+
2009+ * Use latest sylighting, with support for `groovy`.
2010+
2011+ * Document that --html-q-tags requires the smart extension on the reader
2012+ (#6766).
2013+
2014+## pandoc 2.11.0.3 (2020-10-20)
2015+
2016+ * Use latest citeproc (closes #6765). This fixes a problem with
2017+ author-in-text citations for references including both an author
2018+ and an editor. Previously, both were included in the text, but only
2019+ the author should be.
2020+
2021+ * With `--citeproc`, ensure that the final period is removed when
2022+ citations that occur in notes in note-based styles get put in
2023+ parentheses. See jgm/citeproc#20.
2024+
2025+ * Normalize rewritten image paths with `--extract-media` (#6761).
2026+ This change will avoid mixed paths like this one when
2027+ `--extract-media` is used with a Word file:
2028+ `![](C:\Git\TIJ4\Markdown/media/image30.wmf)`. Instead we'll get
2029+ `![](C:\Git\TIJ4\Markdown`media`image30.wmf)`.
2030+
2031+ * Modify `--version` output. Use space more efficiently and report the
2032+ citeproc and ipynb versions, along with skylighting, texmath, and
2033+ pandoc-types. Drop the word "default" before "user data directory."
2034+
2035+ * DocBook reader: bibliomisc and anchor support (#6754, Nils Carlson).
2036+ Also ensure that bibliodiv without a title no longer results in
2037+ an empty Header.
2038+
2039+ * ConTeXt template: adds `\setupinterlinespace` to fonts larger
2040+ than normal (#6763, Denis Maier).
2041+
2042+ * LaTeX template: Do not load amssymb if not needed (#6469, Angelo Peronio).
2043+ See <https://tex.stackexchange.com/a/549938>.
2044+
2045+ * Relax upper bound on hslua, allow hslua-1.3.* (Albert Krewinkel).
2046+
2047+ * MANUAL:
2048+
2049+ + Improve explanation of "indent" variable (#6767, Cyrus Yip).
2050+ + Remove org from list of input formats supporting raw_tex (#6753,
2051+ Nick Fleisher).
2052+
2053+
2054+## pandoc 2.11.0.2 (2020-10-15)
2055+
2056+ * Fix handling of `xdata` in bibtex/biblatex bibliographies (#6752).
2057+
2058+ * Fix some small typos in the API documentation (#6751, Michael Hoffmann).
2059+
2060+ * Require citeproc 0.1.0.2. This fixes a regression from pandoc-citeproc
2061+ involving spacing between components of a reference in certain styles
2062+ (e.g. `cell.csl`).
2063+
2064+ * Fix typos in comments, doc strings, error messages, and tests
2065+ (Albert Krewinkel, #6738).
2066+
2067+## pandoc 2.11.0.1 (2020-10-13)
2068+
2069+ * LaTeX reader: support more acronym commands (#6746):
2070+ `\acl`, `\aclp`, and capitalized versions of already
2071+ supported commands.
2072+
2073+ * Commonmark reader: add `pipe_table` extension *after* defaults (#6739).
2074+ Otherwise we get bad results for non-table, non-paragraph
2075+ lines containing pipe characters.
2076+
2077+ * Markdown writer: Fix autolinks rendering for gfm (#6740).
2078+ Previously, autolinks rendered as raw HTML, due to the
2079+ `class="uri"` added by pandoc's markdown reader.
2080+
2081+ * LaTeX writer:
2082+
2083+ + Escape option values in lstlistings environment (#6742).
2084+ + Fix handling of `lang` `pt-BR` (#2953). For polyglossia we now
2085+ use `\setmainlanguage[variant=brazilian]{portuguese}` and for babel
2086+ `\usepackage[shorthands=off,main=brazilian]{babel}`.
2087+
2088+ * Depend on latest citeproc (0.1.0.1).
2089+
2090+ + This fixes the citation number issue with ieee.csl and other
2091+ styles that do not explicitly sort bibliographies (#6741). (Pandoc
2092+ was numbering them by their order in the bibliography file,
2093+ rather than the order cited, as required by the CSL spec.)
2094+ + Fixes groupin/collapsing with citation items with prefixes.
2095+
2096+ * default.latex: fix `CSLReference` macro definition.
2097+
2098+ * Fix MANUAL.txt CSL JSON conversion examples.
2099+
2100+ * Fix spelling errors in changelog, MANUAL.txt, `doc/org.md` (#6738).
2101+
2102+
2103+## pandoc 2.11 (2020-10-11)
2104+
2105+ * Add `--citeproc` (`-C`) option to trigger built-in citation processing.
2106+ It is no longer necessary to use the external `pandoc-citeproc`
2107+ filter. `--citeproc` behaves like a filter and can be positioned
2108+ relative to other filters as they appear on the command line.
2109+
2110+ The new built-in citation processing uses the citeproc library,
2111+ a reimplementation of CSL citation processing that fixes many
2112+ of the shortcomings of pandoc-citeproc. In general, citation
2113+ processing should work much the same as it did with pandoc-citeproc,
2114+ but with greater fidelity to CSL styles and better performance.
2115+ (The tests from the pandoc-citeproc package have been carried
2116+ over to pandoc.) The following differences should be noted:
2117+
2118+ - At this point, only some of the writers (HTML, ms, LaTeX) properly
2119+ interpret CSL display styles. You should get decent output in
2120+ all formats (at least as good as with pandoc-citeproc), but
2121+ indentation and block-alignment may not be right.
2122+
2123+ - pandoc-citeproc searches the `~/.csl` directory for `.csl`
2124+ styles. Pandoc instead searches the `csl` subdirectory of
2125+ the pandoc user data directory (e.g., `~/.pandoc/csl` or
2126+ `~/.local/share/pandoc/csl`). Users who already keep
2127+ CSL styles in `~/.csl` may find it convenient to add a
2128+ symlink.
2129+
2130+ - Some of the bibliography formats supported by pandoc-citeproc (via
2131+ hs-bibutils) are no longer supported: Copac, EndNote,
2132+ ISI, MEDLINE, MODS, and RIS. If you use one of these formats,
2133+ you may use the `bibutils` utility to convert to BibLaTeX.
2134+ We now support only BibTeX, BibLaTeX, CSL JSON,
2135+ and pandoc's YAML/Markdown analogue of CSL JSON.
2136+
2137+ - pandoc-citeproc would always retrieve the independent parent
2138+ of a dependent style by doing an HTTP request. pandoc will
2139+ now first seek the independent parent locally (in the resource
2140+ path or in the `csl` subdirectory of the pandoc user data
2141+ directory) before resorting to HTTP. In addition, you may
2142+ omit the `.csl` extension, e.g. `--csl zoology`.
2143+
2144+ - Using the `--bibliography` option (or including
2145+ `bibliography` in YAML metadata) no longer triggers
2146+ citation processing implicitly: one must always use the
2147+ `--citeproc` option if citation processing is wanted.
2148+
2149+ * Add `csljson` as and input and output format. This allows pandoc
2150+ to convert between `csljson` and other bibliography formats
2151+ (e.g. `-f csljson -t markdown -s` or `-f bibtex -t csljson`),
2152+ and to generate formatted versions of CSL JSON bibliographies
2153+ (e.g., `pandoc -f csljson --citeproc pl.json -o pl.pdf`).
2154+
2155+ * Added `bibtex`, `biblatex` as input formats. This allows pandoc
2156+ to convert between BibLaTeX and BibTeX and other bibliography formats,
2157+ and to generated formatted versions of BibTeX/BibLaTeX bibliographies
2158+ (e.g., `pandoc -f biblatex --citeproc pl.bib -o pl.pdf`).
2159+
2160+ * Raise informative errors when YAML metadata parsing fails (#6730).
2161+ Previously the command would succeed, returning empty metadata,
2162+ with no errors or warnings.
2163+
2164+ * Sort languages in `--list-highlight-languages` output (#6718,
2165+ Albert Krewinkel). Languages were previously sorted by their
2166+ long name, which leads to unexpected results).
2167+
2168+ * Add CSS to default HTML template (#6601, Mauro Bieg). This
2169+ greatly improves the default typography in pandoc's HTML
2170+ output. The CSS is sensitive to a number of variables
2171+ (e.g. `mainfont`, `fontsize`, `linestretch`): see the manual for
2172+ details. To restore the earlier, more spartan output, you can
2173+ disable this with `-M document-css=false`.
2174+
2175+ * Support `--toc-depth` option for ODT writer (#6696, niszet).
2176+
2177+ * Fix issues with Windows UNC paths with some options (#5127).
2178+
2179+ * Remove `fenced_code_blocks` and `backtick_code_blocks` from allowed
2180+ `commonmark` and `gfm` extensions. These shouldn't really be counted
2181+ as extensions, because they can't be disabled in commonmark.
2182+ Adjust markdown writer to check for the commonmark variant in addition
2183+ to extensions.
2184+
2185+ * Add these extensions to `gfm` and `commonmark`:
2186+ `fenced_code_blocks`, `backtick_code_blocks`, `fenced_code_attributes`.
2187+ These can't really be disabled in the reader, but they need to be enabled
2188+ in the writer or we just get indented code.
2189+
2190+ * Make sure proper set of extensions is recognized for `commonmark_x`.
2191+
2192+ * Allow `gfm_auto_identifiers`, `ascii_identifiers` extensions for `docx`.
2193+
2194+ * Markdown reader:
2195+
2196+ + Add `Maybe FilePath` parameter to `yamlToMeta` [API change].
2197+ + Export `yamlToRefs` [API change], a version of `yamlToMeta`
2198+ specialized to references.
2199+ + Set `citationNoteNum` accurately in citations.
2200+ + Revise abbreviation support. Don't insert a nonbreaking space after a
2201+ potential abbreviation if it comes right before a note or citation.
2202+ This causes problems for citeproc's moving of note citations.
2203+
2204+ * LaTeX reader:
2205+
2206+ + Support missing siunitx commands (#6658).
2207+ + Support `squared`, `cubed`, `tothe` in siunitx (#6657).
2208+ + Improved uncertainty handling in slunitx.
2209+ + Factored out siunitx stuff into separate unexposed module.
2210+ + Fix improper empty cell filtering (#6689, Christian Despres).
2211+ + Fix parsing of "show name" in `\newtheorem` (#6734).
2212+ Previously we were just treating it as a string and
2213+ ignoring accents and formatting.
2214+ + Prevent wrong nesting of `\multirow` and `\multicolumn` table
2215+ cells (#6603, Laurent P. René de Cotret).
2216+ + Table cell parser not consuming spaces correctly (#6596,
2217+ Laurent P. René de Cotret).
2218+ + Change `SIRange` to `SIrange` (#6617, Emerson Harkin).
2219+ + Allow blank lines inside `\author` (#6324).
2220+
2221+ * DocBook reader:
2222+
2223+ + Don't squelch space at end of emphasis and other inline elements;
2224+ instead, move it outside the element (#6719).
2225+ + Implement table cell alignment (#6698, Nils Carlson).
2226+ + Implement column span support for tables (#6492, Nils Carlson).
2227+ + Update list of block level tags (#6610).
2228+
2229+
2230+ * JATS reader:
2231+
2232+ + Don't squelch space at end of emphasis and other inline elements;
2233+ instead, move it outside the element (#6719).
2234+
2235+ * RST reader:
2236+
2237+ + Apply `.. class::` directly to following Header rather than creating
2238+ a surrounding Div (#6699).
2239+
2240+ * Docx reader:
2241+
2242+ + Allow empty dates in comments and tracked changes (#6726, Diego
2243+ Balseiro).
2244+
2245+ * Markdown writer:
2246+
2247+ + Be less aggressive about using quotes for YAML values,
2248+ allowing e.g. a quotation mark or bracket as long as it's not at the
2249+ beginning of the line.
2250+ + Use double quotes for YAML metadata (#6727).
2251+ + Sort YAML metadata keys in Markdown output case-insensitive.
2252+
2253+
2254+ * Asciidoc writer:
2255+
2256+ + Support asciidoctor's block figures (#6538, argent0).
2257+
2258+ * LaTeX writer:
2259+
2260+ + Fix spacing issue with list in definition list.
2261+ When a list occurs at the beginning of a definition list definition,
2262+ it can start on the same line as the label, which looks bad.
2263+ Fix that by starting such lists with an `\item[]`.
2264+
2265+ * HTML writer:
2266+
2267+ + Support intermediate table headers (#5314, Albert Krewinkel).
2268+ + Support attributes on all table elements (Albert Krewinkel).
2269+ + Render table footers if present (#6314, Albert Krewinkel).
2270+ + Fix addition of `doc-biblioentry` role.
2271+ + Support colspans and rowspans in HTML tables (#6312, Albert Krewinkel).
2272+
2273+ * ICML writer:
2274+
2275+ + Support internal document links (#5541, Leonard Rosenthol).
2276+ + Changed default link state to invisible (#6676, Leonard Rosenthol).
2277+
2278+ * Docx writer:
2279+
2280+ + Better handle list items whose contents are lists (#5948, Michael
2281+ Hoffmann). If the first element of a bulleted or ordered list is
2282+ another list, then that first item would previously disappear if the
2283+ target format is docx.
2284+ + Separate adjacent tables (#4315). Word combines adjacent tables,
2285+ so to prevent this we insert an empty paragraph between two
2286+ adjacent tables.
2287+
2288+ * Org writer:
2289+
2290+ + Don't force blank line after headings (#6554).
2291+
2292+ * OpenDocument writer:
2293+
2294+ + Implement table cell alignment (#6700 Nils Carson, Mauro Bieg).
2295+ + New table cell support with row and column spans (#6682, Nils Carson).
2296+ + Syntax highlighting for inline code (#6711, niszet).
2297+
2298+ * Add Text.Pandoc.Citeproc module, exporting `processCitations`
2299+ [API change]. This depends on several other, unexported
2300+ modules under Text.Pandoc.Citeproc.
2301+
2302+ * Add module Text.Pandoc.Writers.CslJson, exporting `writeCslJson`.
2303+ [API change]
2304+
2305+ * Add module Text.Pandoc.Readers.CslJson, exporting `readCslJson`.
2306+ [API change]
2307+
2308+ * Add module Text.Pandoc.Readers.BibTeX, exporting `readBibTeX` and
2309+ `readBibLaTeX`. [API change]
2310+
2311+ * Text.Pandoc.Filter: Add `CiteprocFilter` constructor to Filter.
2312+ [API change] This runs the processCitations transformation.
2313+ We need to treat it like a filter so it can be placed
2314+ in the sequence of filter runs (after some, before others).
2315+ In FromYAML, this is parsed from `citeproc` or `{type: citeproc}`,
2316+ so this special filter may be specified either way in a defaults file
2317+ (or by `citeproc: true`, though this gives no control of positioning
2318+ relative to other filters).
2319+
2320+ * Add new exported module Text.Pandoc.Writers.AnnotatedTable [API change]
2321+ (#6655, Christian Despres). This module (which should generally
2322+ be imported qualified to avoid name conflicts) provides a
2323+ `Table` type that mirrors the structure of a pandoc `Table`,
2324+ but with added inferred information so that the writers do not have to
2325+ lay out tables themselves. The `toTable` and `fromTable` functions convert
2326+ between an annotated `Table` and a regular pandoc `Table`. In addition to
2327+ producing a `Table` with coherent and well-formed annotations, the
2328+ `toTable` function also normalizes its input table like the table
2329+ builder does. Tests ensure that `toTable` normalizes tables exactly
2330+ like the table builder, and that its annotations are coherent.
2331+
2332+ * Text.Pandoc.Logging:
2333+
2334+ + Remove unused `CouldNotParseYamlMetadata` constructor for `LogMessage`
2335+ [API change].
2336+ + Add `CiteprocWarning` constructor to `LogMessage` [API change].
2337+
2338+ * Text.Pandoc.Readers.Metadata: export `yamlBsToRefs` [API change].
2339+ These allow specifying an id filter so we parse only references
2340+ that are used in the document.
2341+
2342+ * Text.Pandoc.Parsing:
2343+
2344+ + Export ParseError [API change].
2345+ + Add `stateInNote` and `stateNoteNumber` to `ParserState`
2346+ [API change]. These are used to populate note numbers for citation
2347+ processing.
2348+
2349+ * Fix apparent typos in sample.lua (#6729, William Lupton).
2350+ Also make the writer less aggressive in escaping quotes.
2351+
2352+ * Text.Pandoc.Options:
2353+
2354+ + `defaultMathJaxURL`: use `tex-chtml-full` instead of `tex-mml-chtml`
2355+ (#6599, Kolen Cheung). This drops the MathML support (which we
2356+ don't need for HTML math rendering) and includes the full JavaScript,
2357+ which makes it possible to use `--self-contained` (though there may
2358+ still be issues if the required math fonts aren't available). This
2359+ change should also reduce latency in pages with lots of formulas.
2360+ + Add `/tex-chtml-full.js` to `defaultMathJaxURL` (#6593) Previously we
2361+ added this in processing command line options, but not in processing
2362+ defaults files, which was inconsistent.
2363+
2364+ * epub.css: Fix cover page selectors and add note explaining their use
2365+ (#6649, a-vrma).
2366+
2367+ * Add data files needed for Text.Pandoc.Citeproc: these include
2368+ `default.csl` in the data directory and a `citeproc` directory that
2369+ is only used at compile-time for biblatex localizations. Note that we've
2370+ added `file-embed` as a mandatory rather than a conditional
2371+ dependency, because of the biblatex localization files.
2372+
2373+ * Lua filters:
2374+
2375+ + Add SimpleTable for backwards compatibility (#6575, Albert Krewinkel).
2376+ A new type `SimpleTable` is made available to Lua filters. It is
2377+ similar to the `Table` type in pandoc versions before 2.10;
2378+ conversion functions from and to the new Table type are provided.
2379+ Old filters using tables now require minimal changes and can use, e.g.,
2380+
2381+ if PANDOC_VERSION > {2,10,1} then
2382+ pandoc.Table = pandoc.SimpleTable
2383+ end
2384+
2385+ and
2386+
2387+ function Table (tbl)
2388+ tbl = pandoc.utils.to_simple_table(tbl)
2389+ …
2390+ return pandoc.utils.from_simple_table(tbl)
2391+ end
2392+
2393+ to work with the current pandoc version.
2394+
2395+ + Make `attr` argument optional in `Table` constructor (Albert Krewinkel).
2396+ This changes the Lua API. It is highly unlikely for this change to affect
2397+ existing filters, since the documentation for the new Table constructor
2398+ (and type) was incomplete and partly wrong before. The Lua API is now
2399+ more consistent, as all constructors for elements with attributes now
2400+ take attributes as the last parameter.
2401+
2402+ * MANUAL.txt:
2403+
2404+ * Add a dedicated Citations section which consolidates the information
2405+ the manual used to contain about citation processing, and incorporates
2406+ some information formerly found in the pandoc-citeproc man page.
2407+ + Add note about lualatex using `selnolig`.
2408+ + Remove duplicate `seriespage` (#6568, Blake Eryx).
2409+ + Remove lists of support extensions for markdown variants (#6604).
2410+ Instead, offer the advice to use `--list-extensions=FORMAT`.
2411+ + Fix position of attributes in header (Albert Krewinkel).
2412+ + Delete obsolete section on compact and loose lists (#6684).
2413+
2414+
2415+ * doc/lua-filters.md:
2416+
2417+ + Add info on how to debug Lua filters (#6732, Ian Max Andolina).
2418+ + Document Underline type and constructor (Albert Krewinkel).
2419+ + Document `body` field (Albert Krewinkel).
2420+ + Add missing header attribute
2421+ + Add missing Link.title field (Albert Krewinkel).
2422+ + Make the setting-the-date example conditional (the-solipsist).
2423+ This makes the example a bit more realistic.
2424+ + Remove outdated link table example.
2425+
2426+ * doc/org.md:
2427+
2428+ + Add section on tables (Albert Krewinkel).
2429+ + Add section on handling of unknown directives (Albert Krewinkel).
2430+
2431+ * CONTRIBUTING.md: fix typo (#6584, Dmitry Volodin).
2432+
2433+ * Use golden test framework for command tests. This means that
2434+ `--accept` can be used to update expected output.
2435+
2436+ * Use the `smart` extension when generating pandoc's man page (#6613).
2437+
2438+ * Release-candidate: don't build windows i386.
2439+ So far we haven't been able to figure out how to get
2440+ stack to use a 32-bit ghc.
2441+
2442+ * Use `null` instead of deprecated `Builder.isNull`.
2443+
2444+ * Makefile:
2445+
2446+ + Fix macospkg target to fetch target from S3 artifacts.
2447+ + Fix pandoc-templates target to include all partials.
2448+
2449+ * Remove duplicated dependency in pandoc.cabal (#6591, Felix Yan).
2450+
2451+ * Sort build depends in pandoc.cabal alphabetically (#6691,
2452+ Albert Krewinkel).
2453+
2454+ * Add .travis.yml for macos release candidate build (#6622).
2455+ We need to build the release candidate on Travis rather
2456+ than GitHub actions, because GH has macos 10.15, and
2457+ binaries compiled on that OS will not work with 10.13.
2458+ This build is only triggered on `rc/*` branches.
2459+
2460+ * Remove instructions for building pandoc-citeproc from CI and
2461+ release binary build instructions. We will no longer distribute
2462+ pandoc-citeproc.
2463+
2464+ * Fix math rendering in trypandoc (this broke after
2465+ commit d8ad766d17603784b86fc5c2e1b22864125d04d1).
2466+
2467+ * Use latest versions of skylighting, commonmark (#6589),
2468+ comonmark-extensions, commonmark-pandoc, texmath.
2469+
2470+ * Relax version bounds for hslua, hslua-module-text, bytestring.
2471+
2472+ * Use released pandoc-types 1.22. This changes the JSON
2473+ encoding slightly for the new table types introduced
2474+ in 1.21, so they're more consistent with the rest.
2475+ Developers of libraries for pandoc filters will want
2476+ to take note.
2477+
2478+ * Fix hlint suggestions, update hlint.yaml (#6680, Christian Despres).
2479+
2480+ * Code cleanup (#6678, Joseph C. Sible).
2481+
2482+ * Add haddocks to functions in Text.Pandoc.Writers.Shared (Albert
2483+ Krewinkel).
2484+
2485+ * Remove duplicate `tshow` definition.
2486+
2487+ * Linux release candidate build: use ghc-musl container. This simplifies
2488+ our build process (over using a customized alpine container).
2489+
2490+
3## pandoc 2.10.1 (2020-07-23)
2491## pandoc 2.10.1 (2020-07-23)
4
2492
5 * Add `commonmark_x` output format. This is `commonmark` with a number
2493 * Add `commonmark_x` output format. This is `commonmark` with a number
@@ -117,7 +2605,7 @@
117 * Ms writer:
2605 * Ms writer:
118
2606
119 + Fix code highlighting with blank lines. Previously blank lines
2607 + Fix code highlighting with blank lines. Previously blank lines
120− were simply omitted from highligted code.
2608+ were simply omitted from highlighted code.
121 + Escape starting periods in ms writer code blocks (#6505, Michael
2609 + Escape starting periods in ms writer code blocks (#6505, Michael
122 Hoffmann). If a line of ms code block output starts with a period (.),
2610 Hoffmann). If a line of ms code block output starts with a period (.),
123 it should be prepended by `\&` so that it is not interpreted as a roff
2611 it should be prepended by `\&` so that it is not interpreted as a roff
@@ -580,7 +3068,7 @@
580 * Make it possible to compile using Stack on NixOS (#6439, Mathieu
3068 * Make it possible to compile using Stack on NixOS (#6439, Mathieu
581 Boespflug).
3069 Boespflug).
582
3070
583− * CI action to check for commit messsage length (Nikolay Yakimov, #6398).
3071+ * CI action to check for commit message length (Nikolay Yakimov, #6398).
584
3072
585
3073
586## pandoc 2.9.2.1 (2020-03-23)
3074## pandoc 2.9.2.1 (2020-03-23)
@@ -1147,7 +3635,7 @@
1147 The main impact of this change is better reflowing of
3635 The main impact of this change is better reflowing of
1148 content interpolated into templates. Previously,
3636 content interpolated into templates. Previously,
1149 interpolated variables were rendered independently and
3637 interpolated variables were rendered independently and
1150− intepolated as strings, which could lead to overly long
3638+ interpolated as strings, which could lead to overly long
1151 lines. Now the templates interpolated as Doc values which
3639 lines. Now the templates interpolated as Doc values which
1152 may include breaking spaces, and reflowing occurs after
3640 may include breaking spaces, and reflowing occurs after
1153 template interpolation rather than before.
3641 template interpolation rather than before.
@@ -1626,7 +4114,7 @@
1626 a margin and font size according to their level.
4114 a margin and font size according to their level.
1627 Furthermore this commit allows changing the font with which code is
4115 Furthermore this commit allows changing the font with which code is
1628 formatted via the `monofont` option.
4116 formatted via the `monofont` option.
1629− + Start numbering at appopriate numbers (Jesse Rosenthal, #5709).
4117+ + Start numbering at appropriate numbers (Jesse Rosenthal, #5709).
1630 Starting numbers for ordered lists were previously ignored. Now
4118 Starting numbers for ordered lists were previously ignored. Now
1631 we specify the number if it is something other than 1.
4119 we specify the number if it is something other than 1.
1632
4120
@@ -2945,7 +5433,7 @@
2945 * Man/Ms writers: Don't escape `-` as `\-`. The `\-` gets rendered
5433 * Man/Ms writers: Don't escape `-` as `\-`. The `\-` gets rendered
2946 in HTML and PDF as a unicode minus sign.
5434 in HTML and PDF as a unicode minus sign.
2947
5435
2948− * Ms writer: Ensure we have a newline after .EN in disply math (#5251).
5436+ * Ms writer: Ensure we have a newline after .EN in display math (#5251).
2949
5437
2950 * RST writer: Don't wrap simple table header lines (#5128).
5438 * RST writer: Don't wrap simple table header lines (#5128).
2951
5439
@@ -3077,7 +5565,7 @@
3077 + Set default listings language for lua, assembler (#5227, John
5565 + Set default listings language for lua, assembler (#5227, John
3078 MacFarlane). Otherwise we get an error when trying to compile code
5566 MacFarlane). Otherwise we get an error when trying to compile code
3079 with lua or assembler code. To change the default dialect
5567 with lua or assembler code. To change the default dialect
3080− (currenty 5.3 for lua and x86masm for assembler), you can use
5568+ (currently 5.3 for lua and x86masm for assembler), you can use
3081 `--include-in-header` to inject something like
5569 `--include-in-header` to inject something like
3082 `\lstset{defaultdialect=[5.2]Lua}`.
5570 `\lstset{defaultdialect=[5.2]Lua}`.
3083
5571
@@ -6774,7 +9262,7 @@
6774
9262
6775 * Removed `hard_line_breaks` extension from `markdown_github` (#3594).
9263 * Removed `hard_line_breaks` extension from `markdown_github` (#3594).
6776 GitHub has two Markdown modes, one for long-form documents like READMEs
9264 GitHub has two Markdown modes, one for long-form documents like READMEs
6777− and one for short things like issue coments. In issue comments, a line
9265+ and one for short things like issue comments. In issue comments, a line
6778 break is treated as a hard line break. In README, wikis, etc., it is
9266 break is treated as a hard line break. In README, wikis, etc., it is
6779 treated as a space as in regular Markdown. Since pandoc is more likely to
9267 treated as a space as in regular Markdown. Since pandoc is more likely to
6780 be used to convert long-form documents from GitHub Markdown,
9268 be used to convert long-form documents from GitHub Markdown,
@@ -7127,7 +9615,7 @@
7127 top-level `Text.Pandoc` module.
9615 top-level `Text.Pandoc` module.
7128
9616
7129 + Changed `StringWriter` -> `TextWriter`.
9617 + Changed `StringWriter` -> `TextWriter`.
7130− + `getWriter` now retuns a pair of a reader and
9618+ + `getWriter` now returns a pair of a reader and
7131 `Extensions`, instead of building the extensions into the
9619 `Extensions`, instead of building the extensions into the
7132 reader (#3659). The calling code must explicitly set
9620 reader (#3659). The calling code must explicitly set
7133 `readerExtensions` using the `Extensions` returned. The
9621 `readerExtensions` using the `Extensions` returned. The
@@ -8079,7 +10567,7 @@
8079 + Use `unicode-math` (Vaclav Haisman). Use `mathspec` with only
10567 + Use `unicode-math` (Vaclav Haisman). Use `mathspec` with only
8080 XeLaTeX on request.
10568 XeLaTeX on request.
8081 + Don't load `fontspec` before `unicode-math` (over there).
10569 + Don't load `fontspec` before `unicode-math` (over there).
8082− The `unicode-math` package loads `fontspec` so explict loading of
10570+ The `unicode-math` package loads `fontspec` so explicit loading of
8083 `fontspec` before `unicode-math` is not necessary.
10571 `fontspec` before `unicode-math` is not necessary.
8084 + Use `unicode-math` by default in default.latex template. mathspec will
10572 + Use `unicode-math` by default in default.latex template. mathspec will
8085 be used in xelatex if the `mathspec` variable is set; otherwise
10573 be used in xelatex if the `mathspec` variable is set; otherwise
@@ -8760,7 +11248,7 @@
8760 is now used in parsing RST and Markdown line blocks, DocBook
11248 is now used in parsing RST and Markdown line blocks, DocBook
8761 `linegroup`/`line` combinations, and Org-mode `VERSE` blocks.
11249 `linegroup`/`line` combinations, and Org-mode `VERSE` blocks.
8762 Previously `Para` blocks with hard linebreaks were used. `LineBlock`s
11250 Previously `Para` blocks with hard linebreaks were used. `LineBlock`s
8763− are handled specially in the following ouput formats: AsciiDoc
11251+ are handled specially in the following output formats: AsciiDoc
8764 (as `[verse]` blocks), ConTeXt (`\startlines`/`\endlines`),
11252 (as `[verse]` blocks), ConTeXt (`\startlines`/`\endlines`),
8765 HTML (`div` with a style), Markdown (line blocks if `line_blocks`
11253 HTML (`div` with a style), Markdown (line blocks if `line_blocks`
8766 is enabled), Org-mode (`VERSE` blocks), RST (line blocks). In
11254 is enabled), Org-mode (`VERSE` blocks), RST (line blocks). In
@@ -8907,7 +11395,7 @@
8907 comma-separated list.
11395 comma-separated list.
8908 + Give precedence to later meta lines. The last meta-line of any given
11396 + Give precedence to later meta lines. The last meta-line of any given
8909 type is the significant line. Previously the value of the first line
11397 type is the significant line. Previously the value of the first line
8910− was kept, even if more lines of the same type were encounterd.
11398+ was kept, even if more lines of the same type were encountered.
8911 + Read LaTeX_header as header-includes. LaTeX-specific header commands
11399 + Read LaTeX_header as header-includes. LaTeX-specific header commands
8912 can be defined in `#+LaTeX_header` lines. They are parsed as
11400 can be defined in `#+LaTeX_header` lines. They are parsed as
8913 format-specific inlines to ensure that they will only show up in LaTeX
11401 format-specific inlines to ensure that they will only show up in LaTeX
@@ -8955,7 +11443,7 @@
8955 be able to figure out internal links to a header in a docx if the
11443 be able to figure out internal links to a header in a docx if the
8956 anchor span was empty. We change that to read the inlines out of the
11444 anchor span was empty. We change that to read the inlines out of the
8957 first anchor span in a header.
11445 first anchor span in a header.
8958− + Let headers use exisiting id. Previously we always generated an id for
11446+ + Let headers use existing id. Previously we always generated an id for
8959 headers (since they wouldn't bring one from Docx). Now we let it use an
11447 headers (since they wouldn't bring one from Docx). Now we let it use an
8960 existing one if possible. This should allow us to recurs through anchor
11448 existing one if possible. This should allow us to recurs through anchor
8961 spans.
11449 spans.
@@ -9534,7 +12022,7 @@
9534 character. Empty rows where parsed as alignment rows and dropped from
12022 character. Empty rows where parsed as alignment rows and dropped from
9535 the output.
12023 the output.
9536 + Fix spacing after LaTeX-style symbols.
12024 + Fix spacing after LaTeX-style symbols.
9537− The org-reader was droping space after unescaped LaTeX-style symbol
12025+ The org-reader was dropping space after unescaped LaTeX-style symbol
9538 commands: `\ForAll \Auml` resulted in `∀Ä` but should give `∀ Ä`
12026 commands: `\ForAll \Auml` resulted in `∀Ä` but should give `∀ Ä`
9539 instead. This seems to be because the LaTeX-reader treats the
12027 instead. This seems to be because the LaTeX-reader treats the
9540 command-terminating space as part of the command. Dropping the trailing
12028 command-terminating space as part of the command. Dropping the trailing
@@ -9869,7 +12357,7 @@
9869
12357
9870 * Entity handling fixes: improved handling of entities like
12358 * Entity handling fixes: improved handling of entities like
9871 `&lang;` that require a trailing semicolon. Allow uppercase
12359 `&lang;` that require a trailing semicolon. Allow uppercase
9872− `x` in numerical hexidecimal character references, working
12360+ `x` in numerical hexadecimal character references, working
9873 around a tagsoup bug.
12361 around a tagsoup bug.
9874
12362
9875 * `stack.yaml` - use lts-4.0, but with older aeson to avoid excessive
12363 * `stack.yaml` - use lts-4.0, but with older aeson to avoid excessive
@@ -11354,7 +13842,7 @@
11354 * `Text.Pandoc.Shared`:
13842 * `Text.Pandoc.Shared`:
11355
13843
11356 + Make safeRead safe (#1801, Matthew Pickering).
13844 + Make safeRead safe (#1801, Matthew Pickering).
11357− + Addded `mapLeft`, `hush` (Matthew Pickering).
13845+ + Added `mapLeft`, `hush` (Matthew Pickering).
11358
13846
11359 * `Text.Pandoc.Pretty`:
13847 * `Text.Pandoc.Pretty`:
11360
13848
@@ -11422,7 +13910,7 @@
11422
13910
11423 + Use `text:p` instead of `text:h` for title.
13911 + Use `text:p` instead of `text:h` for title.
11424 Using `text:h` causes problems with numbering. Closes #2059.
13912 Using `text:h` causes problems with numbering. Closes #2059.
11425− Thansk to @nkalvi for diagnosing this.
13913+ Thanks to @nkalvi for diagnosing this.
11426
13914
11427 * reveal.js template:
13915 * reveal.js template:
11428
13916
@@ -11688,7 +14176,7 @@
11688 * RST writer:
14176 * RST writer:
11689
14177
11690 + Ensure blank line after figure.
14178 + Ensure blank line after figure.
11691− + Avoid exces whitespace after last list item (#1777).
14179+ + Avoid excess whitespace after last list item (#1777).
11692 + Wrap line blocks with spaces before continuations (#1656).
14180 + Wrap line blocks with spaces before continuations (#1656).
11693 + Fixed double-rendering of footnotes in RST tables (#1769).
14181 + Fixed double-rendering of footnotes in RST tables (#1769).
11694
14182
@@ -11750,7 +14238,7 @@
11750 + Renumber header and footer relationships to avoid collisions (Jesse
14238 + Renumber header and footer relationships to avoid collisions (Jesse
11751 Rosenthal). We previously took the old relationship names of the
14239 Rosenthal). We previously took the old relationship names of the
11752 headers and footer in secptr. That led to collisions. We now make
14240 headers and footer in secptr. That led to collisions. We now make
11753− a map of availabl names in the relationships file, and then rename
14241+ a map of available names in the relationships file, and then rename
11754 in secptr.
14242 in secptr.
11755
14243
11756 * ConTeXt writer:
14244 * ConTeXt writer:
@@ -12473,7 +14961,7 @@
12473 different versions of the `directory` library.
14961 different versions of the `directory` library.
12474
14962
12475 + Added `Text.Pandoc.Compat.Except` to allow building against
14963 + Added `Text.Pandoc.Compat.Except` to allow building against
12476− different verions of `mtl`.
14964+ different versions of `mtl`.
12477
14965
12478 * Code cleanup in some writers, using Reader monad to avoid
14966 * Code cleanup in some writers, using Reader monad to avoid
12479 passing options parameter around (Matej Kollar).
14967 passing options parameter around (Matej Kollar).
@@ -14112,7 +16600,7 @@
14112 + Include HTML TOC, even in epub2. The TOC is included in `<spine>`,
16600 + Include HTML TOC, even in epub2. The TOC is included in `<spine>`,
14113 but `linear` is set to `no` unless the `--toc` option is specified.
16601 but `linear` is set to `no` unless the `--toc` option is specified.
14114 Include `<guide>` element in OPF. This should allow the TOC to
16602 Include `<guide>` element in OPF. This should allow the TOC to
14115− be useable in Kindles when converted with kindlegen. Closes #773.
16603+ be usable in Kindles when converted with kindlegen. Closes #773.
14116
16604
14117 * `Text.Pandoc.Parsing`: Optimized `oneOfStringsCI`.
16605 * `Text.Pandoc.Parsing`: Optimized `oneOfStringsCI`.
14118 This dramatically reduces the speed penalty that comes from enabling the
16606 This dramatically reduces the speed penalty that comes from enabling the
@@ -14708,7 +17196,7 @@
14708 be a parenthesized emphasized "hello".
17196 be a parenthesized emphasized "hello".
14709 The new list is taken from the PHP source of textile 2.4.
17197 The new list is taken from the PHP source of textile 2.4.
14710 + Fixed autolinks. Previously the textile reader and writer
17198 + Fixed autolinks. Previously the textile reader and writer
14711− incorrectly implented RST-style autolinks for URLs and email
17199+ incorrectly implemented RST-style autolinks for URLs and email
14712 addresses. This has been fixed. Now an autolink is done this way:
17200 addresses. This has been fixed. Now an autolink is done this way:
14713 `"$":http://myurl.com`.
17201 `"$":http://myurl.com`.
14714 + Fixed footnotes bug in textile. This affected notes occurring
17202 + Fixed footnotes bug in textile. This affected notes occurring
@@ -15771,7 +18259,7 @@
15771 Items are no longer installed as root.
18259 Items are no longer installed as root.
15772 Man pages are zipped and given proper permissions.
18260 Man pages are zipped and given proper permissions.
15773
18261
15774− * Modified windows installer generater to use cabal-dev.
18262+ * Modified windows installer generator to use cabal-dev.
15775
18263
15776 * Setup: Making man pages now works with cabal-dev (at least on OSX). In
18264 * Setup: Making man pages now works with cabal-dev (at least on OSX). In
15777 Setup.hs we now invoke 'runghc' in a way that points it to the correct
18265 Setup.hs we now invoke 'runghc' in a way that points it to the correct
citeproc/biblatex-localization/.stringsnew file

No changes to the content.

citeproc/biblatex-localization/UKenglish.lbx.stringsnew file

No changes to the content.

citeproc/biblatex-localization/USenglish.lbx.stringsnew file

No changes to the content.

citeproc/biblatex-localization/american.lbx.stringsnew file

No changes to the content.

citeproc/biblatex-localization/australian.lbx.stringsnew file

No changes to the content.

citeproc/biblatex-localization/austrian.lbx.stringsnew file+1
@@ -0,0 +1 @@
1+january|J\"anner|J\"an\adddot
citeproc/biblatex-localization/brazil.lbx.stringsnew file

No changes to the content.

citeproc/biblatex-localization/brazilian.lbx.stringsnew file+233
@@ -0,0 +1,233 @@
1+bibliography|Bibliografia|Bibliografia
2+references|Refer\^encias|Refer\^encias
3+shorthands|Lista de abreviaturas|Abreviaturas
4+editor|editor|ed\adddot
5+editors|editores|ed\adddot
6+compiler|compilador|comp\adddot
7+compilers|compiladores|comp\adddot
8+redactor|redator|red\adddot
9+redactors|redatores|red\adddot
10+reviser|revisor|rev\adddot
11+revisers|revisores|rev\adddot
12+founder|fundador|fund\adddot
13+founders|fundadores|fund\adddot
14+continuator|continuador|cont\adddot
15+continuators|continuadores|cont\adddot
16+collaborator|colaborador|colab\adddot
17+collaborators|colaboradores|colab\adddot
18+translator|tradutor|trad\adddot
19+translators|tradutores|trad\adddot
20+commentator|coment\'ario|coment\adddot
21+commentators|coment\'ario|coment\adddot
22+annotator|notas|notas
23+annotators|notas|notas
24+commentary|coment\'ario|coment\adddot
25+annotations|notas|notas
26+foreword|pref\'acio|pref\adddot
27+afterword|posf\'acio|posf\adddot
28+organizer|organizador|org\adddot
29+organizers|organizadores|org\adddot
30+byauthor|por|por
31+byeditor|editado por|ed\adddotspace por
32+bycompiler|compilado por|comp\adddotspace por
33+byredactor|redigido por|red\adddotspace por
34+byreviser|revisado por|rev\adddotspace por
35+byreviewer|resenhado por|res\adddotspace por
36+byfounder|fundado por|fund\adddotspace por
37+bycontinuator|continuado por|cont\adddotspace por
38+bytranslator|traduzido \lbx@lfromlang\ por|trad\adddot\ \lbx@sfromlang\ por
39+bycommentator|comentado por|coment\adddot\ por
40+byannotator|anotado por|anot\adddot\ por
41+byorganizer|organizado por|org\adddotspace por
42+withcommentator|com coment\'ario de|com coment\adddot\ de
43+withannotator|com notas de|com notas de
44+withforeword|com pref\'acio de|com pref\adddot\ de
45+withafterword|com posf\'acio de|com posf\adddot\ de
46+and|e|e
47+andothers|et\addabbrvspace al\adddot|et\addabbrvspace al\adddot
48+andmore|et\addabbrvspace al\adddot|et\addabbrvspace al\adddot
49+volume|volume|vol\adddot
50+volumes|volumes|vol\adddot
51+involumes|em|em
52+jourvol|volume|v\adddot
53+jourser|s\'erie|s\'er\adddot
54+book|livro|livro
55+part|parte|parte
56+issue|n\'umero|n\'um\adddot
57+newseries|nova s\'erie|nova s\'er\adddot
58+oldseries|s\'erie antiga|s\'er\adddot\ antiga
59+reprint|reimpress\~ao|reimpr\adddot
60+reprintof|reimpress\~ao de|reimpr\adddotspace de
61+reprintas|reimpresso como|reimpr\adddotspace como
62+reprintfrom|reimpresso de|reimpr\adddotspace de
63+translationas|traduzido como|trad\adddotspace como
64+translationfrom|traduzido do|trad\adddotspace do
65+reviewof|resenha de|res\adddotspace de
66+origpubas|originalmente publicado como|orig\adddotspace pub\adddotspace como
67+origpubin|originalmente publicado em|orig\adddotspace pub\adddotspace em
68+astitle|como|como
69+bypublisher|por|por
70+nodate|sem\space data|s\adddot d\adddot
71+page|p\'agina|p\adddot
72+pages|p\'aginas|pp\adddot
73+column|coluna|col\adddot
74+columns|colunas|col\adddot
75+line|linha|l\adddot
76+lines|linhas|ll\adddot
77+verse|verso|v\adddot
78+verses|versos|vv\adddot
79+paragraph|par\'agrafo|par\adddot
80+paragraphs|par\'agrafos|par\adddot
81+pagetotal|p\'agina|p\adddot
82+pagetotals|p\'aginas|pp\adddot
83+columntotal|coluna|col\adddot
84+columntotals|colunas|col\adddot
85+linetotal|linha|l\adddot
86+linetotals|linhas|ll\adddot
87+versetotal|verso|v\adddot
88+versetotals|versos|vv\adddot
89+paragraphtotal|par\'agrafo|par\adddot
90+paragraphtotals|par\'agrafos|par\adddot
91+in|em|em
92+inseries|em|em
93+ofseries|de|de
94+number|n\'umero|n\adddot
95+chapter|cap\'\i tulo|cap\adddot
96+bathesis|trabalho de conclus\~ao|trab\adddotspace de conc\adddot
97+phdthesis|tese de doutorado|tese de dout\adddot
98+candthesis||
99+resreport|relat\'orio de pesquisa|rel\adddotspace de pesq\adddot
100+techreport|relat\'orio t\'ecnico|rel\adddotspace t\'ecn\adddot
101+software|software|software
102+datacd|CD-ROM|CD-ROM
103+audiocd|CD de \'audio|CD de \'audio
104+version|vers\~ao|vers\~ao
105+urlfrom|dispon\'ivel em|disp\adddotspace em
106+urlseen|acesso em|acesso em
107+submitted|submetido|submetido
108+inpress|no prelo|no prelo
109+prepublished|pr\'e-publicado|pr\'e-publicado
110+citedas|doravante citado como|doravante citado como
111+thiscite|especialmente|esp\adddot
112+seenote|ver nota|ver nota
113+quotedin|apud|apud
114+idem|idem|idem
115+idemsm|idem|idem
116+idemsf|eadem|eadem
117+idemsn|idem|idem
118+idempm|eidem|eidem
119+idempf|eaedem|eaedem
120+idempn|eadem|eadem
121+idempp|eidem|eidem
122+ibidem|ibidem|ibid\adddot
123+opcit|op\adddotspace cit\adddot|op\adddotspace cit\adddot
124+loccit|loc\adddotspace cit\adddot|loc\adddotspace cit\adddot
125+confer|cf\adddot|cf\adddot
126+sequens|sq\adddot|sq\adddot
127+sequentes|sqq\adddot|sqq\adddot
128+passim|passim|passim
129+see|ver|ver
130+seealso|ver tamb\'em|ver tamb\'em
131+backrefpage|ver p\'agina|ver p\adddot
132+backrefpages|ver p\'aginas|ver pp\adddot
133+january|janeiro|jan\adddot
134+february|fevereiro|fev\adddot
135+april|abril|abr\adddot
136+may|maio|mai\adddot
137+june|junho|jun\adddot
138+july|julho|jul\adddot
139+august|agosto|ago\adddot
140+september|setembro|set\adddot
141+october|outubro|out\adddot
142+november|novembro|nov\adddot
143+december|dezembro|dez\adddot
144+langamerican|ingl\^es|ingl\^es
145+langbulgarian|b\'ulgaro|b\'ulgaro
146+langcatalan|catal\~ao|catal\~ao
147+langcroatian|croata|croata
148+langczech|tcheco|tcheco
149+langdanish|dinamarqu\^es|dinamarqu\^es
150+langenglish|ingl\^es|ingl\^es
151+langfinnish|finland\^es|finland\^es
152+langestonian|estoniano|estoniano
153+langfrench|franc\^es|franc\^es
154+langgalician|galego|galego
155+langgerman|alem\~ao|alem\~ao
156+langgreek|grego|grego
157+langhungarian|h\'ungaro|h\'ungaro
158+langitalian|italiano|italiano
159+langjapanese|japon\^es|japon\^es
160+langlatin|latim|latim
161+langlatvian|let\~ao|let\~ao
162+langlithuanian|lituano|lituano
163+langnorwegian|noruegu\^es|noruegu\^es
164+langpolish|polon\^es|polon\^es
165+langrussian|russo|russo
166+langserbian|s\'ervio|s\'ervio
167+langslovak|eslovaco|eslovaco
168+langslovene|esloveno|esloveno
169+langspanish|espanhol|espanhol
170+langswedish|sueco|sueco
171+langturkish|turco|turco
172+langukrainian|ucraniano|ucraniano
173+fromamerican|do ingl\^es|do ingl\^es
174+frombulgarian|do b\'ulgaro|do b\'ulgaro
175+fromcatalan|do catal\~ao|do catal\~ao
176+fromcroatian|do croata|do croata
177+fromczech|do tcheco|do tcheco
178+fromdanish|do dinamarqu\^es|do dinamarqu\^es
179+fromenglish|do ingl\^es|do ingl\^es
180+fromestonian|do estoniano|do estoniano
181+fromfinnish|do finland\^es|do finland\^es
182+fromfrench|do franc\^es|do franc\^es
183+fromgalician|do galego|do galego
184+fromgerman|do alem\~ao|do alem\~ao
185+fromgreek|do grego|do grego
186+fromhungarian|do h\'ungaro|do h\'ungaro
187+fromitalian|do italiano|do italiano
188+fromjapanese|do japon\^es|do japon\^es
189+fromlatin|do latim|do latim
190+fromlatvian|do let\~ao|do let\~ao
191+fromlithuanian|do lituano|do lituano
192+fromnorwegian|do noruegu\^es|do noruegu\^es
193+frompolish|do polon\^es|do polon\^es
194+fromrussian|do russo|do russo
195+fromserbian|do s\'ervio|do s\'ervio
196+fromslovak|do eslovaco|do eslovaco
197+fromslovene|do esloveno|do esloveno
198+fromspanish|do espanhol|do espanhol
199+fromswedish|do sueco|do sueco
200+fromturkish|do turco|do turco
201+fromukrainian|do ucraniano|do ucraniano
202+countryde|Alemanha|DE
203+countryeu|Uni\~ao Europeia|EU
204+countryep|Uni\~ao Europeia|EP
205+countryuk|Reino Unido|GB
206+countryus|Estados Unidos|US
207+patent|patente|pat\adddot
208+patentde|patente alem\~a|pat\adddot\ alem\~a
209+patenteu|patente europeia|pat\adddot\ europeia
210+patentfr|patente francesa|pat\adddot\ francesa
211+patentuk|patente brit\^anica|pat\adddot\ brit\^anica
212+patentus|patente americana|pat\adddot\ americana
213+patreq|pedido de patente|ped\adddot\ de pat\adddot
214+patreqde|pedido de patente alem\~a|ped\adddot\ de pat\adddot\ alem\~a
215+patreqeu|pedido de patente europeia|ped\adddot\ de pat\adddot\ europeia
216+patreqfr|pedido de patente francesa|ped\adddot\ de pat\adddot\ francesa
217+patrequk|pedido de patente brit\^anica|ped\adddot\ de pat\adddot\ brit\^anica
218+patrequs|pedido de patente americana|ped\adddot\ de pat\adddot\ americana
219+file|arquivo|arquivo
220+library|biblioteca|biblioteca
221+abstract|resumo|resumo
222+annotation|notas|notas
223+commonera|Era Comum|EC
224+beforecommonera|antes da Era Comum|AEC
225+annodomini|depois de Cristo|d\adddot C\adddot
226+beforechrist|antes de Cristo|a\adddot C\adddot
227+circa|circa|ca\adddot
228+spring|primavera|primavera
229+summer|ver\~ao|ver\~ao
230+autumn|outono|outono
231+winter|inverno|inverno
232+am|AM|AM
233+pm|PM|PM
citeproc/biblatex-localization/british.lbx.stringsnew file+3
@@ -0,0 +1,3 @@
1+organizer|organiser|org\adddot
2+organizers|organisers|orgs\adddot
3+byorganizer|organised by|org\adddotspace by
citeproc/biblatex-localization/bulgarian.lbx.stringsnew file+28
@@ -0,0 +1,28 @@
1+bibliography|Библиография|Библиография
2+references|Литература|Литература
3+shorthands|Списък на съкращенията|Съкращения
4+editor|редактор|ред\adddot
5+editors|редактори|ред\adddot
6+compiler|съставител|съст\adddot
7+compilers|съставители|съст\adddot
8+redactor|редактор|ред\adddot
9+redactors|редактори|ред\adddot
10+reviser|коректор|кор\adddotspace кор\adddot
11+revisers|коректор|кор\adddotspace кор\adddot
12+founder|основател|осн\adddot
13+founders|основатели|осн\adddot
14+continuator|продължител|прод\adddot
15+continuators|продължител|прод\adddot
16+collaborator|участник|участ\adddot
17+collaborators|участници|участ\adddot
18+translator|преводач|прев\adddot
19+translators|преводачи|прев\adddot
20+commentator|коментатор|комент\adddot
21+commentators|коментатори|комент\adddot
22+annotator|бележки|бел\adddot
23+annotators|бележки|бел\adddot
24+commentary|комментар|комент\adddot
25+annotations|бележки|бел\adddot
26+introduction|уводна статия|ув\adddotspace ст\adddot
27+foreword|предговор|предг\adddot
28+afterword|послеслов|послесл\adddot
citeproc/biblatex-localization/canadian.lbx.stringsnew file

No changes to the content.

citeproc/biblatex-localization/catalan.lbx.stringsnew file+158
@@ -0,0 +1,158 @@
1+bibliography|Bibliografia|Bibliografia
2+references|Refer\`encies|Refer\`encies
3+shorthands|Llista d'abreviatures|Abreviatures
4+editor|editor|ed\adddot
5+editors|editors|ed\adddot
6+compiler|compilador|comp\adddot
7+compilers|compiladors|comp\adddot
8+redactor|redactor|red\adddot
9+redactors|redactors|red\adddot
10+reviser|revisor|rev\adddot
11+revisers|revisors|rev\adddot
12+founder|fundador|fund\adddot
13+founders|fundadors|fund\adddot
14+continuator|continuador|cont\adddot
15+continuators|continuadors|cont\adddot
16+collaborator|co\l.laborador|co\l.l\adddot
17+collaborators|co\l.laboradors|co\l.l\adddot
18+translator|traductor|trad\adddot
19+translators|traductors|trad\adddot
20+commentator|comentarista|com\adddot
21+commentators|comentaristes|com\adddot
22+annotator|anotador|anot\adddot
23+annotators|anotadors|anot\adddot
24+commentary|comentari|com\adddot
25+annotations|notes|n\adddot
26+introduction|introducci\'o|intr\adddot
27+foreword|pr\`oleg|pr\`ol\adddot
28+editortr|editor i traductor|ed\adddotspace i trad\adddot
29+editorstr|editors i traductors|ed\adddotspace i trad\adddot
30+editorco|editor i comentarista|ed\adddotspace i com\adddot
31+editorsco|editors i comentaristes|ed\adddotspace i com\adddot
32+editoran|editor i anotador|ed\adddotspace i anot\adddot
33+editorsan|editors i anotadors|ed\adddotspace i anot\adddot
34+organizer|organitzador|org\adddot
35+organizers|organitzadors|org\adddot
36+byorganizer|organitzat per|org\adddotspace per
37+byauthor|per|per
38+byeditor|edici\'o a cura \smartof|ed\adddotspace\smartof
39+bycompiler|compilaci\'o a cura \smartof|comp\adddotspace\smartof
40+byredactor|redacci\'o a cura \smartof|red\adddotspace\smartof
41+byreviser|revisi\'o a cura \smartof|rev\adddotspace\smartof
42+byreviewer|ressenya a cura \smartof|ress\adddotspace\smartof
43+byfounder|fundat per|fund\adddotspace per
44+bycontinuator|continuat per|cont\adddotspace per
45+bycollaborator|amb la co\l.laboraci\'o \smartof|amb la co\l.l\adddotspace\smartof
46+bytranslator|traducci\'o \lbx@fromlang\ a cura \smartof|trad\adddotspace\lbx@fromlang\ \smartof
47+bycommentator|comentari a cura \smartof|com\adddotspace\smartof
48+byannotator|notes a cura \smartof|n\adddotspace\smartof
49+withcommentator|amb un comentari a cura \smartof|amb un com\adddotspace\smartof
50+withannotator|amb notes a cura \smartof|amb n\adddotspace\smartof
51+withintroduction|amb una introducci\'o a cura \smartof|amb una intr\adddotspace\smartof
52+withforeword|amb un pr\`oleg a cura \smartof|amb un pr\`ol\adddotspace\smartof
53+and|i|i
54+andothers|et al\adddot|et al\adddot
55+andmore|i m\'es|i m\'es
56+volume|volum|vol\adddot
57+volumes|volums|vol\adddot
58+involumes|en|en
59+jourvol|volum|vol\adddot
60+jourser|s\`erie|s\`er\adddot
61+book|llibre|llib\adddot
62+part|part|part
63+issue|n\'umero|n\'um\adddot
64+newseries|s\`erie nova|s\`erie nova
65+oldseries|s\`erie antiga|s\`erie ant\adddot
66+edition|edici\'o|ed\adddot
67+reprint|reimpressi\'o|reimpr\adddot
68+reprintof|reimpressi\'o \smartof|reimpr\adddotspace\smartof
69+reprintas|reimpr\`es com|reimpr\adddotspace com
70+reprintfrom|reimpr\`es \smartof|reimpr\adddotspace\smartof
71+reviewof|ressenya \smartof|ress\adddotspace\smartof
72+translationof|traducci\'o \smartof|trad\adddotspace\smartof
73+origpubas|publicat origin\`ariament com|pub\adddotspace orig\adddotspace com
74+origpubin|publicat origin\`ariament el|pub\adddotspace orig\adddotspace el
75+astitle|com|com
76+bypublisher|per|per
77+page|p\`agina|p\`ag\adddot
78+pages|p\`agines|p\`ag\adddot
79+column|columna|col\adddot
80+columns|columnes|cols\adddot
81+nodate|sine data|s\adddotspace d\adddot
82+verse|vers|v\adddot
83+verses|versos|v\adddot
84+section|apartat|\S
85+sections|apartats|\S
86+paragraph|par\`agraf|\P
87+paragraphs|par\`agrafs|\P
88+pagetotal|p\`agina|p\`ag\adddot
89+pagetotals|p\`agines|p\`ag\adddot
90+columntotal|columna|col\adddot
91+columntotals|columnes|col\adddot
92+versetotal|vers|v\adddot
93+versetotals|versos|v\adddot
94+sectiontotal|secci\'o|\S
95+sectiontotals|seccions|\S
96+paragraphtotal|par\`agrafs|\P
97+paragraphtotals|par\`agrafs|\P
98+in|a|a
99+inseries|a|a
100+ofseries|\smartof|\smartof
101+number|n\'umero|n\'um\adddot
102+bathesis|treball final de grau|treb\adddotspace fin\adddotspace de gr\adddot
103+mathesis|treball final de m\`aster|treb\adddotspace fin\adddotspace de m\`ast\adddot
104+phdthesis|tesi doctoral|tesi doct\adddot
105+candthesis|tesi de candidatura|tesi de cand\adddot
106+resreport|informe de recerca|inf\adddotspace de rec\adddot
107+techreport|informe t\`ecnic|inf\adddotspace t\`ec\adddot
108+software|programari|prog\adddot
109+datacd|CD de dades|CD de dades
110+audiocd|CD d'\`audio|CD d'\`audio
111+version|versi\'o|vers\adddot
112+urlfrom|disponible a|disp\adddotspace a
113+urlseen|consultat|cons\adddot
114+inpreparation|en preparaci\'o|en prep\adddot
115+inpress|a impremta|a impr\adddot
116+prepublished|pre-publicat|pre-publicat
117+submitted|enviat a publicar|env\adddotspace a pub\adddot
118+forthcoming|properament|prop\adddot
119+citedas|d'ara endavant citat com|d'ara end\adddotspace cit\adddotspace com
120+thiscite|concretament|concr\adddot
121+seenote|vegeu la nota|v\adddotspace la n\adddot
122+quotedin|citat a|cit\adddotspace a
123+opcit|\`op\adddotspace cit\adddot|\`op\adddotspace cit\adddot
124+loccit|loc\adddotspace cit\adddot|loc\adddotspace cit\adddot
125+confer|cf\adddot|cf\adddot
126+sequens|seq\adddot|seq\adddot
127+sequentes|et seq\adddot|et seq\adddot
128+passim|p\`assim|p\`assim
129+see|vegeu|v\adddot
130+seealso|vegeu tamb\'e|v\adddotspace tamb\'e
131+backrefpage|vegeu la p\`agina|v\adddotspace la p\`ag\adddot
132+backrefpages|vegeu les p\`agines|v\adddotspace les p\`ag\adddot
133+january|gener|gen\adddot
134+february|febrer|febr\adddot
135+april|abril|abr\adddot
136+may|maig|maig
137+june|juny|juny
138+july|juliol|jul\adddot
139+august|agost|ag\adddot
140+september|setembre|set\adddot
141+october|octubre|oct\adddot
142+november|novembre|nov\adddot
143+december|desembre|des\adddot
144+langamerican|angl\`es americ\`a|ang\adddotspace amer\adddot
145+langbrazilian|portugu\`es brasiler|port\adddotspace bras\adddot
146+langbulgarian|b\'ulgar|b\'ulg\adddot
147+langcatalan|catal\`a|cat\adddot
148+langczech|txec|txec
149+langcroatian|croat|croat
150+langdanish|dan\`es|dan\adddot
151+langdutch|neerland\`es|neerl\adddot
152+langenglish|angl\`es|ang\adddot
153+langestonian|estoni\`a|eston\adddot
154+langfinnish|fin\`es|fin\adddot
155+langfrench|franc\`es|fr\adddot
156+langgalician|gallec|gal\adddot
157+langgerman|alemany|al\adddot
158+langgreek|grec|grec
citeproc/biblatex-localization/croatian.lbx.stringsnew file+214
@@ -0,0 +1,214 @@
1+bibliography|Bibliografija|Bibliografija
2+references|Literatura|Literatura
3+shorthands|Popis kratica|Kratice
4+editor|urednik|ur\adddot
5+editors|urednici|ur\adddot
6+redactor|redaktor|redaktor
7+redactors|redaktori|redaktori
8+reviser|korektor|korektor
9+revisers|korektori|korektori
10+collaborator|suradnik|sur\adddot
11+collaborators|suradnici|sur\adddot
12+translator|prijevod|prev\adddot
13+translators|prijevod|prev\adddot
14+commentator|komentator|komentator
15+commentators|komentatori|komentatori
16+commentary|komentar|komentar
17+introduction|uvod|uvod
18+foreword|predgovor|predgovor
19+afterword|pogovor|pogovor
20+editortr|prijevod i obrada|ur\adddotspace i prev\adddot
21+editorstr|prijevod i obrada|ur\adddotspace i prev\adddot
22+organizer|organizacija|organizacija
23+organizers|organizacija|organizacija
24+byorganizer|organizacija|organizacija
25+byauthor|autor|autor
26+byeditor|obrada|ur\adddot
27+byredactor|redaktura|red\adddot
28+byreviser|korektura|kor\adddot
29+byreviewer|recenzija|recenzija
30+bycontinuator|nastavio|nastavio
31+bycollaborator|u suradnji s|u sur\adddotspace s
32+bycommentator|komentari|komentari
33+withcommentator|komentari|komentari
34+withintroduction|uvod|uvod
35+withforeword|predgovor|predgovor
36+withafterword|pogovor|pogovor
37+and|i|i
38+andothers|i drugi|i dr\adddot
39+andmore|i drugi|i dr\adddot
40+volume|sv\adddot|sv\adddot
41+volumes|sv\adddot|sv\adddot
42+involumes|u|u
43+jourvol|sv\adddot|sv\adddot
44+jourser|serija|serija
45+book|knjiga|knj\adddot
46+part|dio|dio
47+issue|izd\adddot|izd\adddot
48+newseries|nova serija|nova serija
49+oldseries|stara serija|stara serija
50+edition|izdanje|izdanje
51+reprint|pretisak|pretisak
52+reprintof|pretisak|pretisak
53+reprintas|iznova otisnuto kao|iznova otisnuto kao
54+reprintfrom|iznova otisnut|iznova otisnut
55+translationof|prijevod|prijevod
56+translationas|prev\adddotspace kao|prev\adddotspace kao
57+translationfrom|prijevod|prijevod
58+reviewof|osvrt na|osvrt na
59+origpubas|izvorno obj\adddotspace kao|izv\adddotspace obj\adddotspace kao
60+origpubin|izvorno obj\adddot|izv\adddotspace obj\adddot
61+astitle|kao|kao
62+bypublisher||
63+nodate|bez datuma|bez datuma
64+page|stranica|str\adddot
65+pages|stranice|str\adddot
66+column|stupac|stupac
67+columns|stupci|stupci
68+line|linija|l\adddot
69+lines|linije|ll\adddot
70+verse|stih|stih
71+verses|stihovi|stihovi
72+section|odjeljak|\S
73+sections|odjeljci|\S\S
74+paragraph|stavak|st\adddot
75+paragraphs|stavci|st\adddot
76+pagetotal|str\adddot|str\adddot
77+pagetotals|str\adddot|str\adddot
78+columntotal|stupac|stupac
79+columntotals|stupaca|stupaca
80+linetotal|linija|lin\adddot
81+linetotals|linija|lin\adddot
82+versetotal|stih|st\adddot
83+versetotals|stihova|st\adddot
84+sectiontotal|odjeljak|odj\adddot
85+sectiontotals|odjeljaka|odj\adddot
86+paragraphtotal|stavak|st\adddot
87+paragraphtotals|stavaka|st\adddot
88+in||
89+inseries|u seriji|u seriji
90+ofseries|iz serije|iz serije
91+number|broj|br\adddot
92+chapter|poglavlje|pogl\adddot
93+bathesis|diplomski rad|dipl\adddotspace rad
94+mathesis|magistarski rad|mag\adddotspace rad
95+phdthesis|doktorska disertacija|disertacija
96+software|softver|softver
97+datacd|CD-ROM|CD-ROM
98+audiocd|audio CD|audio CD
99+version|verzija|verzija
100+url|adresa|adresa
101+urlfrom|dostupno na|dost\adddotspace na
102+urlseen|pogledano|pogledano
103+inpreparation|u pripremi|u pripremi
104+submitted|predan|predan
105+inpress|u tisku|u tisku
106+prepublished|pred objavom|pred obj\adddot
107+citedas|dalje citirano kao|dalje citirano kao
108+thiscite|napose|napose
109+quotedin|citirano u|citirano u
110+idem|idem|idem
111+idemsm|idem|idem
112+idemsf|eadem|eadem
113+idemsn|idem|idem
114+idempm|eidem|eidem
115+idempf|eaedem|eaedem
116+idempn|eadem|eadem
117+idempp|eidem|eidem
118+ibidem|ibidem|ibid\adddot
119+opcit|op\adddotspace cit\adddot|op\adddotspace cit\adddot
120+loccit|loc\adddotspace cit\adddot|loc\adddotspace cit\adddot
121+confer|usporedi|usp\adddot
122+sequens|sq\adddot|sq\adddot
123+sequentes|sqq\adddot|sqq\adddot
124+passim|passim|pass\adddot
125+see|vidi|v\adddot
126+seealso|pogledaj i|pogl\adddotspace i
127+backrefpage|citirano na stranci|cit\adddotspace na str\adddot
128+backrefpages|cited on pages|cit\adddotspace na str\adddot
129+april|travanj|travanj
130+may|svibanj|svibanj
131+june|lipanj|lipanj
132+july|srpanj|srpanj
133+august|kolovoz|kolovoz
134+september|rujan|rujan
135+october|listopad|listopad
136+november|studeni|studeni
137+december|prosinac|prosinac
138+dateapril|travnja|travnja
139+datemay|svibnja|svibnja
140+datejune|lipnja|lipnja
141+datejuly|srpnja|srpnja
142+dateaugust|kolovoza|kolovoza
143+dateseptember|rujna|rujna
144+dateoctober|listopada|listopada
145+datenovember|studenoga|studenoga
146+datedecember|prosinca|prosinca
147+langamerican|engleski|engleski
148+langbrazilian|portugalski|portugalski
149+langbulgarian|bugarski|bugarski
150+langcatalan|katalonski|katalonski
151+langcroatian|hrvatski|hrvatski
152+langdanish|danski|danski
153+langdutch|nizozemski|nizozemski
154+langenglish|engleski|engleski
155+langestonian|estonski|estonski
156+langfinnish|finski|finski
157+langfrench|francuski|francuski
158+langgalician|galicijski|galicijski
159+langhungarian|ma\dj arski|ma\dj arski
160+langitalian|talijanski|talijanski
161+langjapanese|japanski|japanski
162+langlatin|latinski|latinski
163+langlatvian|letonski|letonski
164+langpolish|poljski|poljski
165+langportuguese|portugalski|portugalski
166+langrussian|ruski|ruski
167+langslovene|slovenski|slovenski
168+langukrainian|ukrajinski|ukrajinski
169+fromamerican|s engleskog|s engleskog
170+frombrazilian|s portugalskog|s portugalskog
171+frombulgarian|s bugarskog|s bugarskog
172+fromcatalan|s katalonskog|s katalonskog
173+fromcroatian|s hrvatskog|s hrvatskog
174+fromdanish|s danskog|s danskog
175+fromdutch|s nizozemskog|s nizozemskog
176+fromenglish|s engleskog|s engleskog
177+fromestonian|s estonskog|s estonskog
178+fromfinnish|s finskog|s finskog
179+fromfrench|s francuskog|s francuskog
180+fromgalician|s galicijskog|s galicijskog
181+fromhungarian|s ma\dj arskog|s ma\dj arskog
182+fromitalian|s talijanskog|s talijanskog
183+fromjapanese|s japanskog|s japanskog
184+fromlatin|s latinskog|s latinskog
185+fromlatvian|s letonskog|s letonskog
186+frompolish|s poljskog|s poljskog
187+fromportuguese|s portugalskog|s portugalskog
188+fromrussian|s ruskog|s ruskog
189+fromslovene|sa slovenskog|sa slovenskog
190+fromukrainian|s ukrajinskog|s ukrajinskog
191+countryeu|Europska unija|EU
192+countryep|Europska unija|EP
193+countryfr|Francuska|FR
194+countryuk|Velika Britanija|GB
195+patent|patent|pat\adddot
196+patenteu|europski patent|europski pat\adddot
197+patentfr|francuski patent|francuski pat\adddot
198+patentuk|britanski patent|britanski pat\adddot
199+patentus|US patent|US pat\adddot
200+patreq|patentni zahtjev|pat\adddot\ zahtjev
201+patreqeu|europski patentni zahtjev|EU pat\adddotspace zahtjev
202+patrequs|US patentni zahtjev|US pat\adddot\ zahtjev
203+file|datoteka|datoteka
204+library|biblioteka|biblioteka
205+commonera|n\adddotspace e\adddot|n\adddotspace e\adddot
206+beforecommonera|pr\adddotspace n\adddotspace e\adddot|pr\adddotspace n\adddotspace e\adddot
207+annodomini|poslije Krista|p\adddotspace Kr\adddot
208+beforechrist|prije Krista|pr\adddotspace Kr\adddot
209+circa|oko|cca\adddot
210+summer|ljeto|ljeto
211+autumn|jesen|jesen
212+winter|zima|zima
213+am|prije podne|AM
214+pm|poslije podne|PM
citeproc/biblatex-localization/czech.lbx.stringsnew file+91
@@ -0,0 +1,91 @@
1+bibliography|Bibliografie|Bibliografie
2+references|Odkazy|Odkazy
3+shorthands|Seznam zkratek|Zkratky
4+editor|editor|ed\adddot
5+compiler|sestavil|sest\adddot
6+compilers|sestavili|sest\adddot
7+redactor|redaktor|red\adddot
8+reviser|korektor|kor\adddot
9+founder|zakladatel|zakl\adddot
10+annotations|anotace|anot\adddot
11+afterword|doslov|dosl\adddot
12+byauthor||
13+bycompiler|sestaveno|sest\adddot
14+withannotator|s\addnbspace anotacemi od|s\addnbspace anot\adddot\ od
15+withafterword|s\addnbspace doslovem od|s\addnbspace dosl\adddot\ od
16+and|a|a
17+andothers|et\addabbrvspace al\adddot|et\addabbrvspace al\adddot
18+andmore|et\addabbrvspace al\adddot|et\addabbrvspace al\adddot
19+volume|svazek|sv\adddot
20+volumes|svazky|sv\adddot
21+involumes|in|in
22+book|kniha|kniha
23+reprint|dotisk|dotisk
24+reprintof|dotisk|dotisk
25+reprintas|dotisknuto jako|dotisknuto jako
26+reprintfrom|dotisknuto z\addnbspace|dotisknuto z\addnbspace
27+reviewof|recenze|recenz\adddot
28+astitle|jako|jako
29+bypublisher||
30+page|strana|s\adddot
31+pages|strany|s\adddot
32+column|sloupec|sl\adddot
33+columns|sloupce|sl\adddot
34+section|sekce|\S
35+sections|sekce|\S\S
36+paragraph|odstavec|ods\adddot
37+paragraphs|odstavce|ods\adddot
38+pagetotal|strana|s\adddot
39+pagetotals|strany|s\adddot
40+columntotal|sloupec|sl\adddot
41+columntotals|sloupce|sl\adddot
42+sectiontotal|sekce|\S
43+sectiontotals|sekce|\S\S
44+paragraphtotal|odstavec|ods\adddot
45+paragraphtotals|odstavce|ods\adddot
46+in|in|in
47+inseries|in|in
48+ofseries|z|z
49+chapter|kapitola|kap\adddot
50+datacd|CD-ROM|CD-ROM
51+audiocd|audio CD|audio CD
52+version|verze|ver\adddot
53+url|URL|URL
54+inpress|v\addnbspace tisku|v\addnbspace tisku
55+idem|idem|idem
56+idemsm|idem|idem
57+idemsf|eadem|eadem
58+idemsn|idem|idem
59+idempm|eidem|eidem
60+idempf|eaedem|eaedem
61+idempn|eadem|eadem
62+idempp|eidem|eidem
63+ibidem|ibidem|ibid\adddot
64+opcit|op\adddotspace cit\adddot|op\adddotspace cit\adddot
65+loccit|loc\adddotspace cit\adddot|loc\adddotspace cit\adddot
66+confer|cf\adddot|cf\adddot
67+sequens|sq\adddot|sq\adddot
68+sequentes|sqq\adddot|sqq\adddot
69+passim|passim|pass\adddot
70+see|viz|viz
71+january|leden|led\adddot
72+april|duben|dub\adddot
73+august|srpen|srp\adddot
74+november|listopad|lis\adddot
75+december|prosinec|pros\adddot
76+langlatin|latina|lat\adddot
77+fromlatin|z\addnbspace latiny|z\addnbspace lat\adddot
78+countryfr|Francie|FR
79+patent|patent|pat\adddot
80+patentus|US patent|US pat\adddot
81+file|soubor|soub\adddot
82+library|knihovna|knih\adddot
83+abstract|abstrakt|abst\adddot
84+annotation|anotace|anot\adddot
85+annodomini|po Kristu|po Kr\adddot
86+circa|cirka|ca\adddot
87+spring|jaro|jaro
88+autumn|podzim|podzim
89+winter|zima|zima
90+am|AM|AM
91+pm|PM|PM
citeproc/biblatex-localization/danish.lbx.stringsnew file+106
@@ -0,0 +1,106 @@
1+bibliography|Bibliografi|Bibliografi
2+references|Litteraturhenvisninger|Litteratur
3+shorthands|Forkortelser|Forkortelser
4+editor|redakt\o r|red\adddot
5+editors|redakt\o rer|red\adddot
6+compiler|kompilator|kompilator
7+compilers|kompilatorer|kompilatorer
8+redactor|medredakt\o r|medred\adddot
9+redactors|medredakt\o rer|medred\adddot
10+reviser|revision|rev\adddot
11+revisers|revision|rev\adddot
12+founder|stifter|stifter
13+founders|stiftere|stiftere
14+continuator|videref\o rer|videref\adddot
15+continuators|videref\o rere|videref\adddot
16+collaborator|medarbejder|medarb\adddot
17+collaborators|medarbejdere|medarb\adddot
18+translator|overs\ae tter|overs\adddot
19+translators|overs\ae ttere|overs\adddot
20+commentator|kommentator|komm\adddot
21+commentators|kommentatorer|komm\adddot
22+annotator|kommentator|komm\adddot
23+annotators|kommentatorer|komm\adddot
24+commentary|kommentar|komm\adddot
25+annotations|annoteringer|ann\adddot
26+introduction|indledning|indl\adddot
27+foreword|forord|forord
28+afterword|efterord|efterord
29+organizer|organisator|org\adddot
30+organizers|organisatorer|org\adddot
31+byorganizer|organiseret af|org\adddotspace av
32+byauthor|af|af
33+byeditor|redigeret af|red\adddotspace af
34+bycompiler|kompileret af|komp\adddotspace af
35+byredactor|bearbejdet af|bearb\adddotspace af
36+byreviser|revideret af|rev\adddotspace af
37+byreviewer|bed\o mt af|bed\adddotspace af
38+byfounder|stiftet af|stiftet af
39+bycontinuator|videref\o rt af|videref\adddotspace af
40+bycollaborator|i samarbejde med|i samarb\adddotspace m\adddot
41+bycommentator|kommenteret af|komm\adddot\ af
42+byannotator|annoteret af|ann\adddot\ af
43+withcommentator|med kommentarer af|m\adddotspace komm\adddot\ af
44+withannotator|med annoteringer af|m\adddotspace ann\adddot\ af
45+withintroduction|med indledning af|m\adddotspace indl\adddot\ af
46+withforeword|med forord af|m\adddotspace forord af
47+withafterword|med efterord af|m\adddotspace efterord af
48+and|og|og
49+andothers|med flere|m.fl\adddot
50+andmore|med mere|m.m\adddot
51+volume|bind|bd\adddot
52+volumes|bind|bd\adddot
53+involumes|i|i
54+jourvol|\aa rgang|\aa rg\adddot
55+jourser|r\ae kke|rk\adddot
56+book|bog|bog
57+part|del|del
58+issue|nummer|nr\adddot
59+newseries|ny r\ae kke|ny rk\adddot
60+oldseries|gammel r\ae kke|gl. rk\adddot
61+edition|udgave|udg\adddot
62+reprint|genoptryk|genoptr\adddot
63+reprintof|genoptryk af|genoptr\adddot\ af
64+reprintas|genoptryk under titlen|genoptr\adddot\ under titlen
65+reprintfrom|genoptryk fra|genoptr\adddot\ fra
66+translationof|overs\ae ttelse af|overs\adddot\ af
67+translationas|oversat under titlen|overs\adddotspace\ under titlen
68+translationfrom|oversat fra|overs\adddotspace\ fra
69+reviewof|bed\o mmelse af|bed\adddotspace af
70+origpubas|oprindeligt udgivet som|opr\adddot\ udg\adddot\ som
71+origpubin|oprindeligt udgivet i|opr\adddot\ udg\adddot\ i
72+astitle|under titlen|under titlen
73+bypublisher|af|af
74+nodate|uden \aa rstal|u.\aa\adddot
75+page|side|s\adddot
76+pages|sider|s\adddot
77+column|spalte|sp\adddot
78+columns|spalter|sp\adddot
79+line|linje|l\adddot
80+lines|linjer|l\adddot
81+verse|vers|v\adddot
82+verses|vers|v\adddot
83+section|paragraf|par\adddot
84+sections|paragraffer|par\adddot
85+paragraph|afsnit|afsn\adddot
86+paragraphs|afsnit|afsn\adddot
87+pagetotal|side|s\adddot
88+pagetotals|sider|s\adddot
89+columntotal|spalte|sp\adddot
90+columntotals|spalter|sp\adddot
91+line|linje|l\adddot
92+lines|linjer|l\adddot
93+verse|vers|v\adddot
94+verses|vers|v\adddot
95+linetotal|linje|l\adddot
96+linetotals|linje|l\adddot
97+versetotal|vers|v\adddot
98+versetotals|vers|v\adddot
99+sectiontotal|paragraf|par\adddot
100+sectiontotals|paragraffer|par\adddot
101+paragraphtotal|afsnit|afsn\adddot
102+paragraphtotals|afsnit|afsn\adddot
103+in|i|i
104+inseries|i r\ae kken|i rk\adddot
105+ofseries|fra r\ae kken|fra rk\adddot
106+number|nummer|nr\adddot
citeproc/biblatex-localization/dutch.lbx.stringsnew file+23
@@ -0,0 +1,23 @@
1+bibliography|Bibliografie|Bibliografie
2+references|Referenties|Referenties
3+shorthands|Lijst van afkortingen|Afkortingen
4+editor|redacteur|red\adddot
5+editors|redacteurs|red\adddot
6+compiler|samensteller|samenst\adddot
7+compilers|samenstellers|samenst\adddot
8+founder|oprichter|opr\adddot
9+founders|oprichters|opr\adddot
10+continuator|opvolger|opv\adddot
11+continuators|opvolgers|opv\adddot
12+redactor|redacteur|red\adddot
13+redactors|redacteuren|red\adddot
14+reviser|revisor|rev\adddot
15+revisers|revisors|rev\adddot
16+collaborator|medewerker|med\adddot
17+collaborators|medewerkers|med\adddot
18+translator|vertaler|vert\adddot
19+translators|vertalers|vert\adddot
20+commentator|commentator|comm\adddot
21+commentators|commentatoren|comm\adddot
22+annotator|annotator|annot\adddot
23+annotators|annotatoren|annot\adddot
citeproc/biblatex-localization/english.lbx.stringsnew file+254
@@ -0,0 +1,254 @@
1+bibliography|Bibliography|Bibliography
2+references|References|References
3+shorthands|List of Abbreviations|Abbreviations
4+editor|editor|ed\adddot
5+editors|editors|eds\adddot
6+compiler|compiler|comp\adddot
7+compilers|compilers|comp\adddot
8+redactor|redactor|red\adddot
9+redactors|redactors|red\adddot
10+reviser|reviser|rev\adddot
11+revisers|revisers|rev\adddot
12+founder|founder|found\adddot
13+founders|founders|found\adddot
14+continuator|continued|cont\adddot
15+continuators|continued|cont\adddot
16+collaborator|collaborator|collab\adddot
17+collaborators|collaborators|collab\adddot
18+translator|translator|trans\adddot
19+translators|translators|trans\adddot
20+commentator|commentator|comm\adddot
21+commentators|commentators|comm\adddot
22+annotator|annotator|annot\adddot
23+annotators|annotators|annot\adddot
24+commentary|commentary|comm\adddot
25+annotations|annotations|annot\adddot
26+introduction|introduction|intro\adddot
27+foreword|foreword|forew\adddot
28+afterword|afterword|afterw\adddot
29+organizer|organizer|org\adddot
30+organizers|organizers|orgs\adddot
31+byorganizer|organized by|org\adddotspace by
32+byauthor|by|by
33+byeditor|edited by|ed\adddotspace by
34+bycompiler|compiled by|comp\adddotspace by
35+byredactor|redacted by|red\adddotspace by
36+byreviser|revised by|rev\adddotspace by
37+byreviewer|reviewed by|rev\adddotspace by
38+byfounder|founded by|found\adddotspace by
39+bycontinuator|continued by|cont\adddotspace by
40+bycollaborator|in collaboration with|in collab\adddotspace with
41+bytranslator|translated \lbx@lfromlang\ by|trans\adddot\ \lbx@sfromlang\ by
42+bycommentator|commented by|comm\adddot\ by
43+byannotator|annotated by|annot\adddot\ by
44+withcommentator|with a commentary by|with a comment\adddot\ by
45+withannotator|with annotations by|with annots\adddot\ by
46+withintroduction|with an introduction by|with an intro\adddot\ by
47+withforeword|with a foreword by|with a forew\adddot\ by
48+withafterword|with an afterword by|with an afterw\adddot\ by
49+and|and|and
50+andothers|et\addabbrvspace al\adddot|et\addabbrvspace al\adddot
51+andmore|et\addabbrvspace al\adddot|et\addabbrvspace al\adddot
52+volume|volume|vol\adddot
53+volumes|volumes|vols\adddot
54+involumes|in|in
55+jourvol|volume|vol\adddot
56+jourser|series|ser\adddot
57+book|book|book
58+part|part|part
59+issue|issue|issue
60+newseries|new series|new ser\adddot
61+oldseries|old series|old ser\adddot
62+edition|edition|ed\adddot
63+reprint|reprint|repr\adddot
64+reprintof|reprint of|repr\adddotspace of
65+reprintas|reprinted as|rpt\adddotspace as
66+reprintfrom|reprinted from|repr\adddotspace from
67+reviewof|review of|rev\adddotspace of
68+translationof|translation of|trans\adddotspace of
69+translationas|translated as|trans\adddotspace as
70+translationfrom|translated from|trans\adddotspace from
71+origpubas|originally published as|orig\adddotspace pub\adddotspace as
72+origpubin|originally published in|orig\adddotspace pub\adddotspace in
73+astitle|as|as
74+bypublisher|by|by
75+nodate|no date|n\adddot d\adddot
76+page|page|p\adddot
77+pages|pages|pp\adddot
78+column|column|col\adddot
79+columns|columns|cols\adddot
80+line|line|l\adddot
81+lines|lines|ll\adddot
82+verse|verse|v\adddot
83+verses|verses|vv\adddot
84+section|section|\S
85+sections|sections|\S\S
86+paragraph|paragraph|par\adddot
87+paragraphs|paragraphs|par\adddot
88+pagetotal|page|p\adddot
89+pagetotals|pages|pp\adddot
90+columntotal|column|col\adddot
91+columntotals|columns|cols\adddot
92+linetotal|line|l\adddot
93+linetotals|lines|ll\adddot
94+versetotal|verse|v\adddot
95+versetotals|verses|vv\adddot
96+sectiontotal|section|\S
97+sectiontotals|sections|\S\S
98+paragraphtotal|paragraph|par\adddot
99+paragraphtotals|paragraphs|par\adddot
100+in|in|in
101+inseries|in|in
102+ofseries|of|of
103+number|number|no\adddot
104+chapter|chapter|chap\adddot
105+bathesis|Bachelor's thesis|BA\addabbrvspace thesis
106+mathesis|Master's thesis|MA\addabbrvspace thesis
107+phdthesis|PhD\addabbrvspace thesis|PhD\addabbrvspace thesis
108+candthesis|Candidate thesis|Cand\adddotspace thesis
109+resreport|research report|research rep\adddot
110+techreport|technical report|tech\adddotspace rep\adddot
111+software|computer software|comp\adddotspace software
112+datacd|CD-ROM|CD-ROM
113+audiocd|audio CD|audio CD
114+version|version|version
115+url|address|address
116+urlfrom|available from|available from
117+urlseen|visited on|visited on
118+inpreparation|in preparation|in preparation
119+submitted|submitted|submitted
120+forthcoming|forthcoming|forthcoming
121+inpress|in press|in press
122+prepublished|pre-published|pre-published
123+citedas|henceforth cited as|henceforth cited as
124+thiscite|especially|esp\adddot
125+seenote|see note|see n\adddot
126+quotedin|quoted in|qtd\adddotspace in
127+idem|idem|idem
128+idemsm|idem|idem
129+idemsf|eadem|eadem
130+idemsn|idem|idem
131+idempm|eidem|eidem
132+idempf|eaedem|eaedem
133+idempn|eadem|eadem
134+idempp|eidem|eidem
135+ibidem|ibidem|ibid\adddot
136+opcit|op\adddotspace cit\adddot|op\adddotspace cit\adddot
137+loccit|loc\adddotspace cit\adddot|loc\adddotspace cit\adddot
138+confer|cf\adddot|cf\adddot
139+sequens|sq\adddot|sq\adddot
140+sequentes|sqq\adddot|sqq\adddot
141+passim|passim|pass\adddot
142+see|see|see
143+seealso|see also|see also
144+backrefpage|cited on page|cit\adddotspace on p\adddot
145+backrefpages|cited on pages|cit\adddotspace on pp\adddot
146+january|January|Jan\adddot
147+february|February|Feb\adddot
148+march|March|Mar\adddot
149+april|April|Apr\adddot
150+may|May|May
151+june|June|June
152+july|July|July
153+august|August|Aug\adddot
154+september|September|Sept\adddot
155+october|October|Oct\adddot
156+november|November|Nov\adddot
157+december|December|Dec\adddot
158+langamerican|American|American
159+langbrazilian|Brazilian|Brazilian
160+langbulgarian|Bulgarian|Bulgarian
161+langcatalan|Catalan|Catalan
162+langcroatian|Croatian|Croatian
163+langczech|Czech|Czech
164+langdanish|Danish|Danish
165+langdutch|Dutch|Dutch
166+langenglish|English|English
167+langestonian|Estonian|Estonian
168+langfinnish|Finnish|Finnish
169+langfrench|French|French
170+langgalician|Galician|Galician
171+langgerman|German|German
172+langgreek|Greek|Greek
173+langhungarian|Hungarian|Hungarian
174+langitalian|Italian|Italian
175+langjapanese|Japanese|Japanese
176+langlatin|Latin|Latin
177+langlatvian|Latvian|Latvian
178+langlithuanian|Lithuanian|Lithuanian
179+langnorwegian|Norwegian|Norwegian
180+langpolish|Polish|Polish
181+langportuguese|Portuguese|Portuguese
182+langrussian|Russian|Russian
183+langserbian|Serbian|Serbian
184+langslovak|Slovak|Slovak
185+langslovene|Slovene|Slovene
186+langspanish|Spanish|Spanish
187+langswedish|Swedish|Swedish
188+langturkish|Turkish|Turkish
189+langukrainian|Ukrainian|Ukrainian
190+fromamerican|from the American|from the American
191+frombrazilian|from the Brazilian|from the Brazilian
192+frombulgarian|from the Bulgarian|from the Bulgarian
193+fromcatalan|from the Catalan|from the Catalan
194+fromcroatian|from the Croatian|from the Croatian
195+fromczech|from the Czech|from the Czech
196+fromdanish|from the Danish|from the Danish
197+fromdutch|from the Dutch|from the Dutch
198+fromenglish|from the English|from the English
199+fromestonian|from the Estonian|from the Estonian
200+fromfinnish|from the Finnish|from the Finnish
201+fromfrench|from the French|from the French
202+fromgalician|from the Galician|from the Galician
203+fromgerman|from the German|from the German
204+fromgreek|from the Greek|from the Greek
205+fromhungarian|from the Hungarian|from the Hungarian
206+fromitalian|from the Italian|from the Italian
207+fromjapanese|from the Japanese|from the Japanese
208+fromlatin|from the Latin|from the Latin
209+fromlatvian|from the Latvian|from the Latvian
210+fromlithuanian|from the Lithuanian|from the Lithuanian
211+fromnorwegian|from the Norwegian|from the Norwegian
212+frompolish|from the Polish|from the Polish
213+fromportuguese|from the Portuguese|from the Portuguese
214+fromrussian|from the Russian|from the Russian
215+fromserbian|from the Serbian|from the Serbian
216+fromslovak|from the Slovak|from the Slovak
217+fromslovene|from the Slovene|from the Slovene
218+fromspanish|from the Spanish|from the Spanish
219+fromswedish|from the Swedish|from the Swedish
220+fromturkish|from the Turkish|from the Turkish
221+fromukrainian|from the Ukrainian|from the Ukrainian
222+countryde|Germany|DE
223+countryeu|European Union|EU
224+countryep|European Union|EP
225+countryfr|France|FR
226+countryuk|United Kingdom|GB
227+countryus|United States of America|US
228+patent|patent|pat\adddot
229+patentde|German patent|German pat\adddot
230+patenteu|European patent|European pat\adddot
231+patentfr|French patent|French pat\adddot
232+patentuk|British patent|British pat\adddot
233+patentus|U.S\adddotspace patent|U.S\adddotspace pat\adddot
234+patreq|patent request|pat\adddot\ req\adddot
235+patreqde|German patent request|German pat\adddot\ req\adddot
236+patreqeu|European patent request|European pat\adddot\ req\adddot
237+patreqfr|French patent request|French pat\adddot\ req\adddot
238+patrequk|British patent request|British pat\adddot\ req\adddot
239+patrequs|U.S\adddotspace patent request|U.S\adddotspace pat\adddot\ req\adddot
240+file|file|file
241+library|library|library
242+abstract|abstract|abstract
243+annotation|annotations|annotations
244+commonera|Common Era|CE
245+beforecommonera|Before Common Era|BCE
246+annodomini|Anno Domini|AD
247+beforechrist|Before Christ|BC
248+circa|circa|ca\adddot
249+spring|Spring|Spr\adddot
250+summer|Summer|Sum\adddot
251+autumn|Autumn|Aut\adddot
252+winter|Winter|Win\adddot
253+am|AM|AM
254+pm|PM|PM
citeproc/biblatex-localization/estonian.lbx.stringsnew file+178
@@ -0,0 +1,178 @@
1+bibliography|bibliograafia|bibliograafia
2+references|viited|viited
3+editor|toimetaja|toim\adddot
4+editors|toimetajad|toim\adddot
5+compiler|koostaja|koost\adddot
6+compilers|koostajad|koost\adddot
7+redactor|toimetaja|toim\adddot
8+redactors|toimetajad|toim\adddot
9+reviser|toimetaja|toim\adddot
10+revisers|toimetajad|toim\adddot
11+founder|asutaja|asutaja
12+founders|asutajad|asutajad
13+commentator|kommenteerija|kommenteerija
14+commentators|kommenteerijad|kommenteerijad
15+annotator|kommenteerija|kommenteerija
16+annotators|kommenteerijad|kommenteerijad
17+commentary|kommentaarid|kommentaarid
18+annotations|kommentaarid|kommentaarid
19+introduction|sissejuhatus|sissejuhatus
20+organizer|korraldaja|korraldaja
21+organizers|korraldajad|korraldajad
22+byorganizer|korraldanud|korraldanud
23+byauthor|kirjutanud|kirj\adddot
24+byeditor|toimetanud|toim\adddot
25+bycompiler|koostanud|koost\adddot
26+byredactor|toimetanud|toim\adddot
27+byreviewer|vaadanud|vaadanud
28+byfounder|asutanud|asutanud
29+bycommentator|kommenteerinud|kommenteerinud
30+byannotator|kommenteerinud|kommenteerinud
31+withcommentator|koos kommentaaridega|koos kommentaaridega
32+withannotator|koos kommentaaridega|koos kommentaaridega
33+withintroduction|koos tutvustusega|koos tutvustusega
34+and|ja|ja
35+involumes|osas|osas
36+jourser|seeria|seeria
37+book|raamat|raamat
38+part|osa|osa
39+issue|number|nr\adddot
40+newseries|uus seerias|uus seer\adddot
41+oldseries|vana seeria|vana seer\adddot
42+reviewof|arvustus teosest|arvustus teosest
43+origpubas|algselt avaldatud kui|algselt avaldatud kui
44+origpubin|algselt avaldatud aastal|algselt avaldatud aastal
45+astitle|pealkirjaga|pealkirjaga
46+column|veerg|veerg
47+columns|veerud|veerud
48+line|rida|rida
49+lines|read|read
50+verse|salm|salm
51+verses|salmid|salmid
52+section|jagu|jagu
53+sections|jaod|jaod
54+columntotal|veerge kokku|veerge kokku
55+columntotals|veergusid kokku|veergusid kokku
56+linetotal|ridu kokku|ridu kokku
57+linetotals|ridasid kokku|ridasid kokku
58+versetotal|salmi kokku|salmi kokku
59+versetotals|salmesid kokku|salmesid kokku
60+sectiontotal|jagusid kokku|jagusid kokku
61+sectiontotals|jagusid kokku|jagusid kokku
62+in|teoses|teoses
63+inseries|sarjas|sarjas
64+ofseries|sarjast|sarjast
65+number|number|nr
66+resreport|uuringuraport|uuringuraport
67+techreport|tehniline raport|tehniline raport
68+software|tarkvara|tarkvara
69+datacd|CD-ROM|CD-ROM
70+audiocd|audioplaat|audioplaat
71+version|versioon|versioon
72+url|aadress|aadress
73+urlfrom|saadaval|saadaval
74+urlseen|vaadatud|vaadatud
75+inpreparation|koostamisel|koostamisel
76+submitted|esitatud|esitatud
77+forthcoming|tulevases|tulevases
78+citedas|edaspidi viidatud kui|edaspidi viidatud kui
79+thiscite|eriti|eriti
80+quotedin|noteeritud|noteeritud
81+see|vaata|vt
82+seealso|vaata ka|vt ka
83+backrefpage|viidatud lehel|viidatud lehel
84+january|jaanuar|jaanuar
85+february|veebruar|veebruar
86+april|aprill|aprill
87+may|mai|mai
88+june|juuni|juuni
89+july|juuli|juuli
90+august|august|august
91+september|september|september
92+october|oktoober|oktoober
93+november|november|november
94+december|detsember|detsember
95+langamerican|Ameerika inglise keel|Ameerika inglise keel
96+langbrazilian|brasiilia keel|brasiilia keel
97+langbulgarian|bulgaaria keel|bulgaaria keel
98+langcatalan|katalaani keel|katalaani keel
99+langcroatian|horvaadi keel|horvaadi keel
100+langdanish|taani keel|taani keel
101+langdutch|hollandi keel|hollandi keel
102+langenglish|inglise keel|inglise keel
103+langestonian|eesti keel|eesti keel
104+langfinnish|soome keel|soome keel
105+langfrench|prantsuse keel|prantsuse keel
106+langgalician|galeegi keel|galeegi keel
107+langgerman|saksa keel|saksa keel
108+langgreek|kreeka keel|kreeka keel
109+langhungarian|ungari keel|ungari keel
110+langitalian|itaalia keel|itaalia keel
111+langjapanese|jaapani keel|jaapani keel
112+langlatin|ladina keel|ladina keel
113+langnorwegian|norra keel|norra keel
114+langpolish|poola keel|poola keel
115+langportuguese|portugali keel|portugali keel
116+langrussian|vene keel|vene keel
117+langslovak|slovakia keel|slovakia keel
118+langslovene|sloveeni keel|sloveeni keel
119+langspanish|hispaania keel|hispaania keel
120+langswedish|rootsi keel|rootsi keel
121+langukrainian|ukraina keel|ukraina keel
122+fromamerican|Ameerika inglise keelest|Ameerika inglise keelest
123+frombrazilian|brasiilia keelest|brasiilia keelest
124+frombulgarian|bulgaaria keelest|bulgaaria keelest
125+fromcatalan|katalani keelest|kalatalani keelest
126+fromcroatian|horvaadi keelest|horvaadi keelest
127+fromdanish|taani keelest|taani keelest
128+fromdutch|hollandi keelest|hollandi keelest
129+fromenglish|inglise keelest|inglise keelest
130+fromestonian|eesti keelest|eesti keelest
131+fromfinnish|soome keelest|soome keelest
132+fromfrench|prantsuse keelest|prantsuse keelest
133+fromgalician|galeegi keelest|galeegi keelest
134+fromgerman|saksa keelest|saksa keelest
135+fromgreek|kreeka keelest|kreeka keelest
136+fromhungarian|ungari keelest|ungari keelest
137+fromitalian|itaalia keelest|itaalia keelest
138+fromjapanese|jaapani keelest|jaapani keelest
139+fromlatin|ladina keelest|ladina keelest
140+fromnorwegian|norra keelest|norra keelest
141+fromportuguese|portugali keelest|portugali keelest
142+fromrussian|vene keelest|vene keelest
143+fromslovak|slovakia keelest|slovakia keelest
144+fromslovene|sloveenia keelest|sloveenia keelest
145+fromspanish|hispaania keelest|hispaania keelest
146+fromswedish|rootsi keelest|rootsi keelest
147+fromukrainian|ukraina keelest|ukraina keelest
148+countryde|Saksamaa|DE
149+countryeu|Euroopa Liit|EL
150+countryep|Euroopa Parlament|EP
151+countryfr|Prantsusmaa|FR
152+countryuk|Suurbritannia|GB
153+countryus|Ameerika|US
154+patent|patent|pat\adddot
155+patentde|Saksa patent|Saksa pat\adddot
156+patenteu|Euroopa patent|Euroopa pat\adddot
157+patentfr|Prantsuse patent|Prantsuse pat\adddot
158+patentuk|Briti patent|Briti pat\adddot
159+patentus|U.S\adddotspace patent|U.S\adddotspace pat\adddot
160+patreq|patendi taotlus|pat\adddotspace taotl\adddot
161+patreqde|Saksa patendi taotlus|Saksa pat\adddotspace taotl\adddot
162+patreqeu|Euroopa patendi taotlus|Euroopa pat\adddotspace taotl\adddot
163+patreqfr|Prantsuse patendi taotlus|Prantsuse pat\adddotspace taotl\adddot
164+patrequk|Briti patendi taotlus|Briti pat\adddotspace taotl\adddot
165+patrequs|U.S\adddotspace patendi taotlus.|U.S\adddotspace pat\adddotspace taotl\adddot
166+file|fail|fail
167+library|raamatukogu|raamatukogu
168+abstract|teesid|teesid
169+annotation|kommentaarid|kommentaarid
170+commonera|meie ajaarvamise j\"argi|m\adddot a\adddot j
171+beforecommonera|enne meie ajaarvamist|e\adddot m\adddot a
172+annodomini|p\"arast Kristust|pKr
173+beforechrist|enne Kristust|eKr
174+spring|kevadel|kevadel
175+summer|suvel|suvel
176+winter|talvel|talvel
177+am|AM|AM
178+pm|PM|PM
citeproc/biblatex-localization/finnish.lbx.stringsnew file+254
@@ -0,0 +1,254 @@
1+bibliography|Kirjallisuusluettelo|Kirjallisuus
2+references|Viitteet|Viitteet
3+shorthands|Lyhenteet|Lyhenteet
4+editor|toimittanut|toim\adddot
5+editors|toimittaneet|toim\adddot
6+compiler|koontanut|koontanut
7+compilers|koontaneet|koontaneet
8+redactor|toimittanut|toim\adddot
9+redactors|toimittaneet|toim\adddot
10+reviser|toimittanut|toim\adddot
11+revisers|toimittaneet|toim\adddot
12+founder|perustaja|perustaja
13+founders|perustajat|perustajat
14+continuator|jatkaja|jatkaja
15+continuators|jatkajat|jatkajat
16+collaborator|avustaja|avustaja
17+collaborators|avustajat|avustajat
18+translator|k\"a\"ant\"anyt|k\"a\"ant\adddot
19+translators|k\"a\"ant\"anyt|k\"a\"ant\adddot
20+commentator|kommentaarin kirjoittanut|kommentaarin kirjoittanut
21+commentators|kommentaarin kirjoittaneet|kommentaarin kirjoittaneet
22+annotator|selityksin varustanut|selityksin varustanut
23+annotators|selityksin varustaneet|selityksin varustaneet
24+commentary|kommentaari|kommentaari
25+annotations|selitykset|selitykset
26+introduction|johdanto|johdanto
27+foreword|esipuhe|esipuhe
28+afterword|j\"alkisanat|j\"alkisanat
29+organizer|toimittanut|toim\adddot
30+organizers|toimittaneet|toim\adddot
31+byorganizer|toimittanut|toim\adddot
32+byauthor|kirjoittanut|kirj\adddot
33+byeditor|toimittanut|toim\adddot
34+bycompiler|koontanut|koontanut
35+byredactor|toimittanut|toim\adddot
36+byreviser|toimittanut|toim\adddot
37+byreviewer|toimittanut|toim\adddot
38+byfounder|perustanut|perustanut
39+bycontinuator|jatkanut|jatkanut
40+bycollaborator|yhteisty\"oss\"a|yhteisty\"oss\"a
41+bytranslator|\lbx@lfromlang k\"a\"ant\"anyt|\lbx@sfromlang k\"a\"ant\adddot
42+bycommentator|kommentaarin kirjoittanut|kommentaarin kirjoittanut
43+byannotator|selityksin varustanut|selityksin varustanut
44+withcommentator|kommentaarin kirjoittanut|kommentaarin kirjoittanut
45+withannotator|selityksin varustanut|selityksin varustanut
46+withintroduction|johdannon kirjottanut|johdannon kirjottanut
47+withforeword|esipuheen kirjoittanut|esipuheen kirjoittanut
48+withafterword|j\"alkisanat kirjoittanut|j\"alkisanat kirjoittanut
49+and|ja|ja
50+andothers|et\addabbrvspace al\adddot|et\addabbrvspace al\adddot
51+andmore|jne\adddot|jne\adddot
52+volume|volyymi|vol\adddot
53+volumes|volyymit|vol\adddot
54+involumes||
55+jourvol|volyymi|vol\adddot
56+jourser|sarja|sarja
57+book|kirja|kirja
58+part|osa|osa
59+issue|numero|numero
60+newseries|uusi sarja|uusi sarja
61+oldseries|vanha sarja|vanha sarja
62+edition|painos|painos
63+reprint|j\"alkipainos|j\"alkipainos
64+reprintof|julkaistu aiemmin nimell\"a|julkaistu aiemmin nimell\"a
65+reprintas|julkaistu uudelleen nimell\"a|julkaistu uudelleen nimell\"a
66+reprintfrom|julkaistu aiemmin nimell\"a|julkaistu aiemmin nimell\"a
67+translationof|k\"a\"ann\"os teoksesta|k\"a\"ann\"os teoksesta
68+translationas|k\"a\"annetty nimell\"a|k\"a\"annetty nimell\"a
69+translationfrom|k\"a\"annetty kielest\"a|k\"a\"annetty kielest\"a
70+reviewof|arvostelu teoksesta|arvostelu teoksesta
71+origpubas|julkaistu ensi kerran nimell\"a|julkaistu ensi kerran nimell\"a
72+origpubin|julkaistu ensi kerran vuonna|julkaistu ensi kerran vuonna
73+astitle|nimell\"a|nimell\"a
74+bypublisher|julkaissut|julkaissut
75+page|sivu|s\adddot
76+pages|sivut|s\adddot
77+column|palsta|palsta
78+columns|palstat|palstat
79+line|rivi|rivi
80+lines|rivit|rivit
81+nodate|ei julkaisup\"aiv\"a\"a|ei julkaisup\"aiv\"a\"a
82+verse|s\"ae|s\"ae
83+verses|s\"akeet|s\"akeet
84+section|kohta|kohta
85+sections|kohdat|kohdat
86+paragraph|kappale|kappale
87+paragraphs|kappaleet|kappaleet
88+pagetotal|sivu|s\adddot
89+pagetotals|sivut|s\adddot
90+columntotal|palsta|palsta
91+columntotals|palstat|palstat
92+linetotal|rivi|rivi
93+linetotals|rivit|rivit
94+versetotal|s\"ae|s\"ae
95+versetotals|s\"akeet|s\"akeet
96+sectiontotal|kohta|kohta
97+sectiontotals|kohdat|kohdat
98+paragraphtotal|kappale|kappale
99+paragraphtotals|kappaleet|kappaleet
100+in|teoksessa|teoksessa
101+inseries|sarjassa|sarjassa
102+ofseries|sarjassa|sarjassa
103+number|numero|nro
104+chapter|luku|luku
105+bathesis|tutkielma|tutkielma
106+mathesis|tutkielma|tutkielma
107+phdthesis|tohtorinv\"ait\"oskirja|tohtorinv\"ait\"oskirja
108+candthesis|kanditaatintutkielma|kanditaatintutkielma
109+resreport|tutkimusraportti|tutkimusraportti
110+techreport|tekninen raportti|tekninen raportti
111+software|ohjelmisto|ohjelmisto
112+datacd|data-CD|data-CD
113+audiocd|\"a\"ani-CD|\"a\"ani-CD
114+version|versio|versio
115+url|url|url
116+urlfrom|saatavilla osoitteesta|saatavilla osoitteesta
117+urlseen|viitattu|viitattu
118+inpreparation|valmisteilla|valmisteilla
119+submitted|l\"ahetetty|l\"ahetetty
120+forthcoming|hyv\"aksytty julkaistavaksi|hyv\"aksytty julkaistavaksi
121+inpress|painossa|painossa
122+prepublished|esijulkaistu|esijulkaistu
123+citedas|jatkossa|jatkossa
124+thiscite|sama|sama
125+seenote|katso viite|katso viite
126+quotedin|lainattu teoksessa|lainattu teoksessa
127+idem|idem|id\adddot
128+idemsf|idem|id\adddot
129+idemsm|idem|id\adddot
130+idemsn|idem|id\adddot
131+idempf|idem|id\adddot
132+idempm|idem|id\adddot
133+idempn|idem|id\adddot
134+idempp|idem|id\adddot
135+ibidem|ibidem|ibid\adddot
136+opcit|op\adddotspace cit\adddot|op\adddotspace cit\adddot
137+loccit|loc\adddotspace cit\adddot|loc\adddotspace cit\adddot
138+confer|cf\adddot|cf\adddot
139+sequens|sq\adddot|sq\adddot
140+sequentes|sqq\adddot|sqq\adddot
141+passim|passim|pass\adddot
142+see|katso|ks\adddot
143+seealso|katso my\"os|katso my\"os
144+backrefpage|katso sivu|ks\adddotspace s\adddot
145+backrefpages|katso sivut|ks\adddotspace s\adddot
146+january|tammikuuta|tammikuuta
147+february|helmikuuta|helmikuuta
148+march|maaliskuuta|maaliskuuta
149+april|huhtikuuta|huhtikuuta
150+may|toukokuuta|toukokuuta
151+june|kes\"akuuta|kes\"akuuta
152+july|hein\"akuuta|hein\"akuuta
153+august|elokuuta|elokuuta
154+september|syyskuuta|syyskuuta
155+october|lokakuuta|lokakuuta
156+november|marraskuuta|marraskuuta
157+december|joulukuuta|joulukuuta
158+basicjanuary|tammikuu|tammikuu
159+basicfebruary|helmikuu|helmikuu
160+basicmarch|maaliskuu|maaliskuu
161+basicapril|huhtikuu|huhtikuu
162+basicmay|toukokuu|toukokuu
163+basicjune|kes\"akuu|kes\"akuu
164+basicjuly|hein\"akuu|hein\"akuu
165+basicaugust|elokuu|elokuu
166+basicseptember|syyskuu|syyskuu
167+basicoctober|lokakuu|lokakuu
168+basicnovember|marraskuu|marraskuu
169+basicdecember|joulukuu|joulukuu
170+langamerican|amerikanenglanti|amerikanenglanti
171+langbrazilian|brasilianportugali|brasilianportugali
172+langbulgarian|bulgaria|bulgaria
173+langcatalan|katalonia|katalonia
174+langcroatian|kroatia|kroatia
175+langdanish|tanska|tanska
176+langdutch|hollanti|hollanti
177+langenglish|englanti|englanti
178+langestonian|viro|viro
179+langfinnish|suomi|suomi
180+langfrench|ranska|ranska
181+langgalician|galicia|galicia
182+langgerman|saksa|saksa
183+langgreek|kreikka|kreikka
184+langhungarian|unkari|unkari
185+langitalian|italia|italia
186+langlatin|latina|latina
187+langlatvian|latvia|latvia
188+langnorwegian|norja|norja
189+langpolish|puola|puola
190+langportuguese|portugali|portugali
191+langrussian|ven\"aj\"a|ven\"aj\"a
192+langslovak|slovakia|slovakia
193+langslovene|slovenia|slovenia
194+langspanish|espanja|espanja
195+langswedish|ruotsi|ruotsi
196+fromamerican|englannin kielest\"a|englannin kielest\"a
197+frombrazilian|portugalin kielest\"a|portugalin kielest\"a
198+frombulgarian|bulgarian kielest\"a|bulgarian kielest\"a
199+fromcatalan|katalonian kielest\"a|katalonian kielest\"a
200+fromcroatian|kroatian kielest\"a|kroatian kielest\"a
201+fromdanish|tanskan kielest\"a|tanskan kielest\"a
202+fromdutch|hollannin kielest\"a|hollannin kielest\"a
203+fromenglish|englannin kielest\"a|englannin kielest\"a
204+fromestonian|viron kielest\"a|viron kielest\"a
205+fromfinnish|suomen kielest\"a|suomen kielest\"a
206+fromfrench|ranskan kielest\"a|ranskan kielest\"a
207+fromgalician|galician kielest\"a|galician kielest\"a
208+fromgerman|saksan kielest\"a|saksan kielest\"a
209+fromgreek|kreikan kielest\"a|kreikan kielest\"a
210+fromhungarian|unkarin kielest\"a|unkarin kielest\"a
211+fromitalian|italian kielest\"a|italian kielest\"a
212+fromlatin|latinan kielest\"a|latinan kielest\"a
213+fromlatvian|latvian kielest\"a|latvian kielest\"a
214+fromnorwegian|norjan kielest\"a|norjan kielest\"a
215+frompolish|puolan kielest\"a|puolan kielest\"a
216+fromportuguese|portugalin kielest\"a|portugalin kielest\"a
217+fromrussian|ven\"aj\"an kielest\"a|ven\"aj\"an kielest\"a
218+fromslovak|slovakian kielest\"a|slovakian kielest\"a
219+fromslovene|slovenian kielest\"a|slovenian kielest\"a
220+fromspanish|espanjan kielest\"a|espanjan kielest\"a
221+fromswedish|ruotsin kielest\"a|ruotsin kielest\"a
222+countryde|Saksa|DE
223+countryeu|Euroopan Unioni|EU
224+countryep|Euroopan Unioni|EP
225+countryfr|Ranska|FR
226+countryuk|Iso-Britannia|GB
227+countryus|Yhdysvallat|US
228+patent|patentti|pat\adddot
229+patentde|saksalainen patentti|saksalainen pat\adddot
230+patenteu|Euroopan Unionin patentti|Euroopan Unionin pat\adddot
231+patentfr|ranskalainen patentti|ranskalainen pat\adddot
232+patentuk|isobritannialainen patentti|isobritannialainen pat\adddot
233+patentus|yhdysvaltalainen patentti|yhdysvaltalainen pat\adddot
234+patreq|patenttihakemus|pat\adddot\ hak\adddot
235+patreqde|saksalainen patenttihakemus|saksalainen pat\adddot\ hak\adddot
236+patreqeu|Euroopan Unionin patenttihakemus|Euroopan Unionin pat\adddot\ hak\adddot
237+patreqfr|ranskalainen patenttihakemus|ranskalainen pat\adddot\ hak\adddot
238+patrequk|isobritannialainen patenttihakemus|isobritannialainen pat\adddot\ hak\adddot
239+patrequs|yhdysvaltalainen patenttihakemus|yhdysvaltalainen pat\adddot\ hak\adddot
240+file|tiedosto|tiedosto
241+library|kirjasto|kirjasto
242+abstract|tiivistelm\"a|tiivistelm\"a
243+annotation|selitykset|selitykset
244+commonera|j\"alkeen ajanlaskun alun|jaa\adddot
245+beforecommonera|ennen ajanlaskun alkua|eaa\adddot
246+annodomini|j\"alkeen Kristuksen syntym\"an|jKr\adddot
247+beforechrist|ennen Kristuksen syntym\"a\"a|eKr\adddot
248+circa|noin|n\adddot
249+spring|kev\"at|kev\"at
250+summer|kes\"a|kes\"a
251+autumn|syksy|syksy
252+winter|talvi|talvi
253+am|ap\adddot|ip\adddot
254+pm|ip\adddot|ip\adddot
citeproc/biblatex-localization/french.lbx.stringsnew file+245
@@ -0,0 +1,245 @@
1+bibliography|Bibliographie|Bibliographie
2+references|R\'ef\'erences|R\'ef\'erences
3+shorthands|Liste des abr\'eviations|Abr\'eviations
4+editor|\'editeur|\'ed\adddot
5+editors|\'editeurs|\'ed\adddot
6+compiler|compilateur|comp\adddot
7+compilers|compilateurs|comp\adddot
8+redactor|r\'edacteur|r\'ed\adddot
9+redactors|r\'edacteurs|r\'ed\adddot
10+reviser|r\'eviseur|r\'ev\adddot
11+revisers|r\'eviseurs|r\'ev\adddot
12+founder|fondateur|fond\adddot
13+founders|fondateurs|fond\adddot
14+continuator|continuateur|cont\adddot
15+continuators|continuateurs|cont\adddot
16+collaborator|collaborateur|coll\adddot
17+collaborators|collaborateurs|coll\adddot
18+translator|traducteur|trad\adddot
19+translators|traducteurs|trad\adddot
20+commentator|commentateur|comm\adddot
21+commentators|commentateurs|comm\adddot
22+annotator|annotateur|annot\adddot
23+annotators|annotateurs|annot\adddot
24+commentary|commentaires|comment\adddot
25+annotations|annotations|annot\adddot
26+introduction|introduction|introd\adddot
27+foreword|pr\'eface|pr\'ef\adddot
28+afterword|postface|postf\adddot
29+editortr|\'editeur et traducteur|\'ed\adddotspace et trad\adddot
30+editorstr|\'editeurs et traducteurs|\'ed\adddotspace et trad\adddot
31+organizer|organisateur|org\adddot
32+organizers|organisateurs|org\adddot
33+byorganizer|organis\'e par|org\adddotspace par
34+byauthor|par|par
35+byeditor|sous la direction \smartof|sous la dir\adddotspace\smartof
36+bycompiler|compil\'e par|comp\adddotspace par
37+byredactor|r\'edig\'e par|r\'ed\adddotspace par
38+byreviser|r\'evis\'e par|r\'ev\adddotspace par
39+byreviewer|examin\'e par|ex\adddotspace par
40+byfounder|d\'ecouvert par|d\'ecouv\adddotspace par
41+bycontinuator|continu\'e par|cont\adddotspace par
42+bytranslator|traduit \lbx@lfromlang\ par|trad\adddotspace \lbx@sfromlang\ par
43+bycommentator|comment\'e par|comm\adddotspace par
44+byannotator|annot\'e par|annot\adddotspace par
45+withcommentator|avec des commentaires \smartof|avec des comment\adddotspace\smartof
46+withannotator|avec des annotations \smartof|avec des annot\adddotspace\smartof
47+withintroduction|avec une introduction \smartof|avec une introd\adddotspace\smartof
48+withforeword|avec une pr\'eface \smartof|avec une pr\'ef\adddotspace\smartof
49+withafterword|avec une postface \smartof|avec une postf\adddotspace\smartof
50+and|et|et
51+andothers|et\addabbrvspace al\adddot|et\addabbrvspace al\adddot
52+andmore|et\addabbrvspace al\adddot|et\addabbrvspace al\adddot
53+volume|tome|t\adddot
54+volumes|tomes|t\adddot
55+involumes|en|en
56+jourvol|tome|t\adddot
57+jourser|s\'erie|s\'er\adddot
58+book|livre|livre
59+part|partie|partie
60+issue|\'edition|\'ed\adddot
61+newseries|nouvelle s\'erie|nouv\adddotspace s\'er\adddot
62+oldseries|ancienne s\'erie|anc\adddotspace s\'er\adddot
63+edition|\'edition|\'ed\adddot
64+reprint|r\'eimpression|r\'eimpr\adddot
65+reprintof|r\'eimpression de|r\'eimpr\adddotspace de
66+reprintas|r\'eimpression sous le titre|r\'eimpr\adddotspace sous le titre
67+reprintfrom|r\'eimpression \`a partir \smartof|r\'eimpr\adddotspace \`a part\adddotspace\smartof
68+translationof|traduction de|trad\adddotspace de
69+translationas|traduit sous le titre|trad\adddotspace sous le titre
70+translationfrom|traduit de|trad\adddotspace de
71+reviewof|critique de|crit.\adddotspace de
72+origpubas|publi\'e \`a l'origine sous le titre|pub\adddotspace \`a l'orig\adddotspace sous le titre
73+origpubin|publi\'e \`a l'origine en|pub\adddotspace \`a l'orig\adddotspace en
74+astitle|sous le titre|sous le titre
75+bypublisher|par|par
76+page|page|p\adddot
77+pages|pages|p\adddot
78+column|colonne|col\adddot
79+columns|colonnes|col\adddot
80+line|ligne|l\adddot
81+lines|lignes|l\adddot
82+verse|vers|v\adddot
83+verses|vers|v\adddot
84+section|section|sect\adddot
85+sections|sections|sect\adddot
86+paragraph|paragraphe|\S
87+paragraphs|paragraphes|\S
88+pagetotal|page|p\adddot
89+pagetotals|pages|p\adddot
90+columntotal|colonne|col\adddot
91+columntotals|colonnes|col\adddot
92+linetotal|ligne|l\adddot
93+linetotals|lignes|l\adddot
94+versetotal|vers|v\adddot
95+versetotals|vers|v\adddot
96+sectiontotal|section|sect\adddot
97+sectiontotals|sections|sect\adddot
98+paragraphtotal|paragraphe|\S
99+paragraphtotals|paragraphes|\S
100+in|in|in
101+inseries|in|in
102+ofseries|de|de
103+number|num\'ero|n\textsuperscript{o
104+chapter|chapitre|chap\adddot
105+bathesis|m\'emoire de bachelor|m\'em\adddotspace de bach\adddot
106+mathesis|m\'emoire de master|m\'em\adddotspace de mast\adddot
107+phdthesis|th\`ese de doctorat|th\`ese de doct\adddot
108+candthesis|th\`ese de candidature|th\`ese de cand\adddot
109+resreport|rapport scientifique|rapp\adddotspace scient\adddot
110+techreport|rapport technique|rapp\adddotspace tech\adddot
111+software|logiciel|logiciel
112+datacd|c\'ed\'erom|c\'ed\'erom
113+audiocd|disque compact audio|CD
114+version|version|version
115+url|adresse|adresse
116+urlfrom|disponible \`a l'adresse|disp\adddotspace \`a l'adr\adddot
117+urlseen|visit\'e le|visit\'e le
118+inpreparation|en pr\'eparation|en pr\'ep\adddot
119+submitted|soumis|soumis
120+inpress|sous presse|sous presse
121+prepublished|pr\'epubli\'e|pr\'epubl\adddot
122+citedas|d\'esign\'e ci-apr\`es par|ci-apr\`es
123+thiscite|sp\'ecialement|sp\'ec\adddot
124+seenote|voir note|cf\adddotspace note
125+quotedin|cit\'e dans|cit\'e dans
126+idem|idem|idem
127+idemsm|idem|idem
128+idemsf|eadem|eadem
129+idemsn|idem|idem
130+idempm|eidem|eidem
131+idempf|eaedem|eaedem
132+idempn|eadem|eadem
133+idempp|eidem|eidem
134+ibidem|ibidem|ibid\adddot
135+opcit|op\adddotspace cit\adddot|op\adddotspace cit\adddot
136+loccit|loc\adddotspace cit\adddot|loc\adddotspace cit\adddot
137+confer|cf\adddot|cf\adddot
138+sequens|sq\adddot|sq\adddot
139+sequentes|sqq\adddot|sqq\adddot
140+passim|passim|pass\adddot
141+see|cf\adddot|cf\adddot
142+seealso|cf\adddotspace aussi|cf\adddotspace aussi
143+backrefpage|cf\adddotspace page|cf\adddotspace p\adddot
144+backrefpages|cf\adddotspace pages|cf\adddotspace p\adddot
145+january|janvier|jan\adddot
146+february|f\'evrier|f\'ev\adddot
147+march|mars|mars
148+april|avril|avr\adddot
149+may|mai|mai
150+june|juin|juin
151+july|juillet|juill\adddot
152+august|ao\^ut|ao\^ut
153+september|septembre|sept\adddot
154+october|octobre|oct\adddot
155+november|novembre|nov\adddot
156+december|d\'ecembre|d\'ec\adddot
157+langamerican|am\'ericain|am\'ericain
158+langbrazilian|br\'esilien|br\'esilien
159+langbulgarian|bulgare|bulgare
160+langcatalan|catalan|catalan
161+langcroatian|croate|croate
162+langczech|tch\`eque|tch\`eque
163+langdanish|danois|danois
164+langdutch|n\'eerlandais|n\'eerlandais
165+langenglish|anglais|anglais
166+langestonian|estonien|estonien
167+langfinnish|finnois|finnois
168+langgalician|galicien|galicien
169+langgerman|allemand|allemand
170+langgreek|grec|grec
171+langhungarian|hongrois|hongrois
172+langitalian|italien|italien
173+langjapanese|japonais|japonais
174+langlatin|latin|latin
175+langlatvian|letton|letton
176+langnorwegian|norv\'egien|norv\'egien
177+langpolish|polonais|polonais
178+langportuguese|portugais|portugais
179+langrussian|russe|russe
180+langserbian|serbe|serbe
181+langslovak|slovaque|slovaque
182+langslovene|slov\`ene|slov\`ene
183+langspanish|espagnol|espagnol
184+langswedish|su\'edois|su\'edois
185+langukrainian|ukrainien|ukrainien
186+fromamerican|de l'am\'ericain|de l'am\'ericain
187+frombrazilian|du br\'esilien|du br\'esilien
188+frombulgarian|du bulgare|du bulgare
189+fromcatalan|du catalan|du catalan
190+fromcroatian|du croate|du croate
191+fromczech|du tch\`eque|du tch\`eque
192+fromdanish|du danois|du danois
193+fromdutch|du n\'eerlandais|du n\'eerlandais
194+fromenglish|de l'anglais|de l'anglais
195+fromestonian|de l'estonien|de l'estonien
196+fromfinnish|du finnois|du finnois
197+fromgalician|du galicien|du galicien
198+fromgerman|de l'allemand|de l'allemand
199+fromgreek|du grec|du grec
200+fromhungarian|du hongrois|du hongrois
201+fromitalian|de l'italien|de l'italien
202+fromjapanese|du japonais|du japonais
203+fromlatin|du latin|du latin
204+fromlatvian|du letton|du letton
205+fromnorwegian|du norv\'egien|du norv\'egien
206+frompolish|du polonais|du polonais
207+fromportuguese|du portugais|du portugais
208+fromrussian|du russe|du russe
209+fromserbian|du serbe|du serbe
210+fromslovak|du slovaque|du slovaque
211+fromslovene|du slov\`ene|du slov\`ene
212+fromspanish|de l'espagnol|de l'espagnol
213+fromswedish|du su\'edois|du su\'edois
214+fromukrainian|de l'ukrainien|de l'ukrainien
215+countryde|Allemagne|DE
216+countryeu|Union europ\'eenne|EU
217+countryep|Union europ\'eenne|EP
218+countryfr|France|FR
219+countryuk|Royaume-Uni|GB
220+countryus|\'Etats-Unis|US
221+patent|brevet|brev\adddot
222+patentde|brevet allemand|brev\adddotspace allem\adddot
223+patenteu|brevet europ\'een|brev\adddotspace europ\adddot
224+patentuk|brevet britannique|brev\adddotspace brit\adddot
225+patentus|brevet am\'ericain|brev\adddotspace am\'er\adddot
226+patreq|demande de brevet|demande de brev\adddot
227+patreqde|demande de brevet allemand|demande de brev\adddotspace allem\adddot
228+patreqeu|demande de brevet europ\'een|demande de brev\adddotspace europ\adddot
229+patrequk|demande de brevet britannique|demande de brev\adddotspace brit\adddot
230+patrequs|demande de brevet am\'ericain|demande de brev\adddotspace am\'er\adddot
231+file|fichier|fichier
232+library|biblioth\`eque|biblioth\adddot
233+abstract|r\'esum\'e|r\'es\adddot
234+annotation|annotations|annotations
235+commonera|de l'\`ere commune|EC
236+beforecommonera|avant l'\`ere commune|AEC
237+annodomini|apr\`es J\'esus-Christ|apr\adddotspace J\adddot-C\adddot
238+beforechrist|avant J\'esus-Christ|av\adddotspace J\adddot-C\adddot
239+circa|vers|vers
240+spring|printemps|printemps
241+summer|\'et\'e|\'et\'e
242+autumn|automne|automne
243+winter|hiver|hiver
244+am|AM|AM
245+pm|PM|PM
citeproc/biblatex-localization/galician.lbx.stringsnew file+28
@@ -0,0 +1,28 @@
1+bibliography|Bibliograf\'ia|Bibliograf\'ia
2+references|Referencias|Referencias
3+shorthands|Lista de abreviaturas|Abreviaturas
4+editor|editor|ed\adddot
5+editors|editores|eds\adddot
6+compiler|compilador|comp\adddot
7+compilers|compiladores|comp\adddot
8+redactor|redactor|red\adddot
9+redactors|redactores|red\adddot
10+reviser|revisor|rev\adddot
11+revisers|revisores|revs\adddot
12+founder|fundador|fund\adddot
13+founders|fundadores|fund\adddot
14+continuator|continuador|cont\adddot
15+continuators|continuadores|cont\adddot
16+collaborator|colaborador|col\adddot
17+collaborators|colaboradores|cols\adddot
18+translator|tradutor|trad\adddot
19+translators|tradutores|trads\adddot
20+commentator|comentador|coment\adddot
21+commentators|comentadores|coments\adddot
22+annotator|anotador|anot\adddot
23+annotators|anotadores|anots\adddot
24+commentary|comentario|coment\adddot
25+annotations|notas|notas
26+introduction|introduci\'on|introd\adddot
27+foreword|prefacio|pref\adddot
28+afterword|posfacio|posf\adddot
citeproc/biblatex-localization/german.lbx.stringsnew file+28
@@ -0,0 +1,28 @@
1+bibliography|Literaturverzeichnis|Literatur
2+references|Literaturverzeichnis|Literatur
3+shorthands|Sigelverzeichnis|Sigel
4+editor|Herausgeber|Hrsg\adddot
5+editors|Herausgeber|Hrsg\adddot
6+compiler|Kompilator|Komp\adddot
7+compilers|Kompilatoren|Komp\adddot
8+redactor|Bearbeiter|Bearb\adddot
9+redactors|Bearbeiter|Bearb\adddot
10+reviser|\"Uberarbeiter|\"Uberarb\adddot
11+revisers|\"Uberarbeiter|\"Uberarb\adddot
12+founder|Begr\"under|Begr\adddot
13+founders|Begr\"under|Begr\adddot
14+continuator|Fortf\"uhrer|Fortf\adddot
15+continuators|Fortf\"uhrer|Fortf\adddot
16+collaborator|Mitarbeiter|Mitarb\adddot
17+collaborators|Mitarbeiter|Mitarb\adddot
18+translator|\"Ubersetzer|\"Ubers\adddot
19+translators|\"Ubersetzer|\"Ubers\adddot
20+commentator|Kommentator|Komm\adddot
21+commentators|Kommentatoren|Komm\adddot
22+annotator|Kommentator|Komm\adddot
23+annotators|Kommentatoren|Komm\adddot
24+commentary|Kommentar|Komm\adddot
25+annotations|Erl\"auterungen|Erl\"aut\adddot
26+introduction|Einleitung|Einl\adddot
27+foreword|Vorwort|Vorw\adddot
28+afterword|Nachwort|Nachw\adddot
citeproc/biblatex-localization/greek.lbx.stringsnew file+9
@@ -0,0 +1,9 @@
1+bibliography|Βιβλιογραφία|Βιβλιογραφία
2+references|Αναφορές|Αναφορές
3+shorthands|Κατάλογος συντμήσεων|Συντμήσεις
4+editor|επιμελητής|επιμελητής
5+editors|επιμελητές|επιμελητές
6+compiler|συντάκτης|συντάκτης
7+compilers|συντάκτες|συντάκτες
8+redactor|συντάκτης|συντάκτης
9+redactors|συντάκτες|συντάκτες
citeproc/biblatex-localization/hungarian.lbx.stringsnew file

No changes to the content.

citeproc/biblatex-localization/icelandic.lbx.stringsnew file+7
@@ -0,0 +1,7 @@
1+bibliography|Heimildaskr\'a|Heimildaskr\'a
2+references|Heimildir|Heimildir
3+shorthands|Listi yfir skammstafanir|Skammstafanir
4+editor|ristj\'ori|ritstj\adddot
5+editors|ritstj\'orar|ritstj\adddot
6+compiler|samantekt|samantekt
7+compilers|samantekt|samantekt
citeproc/biblatex-localization/italian.lbx.stringsnew file+9
@@ -0,0 +1,9 @@
1+bibliography|Bibliografia|Bibliografia
2+references|Riferimenti bibliografici|Riferimenti bibliografici
3+shorthands|Elenco delle sigle|Sigle
4+editor|curatore|cur\adddot
5+editors|curatori|cur\adddot
6+compiler|compilatore|comp\adddot
7+compilers|compilatori|comp\adddot
8+redactor|redattore|red\adddot
9+redactors|redattori|red\adddot
citeproc/biblatex-localization/latvian.lbx.stringsnew file+75
@@ -0,0 +1,75 @@
1+redactor|redaktors|redakt\adddot
2+redactors|redaktori|radakt\adddot
3+reviser|revidents|revid\adddot
4+revisers|revidenti|revid\adddot
5+introduction|ievads|ievads
6+byeditor|izdevis|izdevis
7+bytranslator|tulkojis|tulk\adddot
8+withintroduction|ar ievadu no|ar ievadu no
9+byeditortr|izdevis un tulkojis|izdev\adddotspace un tulk\adddot
10+and|un|un
11+andothers|un citi|u\adddotspace c\adddot
12+jourvol|izdevums|izdev\adddot
13+issue|izdevums|izdev\adddot
14+edition|izdevums|izdev\adddot
15+translationof|tulkojums no|tulk\adddotspace no
16+translationfrom|tulkots no|tulk\adddotspace no
17+reviewof|recenzija|recenz\adddot
18+bypublisher|no|no
19+nodate|bez datuma|bez dat\adddot
20+page|lappuse|lpp\adddot
21+pages|lappuses|lpp\adddot
22+column|sleja|sleja
23+columns|slejas|slejas
24+line|rinda|rinda
25+lines|rindas|rindas
26+verse|pants|pants
27+verses|panti|panti
28+paragraph|rindkopa|rindk\adddot
29+paragraphs|rindkopas|rindk\adddot
30+pagetotal|lappuse|lpp\adddot
31+pagetotals|lappuses|lpp\adddot
32+columntotal|sleja|sleja
33+columntotals|slejas|slejas
34+linetotal|rinda|rinda
35+linetotals|rindas|rindas
36+versetotal|pants|pants
37+versetotals|panti|panti
38+paragraphtotal|rindkopa|rindk\adddot
39+paragraphtotals|rindkopas|rindk\adddot
40+in||
41+number|numurs|nr\adddot
42+datacd|datu CD|datu CD
43+audiocd|audio CD|audio CD
44+version|versija|versija
45+url|pieejams|pieejams
46+urlfrom|pieejams no|pieejams no
47+inpreparation|tiek gatavots|tiek gatavots
48+submitted|iesniegts|iesniegts
49+march|marts|marts
50+may|maijs|maijs
51+august|augusts|aug\adddot
52+september|septembris|sept\adddot
53+october|oktobris|okt\adddot
54+november|novembris|nov\adddot
55+december|decembris|dec\adddot
56+langfinnish|somu|somu
57+langrussian|krievu|krievu
58+langswedish|zviedru|zviedru
59+fromfinnish|no somu|no somu
60+fromrussian|no krievu|no krievu
61+fromswedish|no zviedru|no zviedru
62+countryep|Eiropas Parlaments|EP
63+countryfr|Francija|FR
64+patent|patents|patents
65+patenteu|Eiropas patents|Eiropas pat\adddot
66+patentus|ASV patents|ASV pat\adddot
67+file|fails|fails
68+circa|ap|ap
69+spring|pavasaris|pav\adddot
70+summer|vasara|vas\adddot
71+autumn|rudens|rud\adddot
72+winter|ziema|ziema
73+am|AM|AM
74+pm|PM|PM
75+dateyear|gada|g\adddot
citeproc/biblatex-localization/lithuanian.lbx.stringsnew file+31
@@ -0,0 +1,31 @@
1+bibliography|Bibliografija|Bibliografija
2+references|Literatūros sąrašas|Literatūra
3+shorthands|Santrumpų sąrašas|Santrumpos
4+editor|sudarytojas|sud\adddot
5+editors|sudarytojai|sud\adddot
6+compiler|parengėjas|pareng\adddot
7+compilers|parengėjai|pareng\adddot
8+redactor|redaktorius|red\adddot
9+redactors|redaktoriai|red\adddot
10+reviser|korektorius|kor\adddot
11+revisers|korektoriai|kor\adddot
12+founder|pradininkas|prad\adddot
13+founders|pradininkai|prad\adddot
14+continuator|tęsėjas|tęs\adddot
15+continuators|tęsėjai|tęs\adddot
16+collaborator|bendradarbis|bendr\adddot
17+collaborators|bendradarbiai|bendr\adddot
18+translator|vertėjas|vert\adddot
19+translators|vertėjai|vert\adddot
20+commentator|komentarų autorius|koment\adddotspace aut\adddot
21+commentators|komentarų autoriai|koment\adddotspace aut\adddot
22+annotator|paaiškinimų autorius|paaišk\adddotspace aut\adddot
23+annotators|paaiškinimų autoriai|paaišk\adddotspace aut\adddot
24+commentary|komentarai|koment\adddot
25+annotations|paaiškinimai|paaišk\adddot
26+introduction|įvadas|įv\adddot
27+foreword|pratarmė|prat\adddot
28+afterword|pabaigos žodis|pab\adddotspace žodis
29+organizer|organizatorius|org\adddot
30+organizers|organizatoriai|org\adddot
31+byorganizer|organizavo|org\adddot
citeproc/biblatex-localization/magyar.lbx.stringsnew file+29
@@ -0,0 +1,29 @@
1+bibliography|Irodalomjegyz\'ek|Irodalom
2+references|Hivatkoz\'asok|Hivatkoz\'asok
3+shorthands|R\"ovid\'it\'esek jegyz\'eke|R\"ovid\'it\'esek
4+compiler|\"ossze\'all\'it\'o|\"ossze\'all\adddot
5+compilers|\"ossze\'all\'it\'ok|\"ossze\'all\adddot
6+reviser|korrektor|korr\adddot
7+revisers|korrektorok|korr\adddot
8+founder|alap\'it\'o|alap\adddot
9+founders|alap\'it\'ok|alap\adddot
10+%continuator||
11+%continuators||
12+translator|ford\'it\'o|ford\adddot
13+translators|ford\'it\'ok|ford\adddot
14+commentator|komment\'ator|komm\adddot
15+commentators|komment\'atorok|komm\adddot
16+annotator|jegyzetek \'ir\'oja|jegyz\adddot
17+annotators|jegyzetek \'ir\'oi|jegyz\adddot
18+commentary|komment\'ar|komm\adddot
19+annotations|jegyzetek|jegyz\adddot
20+introduction|bevezet\'es|bev\adddot
21+afterword|ut\'osz\'o|ut\'osz\'o
22+byorganizer|szervezte|szerv\adddot
23+byauthor|\'irta|\'irta
24+byeditor|szerkesztette|szerk\adddot
25+bycompiler|\"ossze\'all\'itotta|\"ossze\'all\adddot
26+byredactor|sajt\'o al\'a rendezte|kiad\adddot
27+byreviser|jav\'itotta|jav\adddot
28+byreviewer|b\'ir\'alta|b\'ir\adddot
29+byfounder|alap\'itotta|alap\adddot
citeproc/biblatex-localization/naustrian.lbx.stringsnew file+2
@@ -0,0 +1,2 @@
1+citedas|im Folgenden zitiert als|im Folgenden zit\adddotspace als
2+january|J\"anner|J\"an\adddot
citeproc/biblatex-localization/newzealand.lbx.stringsnew file

No changes to the content.

citeproc/biblatex-localization/ngerman.lbx.stringsnew file+1
@@ -0,0 +1 @@
1+citedas|im Folgenden zitiert als|im Folgenden zit\adddotspace als
citeproc/biblatex-localization/norsk.lbx.stringsnew file+98
@@ -0,0 +1,98 @@
1+bibliography|Bibliografi|Bibliografi
2+references|Referanser|Referanser
3+shorthands|Forkortelser|Forkortelser
4+compiler|kompilator|komp\adddot
5+compilers|kompilatorer|komp\adddot
6+redactor|bearbeidelse|bearb\adddot
7+redactors|bearbeidelse|bearb\adddot
8+reviser|revisjon|rev\adddot
9+revisers|revisjon|rev\adddot
10+founder|grunnlegger|grunnl\adddot
11+founders|grunnleggere|grunnl\adddot
12+collaborator|samarbeid|samarb\adddot
13+collaborators|samarbeid|samarb\adddot
14+translator|oversetter|overs\adddot
15+translators|oversettere|overs\adddot
16+commentator|kommentarer|komm\adddot
17+commentators|kommentarer|komm\adddot
18+annotator|forklaringer|forkl\adddot
19+annotators|forklaringer|forkl\adddot
20+commentary|kommentarer|komm\adddot
21+annotations|forklaringer|forkl\adddot
22+introduction|innledning|innl\adddot
23+foreword|forord|forord
24+afterword|etterord|etterord
25+organizer|organisator|org\adddot
26+organizers|organisatorer|org\adddot
27+byorganizer|organisert av|org\adddotspace av
28+byauthor|av|av
29+byeditor|redigert av|red\adddotspace av
30+bycompiler|kompilert av|komp\adddotspace av
31+byredactor|bearbeidet av|bearb\adddotspace av
32+byreviser|revidert av|rev\adddotspace av
33+byreviewer|kritikk ved|krit\adddotspace ved
34+byfounder|grunnlagt av|grunnl\adddotspace av
35+bycollaborator|i samarbeid med|i samarb\adddotspace med
36+bytranslator|oversatt \lbx@lfromlang\ av|overs\adddot\ \lbx@sfromlang\ av
37+bycommentator|kommentert av|komm\adddot\ av
38+byannotator|forklart av|forkl\adddot\ av
39+withcommentator|med kommentarer av|med komm\adddot\ av
40+withannotator|med forklaringer av|med forkl\adddot\ av
41+withintroduction|med innledning av|med innl\adddot\ av
42+withforeword|med forord av|med forord av
43+withafterword|med etterord av|med etterord av
44+and|og|og
45+andothers|med flere|mfl\adddot
46+andmore|med mer|m.m\adddot
47+volume|bind|bd\adddot
48+volumes|bind|bd\adddot
49+involumes|i|i
50+jourser|serie|ser\adddot
51+book|bok|bok
52+part|del|del
53+issue|nummer|nr\adddot
54+newseries|ny serie|ny ser\adddot
55+oldseries|gammel serie|gl\adddotspace ser\adddot
56+edition|utgave|utg\adddot
57+reprint|opptrykk|opptr\adddot
58+reprintof|opptrykk av|opptr\adddotspace av
59+reprintas|trykt om som|tr\adddotspace om som
60+reprintfrom|opptrykk fra|opptr\adddotspace fra
61+translationof|oversettelse av|overs\adddotspace av
62+translationas|oversatt som|overs\adddotspace som
63+translationfrom|oversatt fra|overs\adddotspace fra
64+reviewof|kritikk av|krit\adddotspace av
65+origpubas|opprinnelig utgitt som|oppr\adddot\ utg\adddot\ som
66+origpubin|opprinnelig utgitt i|oppr\adddot\ utg\adddot\ i
67+astitle|som|som
68+bypublisher|av|av
69+nodate|udatert|udatert
70+page|side|s\adddot
71+pages|sider|s\adddot
72+column|spalte|sp\adddot
73+columns|spalter|sp\adddot
74+line|linje|l\adddot
75+lines|linjer|l\adddot
76+verse|vers|v\adddot
77+verses|vers|v\adddot
78+section|avsnitt|avsn\adddot
79+sections|avsnitt|avsn\adddot
80+paragraph|avsnitt|avsn\adddot
81+paragraphs|avsnitt|avsn\adddot
82+pagetotal|side|s\adddot
83+pagetotals|sider|s\adddot
84+columntotal|spalte|sp\adddot
85+columntotals|spalter|sp\adddot
86+linetotal|linje|l\adddot
87+linetotals|linjer|l\adddot
88+versetotal|vers|v\adddot
89+versetotals|vers|v\adddot
90+sectiontotal|avsnitt|avsn\adddot
91+sectiontotals|avsnitt|avsn\adddot
92+paragraphtotal|avsnitt|avsn\adddot
93+paragraphtotals|avsnitt|avsn\adddot
94+in|i|i
95+inseries|i|i
96+ofseries|av|av
97+number|nummer|nr\adddot
98+chapter|kapittel|kap\adddot
citeproc/biblatex-localization/nswissgerman.lbx.stringsnew file+2
@@ -0,0 +1,2 @@
1+citedas|im Folgenden zitiert als|im Folgenden zit\adddotspace als
2+countryuk|Grossbritannien|GB
citeproc/biblatex-localization/nynorsk.lbx.stringsnew file+28
@@ -0,0 +1,28 @@
1+references|Referansar|Referansar
2+shorthands|Forkortingar|Forkortingar
3+compilers|kompilatorar|komp\adddot
4+redactor|omarbeiding|omarb\adddot
5+redactors|omarbeiding|omarb\adddot
6+founder|grunnleggjar|grunnl\adddot
7+founders|grunnleggjarar|grunnl\adddot
8+translator|omsetjar|oms\adddot
9+translators|omsetjarar|oms\adddot
10+commentator|kommentarar|komm\adddot
11+commentators|kommentarar|komm\adddot
12+annotator|forklaringar|forkl\adddot
13+annotators|forklaringar|forkl\adddot
14+commentary|kommentarar|komm\adddot
15+annotations|forklaringar|forkl\adddot
16+introduction|innleiing|innl\adddot
17+organizers|organisatorar|org\adddot
18+byredactor|omarbeidd av|omarb\adddotspace av
19+withcommentator|med kommentarar av|med komm\adddot\ av
20+withannotator|med forklaringar av|med forkl\adddot\ av
21+withintroduction|med innleiing av|med innl\adddot\ av
22+andothers|med fleire|mfl\adddot
23+andmore|med meir|m.m\adddot
24+oldseries|gamal serie|gl\adddotspace ser\adddot
25+translationof|omsetjing av|oms\adddotspace av
26+translationas|omsett som|oms\adddotspace som
27+origpubas|opphavleg utgitt som|opph\adddot\ utg\adddot\ som
28+origpubin|opphavleg utgitt i|opph\adddot\ utg\adddot\ i
citeproc/biblatex-localization/polish.lbx.stringsnew file+100
@@ -0,0 +1,100 @@
1+bibliography|Bibliografia|Bibliografia
2+references|Bibliografia|Bibliografia
3+editor|redaktor|red\adddot
4+editors|redaktorzy|red\adddot
5+compiler|redaktor|red\adddot
6+compilers|redaktorzy|red\adddot
7+redactor|redaktor|red\adddot
8+redactors|redaktorzy|red\adddot
9+reviser|korektor|kor\adddot
10+revisers|korektorzy|kor\adddot
11+collaborator|uczestnik|ucz\adddot
12+collaborators|uczestnicy|ucz\adddot
13+translator|t\l umacz|t\l um\adddot
14+translators|t\l umacze|t\l um\adddot
15+commentator|komentator|kom\adddot
16+commentators|komentatorzy|kom\adddot
17+annotator|uwaga|uw\adddot
18+annotators|uwagi|uw\adddot
19+commentary|komentarz|kom\adddot
20+annotations|komentarze|kom\adddot
21+foreword|przedmowa|przedm\adddot
22+afterword|pos\l owie|pos\l \adddot
23+editortr|redaktor i t\l umacz|red\adddotspace i per\adddot
24+editorstr|redaktorzy i t\l umacze|red\adddotspace i per\adddot
25+editorco|redaktor i komentator|red\adddotspace i kom\adddot
26+translatorco|t\l umacz i komentator|t\l um\adddotspace i kom\adddot
27+translatorsco|t\l umacze i komentatorzy|t\l um\adddotspace i kom\adddot
28+organizer|organizator|org\adddot
29+organizers|organizatorzy|org\adddot
30+byorganizer|organizowane|org\adddot
31+byauthor|autorstwo|aut\adddot
32+byeditor|redagowa\l|red\adddot
33+byredactor|zredagowano|zred\adddot
34+byreviser|poprawione|popr\adddot
35+byreviewer|recenzja|rec\adddot
36+bytranslator|t\l umaczenie \lbx@lfromlang|t\l um\adddotspace \lbx@sfromlang
37+bycommentator|skomentowane przez|skom\adddot
38+byannotator|uwagi od|uw\adddot
39+withcommentator|komentarze|kom\adddot
40+withannotator|uwagi|uw\adddot
41+withforeword|przedmowa|przedm\adddot
42+withafterword|pos\l owie|pos\l \adddot
43+byeditoran|zredagowany i z uwagami|zredag\adddotspace i z uw\adddot
44+byeditoraf|zredagowany, z pos\l owiem|zred., z pos\l \adddot
45+byeditorcofo|zredagowany, komentarze i przedmowa|zred., kom\adddotspace i przedm\adddot
46+byeditorcoaf|zredagowany, komentarze i pos\l owie|zred., kom\adddotspace i pos\l \adddot
47+byeditoranfo|zredagowany, uwagi i przedmowa|zred., uw\adddotspace i przedm\adddot
48+byeditoranaf|zredagowany, uwagi i pos\l owie|zred., uw\adddotspace i pos\l \adddot
49+and|i|i
50+andothers|i inni|i in\adddot
51+andmore|i inni|i in\adddot
52+volume|tom|t\adddot
53+volumes|tomy|t\adddot
54+involumes|w|w
55+jourvol|tom|t\adddot
56+jourser|seria|ser\adddot
57+issue|wydanie|wyd\adddot
58+newseries|nowa seria|now\adddotspace ser\adddot
59+oldseries|stara seria|star\adddotspace ser\adddot
60+edition|wydruk|wyd\adddot
61+reprint|przedruk|przedr\adddot
62+reprintof|przedruk|przedr\adddot
63+reprintas|przedrukowano jako|przedr\adddotspace jako
64+reprintfrom|przedrukowano z|przedr\adddotspace z
65+translationof|t\l umaczenie|t\l um\adddot
66+translationas|t\l umaczenie jako|t\l um\adddotspace jako
67+translationfrom|t\l umaczenie z|t\l um\adddotspace z
68+reviewof|recenzja na\addcolon|rec\adddotspace na\addcolon
69+origpubin|pierwodruk wydano w|pierw\adddotspace wyd\adddotspace w
70+astitle|pod tytu\l em|pod tyt\adddot
71+page|strona|s\adddot
72+pages|strony|s\adddot
73+column|kolumna|kol\adddot
74+columns|kolumny|kol\adddot
75+line|linijka|l\adddot
76+lines|linijki|l\adddot
77+nodate|bez daty|b\adddot d\adddot
78+verse|werset|wer\adddot
79+verses|wersety|wer\adddot
80+section|paragraf|par\adddot
81+sections|paragrafy|par\adddot
82+paragraph|akapit|akap\adddot
83+paragraphs|akapity|akap\adddot
84+pagetotal|strona|s\adddot
85+pagetotals|strony|s\adddot
86+columntotal|kolumna|kol\adddot
87+columntotals|kolumny|kol\adddot
88+linetotal|wers|wer\adddot
89+linetotals|wersy|wer\adddot
90+versetotal|wiersz|wier\adddot
91+versetotals|wiersze|wier\adddot
92+sectiontotal|paragraf|par\adddot
93+sectiontotals|paragrafy|par\adddot
94+paragraphtotal|akapit|akap\adddot
95+paragraphtotals|akapit|akap\adddot
96+in|w|w
97+inseries|w|w
98+ofseries|z|z
99+number|numer|nr\adddot
100+chapter|rozdzia\l |rozd\adddot
citeproc/biblatex-localization/portuges.lbx.stringsnew file

No changes to the content.

citeproc/biblatex-localization/portuguese.lbx.stringsnew file+95
@@ -0,0 +1,95 @@
1+bibliography|Bibliografia|Bibliografia
2+references|Refer\^encias|Refer\^encias
3+shorthands|Lista de Abreviaturas|Abreviaturas
4+editor|editor|ed\adddot
5+editors|editores|eds\adddot
6+compiler|compilador|comp\adddot
7+compilers|compiladores|comp\adddot
8+redactor|redator|red\adddot
9+redactors|redatores|red\adddot
10+reviser|revisor|rev\adddot
11+revisers|revisores|rev\adddot
12+founder|fundador|fund\adddot
13+founders|fundadores|fund\adddot
14+continuator|continuador|cont\adddot
15+continuators|continuadores|cont\adddot
16+collaborator|colaborador|col\adddot
17+collaborators|colaboradores|col\adddot
18+translator|tradutor|trad\adddot
19+translators|tradutores|trad\adddot
20+commentator|comentador|coment\adddot
21+commentators|comentadores|coment\adddot
22+annotator|anotador|anot\adddot
23+annotators|anotadores|anot\adddot
24+commentary|coment\'ario|coment\adddot
25+annotations|notas|notas
26+foreword|pref\'acio|pref\adddot
27+afterword|posf\'acio|posf\adddot
28+organizer|organizador|org\adddot
29+organizers|organizadores|orgs\adddot
30+byorganizer|organizado por|org\adddotspace por
31+byauthor|por|por
32+byeditor|editado por|ed\adddotspace por
33+bycompiler|compilado por|comp\adddotspace por
34+byredactor|redigido por|red\adddotspace por
35+byreviser|revisto por|rev\adddotspace por
36+byreviewer|resenhado por|res\adddotspace por
37+byfounder|fundado por|fund\adddotspace por
38+bycontinuator|continuado por|cont\adddotspace por
39+bytranslator|traduzido \lbx@lfromlang\ por|trad\adddot\ \lbx@sfromlang\ por
40+bycommentator|comentado por|coment\adddot\ por
41+byannotator|notas de|notas de
42+withcommentator|com coment\'arios de|com coment\adddot\ de
43+withannotator|com notas de|com notas de
44+withforeword|com pref\'acio de|com pref\adddot\ de
45+withafterword|com posf\'acio de|com posf\adddot\ de
46+and|e|e
47+andothers|et\addabbrvspace al\adddot|et\addabbrvspace al\adddot
48+andmore|et\addabbrvspace al\adddot|et\addabbrvspace al\adddot
49+volume|volume|vol\adddot
50+volumes|volumes|vols\adddot
51+involumes|em|em
52+jourvol|volume|vol\adddot
53+jourser|s\'erie|s\'er\adddot
54+book|livro|livro
55+part|parte|parte
56+issue|n\'umero|n\'umero
57+newseries|nova s\'erie|nova s\'er\adddot
58+oldseries|s\'erie antiga|s\'er\adddot\ antiga
59+reprint|reimpress\~ao|reimpr\adddot
60+reprintof|reimpress\~ao de|reimpr\adddotspace de
61+reprintas|reimpresso como|reimpr\adddotspace como
62+reprintfrom|reimpresso|reimpr\adddot
63+translationas|traduzido como|trad\adddotspace como
64+translationfrom|traduzido do|trad\adddotspace do
65+reviewof|resenha de|res\adddotspace de
66+origpubas|originalmente publicado como|orig\adddotspace pub\adddotspace como
67+origpubin|originalmente publicado em|orig\adddotspace pub\adddotspace em
68+astitle|como|como
69+bypublisher|por|por
70+nodate|sem data|s\adddot d\adddot
71+page|p\'agina|p\adddot
72+pages|p\'aginas|pp\adddot
73+column|coluna|col\adddot
74+columns|colunas|cols\adddot
75+line|linha|l\adddot
76+lines|linhas|ll\adddot
77+verse|verso|v\adddot
78+verses|versos|vv\adddot
79+paragraph|par\'agrafo|par\adddot
80+paragraphs|par\'agrafo|par\adddot
81+pagetotal|p\'agina|p\adddot
82+pagetotals|p\'aginas|pp\adddot
83+columntotal|coluna|col\adddot
84+columntotals|colunas|cols\adddot
85+linetotal|linha|l\adddot
86+linetotals|linhas|ll\adddot
87+versetotal|verso|v\adddot
88+versetotals|versos|vv\adddot
89+paragraphtotal|par\'agrafo|par\adddot
90+paragraphtotals|par\'agrafo|par\adddot
91+in|em|em
92+inseries|em|em
93+ofseries|de|de
94+number|n\'umero|n\adddot\textordmasculine
95+chapter|cap\'\i tulo|cap\adddot
citeproc/biblatex-localization/russian.lbx.stringsnew file+102
@@ -0,0 +1,102 @@
1+bibliography|Список литературы|Список литературы
2+references|Список литературы|Список литературы
3+shorthands|Список сокращений|Сокращения
4+editor|редактор|ред\adddot
5+editors|редакторы|ред\adddot
6+compiler|составитель|сост\adddot
7+compilers|составители|сост\adddot
8+redactor|редактор|ред\adddot
9+redactors|редакторы|ред\adddot
10+reviser|ревизионный корректор|ревиз\adddotspace кор\adddot
11+revisers|ревизионные корректоры|ревиз\adddotspace кор\adddot
12+founder|основатель|осн\adddot
13+founders|основатели|осн\adddot
14+continuator|продолжатель|прод\adddot
15+continuators|продолжатели|прод\adddot
16+collaborator|участник|участ\adddot
17+collaborators|участники|участ\adddot
18+translator|переводчик|пер\adddot
19+translators|переводчики|пер\adddot
20+commentator|комментатор|коммент\adddot
21+commentators|комментаторы|коммент\adddot
22+annotator|примечания|примеч\adddot
23+annotators|примечания|примеч\adddot
24+commentary|комментарий|коммент\adddot
25+annotations|примечания|примеч\adddot
26+introduction|вступительная статья|вступ\adddotspace ст\adddot
27+foreword|предисловие|предисл\adddot
28+afterword|послесловие|послесл\adddot
29+organizer|организатор|орг\adddot
30+organizers|организаторы|орг\adddot
31+byorganizer|организатор|орг\adddot
32+byauthor||
33+byeditor|под редакцией|под\addabbrvspace ред\adddot
34+bycompiler|составитель|сост\adddot
35+byredactor|под редакцией|под\addabbrvspace ред\adddot
36+byreviser|исправлено|испр\adddot
37+byreviewer|рецензия|рец\adddot
38+byfounder|учредитель|учр\adddot
39+bycontinuator|продолжение|продолж\adddot
40+bycollaborator|при участии|при\addabbrvspace уч\adddot
41+bytranslator|перевод \lbx@lfromlang|пер\adddot\ \lbx@sfromlang
42+bycommentator|комментарии|коммент\adddot
43+byannotator|примечания|примеч\adddot
44+withcommentator|комментарии|коммент\adddot
45+withannotator|примечания|примеч\adddot
46+withintroduction|вступительная статья|вступ\adddotspace ст\adddot
47+withforeword|предисловие|предисл\adddot
48+withafterword|послесловие|послесл\adddot
49+and|и|и
50+andothers|и\addabbrvspace др\adddot|и\addabbrvspace др\adddot
51+andmore|и\addabbrvspace др\adddot|и\addabbrvspace др\adddot
52+volume|том|т\adddot
53+volumes|томах|т\adddot
54+involumes|в|в
55+jourvol|том|т\adddot
56+jourser|серия|сер\adddot
57+book|книга|кн\adddot
58+part|часть|ч\adddot
59+issue|выпуск|вып\adddot
60+newseries|новая серия|нов\adddotspace сер\adddot
61+oldseries|старая серия|стар\adddotspace сер\adddot
62+edition|издание|изд\adddot
63+reprint|переиздание|переизд\adddot
64+reprintof|переиздание|переизд\adddot
65+reprintas|переиздано как|переизд\adddotspace как
66+reprintfrom|переиздано с|переизд\adddotspace с
67+translationof|перевод по изданию\addcolon|пер\adddotspace по изд\adddot\addcolon
68+translationas|перевод\addcolon|пер\adddot\addcolon
69+translationfrom|перевод с|пер\adddotspace с
70+reviewof|рецензия на\addcolon|рец\adddotspace на\addcolon
71+astitle|\addcolon|\addcolon
72+bypublisher|\addcomma|\addcomma
73+nodate|б\adddot г\adddot|б\adddot г\adddot
74+page|страница|с\adddot
75+pages|страницы|с\adddot
76+column|колонка|кол\adddot
77+columns|колонки|кол\adddot
78+line|строка|строка
79+lines|строки|строка
80+verse|стих|стих
81+verses|стихи|стихи
82+section|параграф|\S
83+sections|параграфы|\S\S
84+paragraph|абзац|абз\adddot
85+paragraphs|абзацы|абз\adddot
86+pagetotal|страница|с\adddot
87+pagetotals|страницы|с\adddot
88+columntotal|колонка|кол\adddot
89+columntotals|колонки|кол\adddot
90+linetotal|строка|строка
91+linetotals|строки|строка
92+versetotal|стих|стих
93+versetotals|стихи|стихи
94+sectiontotal|параграф|\S
95+sectiontotals|параграфы|\S\S
96+paragraphtotal|абзац|абз\adddot
97+paragraphtotals|абзацы|абз\adddot
98+in|в|в
99+inseries|в|в
100+ofseries|из|из
101+number|номер|№
102+chapter|глава|гл\adddot
citeproc/biblatex-localization/serbian.lbx.stringsnew file

No changes to the content.

citeproc/biblatex-localization/serbianc.lbx.stringsnew file

No changes to the content.

citeproc/biblatex-localization/slovak.lbx.stringsnew file+82
@@ -0,0 +1,82 @@
1+references|Referencie|Referencie
2+shorthands|Zoznam skratiek|Skratky
3+editor|editor|ed\adddot
4+editors|editori|ed\adddot
5+compilers|zostavovatelia|zost\adddot
6+redactor|redaktor|red\adddot
7+redactors|redaktori|red\adddot
8+reviser|korektor|kor\adddot
9+revisers|korektori|kor\adddot
10+founders|zakladatelia|zakl\adddot
11+translators|prekladatelia|prekl\adddot
12+foreword|predhovor|predh\adddot
13+afterword|doslov|dosl\adddot
14+byauthor||
15+withforeword|s\addnbspace predhovorom od|s\addnbspace predh\adddot\ od
16+withafterword|s\addnbspace doslovom od|s\addnbspace dosl\adddot\ od
17+and|a|a
18+andothers|et\addabbrvspace al\adddot|et\addabbrvspace al\adddot
19+andmore|et\addabbrvspace al\adddot|et\addabbrvspace al\adddot
20+involumes|in|in
21+book|kniha|kniha
22+edition|vydanie|vyd\adddot
23+reviewof|recenzia|recenz\adddot
24+translationof|preklad|prekl\adddot
25+astitle|ako|ako
26+bypublisher||
27+page|strana|s\adddot
28+pages|strany|s\adddot
29+line|riadok|r\adddot
30+lines|riadky|r\adddot
31+section|sekcia|\S
32+sections|sekcie|\S\S
33+paragraph|odsek|ods\adddot
34+paragraphs|odseky|ods\adddot
35+pagetotal|strana|s\adddot
36+pagetotals|strany|s\adddot
37+linetotal|riadok|r\adddot
38+linetotals|riadky|r\adddot
39+sectiontotal|sekcia|\S
40+sectiontotals|sekcie|\S\S
41+paragraphtotal|odsek|ods\adddot
42+paragraphtotals|odseky|ods\adddot
43+in|in|in
44+inseries|in|in
45+ofseries|z|z
46+chapter|kapitola|kap\adddot
47+datacd|CD-ROM|CD-ROM
48+audiocd|audio CD|audio CD
49+version|verzia|ver\adddot
50+url|URL|URL
51+idem|idem|idem
52+idemsm|idem|idem
53+idemsf|eadem|eadem
54+idemsn|idem|idem
55+idempm|eidem|eidem
56+idempf|eaedem|eaedem
57+idempn|eadem|eadem
58+idempp|eidem|eidem
59+ibidem|ibidem|ibid\adddot
60+opcit|op\adddotspace cit\adddot|op\adddotspace cit\adddot
61+loccit|loc\adddotspace cit\adddot|loc\adddotspace cit\adddot
62+confer|cf\adddot|cf\adddot
63+sequens|sq\adddot|sq\adddot
64+sequentes|sqq\adddot|sqq\adddot
65+passim|passim|pass\adddot
66+march|marec|mar\adddot
67+august|august|aug\adddot
68+september|september|sept\adddot
69+november|november|nov\adddot
70+december|december|dec\adddot
71+countryde|Nemecko|DE
72+patent|patent|pat\adddot
73+patentus|US patent|US pat\adddot
74+abstract|abstrakt|abst\adddot
75+annodomini|po Kristovi|po Kr\adddot
76+beforechrist|pred Kristom|pred Kr\adddot
77+circa|cirka|ca\adddot
78+spring|jar|jar
79+summer|leto|leto
80+winter|zima|zima
81+am|AM|AM
82+pm|PM|PM
citeproc/biblatex-localization/slovene.lbx.stringsnew file+28
@@ -0,0 +1,28 @@
1+bibliography|Literatura|Literatura
2+references|Literatura|Literatura
3+shorthands|Kratice|Kratice
4+editor|urednik|ur\adddot
5+editors|uredniki|ur\adddot
6+compiler|sestavljalec|sest\adddot
7+compilers|sestavljalci|sest\adddot
8+redactor|redaktor|redaktor
9+redactors|redaktorji|redaktorji
10+reviser|korektor|korektor
11+revisers|korektorji|korektorji
12+founder|snovalec|snovalec
13+founders|snovalci|snovalci
14+continuator|nadaljevalec|nadaljevalec
15+continuators|nadaljevalci|nadaljevalci
16+collaborator|sodelavec|sod\adddot
17+collaborators|sodelavci|sod\adddot
18+translator|prevajalec|prev\adddot
19+translators|prevajalci|prev\adddot
20+commentator|komentator|komentator
21+commentators|komentatorji|komentatorji
22+annotator|anotator|anotator
23+annotators|anotatorji|anotatorji
24+commentary|komentar|komentar
25+annotations|opombe|op\adddot
26+introduction|uvod|uvod
27+foreword|predgovor|predg\adddot
28+afterword|spremna beseda|spr\adddotspace b\adddot
citeproc/biblatex-localization/slovenian.lbx.stringsnew file

No changes to the content.

citeproc/biblatex-localization/spanish.lbx.stringsnew file+190
@@ -0,0 +1,190 @@
1+references|Referencias|Referencias
2+shorthands|Lista de abreviaturas|Abreviaturas
3+editor|edici\'on|ed\adddot
4+editors|edici\'on|eds\adddot
5+commentator|comentario|com\adddot
6+commentators|comentarios|coms\adddot
7+annotator|anotaciones|anot\adddot
8+annotators|anotaciones|anots\adddot
9+commentary|comentario|com\adddot
10+annotations|notas|notas
11+introduction|introducci\'on|intr\adddot
12+foreword|pr\'ologo|pr\'ol\adddot
13+organizer|organizaci\'on|org\adddot
14+organizers|organizaci\'on|orgs\adddot
15+byorganizer|organizado por|org\adddotspace por
16+byauthor|de|de
17+byeditor|editado por|ed\adddotspace por
18+bycompiler|compilado por|comp\adddotspace por
19+byredactor|redacci\'on de|red\adddotspace de
20+byreviser|revisado por|rev\adddotspace por
21+byfounder|fundado por|fund\adddotspace por
22+bycontinuator|continuado por|cont\adddotspace por
23+bytranslator|traducido \lbx@lfromlang\ por|trad\adddot \lbx@sfromlang\ por
24+bycommentator|comentado por|com\adddotspace por
25+byannotator|anotado por|anot\adddotspace por
26+withcommentator|con comentario de|con com\adddotspace de
27+withannotator|con notas de|con notas de
28+withintroduction|con introduci\'on de|con intr\adddotspace de
29+withforeword|con pr\'ologo de|con pr\'ol\adddotspace de
30+and|y|y
31+andothers|y~col\adddot|y~col\adddot
32+andmore|et\adddotspace al\adddot|et\adddotspace al\adddot
33+volume|volumen|vol\adddot
34+volumes|vol\'umenes|vols\adddot
35+involumes|en|en
36+jourvol|volumen|vol\adddot
37+jourser|\'epoca|\'ep\adddot
38+book|libro|libro
39+part|parte|parte
40+issue|n\'umero|n\'um\adddot
41+newseries|nueva \'epoca|n\adddotspace \'ep\adddot
42+oldseries|antigua \'epoca|ant\adddotspace \'ep\adddot
43+edition|edici\'on|ed\adddot
44+reprintas|reimpreso como|reimp\adddotspace como
45+translationas|traducido como|trad\adddotspace como
46+translationfrom|traducido del|trad\adddotspace del
47+origpubas|publicado originalmente como|pub\adddotspace orig\adddotspace como
48+origpubin|publicado originalmente en|pub\adddot orig\adddot en
49+bypublisher|por la editorial|por la ed\adddot
50+page|p\'agina|p\'ag\adddot
51+pages|p\'aginas|p\'ags\adddot
52+column|columna|col\adddot
53+columns|columnas|cols\adddot
54+verse|verso|v\adddot
55+verses|versos|vv\adddot
56+sections|secciones|secs\adddot
57+pagetotal|p\'agina|p\'ag\adddot
58+pagetotals|p\'aginas|p\'ags\adddot
59+columntotal|columna|col\adddot
60+columntotals|columnas|cols\adddot
61+versetotal|verso|v\adddot
62+versetotals|versos|vv\adddot
63+sectiontotals|secciones|secs\adddot
64+in|en|en
65+inseries|en|en
66+ofseries|de|de
67+number|n\'umero|n\sptext{o
68+chapter|cap\'itulo|cap\adddot
69+bathesis|Tesis de licenciatura|Tesis de lic\adddot
70+phdthesis|Tesis doctoral|Tesis doct\adddot
71+candthesis|Tesis de candidatura doctoral|Tesis de cand\adddotspace doct\adddot
72+techreport|informe t\'ecnico|inf\adddotspace t\'ec\adddot
73+software|programa|prog\adddot
74+datacd|disco de datos|CD de datos
75+audiocd|disco de audio|CD de audio
76+version|versi\'on|ver\adddot
77+url|direcci\'on|direcci\'on
78+urlfrom|disponible desde|disp\adddotspace desde
79+urlseen|visitado|visitado
80+submitted|enviado|enviado
81+forthcoming|pr\'oximamente|prox\adddot
82+inpress|en prensa|en prensa
83+prepublished|previamente publicado|prepublicado
84+citedas|citado en adelante como|cit\adddotspace en adelante como
85+thiscite|especialmente|esp\adddot
86+seenote|ver nota|ver n\adddot
87+quotedin|citado en|cit\adddotspace en
88+loccit|loc\adddotspace cit\adddot|loc\adddot cit\adddot
89+confer|cf\adddot|cf\adddot
90+sequens|s\adddot|s\adddot
91+sequentes|ss\adddot|ss\adddot
92+passim|p\'assim|p\'assim
93+see|v\'ease|vid\adddot
94+seealso|v\'ease tambi\'en|vid\adddotspace tambi\'en
95+backrefpage|v\'ease p\'agina|vid\adddotspace p\'ag\adddot
96+backrefpages|v\'eanse p\'aginas|vid\adddotspace p\'ags\adddot
97+january|enero|ene\adddot
98+february|febrero|feb\adddot
99+march|marzo|mar\adddot
100+april|abril|abr\adddot
101+may|mayo|mayo
102+june|junio|jun\adddot
103+july|julio|jul\adddot
104+august|agosto|ago\adddot
105+september|septiembre|sep\adddot
106+october|octubre|oct\adddot
107+november|noviembre|nov\adddot
108+december|diciembre|dic\adddot
109+langbrazilian|brasile\~no|brasile\~no
110+langbulgarian|b\'ulgaro|b\'ulgaro
111+langcroatian|croata|croata
112+langczech|checo|checo
113+langdanish|dan\'es|dan\'es
114+langdutch|neerland\'es|neerland\'es
115+langenglish|ingl\'es|ingl\'es
116+langestonian|estonio|estonio
117+langfrench|franc\'es|franc\'es
118+langgalician|gallego|gallego
119+langgerman|alem\'an|alem\'an
120+langgreek|griego|griego
121+langhungarian|h\'ungaro|h\'ungaro
122+langitalian|italiano|italiano
123+langjapanese|japon\'es|japon\'es
124+langlatvian|lituano|lituano
125+langnorwegian|noruego|noruego
126+langpolish|polaco|polaco
127+langportuguese|portugu\'es|portugu\'es
128+langrussian|ruso|ruso
129+langslovak|eslovaco|eslovaco
130+langslovene|esloveno|esloveno
131+langspanish|espa\~nol|espa\~nol
132+langswedish|sueco|sueco
133+langukrainian|ucraniano|ucraniano
134+frombrazilian|del brasile\~no|del brasile\~no
135+frombulgarian|del b\'ulgaro|del b\'ulgaro
136+fromcroatian|del croata|del croata
137+fromczech|del checo|del checo
138+fromdanish|del dan\'es|del dan\'es
139+fromdutch|del neerland\'es|del neerland\'es
140+fromenglish|del ingl\'es|del ingl\'es
141+fromestonian|del estonio|del estonio
142+fromfrench|del franc\'es|del franc\'es
143+fromgalician|del gallego|del gallego
144+fromgerman|del alem\'an|del alem\'an
145+fromgreek|del griego|del griego
146+fromhungarian|del h\'ungaro|del h\'ungaro
147+fromitalian|del italiano|del italiano
148+fromjapanese|del japon\'es|del japon\'es
149+fromlatvian|del lituano|del lituano
150+fromnorwegian|del noruego|del noruego
151+frompolish|del polaco|del polaco
152+fromportuguese|del portugu\'es|del portugu\'es
153+fromrussian|del ruso|del ruso
154+fromslovak|del eslovaco|del eslovaco
155+fromslovene|del esloveno|del esloveno
156+fromspanish|del espa\~nol|del espa\~nol
157+fromswedish|del sueco|del sueco
158+fromukrainian|del ucraniano|del ucraniano
159+countryde|Alemania|DE
160+countryeu|Uni\'on Europea|EU
161+countryep|Uni\'on Europea|EP
162+countryfr|Francia|FR
163+countryuk|Reino Unido|GB
164+countryus|Estados Unidos|US
165+patent|patente|pat\adddot
166+patentde|patente alemana|pat\adddotspace alemana
167+patenteu|patente europea|pat\adddotspace europea
168+patentfr|patente francesa|pat\adddotspace francesa
169+patentuk|patente brit\'anica|pat\adddotspace brit\'anica
170+patentus|patente estadounidense|pat\adddotspace estadounidense
171+patreq|solicitud de patente|sol\adddotspace de pat\adddot
172+patreqde|solicitud de patente alemana|sol\adddotspace de pat\adddot alemana
173+patreqeu|solicitud de patente europea|sol\adddotspace de pat\adddot europea
174+patreqfr|solicitud de patente francesa|sol\adddotspace de pat\adddot francesa
175+patrequk|solicitud de patente brit\'anica|sol\adddotspace de pat\adddot brit\'anica
176+patrequs|solicitud de patente estadounidense|sol\adddotspace de pat\adddot estadounidense
177+file|archivo|archivo
178+library|biblioteca|bibl\adddot
179+abstract|resumen|resumen
180+commonera|era com\'un|e\adddotspace c\adddot
181+beforecommonera|antes de la era com\'un|a\adddotspace e\adddotspace c\adddot
182+annodomini|despu\'es de Cristo|d\adddotspace C\adddot
183+beforechrist|antes de Cristo|a\adddotspace C\adddot
184+circa|circa|ca\adddot
185+spring|primavera|prim\adddot
186+summer|verano|ver\adddot
187+autumn|oto\~no|ot\adddot
188+winter|invierno|inv\adddot
189+am|a\adddotspace m\adddot|a\adddot m\adddot
190+pm|p\adddotspace m\adddot|p\adddot m\adddot
citeproc/biblatex-localization/swedish.lbx.stringsnew file+9
@@ -0,0 +1,9 @@
1+bibliography|Litteraturf\"orteckning|Litteratur
2+references|Referenser|Referenser
3+shorthands|F\"orkortningar|F\"orkortningar
4+editor|utgivare|utg\adddot
5+editors|utgivare|utg\adddot
6+compiler|sammanst\"allare|sammanst\adddot
7+compilers|sammanst\"allare|sammanst\adddot
8+redactor|redakt\"or|red\adddot
9+redactors|redakt\"orer|red\adddot
citeproc/biblatex-localization/swissgerman.lbx.stringsnew file+1
@@ -0,0 +1 @@
1+countryuk|Grossbritannien|GB
citeproc/biblatex-localization/turkish.lbx.stringsnew file+157
@@ -0,0 +1,157 @@
1+references|Kaynaklar|Kaynaklar
2+shorthands|K\i saltmalar dizini|K\i saltmalar
3+compiler|derleyen|der\adddot
4+compilers|derleyenler|der\adddot
5+redactor|yay\i na haz\i rlayan|yay\adddot\ haz\adddot
6+redactors|yay\i na haz\i rlayanlar|yay\adddot\ haz\adddot
7+reviser|tashih eden|tashih\adddot
8+revisers|tashih edenler|tashih\adddot
9+founder|kurucu|kur\adddot
10+founders|kurucular|kur\adddot
11+continuator|tamamlayan|tam\adddot
12+continuators|tamamlayanlar|tam\adddot
13+collaborator|ortak|ortak
14+collaborators|ortaklar|ortaklar
15+commentator|yorumlayan|yrm\adddot
16+commentators|yorumlayanlar|yrm\adddot
17+commentary|yorum|yrm\adddot
18+byauthor|yazar|yazar
19+bycompiler|derleyen|der\adddot
20+byredactor|yay\i na haz\i rlayan|yay\adddot\ haz\adddot
21+byreviser|tashih|tashih
22+byfounder|kurucu|kur\adddot
23+bycontinuator|tamamlayan|tam\adddot
24+bycommentator|yorumlayan|yrm\adddot
25+withcommentator|yorumlar\i yla katk\i da bulunan|yrm\adddot\ kat\adddot\ bul\adddot
26+and|ve|ve
27+volume|cilt|c\adddot
28+volumes|cilt|c\adddot
29+jourvol|cilt|c\adddot
30+jourser|seri|seri
31+book|kitap|kitap
32+part|k\i s\i m|k\i s\i m
33+issue|say\i|say\i
34+newseries|yeni seri|yeni seri
35+oldseries|eski seri|eski seri
36+edition|bask\i|bs\adddot
37+reprint|yeni bask\i s\i|yeni bask\i s\i
38+reprintof|yeni bask\i s\i|yeni bask\i s\i
39+reprintas|yeni bask\i s\i|yeni bask\i s\i
40+reprintfrom|yeni bask\i s\i|yeni bask\i s\i
41+reviewof|derlenen eser|der\adddot\ eser
42+origpubas|as\i l eser|as\i l eser
43+origpubin|as\i l eser yay\i n tarihi|as\i l eser yay\i n tarihi
44+bypublisher|yay\i n evi|yay\i n evi
45+nodate|tarih yok|t\adddot y\adddot
46+page|sayfa|s\adddot
47+pages|sayfalar|ss\adddot
48+line|sat\i r|sat\adddot
49+lines|sat\i rlar|sat\adddot
50+verse|m\i sra|m\i s\adddot
51+verses|m\i sralar|m\i s\adddot
52+paragraph|paragraf|par\adddot
53+paragraphs|paragraflar|par\adddot
54+pagetotal|toplam sayfa|s\adddot
55+pagetotals|toplam sayfalar|ss\adddot
56+linetotal|toplam sat\i r|sat\adddot
57+linetotals|toplam sat\i rlar|sat\adddot
58+versetotal|toplam m\i sra|m\i s\adddot
59+versetotals|toplam m\i sralar|m\i s\adddot
60+paragraphtotal|toplam paragraf|par\adddot
61+paragraphtotals|toplam paragraflar|par\adddot
62+inseries|serilerde|serilerde
63+ofseries|serilerde|serilerde
64+number|numara|no\adddot
65+bathesis|lisans tezi|lis\adddot\ tezi
66+phdthesis|doktora tezi|dok\adddot\ tezi
67+candthesis|aday tezi|aday tezi
68+techreport|teknik rapor|tek\adddot\ rap\adddot
69+software|bilgisayar yaz\i l\i m\i|bilg\adddot\ yaz\adddot
70+datacd|CD|CD
71+audiocd|ses CD'si|ses CD'si
72+version|versiyon|ver\adddot
73+forthcoming|yak\i nda|yak\i nda
74+prepublished|taslak bas\i m\i|taslak bas\i m\i
75+citedas|at\i f olarak|at\i f olarak
76+seenote|nota bak\i n\i z|nota bkz\adddot
77+quotedin|al\i nt\i|al\i nt\i
78+idem|ayn\i|ayn\i
79+idemsm|ayn\i|ayn\i
80+idemsf|ayn\i|ayn\i
81+idemsn|ayn\i|ayn\i
82+idempm|ayn\i lar\i|ayn\i lar\i
83+idempf|ayn\i lar\i|ayn\i lar\i
84+idempn|ayn\i lar\i|ayn\i lar\i
85+idempp|ayn\i lar\i|ayn\i lar\i
86+loccit|at\i f yap\i lan yer|at\i f yap\adddot\ yer
87+sequens|takip eden|takip eden
88+sequentes|takip eden|takip eden
89+passim|rastgele|rastgele
90+see|bak\i n\i z|bkz\adddot
91+seealso|ayr\i ca bak\i n\i z|ayr\i ca bkz\adddot
92+january|Ocak|Ocak
93+march|Mart|Mar\adddot
94+april|Nisan|Nis\adddot
95+may|May\i s|May\adddot
96+june|Haziran|Haz\adddot
97+july|Temmuz|Tem\adddot
98+october|Ekim|Ekim
99+november|Kas\i m|Kas\adddot
100+december|Aral\i k|Ara\adddot
101+langamerican|Amerikanca|Amerikanca
102+langbrazilian|Brezilyanca|Brezilyanca
103+langbulgarian|Bulgarca|Bulgarca
104+langcatalan|Katalanca|Katalanca
105+langdanish|Danimarkanca|Danimarkanca
106+langestonian|Estonca|Estonca
107+langfinnish|Fince|Fince
108+langfrench|Frans\i zca|Frans\i zca
109+langgalician|Galce|Galce
110+langgerman|Almanca|Almanca
111+langgreek|Yunanca|Yunanca
112+langhungarian|Macarca|Macarca
113+langjapanese|Japonca|Japonca
114+langlatin|Latince|Latince
115+langlatvian|Letonca|Letonca
116+langlithuanian|Litvanca|Litvanca
117+langpolish|Polonyaca|Polonyaca
118+langportuguese|Portekizce|Portekizce
119+langslovene|Slovence|Slovence
120+langukrainian|Ukraynaca|Ukraynaca
121+fromamerican|Amerikanca'dan|Amerikanca'dan
122+frombrazilian|Brezilyanca'dan|Brezilyanca'dan
123+frombulgarian|Bulgarca'dan|Bulgarca'dan
124+fromcatalan|Katalanca'dan|Katalanca'dan
125+fromdanish|Danimarkanca'dan|Danimarkanca'dan
126+fromestonian|Estonyaca'dan|Estonyaca'dan
127+fromfinnish|Fince'den|Fince'den
128+fromfrench|Frans\i zca'dan|Frans\i zca'dan
129+fromgalician|Galyaca'dan|Galyaca'dan
130+fromgerman|Almanca'dan|Almanca'dan
131+fromgreek|Yunanca'dan|Yunanca'dan
132+fromhungarian|Macarca'dan|Macarca'dan
133+fromjapanese|Japonca'dan|Japonca'dan
134+fromlatin|Latince'den|Latince'den
135+fromlatvian|Latvianca'dan|Latvianca'dan
136+fromlithuanian|Litvanca'dan|Litvanca'dan
137+frompolish|Polonyaca'dan|Polonyaca'dan
138+fromportuguese|Portekizce'den|Portekizce'den
139+fromslovene|Slovence'den|Slovence'den
140+fromukrainian|Ukraynaca'dan|Ukraynaca'dan
141+countryde|Almanya|DE
142+countryfr|Fransa|FR
143+patent|patent|pat\adddot
144+patentde|Alman patenti|Alman pat\adddot
145+patenteu|Avrupa patenti|Avrupa pat\adddot
146+patentfr|Frans\i z patenti|Frans\i z pat\adddot
147+patentus|Amerika patenti|Amerika pat\adddot
148+patreq|patent beklemede|pat\adddot\ bek\adddot
149+patreqde|Alman patenti beklemede|Alman pat\adddot\ bek\adddot
150+patreqeu|Avrupa patenti beklemede|Avrupa pat\adddot\ bek\adddot
151+patreqfr|Frans\i z patenti beklemede|Frans\i z pat\adddot\ bek\adddot
152+patrequs|Amerika patenti beklemede|Amerika pat\adddot\ bek\adddot
153+file|dosya|dosya
154+commonera|milattan sonra|MS
155+annodomini|milattan sonra|MS
156+summer|Yaz|Yaz
157+autumn|Sonbahar|Sonbahar
citeproc/biblatex-localization/ukrainian.lbx.stringsnew file+102
@@ -0,0 +1,102 @@
1+bibliography|Перелік літератури|Література
2+references|Перелік літератури|Література
3+shorthands|Перелік скорочень|Скорочення
4+editor|редактор|ред\adddot
5+editors|редактори|ред\adddot
6+compiler|укладач|уклад\adddot
7+compilers|укладачі|уклад\adddot
8+redactor|редактор|ред\adddot
9+redactors|редактори|ред\adddot
10+reviser|ревізійний коректор|ревіз\adddotspace кор\adddot
11+revisers|ревізійні коректори|ревіз\adddotspace кор\adddot
12+founder|засновник|засн\adddot
13+founders|засновник|засн\adddot
14+continuator|продовжувач|прод\adddot
15+continuators|продовжувачі|прод\adddot
16+collaborator|учасник|учас\adddot
17+collaborators|учасники|учас\adddot
18+translator|перекладач|пер\adddot
19+translators|перекладачі|пер\adddot
20+commentator|коментатор|комент\adddot
21+commentators|коментатори|комент\adddot
22+annotator|примітки|прим\adddot
23+annotators|примітки|прим\adddot
24+commentary|коментар|комент\adddot
25+annotations|примітки|прим\adddot
26+introduction|вступна стаття|вступ\adddotspace ст\adddot
27+foreword|передмова|передм\adddot
28+afterword|післямова|післям\adddot
29+organizer|організатор|орг\adddot
30+organizers|організатори|орг\adddot
31+byorganizer|організатор|орг\adddot
32+byauthor|згідно автора|згідн\adddot авт\adddot
33+byeditor|за редакцією|за\addabbrvspace ред\adddot
34+bycompiler|укладач|уклад\adddot
35+byredactor|за редакцією|за\addabbrvspace ред\adddot
36+byreviser|виправлено|випр\adddot
37+byreviewer|рецензія|рец\adddot
38+byfounder|засновник|засн\adddot
39+bycontinuator|продовження|продовж\adddot
40+bycollaborator|за участю|за\addabbrvspace уч\adddot
41+bytranslator|переклад \lbx@lfromlang|пер\adddot\ \lbx@sfromlang
42+bycommentator|коментарі|комент\adddot
43+byannotator|примітки|прим\adddot
44+withcommentator|коментарі|комент\adddot
45+withannotator|примітки|прим\adddot
46+withintroduction|вступна стаття|вступ\adddotspace ст\adddot
47+withforeword|передмовие|передм\adddot
48+withafterword|післямовие|післям\adddot
49+and|та|та
50+andothers|та\addabbrvspace ін\adddot|та\addabbrvspace ін\adddot
51+andmore|та\addabbrvspace ін\adddot|та\addabbrvspace ін\adddot
52+volume|том|т\adddot
53+volumes|томах|т\adddot
54+involumes|в|в
55+jourvol|том|т\adddot
56+jourser|серія|сер\adddot
57+book|книга|кн\adddot
58+part|частина|ч\adddot
59+issue|випуск|вип\adddot
60+newseries|нова серія|нов\adddotspace сер\adddot
61+oldseries|стара серія|стар\adddotspace сер\adddot
62+edition|видання|вид\adddot
63+reprint|перевидання|перевид\adddot
64+reprintof|перевидання|перевид\adddot
65+reprintas|перевидано як|перевид\adddotspace як
66+reprintfrom|перевидано з|перевид\adddotspace з
67+translationof|переклад по виданню\addcolon|пер\adddotspace по вид\adddot\addcolon
68+translationas|переклад\addcolon|пер\adddot\addcolon
69+translationfrom|переклад з|пер\adddotspace з
70+reviewof|рецензія на\addcolon|рец\adddotspace на\addcolon
71+astitle|\addcolon|\addcolon
72+bypublisher|\addcomma|\addcomma
73+nodate|б\adddot р\adddot|б\adddot р\adddot
74+page|сторінка|с\adddot
75+pages|сторінки|с\adddot
76+column|колонка|кол\adddot
77+columns|колонки|кол\adddot
78+line|рядок|рядок
79+lines|рядки|рядки
80+verse|вірш|вірш
81+verses|вірші|вірші
82+section|параграф|\S
83+sections|параграфи|\S\S
84+paragraph|абзац|абз\adddot
85+paragraphs|абзаци|абз\adddot
86+pagetotal|сторінка|с\adddot
87+pagetotals|сторінки|с\adddot
88+columntotal|колонка|кол\adddot
89+columntotals|колонки|кол\adddot
90+linetotal|рядок|рядок
91+linetotals|рядки|рядки
92+versetotal|вірш|вірш
93+versetotals|вірші|вірші
94+sectiontotal|параграф|\S
95+sectiontotals|параграфи|\S\S
96+paragraphtotal|абзац|абз\adddot
97+paragraphtotals|абзаци|абз\adddot
98+in|в|в
99+inseries|в|в
100+ofseries|із|із
101+number|номер|№
102+chapter|глава|гл\adddot
data/default.cslnew file+658
@@ -0,0 +1,658 @@
1+<?xml version="1.0" encoding="utf-8"?>
2+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="display-and-sort" page-range-format="chicago">
3+ <info>
4+ <title>Chicago Manual of Style 17th edition (author-date)</title>
5+ <id>http://www.zotero.org/styles/chicago-author-date</id>
6+ <link href="http://www.zotero.org/styles/chicago-author-date" rel="self"/>
7+ <link href="http://www.chicagomanualofstyle.org/tools_citationguide.html" rel="documentation"/>
8+ <author>
9+ <name>Julian Onions</name>
10+ <email>julian.onions@gmail.com</email>
11+ </author>
12+ <contributor>
13+ <name>Sebastian Karcher</name>
14+ </contributor>
15+ <contributor>
16+ <name>Richard Karnesky</name>
17+ <email>karnesky+zotero@gmail.com</email>
18+ <uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri>
19+ </contributor>
20+ <contributor>
21+ <name>Andrew Dunning</name>
22+ <email>andrew.dunning@utoronto.ca</email>
23+ <uri>https://orcid.org/0000-0003-0464-5036</uri>
24+ </contributor>
25+ <contributor>
26+ <name>Matthew Roth</name>
27+ <email>matthew.g.roth@yale.edu</email>
28+ <uri> https://orcid.org/0000-0001-7902-6331</uri>
29+ </contributor>
30+ <contributor>
31+ <name>Brenton M. Wiernik</name>
32+ </contributor>
33+ <category citation-format="author-date"/>
34+ <category field="generic-base"/>
35+ <summary>The author-date variant of the Chicago style</summary>
36+ <updated>2018-01-24T12:00:00+00:00</updated>
37+ <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
38+ </info>
39+ <locale xml:lang="en">
40+ <terms>
41+ <term name="editor" form="verb-short">ed.</term>
42+ <term name="container-author" form="verb">by</term>
43+ <term name="translator" form="verb-short">trans.</term>
44+ <term name="editortranslator" form="verb">edited and translated by</term>
45+ <term name="translator" form="short">trans.</term>
46+ </terms>
47+ </locale>
48+ <macro name="secondary-contributors">
49+ <choose>
50+ <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="none">
51+ <group delimiter=". ">
52+ <names variable="editor translator" delimiter=". ">
53+ <label form="verb" text-case="capitalize-first" suffix=" "/>
54+ <name and="text" delimiter=", "/>
55+ </names>
56+ <names variable="director" delimiter=". ">
57+ <label form="verb" text-case="capitalize-first" suffix=" "/>
58+ <name and="text" delimiter=", "/>
59+ </names>
60+ </group>
61+ </if>
62+ </choose>
63+ </macro>
64+ <macro name="container-contributors">
65+ <choose>
66+ <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
67+ <group prefix=", " delimiter=", ">
68+ <names variable="container-author" delimiter=", ">
69+ <label form="verb" suffix=" "/>
70+ <name and="text" delimiter=", "/>
71+ </names>
72+ <names variable="editor translator" delimiter=", ">
73+ <label form="verb" suffix=" "/>
74+ <name and="text" delimiter=", "/>
75+ </names>
76+ </group>
77+ </if>
78+ </choose>
79+ </macro>
80+ <macro name="editor">
81+ <names variable="editor">
82+ <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
83+ <label form="short" prefix=", "/>
84+ </names>
85+ </macro>
86+ <macro name="translator">
87+ <names variable="translator">
88+ <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
89+ <label form="short" prefix=", "/>
90+ </names>
91+ </macro>
92+ <macro name="recipient">
93+ <choose>
94+ <if type="personal_communication">
95+ <choose>
96+ <if variable="genre">
97+ <text variable="genre" text-case="capitalize-first"/>
98+ </if>
99+ <else>
100+ <text term="letter" text-case="capitalize-first"/>
101+ </else>
102+ </choose>
103+ </if>
104+ </choose>
105+ <names variable="recipient" delimiter=", ">
106+ <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
107+ <name and="text" delimiter=", "/>
108+ </names>
109+ </macro>
110+ <macro name="substitute-title">
111+ <choose>
112+ <if type="article-magazine article-newspaper review review-book" match="any">
113+ <text macro="container-title"/>
114+ </if>
115+ </choose>
116+ </macro>
117+ <macro name="contributors">
118+ <group delimiter=". ">
119+ <names variable="author">
120+ <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
121+ <label form="short" prefix=", "/>
122+ <substitute>
123+ <names variable="editor"/>
124+ <names variable="translator"/>
125+ <names variable="director"/>
126+ <text macro="substitute-title"/>
127+ <text macro="title"/>
128+ </substitute>
129+ </names>
130+ <text macro="recipient"/>
131+ </group>
132+ </macro>
133+ <macro name="contributors-short">
134+ <names variable="author">
135+ <name form="short" and="text" delimiter=", " initialize-with=". "/>
136+ <substitute>
137+ <names variable="editor"/>
138+ <names variable="translator"/>
139+ <names variable="director"/>
140+ <text macro="substitute-title"/>
141+ <text macro="title"/>
142+ </substitute>
143+ </names>
144+ </macro>
145+ <macro name="interviewer">
146+ <names variable="interviewer" delimiter=", ">
147+ <label form="verb" prefix=" " text-case="capitalize-first" suffix=" "/>
148+ <name and="text" delimiter=", "/>
149+ </names>
150+ </macro>
151+ <macro name="archive">
152+ <group delimiter=". ">
153+ <text variable="archive_location" text-case="capitalize-first"/>
154+ <text variable="archive"/>
155+ <text variable="archive-place"/>
156+ </group>
157+ </macro>
158+ <macro name="access">
159+ <group delimiter=". ">
160+ <choose>
161+ <if type="graphic report" match="any">
162+ <text macro="archive"/>
163+ </if>
164+ <else-if type="article-journal bill book chapter legal_case legislation motion_picture paper-conference" match="none">
165+ <text macro="archive"/>
166+ </else-if>
167+ </choose>
168+ <choose>
169+ <if type="webpage post-weblog" match="any">
170+ <date variable="issued" form="text"/>
171+ </if>
172+ </choose>
173+ <choose>
174+ <if variable="issued" match="none">
175+ <group delimiter=" ">
176+ <text term="accessed" text-case="capitalize-first"/>
177+ <date variable="accessed" form="text"/>
178+ </group>
179+ </if>
180+ </choose>
181+ <choose>
182+ <if type="legal_case" match="none">
183+ <choose>
184+ <if variable="DOI">
185+ <text variable="DOI" prefix="https://doi.org/"/>
186+ </if>
187+ <else>
188+ <text variable="URL"/>
189+ </else>
190+ </choose>
191+ </if>
192+ </choose>
193+ </group>
194+ </macro>
195+ <macro name="title">
196+ <choose>
197+ <if variable="title" match="none">
198+ <choose>
199+ <if type="personal_communication" match="none">
200+ <text variable="genre" text-case="capitalize-first"/>
201+ </if>
202+ </choose>
203+ </if>
204+ <else-if type="bill book graphic legislation motion_picture song" match="any">
205+ <text variable="title" text-case="title" font-style="italic"/>
206+ <group prefix=" (" suffix=")" delimiter=" ">
207+ <text term="version"/>
208+ <text variable="version"/>
209+ </group>
210+ </else-if>
211+ <else-if variable="reviewed-author">
212+ <choose>
213+ <if variable="reviewed-title">
214+ <group delimiter=". ">
215+ <text variable="title" text-case="title" quotes="true"/>
216+ <group delimiter=", ">
217+ <text variable="reviewed-title" text-case="title" font-style="italic" prefix="Review of "/>
218+ <names variable="reviewed-author">
219+ <label form="verb-short" text-case="lowercase" suffix=" "/>
220+ <name and="text" delimiter=", "/>
221+ </names>
222+ </group>
223+ </group>
224+ </if>
225+ <else>
226+ <group delimiter=", ">
227+ <text variable="title" text-case="title" font-style="italic" prefix="Review of "/>
228+ <names variable="reviewed-author">
229+ <label form="verb-short" text-case="lowercase" suffix=" "/>
230+ <name and="text" delimiter=", "/>
231+ </names>
232+ </group>
233+ </else>
234+ </choose>
235+ </else-if>
236+ <else-if type="legal_case interview patent" match="any">
237+ <text variable="title"/>
238+ </else-if>
239+ <else>
240+ <text variable="title" text-case="title" quotes="true"/>
241+ </else>
242+ </choose>
243+ </macro>
244+ <macro name="edition">
245+ <choose>
246+ <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
247+ <choose>
248+ <if is-numeric="edition">
249+ <group delimiter=" " prefix=". ">
250+ <number variable="edition" form="ordinal"/>
251+ <text term="edition" form="short" strip-periods="true"/>
252+ </group>
253+ </if>
254+ <else>
255+ <text variable="edition" text-case="capitalize-first" prefix=". "/>
256+ </else>
257+ </choose>
258+ </if>
259+ <else-if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
260+ <choose>
261+ <if is-numeric="edition">
262+ <group delimiter=" " prefix=", ">
263+ <number variable="edition" form="ordinal"/>
264+ <text term="edition" form="short"/>
265+ </group>
266+ </if>
267+ <else>
268+ <text variable="edition" prefix=", "/>
269+ </else>
270+ </choose>
271+ </else-if>
272+ </choose>
273+ </macro>
274+ <macro name="locators">
275+ <choose>
276+ <if type="article-journal">
277+ <choose>
278+ <if variable="volume">
279+ <text variable="volume" prefix=" "/>
280+ <group prefix=" (" suffix=")">
281+ <choose>
282+ <if variable="issue">
283+ <text variable="issue"/>
284+ </if>
285+ <else>
286+ <date variable="issued">
287+ <date-part name="month"/>
288+ </date>
289+ </else>
290+ </choose>
291+ </group>
292+ </if>
293+ <else-if variable="issue">
294+ <group delimiter=" " prefix=", ">
295+ <text term="issue" form="short"/>
296+ <text variable="issue"/>
297+ <date variable="issued" prefix="(" suffix=")">
298+ <date-part name="month"/>
299+ </date>
300+ </group>
301+ </else-if>
302+ <else>
303+ <date variable="issued" prefix=", ">
304+ <date-part name="month"/>
305+ </date>
306+ </else>
307+ </choose>
308+ </if>
309+ <else-if type="legal_case">
310+ <text variable="volume" prefix=", "/>
311+ <text variable="container-title" prefix=" "/>
312+ <text variable="page" prefix=" "/>
313+ </else-if>
314+ <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
315+ <group prefix=". " delimiter=". ">
316+ <group>
317+ <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
318+ <number variable="volume" form="numeric"/>
319+ </group>
320+ <group>
321+ <number variable="number-of-volumes" form="numeric"/>
322+ <text term="volume" form="short" prefix=" " plural="true"/>
323+ </group>
324+ </group>
325+ </else-if>
326+ <else-if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
327+ <choose>
328+ <if variable="page" match="none">
329+ <group prefix=". ">
330+ <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
331+ <number variable="volume" form="numeric"/>
332+ </group>
333+ </if>
334+ </choose>
335+ </else-if>
336+ </choose>
337+ </macro>
338+ <macro name="locators-chapter">
339+ <choose>
340+ <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
341+ <choose>
342+ <if variable="page">
343+ <group prefix=", ">
344+ <text variable="volume" suffix=":"/>
345+ <text variable="page"/>
346+ </group>
347+ </if>
348+ </choose>
349+ </if>
350+ </choose>
351+ </macro>
352+ <macro name="locators-article">
353+ <choose>
354+ <if type="article-newspaper">
355+ <group prefix=", " delimiter=", ">
356+ <group delimiter=" ">
357+ <text variable="edition"/>
358+ <text term="edition"/>
359+ </group>
360+ <group>
361+ <text term="section" form="short" suffix=" "/>
362+ <text variable="section"/>
363+ </group>
364+ </group>
365+ </if>
366+ <else-if type="article-journal">
367+ <choose>
368+ <if variable="volume issue" match="any">
369+ <text variable="page" prefix=": "/>
370+ </if>
371+ <else>
372+ <text variable="page" prefix=", "/>
373+ </else>
374+ </choose>
375+ </else-if>
376+ </choose>
377+ </macro>
378+ <macro name="point-locators">
379+ <choose>
380+ <if variable="locator">
381+ <choose>
382+ <if locator="page" match="none">
383+ <choose>
384+ <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
385+ <choose>
386+ <if variable="volume">
387+ <group>
388+ <text term="volume" form="short" suffix=" "/>
389+ <number variable="volume" form="numeric"/>
390+ <label variable="locator" form="short" prefix=", " suffix=" "/>
391+ </group>
392+ </if>
393+ <else>
394+ <label variable="locator" form="short" suffix=" "/>
395+ </else>
396+ </choose>
397+ </if>
398+ <else>
399+ <label variable="locator" form="short" suffix=" "/>
400+ </else>
401+ </choose>
402+ </if>
403+ <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
404+ <number variable="volume" form="numeric" suffix=":"/>
405+ </else-if>
406+ </choose>
407+ <text variable="locator"/>
408+ </if>
409+ </choose>
410+ </macro>
411+ <macro name="container-prefix">
412+ <text term="in" text-case="capitalize-first"/>
413+ </macro>
414+ <macro name="container-title">
415+ <choose>
416+ <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
417+ <text macro="container-prefix" suffix=" "/>
418+ </if>
419+ </choose>
420+ <choose>
421+ <if type="webpage">
422+ <text variable="container-title" text-case="title"/>
423+ </if>
424+ <else-if type="legal_case" match="none">
425+ <group delimiter=" ">
426+ <text variable="container-title" text-case="title" font-style="italic"/>
427+ <choose>
428+ <if type="post-weblog">
429+ <text value="(blog)"/>
430+ </if>
431+ </choose>
432+ </group>
433+ </else-if>
434+ </choose>
435+ </macro>
436+ <macro name="publisher">
437+ <group delimiter=": ">
438+ <text variable="publisher-place"/>
439+ <text variable="publisher"/>
440+ </group>
441+ </macro>
442+ <macro name="date">
443+ <choose>
444+ <if variable="issued">
445+ <group delimiter=" ">
446+ <date variable="original-date" form="text" date-parts="year" prefix="(" suffix=")"/>
447+ <date variable="issued">
448+ <date-part name="year"/>
449+ </date>
450+ </group>
451+ </if>
452+ <else-if variable="status">
453+ <text variable="status" text-case="capitalize-first"/>
454+ </else-if>
455+ <else>
456+ <text term="no date" form="short"/>
457+ </else>
458+ </choose>
459+ </macro>
460+ <macro name="date-in-text">
461+ <choose>
462+ <if variable="issued">
463+ <group delimiter=" ">
464+ <date variable="original-date" form="text" date-parts="year" prefix="[" suffix="]"/>
465+ <date variable="issued">
466+ <date-part name="year"/>
467+ </date>
468+ </group>
469+ </if>
470+ <else-if variable="status">
471+ <text variable="status"/>
472+ </else-if>
473+ <else>
474+ <text term="no date" form="short"/>
475+ </else>
476+ </choose>
477+ </macro>
478+ <macro name="day-month">
479+ <date variable="issued">
480+ <date-part name="month"/>
481+ <date-part name="day" prefix=" "/>
482+ </date>
483+ </macro>
484+ <macro name="collection-title">
485+ <choose>
486+ <if match="none" type="article-journal">
487+ <choose>
488+ <if match="none" is-numeric="collection-number">
489+ <group delimiter=", ">
490+ <text variable="collection-title" text-case="title"/>
491+ <text variable="collection-number"/>
492+ </group>
493+ </if>
494+ <else>
495+ <group delimiter=" ">
496+ <text variable="collection-title" text-case="title"/>
497+ <text variable="collection-number"/>
498+ </group>
499+ </else>
500+ </choose>
501+ </if>
502+ </choose>
503+ </macro>
504+ <macro name="collection-title-journal">
505+ <choose>
506+ <if type="article-journal">
507+ <group delimiter=" ">
508+ <text variable="collection-title"/>
509+ <text variable="collection-number"/>
510+ </group>
511+ </if>
512+ </choose>
513+ </macro>
514+ <macro name="event">
515+ <group delimiter=" ">
516+ <choose>
517+ <if variable="genre">
518+ <text term="presented at"/>
519+ </if>
520+ <else>
521+ <text term="presented at" text-case="capitalize-first"/>
522+ </else>
523+ </choose>
524+ <text variable="event"/>
525+ </group>
526+ </macro>
527+ <macro name="description">
528+ <choose>
529+ <if type="interview">
530+ <group delimiter=". ">
531+ <text macro="interviewer"/>
532+ <text variable="medium" text-case="capitalize-first"/>
533+ </group>
534+ </if>
535+ <else-if type="patent">
536+ <group delimiter=" " prefix=". ">
537+ <text variable="authority"/>
538+ <text variable="number"/>
539+ </group>
540+ </else-if>
541+ <else>
542+ <text variable="medium" text-case="capitalize-first" prefix=". "/>
543+ </else>
544+ </choose>
545+ <choose>
546+ <if variable="title" match="none"/>
547+ <else-if type="thesis personal_communication speech" match="any"/>
548+ <else>
549+ <group delimiter=" " prefix=". ">
550+ <text variable="genre" text-case="capitalize-first"/>
551+ <choose>
552+ <if type="report">
553+ <text variable="number"/>
554+ </if>
555+ </choose>
556+ </group>
557+ </else>
558+ </choose>
559+ </macro>
560+ <macro name="issue">
561+ <choose>
562+ <if type="legal_case">
563+ <text variable="authority" prefix=". "/>
564+ </if>
565+ <else-if type="speech">
566+ <group prefix=". " delimiter=", ">
567+ <group delimiter=" ">
568+ <text variable="genre" text-case="capitalize-first"/>
569+ <text macro="event"/>
570+ </group>
571+ <text variable="event-place"/>
572+ <text macro="day-month"/>
573+ </group>
574+ </else-if>
575+ <else-if type="article-newspaper article-magazine personal_communication" match="any">
576+ <date variable="issued" form="text" prefix=", "/>
577+ </else-if>
578+ <else-if type="patent">
579+ <group delimiter=", " prefix=", ">
580+ <group delimiter=" ">
581+ <!--Needs Localization-->
582+ <text value="filed"/>
583+ <date variable="submitted" form="text"/>
584+ </group>
585+ <group delimiter=" ">
586+ <choose>
587+ <if variable="issued submitted" match="all">
588+ <text term="and"/>
589+ </if>
590+ </choose>
591+ <!--Needs Localization-->
592+ <text value="issued"/>
593+ <date variable="issued" form="text"/>
594+ </group>
595+ </group>
596+ </else-if>
597+ <else-if type="article-journal" match="any"/>
598+ <else>
599+ <group prefix=". " delimiter=", ">
600+ <choose>
601+ <if type="thesis">
602+ <text variable="genre" text-case="capitalize-first"/>
603+ </if>
604+ </choose>
605+ <text macro="publisher"/>
606+ </group>
607+ </else>
608+ </choose>
609+ </macro>
610+ <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" givenname-disambiguation-rule="primary-name" collapse="year" after-collapse-delimiter="; ">
611+ <layout prefix="(" suffix=")" delimiter="; ">
612+ <group delimiter=", ">
613+ <choose>
614+ <if variable="issued accessed" match="any">
615+ <group delimiter=" ">
616+ <text macro="contributors-short"/>
617+ <text macro="date-in-text"/>
618+ </group>
619+ </if>
620+ <!---comma before forthcoming and n.d.-->
621+ <else>
622+ <group delimiter=", ">
623+ <text macro="contributors-short"/>
624+ <text macro="date-in-text"/>
625+ </group>
626+ </else>
627+ </choose>
628+ <text macro="point-locators"/>
629+ </group>
630+ </layout>
631+ </citation>
632+ <bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="&#8212;&#8212;&#8212;" entry-spacing="0">
633+ <sort>
634+ <key macro="contributors"/>
635+ <key variable="issued"/>
636+ <key variable="title"/>
637+ </sort>
638+ <layout suffix=".">
639+ <group delimiter=". ">
640+ <text macro="contributors"/>
641+ <text macro="date"/>
642+ <text macro="title"/>
643+ </group>
644+ <text macro="description"/>
645+ <text macro="secondary-contributors" prefix=". "/>
646+ <text macro="container-title" prefix=". "/>
647+ <text macro="container-contributors"/>
648+ <text macro="edition"/>
649+ <text macro="locators-chapter"/>
650+ <text macro="collection-title-journal" prefix=", " suffix=", "/>
651+ <text macro="locators"/>
652+ <text macro="collection-title" prefix=". "/>
653+ <text macro="issue"/>
654+ <text macro="locators-article"/>
655+ <text macro="access" prefix=". "/>
656+ </layout>
657+ </bibliography>
658+</style>
data/docx/word/settings.xml+6−16
@@ -1,6 +1,6 @@
1<?xml version="1.0" encoding="UTF-8"?>
1<?xml version="1.0" encoding="UTF-8"?>
2<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">
2<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">
3− <w:zoom w:percent="90" />
3+ <w:zoom w:percent="100" />
4 <w:embedSystemFonts />
4 <w:embedSystemFonts />
5 <w:proofState w:spelling="clean" w:grammar="clean" />
5 <w:proofState w:spelling="clean" w:grammar="clean" />
6 <w:stylePaneFormatFilter w:val="0004" />
6 <w:stylePaneFormatFilter w:val="0004" />
@@ -17,31 +17,21 @@
17 <w:characterSpacingControl w:val="doNotCompress" />
17 <w:characterSpacingControl w:val="doNotCompress" />
18 <w:savePreviewPicture />
18 <w:savePreviewPicture />
19 <w:rsids>
19 <w:rsids>
20− <w:rsidRoot w:val="00590D07" />
21− <w:rsid w:val="00011C8B" />
22− <w:rsid w:val="004E29B3" />
23− <w:rsid w:val="00590D07" />
24− <w:rsid w:val="00784D58" />
25− <w:rsid w:val="008D6863" />
26− <w:rsid w:val="00B86B75" />
27− <w:rsid w:val="00BC48D5" />
28− <w:rsid w:val="00C36279" />
29− <w:rsid w:val="00E315A3" />
30 </w:rsids>
20 </w:rsids>
31 <m:mathPr>
21 <m:mathPr>
32− <m:mathFont m:val="Lucida Grande" />
22+ <m:mathFont m:val="Cambria Math" />
33 <m:brkBin m:val="before" />
23 <m:brkBin m:val="before" />
34 <m:brkBinSub m:val="--" />
24 <m:brkBinSub m:val="--" />
35− <m:smallFrac m:val="false" />
25+ <m:smallFrac m:val="0" />
36− <m:dispDef m:val="false" />
26+ <m:dispDef />
37 <m:lMargin m:val="0" />
27 <m:lMargin m:val="0" />
38 <m:rMargin m:val="0" />
28 <m:rMargin m:val="0" />
39 <m:wrapRight />
29 <m:wrapRight />
40 <m:intLim m:val="subSup" />
30 <m:intLim m:val="subSup" />
41− <m:naryLim m:val="subSup" />
31+ <m:naryLim m:val="undOvr" />
42 </m:mathPr>
32 </m:mathPr>
43 <w:themeFontLang w:val="en-US" />
33 <w:themeFontLang w:val="en-US" />
44 <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" />
34 <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" />
45 <w:decimalSymbol w:val="." />
35 <w:decimalSymbol w:val="." />
46 <w:listSeparator w:val="," />
36 <w:listSeparator w:val="," />
47−</w:settings>
37+</w:settings>
data/docx/word/styles.xml+15
@@ -350,6 +350,21 @@
350 <w:right w:w="108" w:type="dxa" />
350 <w:right w:w="108" w:type="dxa" />
351 </w:tblCellMar>
351 </w:tblCellMar>
352 </w:tblPr>
352 </w:tblPr>
353+ <w:tblStylePr w:type="firstRow">
354+ <w:tblPr>
355+ <w:jc w:val="left"/>
356+ <w:tblInd w:w="0" w:type="dxa"/>
357+ </w:tblPr>
358+ <w:trPr>
359+ <w:jc w:val="left"/>
360+ </w:trPr>
361+ <w:tcPr>
362+ <w:vAlign w:val="bottom"/>
363+ <w:tcBorders>
364+ <w:bottom w:val="single"/>
365+ </w:tcBorders>
366+ </w:tcPr>
367+ </w:tblStylePr>
353 </w:style>
368 </w:style>
354 <w:style w:type="paragraph" w:customStyle="1" w:styleId="DefinitionTerm">
369 <w:style w:type="paragraph" w:customStyle="1" w:styleId="DefinitionTerm">
355 <w:name w:val="Definition Term" />
370 <w:name w:val="Definition Term" />
data/make-reference-files.hsdeleted−27
@@ -1,27 +0,0 @@
1−import System.Environment
2−import System.Directory
3−import Codec.Archive.Zip
4−import qualified Data.ByteString.Lazy as BS
5−import qualified Control.Exception as E
6−import System.IO.Error (isDoesNotExistError)
7−import System.FilePath
8−
9−mkzip :: String -> IO ()
10−mkzip fmt = do
11− let dir = "data" </> fmt
12− output = "data" </> "reference" <.> fmt
13− cd <- getCurrentDirectory
14− setCurrentDirectory dir
15− archive <- addFilesToArchive [OptRecursive] emptyArchive ["."]
16− setCurrentDirectory cd
17− removeIfExists output
18− BS.writeFile output $ fromArchive archive
19−
20−removeIfExists :: FilePath -> IO ()
21−removeIfExists fileName = removeFile fileName `E.catch` handleExists
22− where handleExists e
23− | isDoesNotExistError e = return ()
24− | otherwise = E.throwIO e
25−
26−main :: IO ()
27−main = getArgs >>= mkzip . (!!0)
data/odt/styles.xml+1−1
@@ -350,7 +350,7 @@ xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2">
350 </style:style>
350 </style:style>
351 <style:style style:name="First_20_paragraph"
351 <style:style style:name="First_20_paragraph"
352 style:display-name="First paragraph" style:family="paragraph"
352 style:display-name="First paragraph" style:family="paragraph"
353− style:parent-style-name="Standard"
353+ style:parent-style-name="Text_20_body"
354 style:next-style-name="Text_20_body" style:class="text" />
354 style:next-style-name="Text_20_body" style:class="text" />
355 <style:style style:name="Numbering_20_Symbols"
355 <style:style style:name="Numbering_20_Symbols"
356 style:display-name="Numbering Symbols" style:family="text" />
356 style:display-name="Numbering Symbols" style:family="text" />
data/pandoc.lua+24
@@ -1058,6 +1058,30 @@ M.ListAttributes.behavior.__pairs = function(t)
1058 return make_next_function(fields), t, nil
1058 return make_next_function(fields), t, nil
1059end
1059end
1060
1060
1061+--
1062+-- Legacy and compatibility types
1063+--
1064+
1065+--- Creates a simple (old style) table element.
1066+-- @function SimpleTable
1067+-- @tparam {Inline,...} caption table caption
1068+-- @tparam {AlignDefault|AlignLeft|AlignRight|AlignCenter,...} aligns alignments
1069+-- @tparam {int,...} widths column widths
1070+-- @tparam {Block,...} headers header row
1071+-- @tparam {{Block,...}} rows table rows
1072+-- @treturn Block table element
1073+M.SimpleTable = function(caption, aligns, widths, headers, rows)
1074+ return {
1075+ caption = ensureInlineList(caption),
1076+ aligns = List:new(aligns),
1077+ widths = List:new(widths),
1078+ headers = List:new(headers),
1079+ rows = List:new(rows),
1080+ tag = "SimpleTable",
1081+ t = "SimpleTable",
1082+ }
1083+end
1084+
1061
1085
1062------------------------------------------------------------------------
1086------------------------------------------------------------------------
1063-- Constants
1087-- Constants
data/sample.lua+7−8
@@ -21,7 +21,7 @@ local stringify = (require "pandoc.utils").stringify
21-- configure the writer.
21-- configure the writer.
22local meta = PANDOC_DOCUMENT.meta
22local meta = PANDOC_DOCUMENT.meta
23
23
24−-- Chose the image format based on the value of the
24+-- Choose the image format based on the value of the
25-- `image_format` meta value.
25-- `image_format` meta value.
26local image_format = meta.image_format
26local image_format = meta.image_format
27 and stringify(meta.image_format)
27 and stringify(meta.image_format)
@@ -45,9 +45,9 @@ local function escape(s, in_attribute)
45 return '&gt;'
45 return '&gt;'
46 elseif x == '&' then
46 elseif x == '&' then
47 return '&amp;'
47 return '&amp;'
48− elseif x == '"' then
48+ elseif in_attribute and x == '"' then
49 return '&quot;'
49 return '&quot;'
50− elseif x == "'" then
50+ elseif in_attribute and x == "'" then
51 return '&#39;'
51 return '&#39;'
52 else
52 else
53 return x
53 return x
@@ -141,8 +141,8 @@ function Strikeout(s)
141 return '<del>' .. s .. '</del>'
141 return '<del>' .. s .. '</del>'
142end
142end
143
143
144−function Link(s, src, tit, attr)
144+function Link(s, tgt, tit, attr)
145− return "<a href='" .. escape(src,true) .. "' title='" ..
145+ return "<a href='" .. escape(tgt,true) .. "' title='" ..
146 escape(tit,true) .. "'>" .. s .. "</a>"
146 escape(tit,true) .. "'>" .. s .. "</a>"
147end
147end
148
148
@@ -271,7 +271,7 @@ end
271
271
272-- Convert pandoc alignment to something HTML can use.
272-- Convert pandoc alignment to something HTML can use.
273-- align is AlignLeft, AlignRight, AlignCenter, or AlignDefault.
273-- align is AlignLeft, AlignRight, AlignCenter, or AlignDefault.
274−function html_align(align)
274+local function html_align(align)
275 if align == 'AlignLeft' then
275 if align == 'AlignLeft' then
276 return 'left'
276 return 'left'
277 elseif align == 'AlignRight' then
277 elseif align == 'AlignRight' then
@@ -286,7 +286,7 @@ end
286function CaptionedImage(src, tit, caption, attr)
286function CaptionedImage(src, tit, caption, attr)
287 return '<div class="figure">\n<img src="' .. escape(src,true) ..
287 return '<div class="figure">\n<img src="' .. escape(src,true) ..
288 '" title="' .. escape(tit,true) .. '"/>\n' ..
288 '" title="' .. escape(tit,true) .. '"/>\n' ..
289− '<p class="caption">' .. caption .. '</p>\n</div>'
289+ '<p class="caption">' .. escape(caption) .. '</p>\n</div>'
290end
290end
291
291
292-- Caption is a string, aligns is an array of strings,
292-- Caption is a string, aligns is an array of strings,
@@ -357,4 +357,3 @@ meta.__index =
357 return function() return "" end
357 return function() return "" end
358 end
358 end
359setmetatable(_G, meta)
359setmetatable(_G, meta)
360−
data/templates/.github/ISSUE_TEMPLATE.mddeleted−3
@@ -1,3 +0,0 @@
1−This repository is now maintained as a subtree of
2−[jgm/pandoc](https://github.com/jgm/pandoc). Please open
3−your issue there, not here.
data/templates/.github/PULL_REQUEST_TEMPLATE.mddeleted−4
@@ -1,4 +0,0 @@
1−This repository is now maintained as a subtree of
2−[jgm/pandoc](https://github.com/jgm/pandoc). Please open
3−your pull request there, not here.
4−
data/templates/README.markdowndeleted−49
@@ -1,49 +0,0 @@
1−The [pandoc-templates] repository contains default templates for [pandoc].
2−
3−If you use custom templates, we recommend forking this
4−repository, so that you can integrate changes to the default
5−templates in future pandoc releases.
6−
7−This repository is a subtree of [pandoc]; it will be updated
8−each time there is a new pandoc release. However, changes to
9−templates are made first in [pandoc]; thus, issues and pull
10−requests should be made [pandoc]'s issue tracker rather than
11−here.
12−
13−[pandoc]: https://github.com/jgm/pandoc
14−[pandoc-templates]: https://github.com/jgm/pandoc-templates
15−
16−All of the templates in this repository are dual licensed, under both
17−the GPL (v2 or higher, same as pandoc) and the BSD 3-clause license
18−(included below).
19−
20−Copyright (c) 2014--2019, John MacFarlane
21−
22−All rights reserved.
23−
24−Redistribution and use in source and binary forms, with or without
25−modification, are permitted provided that the following conditions are met:
26−
27−* Redistributions of source code must retain the above copyright
28− notice, this list of conditions and the following disclaimer.
29−
30−* Redistributions in binary form must reproduce the above
31− copyright notice, this list of conditions and the following
32− disclaimer in the documentation and/or other materials provided
33− with the distribution.
34−
35−* Neither the name of John MacFarlane nor the names of other
36− contributors may be used to endorse or promote products derived
37− from this software without specific prior written permission.
38−
39−THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
40−"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
41−LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
42−A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
43−OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
44−SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
45−LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
46−DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
47−THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
48−(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
49−OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
data/templates/affiliations.jatsnew file+38
@@ -0,0 +1,38 @@
1+$--
2+$-- Affiliations
3+$--
4+$for(affiliation)$
5+<aff id="aff-$affiliation.id$">
6+$-- wrap affiliation if it has a known institution identifier
7+$if(affiliation.group)$
8+<institution content-type="group">$affiliation.group$</institution>
9+$endif$
10+$if(affiliation.department)$
11+<institution content-type="dept">$affiliation.department$</institution>
12+$endif$
13+<institution-wrap>
14+$if(affiliation.organization)$
15+<institution>$affiliation.organization$</institution>
16+$else$
17+<institution>$affiliation.name$</institution>
18+$endif$
19+$if(affiliation.isni)$
20+<institution-id institution-id-type="ISNI">$affiliation.isni$</institution-id>
21+$endif$
22+$if(affiliation.ringgold)$
23+<institution-id institution-id-type="Ringgold">$affiliation.ringgold$</institution-id>
24+$endif$
25+$if(affiliation.ror)$
26+<institution-id institution-id-type="ROR">$affiliation.ror$</institution-id>
27+$endif$
28+$for(affiliation.pid)$
29+<institution-id institution-id-type="$affiliation.pid.type$">$affiliation.pid.id$</institution-id>
30+$endfor$
31+</institution-wrap>$if(affiliation.street-address)$,
32+$for(affiliation.street-address)$
33+<addr-line>$affiliation.street-address$</addr-line>$sep$,
34+$endfor$
35+$else$$if(affiliation.city)$, <city>$affiliation.city$</city>$endif$$endif$$if(affiliation.country)$,
36+<country$if(affiliation.country-code)$ country="$affiliation.country-code$"$endif$>$affiliation.country$</country>$endif$
37+</aff>
38+$endfor$
data/templates/article.jats_publishing+23−7
@@ -14,6 +14,13 @@ $endif$
14$if(journal.pmc)$
14$if(journal.pmc)$
15<journal-id journal-id-type="pmc">$journal.pmc$</journal-id>
15<journal-id journal-id-type="pmc">$journal.pmc$</journal-id>
16$endif$
16$endif$
17+$-- Fallback: an empty journal-id in case none is available.
18+$if(journal.publisher-id)$
19+$elseif(journal.nlm-ta)$
20+$elseif(journal.pmc)$
21+$else$
22+<journal-id></journal-id>
23+$endif$
17<journal-title-group>
24<journal-title-group>
18$if(journal.title)$
25$if(journal.title)$
19<journal-title>$journal.title$</journal-title>
26<journal-title>$journal.title$</journal-title>
@@ -23,10 +30,16 @@ $if(journal.abbrev-title)$
23$endif$
30$endif$
24</journal-title-group>
31</journal-title-group>
25$if(journal.pissn)$
32$if(journal.pissn)$
26−<issn pub-type="ppub">$journal.pissn$</issn>
33+<issn publication-format="print">$journal.pissn$</issn>
27$endif$
34$endif$
28$if(journal.eissn)$
35$if(journal.eissn)$
29−<issn pub-type="epub">$journal.eissn$</issn>
36+<issn publication-format="electronic">$journal.eissn$</issn>
37+$endif$
38+$-- At least one issn element is required; use empty issn as fallback
39+$if(journal.pissn)$
40+$elseif(journal.eissn)$
41+$else$
42+<issn></issn>
30$endif$
43$endif$
31<publisher>
44<publisher>
32<publisher-name>$journal.publisher-name$</publisher-name>
45<publisher-name>$journal.publisher-name$</publisher-name>
@@ -73,7 +86,7 @@ $endif$
73$if(author)$
86$if(author)$
74<contrib-group>
87<contrib-group>
75$for(author)$
88$for(author)$
76−<contrib contrib-type="author">
89+<contrib contrib-type="author"$if(author.equal-contrib)$ equal-contrib="true"$endif$>
77$if(author.orcid)$
90$if(author.orcid)$
78<contrib-id contrib-id-type="orcid">$author.orcid$</contrib-id>
91<contrib-id contrib-id-type="orcid">$author.orcid$</contrib-id>
79$endif$
92$endif$
@@ -82,20 +95,23 @@ $if(author.surname)$
82<surname>$author.surname$</surname>
95<surname>$author.surname$</surname>
83<given-names>$author.given-names$</given-names>
96<given-names>$author.given-names$</given-names>
84</name>
97</name>
98+$elseif(author.name)$
99+<string-name>$author.name$</string-name>
85$else$
100$else$
86<string-name>$author$</string-name>
101<string-name>$author$</string-name>
87$endif$
102$endif$
88$if(author.email)$
103$if(author.email)$
89<email>$author.email$</email>
104<email>$author.email$</email>
90$endif$
105$endif$
91−$if(author.aff-id)$
106+$for(author.affiliation)$
92−<xref ref-type="aff" rid="aff-$contrib.aff-id$"/>
107+<xref ref-type="aff" rid="aff-$author.affiliation$"/>
93−$endif$
108+$endfor$
94$if(author.cor-id)$
109$if(author.cor-id)$
95<xref ref-type="corresp" rid="cor-$author.cor-id$"><sup>*</sup></xref>
110<xref ref-type="corresp" rid="cor-$author.cor-id$"><sup>*</sup></xref>
96$endif$
111$endif$
97</contrib>
112</contrib>
98$endfor$
113$endfor$
114+${ affiliations.jats() }
99</contrib-group>
115</contrib-group>
100$endif$
116$endif$
101$if(article.author-notes)$
117$if(article.author-notes)$
@@ -114,7 +130,7 @@ $endif$
114</author-notes>
130</author-notes>
115$endif$
131$endif$
116$if(date)$
132$if(date)$
117−<pub-date pub-type="epub"$if(date.iso-8601)$ iso-8601-date="$date.iso-8601$"$endif$>
133+<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$>
118$if(date.day)$
134$if(date.day)$
119<day>$date.day$</day>
135<day>$date.day$</day>
120$endif$
136$endif$
data/templates/default.biblatexnew file+10
@@ -0,0 +1,10 @@
1+$for(header-includes)$
2+$header-includes$
3+$endfor$
4+$for(include-before)$
5+$include-before$
6+$endfor$
7+$body$
8+$for(include-after)$
9+$include-after$
10+$endfor$
data/templates/default.bibtexnew file+10
@@ -0,0 +1,10 @@
1+$for(header-includes)$
2+$header-includes$
3+$endfor$
4+$for(include-before)$
5+$include-before$
6+$endfor$
7+$body$
8+$for(include-after)$
9+$include-after$
10+$endfor$
data/templates/default.context+10−8
@@ -51,6 +51,7 @@ $endif$
51
51
52% use microtypography
52% use microtypography
53\definefontfeature[default][default][script=latn, protrusion=quality, expansion=quality, itlc=yes, textitalics=yes, onum=yes, pnum=yes]
53\definefontfeature[default][default][script=latn, protrusion=quality, expansion=quality, itlc=yes, textitalics=yes, onum=yes, pnum=yes]
54+\definefontfeature[default:tnum][default][tnum=yes, pnum=no]
54\definefontfeature[smallcaps][script=latn, protrusion=quality, expansion=quality, smcp=yes, onum=yes, pnum=yes]
55\definefontfeature[smallcaps][script=latn, protrusion=quality, expansion=quality, smcp=yes, onum=yes, pnum=yes]
55\setupalign[hz,hanging]
56\setupalign[hz,hanging]
56\setupitaliccorrection[global, always]
57\setupitaliccorrection[global, always]
@@ -72,9 +73,9 @@ $if(interlinespace)$
72\setupinterlinespace[$for(interlinespace)$$interlinespace$$sep$,$endfor$]
73\setupinterlinespace[$for(interlinespace)$$interlinespace$$sep$,$endfor$]
73$endif$
74$endif$
74
75
75−\setuphead[chapter] [style=\tfd,header=empty]
76+\setuphead[chapter] [style=\tfd\setupinterlinespace,header=empty]
76−\setuphead[section] [style=\tfc]
77+\setuphead[section] [style=\tfc\setupinterlinespace]
77−\setuphead[subsection] [style=\tfb]
78+\setuphead[subsection] [style=\tfb\setupinterlinespace]
78\setuphead[subsubsection] [style=\bf]
79\setuphead[subsubsection] [style=\bf]
79\setuphead[subsubsubsection] [style=\sc]
80\setuphead[subsubsubsection] [style=\sc]
80\setuphead[subsubsubsubsection][style=\it]
81\setuphead[subsubsubsubsection][style=\it]
@@ -97,11 +98,12 @@ $endif$
97\setupitemize[autointro] % prevent orphan list intro
98\setupitemize[autointro] % prevent orphan list intro
98\setupitemize[indentnext=no]
99\setupitemize[indentnext=no]
99
100
101+\defineitemgroup[enumerate]
102+\setupenumerate[each][fit][itemalign=left,distance=.5em,style={\feature[+][default:tnum]}]
103+
100\setupfloat[figure][default={here,nonumber}]
104\setupfloat[figure][default={here,nonumber}]
101\setupfloat[table][default={here,nonumber}]
105\setupfloat[table][default={here,nonumber}]
102
106
103−\setupthinrules[width=15em] % width of horizontal rules
104−
105\setupxtable[frame=off]
107\setupxtable[frame=off]
106\setupxtable[head][topframe=on,bottomframe=on]
108\setupxtable[head][topframe=on,bottomframe=on]
107\setupxtable[body][]
109\setupxtable[body][]
@@ -162,12 +164,12 @@ $endfor$
162$if(toc)$
164$if(toc)$
163\completecontent
165\completecontent
164$endif$
166$endif$
165−$if(lot)$
166−\completelistoftables
167−$endif$
168$if(lof)$
167$if(lof)$
169\completelistoffigures
168\completelistoffigures
170$endif$
169$endif$
170+$if(lot)$
171+\completelistoftables
172+$endif$
171
173
172$body$
174$body$
173
175
data/templates/default.dzslides+1−1
@@ -171,7 +171,7 @@ $if(subtitle)$
171 <h1 class="subtitle">$subtitle$</h1>
171 <h1 class="subtitle">$subtitle$</h1>
172$endif$
172$endif$
173 <footer>
173 <footer>
174− $if(author)$<span class="author">$for(author)$$author$$sep$, $endfor$</span>$endif$ · $if(date)$<span class="date">$date$</span>$endif$
174+ $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$
175 </footer>
175 </footer>
176</section>
176</section>
177$endif$
177$endif$
data/templates/default.epub2+1−1
@@ -48,7 +48,7 @@ $endif$
48$else$
48$else$
49$if(coverpage)$
49$if(coverpage)$
50<div id="cover-image">
50<div id="cover-image">
51−<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">
51+<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">
52<image width="$cover-image-width$" height="$cover-image-height$" xlink:href="../media/$cover-image$" />
52<image width="$cover-image-width$" height="$cover-image-height$" xlink:href="../media/$cover-image$" />
53</svg>
53</svg>
54</div>
54</div>
data/templates/default.epub3+1−1
@@ -49,7 +49,7 @@ $endif$
49$else$
49$else$
50$if(coverpage)$
50$if(coverpage)$
51<div id="cover-image">
51<div id="cover-image">
52−<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">
52+<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">
53<image width="$cover-image-width$" height="$cover-image-height$" xlink:href="../media/$cover-image$" />
53<image width="$cover-image-width$" height="$cover-image-height$" xlink:href="../media/$cover-image$" />
54</svg>
54</svg>
55</div>
55</div>
data/templates/default.html4+3
@@ -12,6 +12,9 @@ $if(date-meta)$
12$endif$
12$endif$
13$if(keywords)$
13$if(keywords)$
14 <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" />
14 <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" />
15+$endif$
16+$if(description-meta)$
17+ <meta name="description" content="$description-meta$" />
15$endif$
18$endif$
16 <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
19 <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
17 <style type="text/css">
20 <style type="text/css">
data/templates/default.html5+3
@@ -12,6 +12,9 @@ $if(date-meta)$
12$endif$
12$endif$
13$if(keywords)$
13$if(keywords)$
14 <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" />
14 <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" />
15+$endif$
16+$if(description-meta)$
17+ <meta name="description" content="$description-meta$" />
15$endif$
18$endif$
16 <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
19 <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
17 <style>
20 <style>
data/templates/default.jats_articleauthoring+7−4
@@ -19,7 +19,7 @@ $endif$
19$if(author)$
19$if(author)$
20<contrib-group>
20<contrib-group>
21$for(author)$
21$for(author)$
22−<contrib contrib-type="author">
22+<contrib contrib-type="author"$if(author.equal-contrib)$ equal-contrib="true"$endif$>
23$if(author.orcid)$
23$if(author.orcid)$
24<contrib-id contrib-id-type="orcid">$author.orcid$</contrib-id>
24<contrib-id contrib-id-type="orcid">$author.orcid$</contrib-id>
25$endif$
25$endif$
@@ -28,20 +28,23 @@ $if(author.surname)$
28<surname>$author.surname$</surname>
28<surname>$author.surname$</surname>
29<given-names>$author.given-names$</given-names>
29<given-names>$author.given-names$</given-names>
30</name>
30</name>
31+$elseif(author.name)$
32+<string-name>$author.name$</string-name>
31$else$
33$else$
32<string-name>$author$</string-name>
34<string-name>$author$</string-name>
33$endif$
35$endif$
34$if(author.email)$
36$if(author.email)$
35<email>$author.email$</email>
37<email>$author.email$</email>
36$endif$
38$endif$
37−$if(author.aff-id)$
39+$for(author.affiliation)$
38−<xref ref-type="aff" rid="aff-$contrib.aff-id$"/>
40+<xref ref-type="aff" rid="aff-$author.affiliation$"/>
39−$endif$
41+$endfor$
40$if(author.cor-id)$
42$if(author.cor-id)$
41<xref ref-type="corresp" rid="cor-$author.cor-id$"><sup>*</sup></xref>
43<xref ref-type="corresp" rid="cor-$author.cor-id$"><sup>*</sup></xref>
42$endif$
44$endif$
43</contrib>
45</contrib>
44$endfor$
46$endfor$
47+${ affiliations.jats() }
45</contrib-group>
48</contrib-group>
46$endif$
49$endif$
47$if(copyright)$
50$if(copyright)$
data/templates/default.latex+78−29
@@ -2,7 +2,7 @@
2\PassOptionsToPackage{unicode$for(hyperrefoptions)$,$hyperrefoptions$$endfor$}{hyperref}
2\PassOptionsToPackage{unicode$for(hyperrefoptions)$,$hyperrefoptions$$endfor$}{hyperref}
3\PassOptionsToPackage{hyphens}{url}
3\PassOptionsToPackage{hyphens}{url}
4$if(colorlinks)$
4$if(colorlinks)$
5−\PassOptionsToPackage{dvipsnames,svgnames*,x11names*}{xcolor}
5+\PassOptionsToPackage{dvipsnames,svgnames,x11names}{xcolor}
6$endif$
6$endif$
7$if(dir)$
7$if(dir)$
8$if(latex-dir-rtl)$
8$if(latex-dir-rtl)$
@@ -89,6 +89,7 @@ $endif$
89$if(beamerarticle)$
89$if(beamerarticle)$
90\usepackage{beamerarticle} % needs to be loaded first
90\usepackage{beamerarticle} % needs to be loaded first
91$endif$
91$endif$
92+\usepackage{amsmath,amssymb}
92$if(fontfamily)$
93$if(fontfamily)$
93\usepackage[$for(fontfamilyoptions)$$fontfamilyoptions$$sep$,$endfor$]{$fontfamily$}
94\usepackage[$for(fontfamilyoptions)$$fontfamilyoptions$$sep$,$endfor$]{$fontfamily$}
94$else$
95$else$
@@ -97,15 +98,14 @@ $endif$
97$if(linestretch)$
98$if(linestretch)$
98\usepackage{setspace}
99\usepackage{setspace}
99$endif$
100$endif$
100−\usepackage{amssymb,amsmath}
101+\usepackage{iftex}
101−\usepackage{ifxetex,ifluatex}
102+\ifPDFTeX
102−\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex
103 \usepackage[$if(fontenc)$$fontenc$$else$T1$endif$]{fontenc}
103 \usepackage[$if(fontenc)$$fontenc$$else$T1$endif$]{fontenc}
104 \usepackage[utf8]{inputenc}
104 \usepackage[utf8]{inputenc}
105 \usepackage{textcomp} % provide euro and other symbols
105 \usepackage{textcomp} % provide euro and other symbols
106\else % if luatex or xetex
106\else % if luatex or xetex
107$if(mathspec)$
107$if(mathspec)$
108− \ifxetex
108+ \ifXeTeX
109 \usepackage{mathspec}
109 \usepackage{mathspec}
110 \else
110 \else
111 \usepackage{unicode-math}
111 \usepackage{unicode-math}
@@ -129,7 +129,7 @@ $for(fontfamilies)$
129$endfor$
129$endfor$
130$if(mathfont)$
130$if(mathfont)$
131$if(mathspec)$
131$if(mathspec)$
132− \ifxetex
132+ \ifXeTeX
133 \setmathfont(Digits,Latin,Greek)[$for(mathfontoptions)$$mathfontoptions$$sep$,$endfor$]{$mathfont$}
133 \setmathfont(Digits,Latin,Greek)[$for(mathfontoptions)$$mathfontoptions$$sep$,$endfor$]{$mathfont$}
134 \else
134 \else
135 \setmathfont[$for(mathfontoptions)$$mathfontoptions$$sep$,$endfor$]{$mathfont$}
135 \setmathfont[$for(mathfontoptions)$$mathfontoptions$$sep$,$endfor$]{$mathfont$}
@@ -139,23 +139,42 @@ $else$
139$endif$
139$endif$
140$endif$
140$endif$
141$if(CJKmainfont)$
141$if(CJKmainfont)$
142− \ifxetex
142+ \ifXeTeX
143 \usepackage{xeCJK}
143 \usepackage{xeCJK}
144 \setCJKmainfont[$for(CJKoptions)$$CJKoptions$$sep$,$endfor$]{$CJKmainfont$}
144 \setCJKmainfont[$for(CJKoptions)$$CJKoptions$$sep$,$endfor$]{$CJKmainfont$}
145 \fi
145 \fi
146$endif$
146$endif$
147$if(luatexjapresetoptions)$
147$if(luatexjapresetoptions)$
148− \ifluatex
148+ \ifLuaTeX
149 \usepackage[$for(luatexjapresetoptions)$$luatexjapresetoptions$$sep$,$endfor$]{luatexja-preset}
149 \usepackage[$for(luatexjapresetoptions)$$luatexjapresetoptions$$sep$,$endfor$]{luatexja-preset}
150 \fi
150 \fi
151$endif$
151$endif$
152$if(CJKmainfont)$
152$if(CJKmainfont)$
153− \ifluatex
153+ \ifLuaTeX
154 \usepackage[$for(luatexjafontspecoptions)$$luatexjafontspecoptions$$sep$,$endfor$]{luatexja-fontspec}
154 \usepackage[$for(luatexjafontspecoptions)$$luatexjafontspecoptions$$sep$,$endfor$]{luatexja-fontspec}
155 \setmainjfont[$for(CJKoptions)$$CJKoptions$$sep$,$endfor$]{$CJKmainfont$}
155 \setmainjfont[$for(CJKoptions)$$CJKoptions$$sep$,$endfor$]{$CJKmainfont$}
156 \fi
156 \fi
157$endif$
157$endif$
158\fi
158\fi
159+$if(zero-width-non-joiner)$
160+%% Support for zero-width non-joiner characters.
161+\makeatletter
162+\def\zerowidthnonjoiner{%
163+ % Prevent ligatures and adjust kerning, but still support hyphenating.
164+ \texorpdfstring{%
165+ \textormath{\nobreak\discretionary{-}{}{\kern.03em}%
166+ \ifvmode\else\nobreak\hskip\z@skip\fi}{}%
167+ }{}%
168+}
169+\makeatother
170+\ifPDFTeX
171+ \DeclareUnicodeCharacter{200C}{\zerowidthnonjoiner}
172+\else
173+ \catcode`^^^^200c=\active
174+ \protected\def ^^^^200c{\zerowidthnonjoiner}
175+\fi
176+%% End of ZWNJ support
177+$endif$
159$if(beamer)$
178$if(beamer)$
160$if(theme)$
179$if(theme)$
161\usetheme[$for(themeoptions)$$themeoptions$$sep$,$endfor$]{$theme$}
180\usetheme[$for(themeoptions)$$themeoptions$$sep$,$endfor$]{$theme$}
@@ -219,10 +238,10 @@ $if(keywords)$
219$endif$
238$endif$
220$if(colorlinks)$
239$if(colorlinks)$
221 colorlinks=true,
240 colorlinks=true,
222− linkcolor=$if(linkcolor)$$linkcolor$$else$Maroon$endif$,
241+ linkcolor={$if(linkcolor)$$linkcolor$$else$Maroon$endif$},
223− filecolor=$if(filecolor)$$filecolor$$else$Maroon$endif$,
242+ filecolor={$if(filecolor)$$filecolor$$else$Maroon$endif$},
224− citecolor=$if(citecolor)$$citecolor$$else$Blue$endif$,
243+ citecolor={$if(citecolor)$$citecolor$$else$Blue$endif$},
225− urlcolor=$if(urlcolor)$$urlcolor$$else$Blue$endif$,
244+ urlcolor={$if(urlcolor)$$urlcolor$$else$Blue$endif$},
226$else$
245$else$
227 hidelinks,
246 hidelinks,
228$endif$
247$endif$
@@ -254,7 +273,11 @@ $if(highlighting-macros)$
254$highlighting-macros$
273$highlighting-macros$
255$endif$
274$endif$
256$if(tables)$
275$if(tables)$
257−\usepackage{longtable,booktabs}
276+\usepackage{longtable,booktabs,array}
277+$if(multirow)$
278+\usepackage{multirow}
279+$endif$
280+\usepackage{calc} % for calculating minipage widths
258$if(beamer)$
281$if(beamer)$
259\usepackage{caption}
282\usepackage{caption}
260% Make caption package work with longtable
283% Make caption package work with longtable
@@ -321,11 +344,36 @@ $endif$
321$if(pagestyle)$
344$if(pagestyle)$
322\pagestyle{$pagestyle$}
345\pagestyle{$pagestyle$}
323$endif$
346$endif$
347+$if(csl-refs)$
348+\newlength{\cslhangindent}
349+\setlength{\cslhangindent}{1.5em}
350+\newlength{\csllabelwidth}
351+\setlength{\csllabelwidth}{3em}
352+\newlength{\cslentryspacingunit} % times entry-spacing
353+\setlength{\cslentryspacingunit}{\parskip}
354+\newenvironment{CSLReferences}[2] % #1 hanging-ident, #2 entry spacing
355+ {% don't indent paragraphs
356+ \setlength{\parindent}{0pt}
357+ % turn on hanging indent if param 1 is 1
358+ \ifodd #1
359+ \let\oldpar\par
360+ \def\par{\hangindent=\cslhangindent\oldpar}
361+ \fi
362+ % set entry spacing
363+ \setlength{\parskip}{#2\cslentryspacingunit}
364+ }%
365+ {}
366+\usepackage{calc}
367+\newcommand{\CSLBlock}[1]{#1\hfill\break}
368+\newcommand{\CSLLeftMargin}[1]{\parbox[t]{\csllabelwidth}{#1}}
369+\newcommand{\CSLRightInline}[1]{\parbox[t]{\linewidth - \csllabelwidth}{#1}\break}
370+\newcommand{\CSLIndent}[1]{\hspace{\cslhangindent}#1}
371+$endif$
324$for(header-includes)$
372$for(header-includes)$
325$header-includes$
373$header-includes$
326$endfor$
374$endfor$
327$if(lang)$
375$if(lang)$
328−\ifxetex
376+\ifXeTeX
329 % Load polyglossia as late as possible: uses bidi with RTL langages (e.g. Hebrew, Arabic)
377 % Load polyglossia as late as possible: uses bidi with RTL langages (e.g. Hebrew, Arabic)
330 \usepackage{polyglossia}
378 \usepackage{polyglossia}
331 \setmainlanguage[$for(polyglossia-lang.options)$$polyglossia-lang.options$$sep$,$endfor$]{$polyglossia-lang.name$}
379 \setmainlanguage[$for(polyglossia-lang.options)$$polyglossia-lang.options$$sep$,$endfor$]{$polyglossia-lang.name$}
@@ -333,21 +381,24 @@ $for(polyglossia-otherlangs)$
333 \setotherlanguage[$for(polyglossia-otherlangs.options)$$polyglossia-otherlangs.options$$sep$,$endfor$]{$polyglossia-otherlangs.name$}
381 \setotherlanguage[$for(polyglossia-otherlangs.options)$$polyglossia-otherlangs.options$$sep$,$endfor$]{$polyglossia-otherlangs.name$}
334$endfor$
382$endfor$
335\else
383\else
336− \usepackage[shorthands=off,$for(babel-otherlangs)$$babel-otherlangs$,$endfor$main=$babel-lang$]{babel}
384+ \usepackage[$for(babel-otherlangs)$$babel-otherlangs$,$endfor$main=$babel-lang$]{babel}
385+% get rid of language-specific shorthands (see #6817):
386+\let\LanguageShortHands\languageshorthands
387+\def\languageshorthands#1{}
337$if(babel-newcommands)$
388$if(babel-newcommands)$
338 $babel-newcommands$
389 $babel-newcommands$
339$endif$
390$endif$
340\fi
391\fi
341$endif$
392$endif$
342−\ifluatex
393+\ifLuaTeX
343 \usepackage{selnolig} % disable illegal ligatures
394 \usepackage{selnolig} % disable illegal ligatures
344\fi
395\fi
345$if(dir)$
396$if(dir)$
346−\ifxetex
397+\ifXeTeX
347 % Load bidi as late as possible as it modifies e.g. graphicx
398 % Load bidi as late as possible as it modifies e.g. graphicx
348 \usepackage{bidi}
399 \usepackage{bidi}
349\fi
400\fi
350−\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex
401+\ifPDFTeX
351 \TeXXeTstate=1
402 \TeXXeTstate=1
352 \newcommand{\RL}[1]{\beginR #1\endR}
403 \newcommand{\RL}[1]{\beginR #1\endR}
353 \newcommand{\LR}[1]{\beginL #1\endL}
404 \newcommand{\LR}[1]{\beginL #1\endL}
@@ -365,13 +416,11 @@ $for(bibliography)$
365\addbibresource{$bibliography$}
416\addbibresource{$bibliography$}
366$endfor$
417$endfor$
367$endif$
418$endif$
368−$if(csl-refs)$
419+$if(nocite-ids)$
369−\newlength{\cslhangindent}
420+\nocite{$for(nocite-ids)$$it$$sep$, $endfor$}
370−\setlength{\cslhangindent}{1.5em}
421+$endif$
371−\newenvironment{cslreferences}%
422+$if(csquotes)$
372− {$if(csl-hanging-indent)$\setlength{\parindent}{0pt}%
423+\usepackage{csquotes}
373− \everypar{\setlength{\hangindent}{\cslhangindent}}\ignorespaces$endif$}%
374− {\par}
375$endif$
424$endif$
376
425
377$if(title)$
426$if(title)$
@@ -445,12 +494,12 @@ $endif$
445}
494}
446$endif$
495$endif$
447$endif$
496$endif$
448−$if(lot)$
449−\listoftables
450−$endif$
451$if(lof)$
497$if(lof)$
452\listoffigures
498\listoffigures
453$endif$
499$endif$
500+$if(lot)$
501+\listoftables
502+$endif$
454$if(linestretch)$
503$if(linestretch)$
455\setstretch{$linestretch$}
504\setstretch{$linestretch$}
456$endif$
505$endif$
data/templates/default.man+1−1
@@ -1,5 +1,5 @@
1$if(has-tables)$
1$if(has-tables)$
2−.\"t
2+'\" t
3$endif$
3$endif$
4$if(pandoc-version)$
4$if(pandoc-version)$
5.\" Automatically generated by Pandoc $pandoc-version$
5.\" Automatically generated by Pandoc $pandoc-version$
data/templates/default.opendocument+1−1
@@ -31,7 +31,7 @@ $include-before$
31$endfor$
31$endfor$
32$if(toc)$
32$if(toc)$
33<text:table-of-content>
33<text:table-of-content>
34− <text:table-of-content-source text:outline-level="10">
34+ <text:table-of-content-source text:outline-level="$toc-depth$">
35 <text:index-title-template text:style-name="Contents_20_Heading">$toc-title$</text:index-title-template>
35 <text:index-title-template text:style-name="Contents_20_Heading">$toc-title$</text:index-title-template>
36 <text:table-of-content-entry-template text:outline-level="1"
36 <text:table-of-content-entry-template text:outline-level="1"
37 text:style-name="Contents_20_1">
37 text:style-name="Contents_20_1">
data/templates/default.org+3−3
@@ -1,12 +1,12 @@
1$if(title)$
1$if(title)$
2−#+TITLE: $title$
2+#+title: $title$
3
3
4$endif$
4$endif$
5$if(author)$
5$if(author)$
6−#+AUTHOR: $for(author)$$author$$sep$; $endfor$
6+#+author: $for(author)$$author$$sep$; $endfor$
7$endif$
7$endif$
8$if(date)$
8$if(date)$
9−#+DATE: $date$
9+#+date: $date$
10
10
11$endif$
11$endif$
12$for(header-includes)$
12$for(header-includes)$
data/templates/default.revealjs+84−122
@@ -52,6 +52,9 @@ $endif$
52$for(author)$
52$for(author)$
53 <p class="author">$author$</p>
53 <p class="author">$author$</p>
54$endfor$
54$endfor$
55+$for(institute)$
56+ <p class="institute">$institute$</p>
57+$endfor$
55$if(date)$
58$if(date)$
56 <p class="date">$date$</p>
59 <p class="date">$date$</p>
57$endif$
60$endif$
@@ -59,7 +62,12 @@ $endif$
59$endif$
62$endif$
60$if(toc)$
63$if(toc)$
61<section id="$idprefix$TOC">
64<section id="$idprefix$TOC">
65+<nav role="doc-toc">
66+$if(toc-title)$
67+<h2 id="$idprefix$toc-title">$toc-title$</h2>
68+$endif$
62$table-of-contents$
69$table-of-contents$
70+</nav>
63</section>
71</section>
64$endif$
72$endif$
65
73
@@ -69,7 +77,7 @@ $body$
69
77
70 <script src="$revealjs-url$/dist/reveal.js"></script>
78 <script src="$revealjs-url$/dist/reveal.js"></script>
71
79
72− // reveal.js plugins
80+ <!-- reveal.js plugins -->
73 <script src="$revealjs-url$/plugin/notes/notes.js"></script>
81 <script src="$revealjs-url$/plugin/notes/notes.js"></script>
74 <script src="$revealjs-url$/plugin/search/search.js"></script>
82 <script src="$revealjs-url$/plugin/search/search.js"></script>
75 <script src="$revealjs-url$/plugin/zoom/zoom.js"></script>
83 <script src="$revealjs-url$/plugin/zoom/zoom.js"></script>
@@ -82,244 +90,198 @@ $endif$
82 // Full list of configuration options available at:
90 // Full list of configuration options available at:
83 // https://revealjs.com/config/
91 // https://revealjs.com/config/
84 Reveal.initialize({
92 Reveal.initialize({
85−$if(controls)$
86 // Display controls in the bottom right corner
93 // Display controls in the bottom right corner
87 controls: $controls$,
94 controls: $controls$,
88−$endif$
95+
89−$if(controlsTutorial)$
90 // Help the user learn the controls by providing hints, for example by
96 // Help the user learn the controls by providing hints, for example by
91 // bouncing the down arrow when they first encounter a vertical slide
97 // bouncing the down arrow when they first encounter a vertical slide
92 controlsTutorial: $controlsTutorial$,
98 controlsTutorial: $controlsTutorial$,
93−$endif$
99+
94−$if(controlsLayout)$
95 // Determines where controls appear, "edges" or "bottom-right"
100 // Determines where controls appear, "edges" or "bottom-right"
96− controlsLayout: $controlsLayout$,
101+ controlsLayout: '$controlsLayout$',
97−$endif$
102+
98−$if(controlsBackArrows)$
99 // Visibility rule for backwards navigation arrows; "faded", "hidden"
103 // Visibility rule for backwards navigation arrows; "faded", "hidden"
100 // or "visible"
104 // or "visible"
101− controlsBackArrows: $controlsBackArrows$,
105+ controlsBackArrows: '$controlsBackArrows$',
102−$endif$
106+
103−$if(progress)$
104 // Display a presentation progress bar
107 // Display a presentation progress bar
105 progress: $progress$,
108 progress: $progress$,
106−$endif$
109+
107−$if(slideNumber)$
108 // Display the page number of the current slide
110 // Display the page number of the current slide
109 slideNumber: $slideNumber$,
111 slideNumber: $slideNumber$,
110−$endif$
112+
111−$if(hash)$
113+ // 'all', 'print', or 'speaker'
114+ showSlideNumber: '$showSlideNumber$',
115+
112 // Add the current slide number to the URL hash so that reloading the
116 // Add the current slide number to the URL hash so that reloading the
113 // page/copying the URL will return you to the same slide
117 // page/copying the URL will return you to the same slide
114 hash: $hash$,
118 hash: $hash$,
115−$endif$
119+
120+ // Start with 1 for the hash rather than 0
121+ hashOneBasedIndex: $hashOneBasedIndex$,
122+
123+ // Flags if we should monitor the hash and change slides accordingly
124+ respondToHashChanges: $respondToHashChanges$,
125+
116 // Push each slide change to the browser history
126 // Push each slide change to the browser history
117−$if(history)$
118 history: $history$,
127 history: $history$,
119−$else$
128+
120− history: true,
121−$endif$
122−$if(keyboard)$
123 // Enable keyboard shortcuts for navigation
129 // Enable keyboard shortcuts for navigation
124 keyboard: $keyboard$,
130 keyboard: $keyboard$,
125−$endif$
131+
126−$if(overview)$
127 // Enable the slide overview mode
132 // Enable the slide overview mode
128 overview: $overview$,
133 overview: $overview$,
129−$endif$
134+
130−$if(center)$
135+ // Disables the default reveal.js slide layout (scaling and centering)
136+ // so that you can use custom CSS layout
137+ disableLayout: false,
138+
131 // Vertical centering of slides
139 // Vertical centering of slides
132 center: $center$,
140 center: $center$,
133−$endif$
141+
134−$if(touch)$
135 // Enables touch navigation on devices with touch input
142 // Enables touch navigation on devices with touch input
136 touch: $touch$,
143 touch: $touch$,
137−$endif$
144+
138−$if(loop)$
139 // Loop the presentation
145 // Loop the presentation
140 loop: $loop$,
146 loop: $loop$,
141−$endif$
147+
142−$if(rtl)$
143 // Change the presentation direction to be RTL
148 // Change the presentation direction to be RTL
144 rtl: $rtl$,
149 rtl: $rtl$,
145−$endif$
150+
146−$if(navigationMode)$
147 // see https://revealjs.com/vertical-slides/#navigation-mode
151 // see https://revealjs.com/vertical-slides/#navigation-mode
148 navigationMode: '$navigationMode$',
152 navigationMode: '$navigationMode$',
149−$endif$
153+
150−$if(shuffle)$
151 // Randomizes the order of slides each time the presentation loads
154 // Randomizes the order of slides each time the presentation loads
152 shuffle: $shuffle$,
155 shuffle: $shuffle$,
153−$endif$
156+
154−$if(fragments)$
155 // Turns fragments on and off globally
157 // Turns fragments on and off globally
156 fragments: $fragments$,
158 fragments: $fragments$,
157−$endif$
159+
158−$if(fragmentInURL)$
159 // Flags whether to include the current fragment in the URL,
160 // Flags whether to include the current fragment in the URL,
160 // so that reloading brings you to the same fragment position
161 // so that reloading brings you to the same fragment position
161 fragmentInURL: $fragmentInURL$,
162 fragmentInURL: $fragmentInURL$,
162−$endif$
163+
163−$if(embedded)$
164 // Flags if the presentation is running in an embedded mode,
164 // Flags if the presentation is running in an embedded mode,
165 // i.e. contained within a limited portion of the screen
165 // i.e. contained within a limited portion of the screen
166 embedded: $embedded$,
166 embedded: $embedded$,
167−$endif$
167+
168−$if(help)$
169 // Flags if we should show a help overlay when the questionmark
168 // Flags if we should show a help overlay when the questionmark
170 // key is pressed
169 // key is pressed
171 help: $help$,
170 help: $help$,
172−$endif$
171+
173−$if(showNotes)$
172+ // Flags if it should be possible to pause the presentation (blackout)
173+ pause: $pause$,
174+
174 // Flags if speaker notes should be visible to all viewers
175 // Flags if speaker notes should be visible to all viewers
175 showNotes: $showNotes$,
176 showNotes: $showNotes$,
176−$endif$
177+
177−$if(autoPlayMedia)$
178− // Global override for autoplaying embedded media (video/audio/iframe)
178+ // Global override for autoplaying embedded media (null/true/false)
179− // - null: Media will only autoplay if data-autoplay is present
180− // - true: All media will autoplay, regardless of individual setting
181− // - false: No media will autoplay, regardless of individual setting
182 autoPlayMedia: $autoPlayMedia$,
179 autoPlayMedia: $autoPlayMedia$,
183−$endif$
180+
184−$if(preloadIframes)$
185− // Global override for preloading lazy-loaded iframes
181+ // Global override for preloading lazy-loaded iframes (null/true/false)
186− // - null: Iframes with data-src AND data-preload will be loaded when within
187− // the viewDistance, iframes with only data-src will be loaded when visible
188− // - true: All iframes with data-src will be loaded when within the viewDistance
189− // - false: All iframes with data-src will be loaded only when visible
190 preloadIframes: $preloadIframes$,
182 preloadIframes: $preloadIframes$,
191−$endif$
183+
192−$if(autoSlide)$
193 // Number of milliseconds between automatically proceeding to the
184 // Number of milliseconds between automatically proceeding to the
194 // next slide, disabled when set to 0, this value can be overwritten
185 // next slide, disabled when set to 0, this value can be overwritten
195 // by using a data-autoslide attribute on your slides
186 // by using a data-autoslide attribute on your slides
196 autoSlide: $autoSlide$,
187 autoSlide: $autoSlide$,
197−$endif$
188+
198−$if(autoSlideStoppable)$
199 // Stop auto-sliding after user input
189 // Stop auto-sliding after user input
200 autoSlideStoppable: $autoSlideStoppable$,
190 autoSlideStoppable: $autoSlideStoppable$,
201−$endif$
191+
202−$if(autoSlideMethod)$
203 // Use this method for navigation when auto-sliding
192 // Use this method for navigation when auto-sliding
204 autoSlideMethod: $autoSlideMethod$,
193 autoSlideMethod: $autoSlideMethod$,
205−$endif$
194+
206−$if(defaultTiming)$
207 // Specify the average time in seconds that you think you will spend
195 // Specify the average time in seconds that you think you will spend
208 // presenting each slide. This is used to show a pacing timer in the
196 // presenting each slide. This is used to show a pacing timer in the
209 // speaker view
197 // speaker view
210 defaultTiming: $defaultTiming$,
198 defaultTiming: $defaultTiming$,
211−$endif$
199+
212−$if(totalTime)$
213− // Specify the total time in seconds that is available to
214− // present. If this is set to a nonzero value, the pacing
215− // timer will work out the time available for each slide,
216− // instead of using the defaultTiming value
217− totalTime: $totalTime$,
218−$endif$
219−$if(minimumTimePerSlide)$
220− // Specify the minimum amount of time you want to allot to
221− // each slide, if using the totalTime calculation method. If
222− // the automated time allocation causes slide pacing to fall
223− // below this threshold, then you will see an alert in the
224− // speaker notes window
225− minimumTimePerSlide: $minimumTimePerSlide$,
226−$endif$
227−$if(mouseWheel)$
228 // Enable slide navigation via mouse wheel
200 // Enable slide navigation via mouse wheel
229 mouseWheel: $mouseWheel$,
201 mouseWheel: $mouseWheel$,
230−$endif$
202+
231−$if(rollingLinks)$
203+ // The display mode that will be used to show slides
232− // Apply a 3D roll to links on hover
204+ display: '$display$',
233− rollingLinks: $rollingLinks$,
205+
234−$endif$
235−$if(hideInactiveCursor)$
236 // Hide cursor if inactive
206 // Hide cursor if inactive
237 hideInactiveCursor: $hideInactiveCursor$,
207 hideInactiveCursor: $hideInactiveCursor$,
238−$endif$
208+
239−$if(hideCursorTime)$
240 // Time before the cursor is hidden (in ms)
209 // Time before the cursor is hidden (in ms)
241 hideCursorTime: $hideCursorTime$,
210 hideCursorTime: $hideCursorTime$,
242−$endif$
211+
243−$if(hideAddressBar)$
244− // Hides the address bar on mobile devices
245− hideAddressBar: $hideAddressBar$,
246−$endif$
247−$if(previewLinks)$
248 // Opens links in an iframe preview overlay
212 // Opens links in an iframe preview overlay
249 previewLinks: $previewLinks$,
213 previewLinks: $previewLinks$,
250−$endif$
214+
251−$if(transition)$
252− // Transition style
253− transition: '$transition$', // none/fade/slide/convex/concave/zoom
215+ // Transition style (none/fade/slide/convex/concave/zoom)
254−$endif$
216+ transition: '$transition$',
255−$if(transitionSpeed)$
217+
256− // Transition speed
218+ // Transition speed (default/fast/slow)
257− transitionSpeed: '$transitionSpeed$', // default/fast/slow
219+ transitionSpeed: '$transitionSpeed$',
258−$endif$
220+
259−$if(backgroundTransition)$
260 // Transition style for full page slide backgrounds
221 // Transition style for full page slide backgrounds
261− backgroundTransition: '$backgroundTransition$', // none/fade/slide/convex/concave/zoom
222+ // (none/fade/slide/convex/concave/zoom)
262−$endif$
223+ backgroundTransition: '$backgroundTransition$',
263−$if(viewDistance)$
224+
264 // Number of slides away from the current that are visible
225 // Number of slides away from the current that are visible
265 viewDistance: $viewDistance$,
226 viewDistance: $viewDistance$,
266−$endif$
227+
267−$if(mobileViewDistance)$
268 // Number of slides away from the current that are visible on mobile
228 // Number of slides away from the current that are visible on mobile
269 // devices. It is advisable to set this to a lower number than
229 // devices. It is advisable to set this to a lower number than
270 // viewDistance in order to save resources.
230 // viewDistance in order to save resources.
271 mobileViewDistance: $mobileViewDistance$,
231 mobileViewDistance: $mobileViewDistance$,
272−$endif$
273$if(parallaxBackgroundImage)$
232$if(parallaxBackgroundImage)$
233+
274 // Parallax background image
234 // Parallax background image
275 parallaxBackgroundImage: '$parallaxBackgroundImage$', // e.g. "'https://s3.amazonaws.com/hakim-static/reveal-js/reveal-parallax-1.jpg'"
235 parallaxBackgroundImage: '$parallaxBackgroundImage$', // e.g. "'https://s3.amazonaws.com/hakim-static/reveal-js/reveal-parallax-1.jpg'"
276$else$
236$else$
277$if(background-image)$
237$if(background-image)$
238+
278 // Parallax background image
239 // Parallax background image
279 parallaxBackgroundImage: '$background-image$', // e.g. "'https://s3.amazonaws.com/hakim-static/reveal-js/reveal-parallax-1.jpg'"
240 parallaxBackgroundImage: '$background-image$', // e.g. "'https://s3.amazonaws.com/hakim-static/reveal-js/reveal-parallax-1.jpg'"
280$endif$
241$endif$
281$endif$
242$endif$
282$if(parallaxBackgroundSize)$
243$if(parallaxBackgroundSize)$
244+
283 // Parallax background size
245 // Parallax background size
284 parallaxBackgroundSize: '$parallaxBackgroundSize$', // CSS syntax, e.g. "2100px 900px"
246 parallaxBackgroundSize: '$parallaxBackgroundSize$', // CSS syntax, e.g. "2100px 900px"
285$endif$
247$endif$
286$if(parallaxBackgroundHorizontal)$
248$if(parallaxBackgroundHorizontal)$
249+
287 // Amount to move parallax background (horizontal and vertical) on slide change
250 // Amount to move parallax background (horizontal and vertical) on slide change
288 // Number, e.g. 100
251 // Number, e.g. 100
289 parallaxBackgroundHorizontal: $parallaxBackgroundHorizontal$,
252 parallaxBackgroundHorizontal: $parallaxBackgroundHorizontal$,
290$endif$
253$endif$
291$if(parallaxBackgroundVertical)$
254$if(parallaxBackgroundVertical)$
255+
292 parallaxBackgroundVertical: $parallaxBackgroundVertical$,
256 parallaxBackgroundVertical: $parallaxBackgroundVertical$,
293$endif$
257$endif$
294$if(width)$
258$if(width)$
259+
295 // The "normal" size of the presentation, aspect ratio will be preserved
260 // The "normal" size of the presentation, aspect ratio will be preserved
296 // when the presentation is scaled to fit different resolutions. Can be
261 // when the presentation is scaled to fit different resolutions. Can be
297 // specified using percentage units.
262 // specified using percentage units.
298 width: $width$,
263 width: $width$,
299$endif$
264$endif$
300$if(height)$
265$if(height)$
266+
301 height: $height$,
267 height: $height$,
302$endif$
268$endif$
303$if(margin)$
269$if(margin)$
270+
304 // Factor of the display size that should remain empty around the content
271 // Factor of the display size that should remain empty around the content
305 margin: $margin$,
272 margin: $margin$,
306$endif$
273$endif$
307$if(minScale)$
274$if(minScale)$
275+
308 // Bounds for smallest/largest possible scale to apply to content
276 // Bounds for smallest/largest possible scale to apply to content
309 minScale: $minScale$,
277 minScale: $minScale$,
310$endif$
278$endif$
311$if(maxScale)$
279$if(maxScale)$
280+
312 maxScale: $maxScale$,
281 maxScale: $maxScale$,
313$endif$
282$endif$
314−$if(zoomKey)$
315− // Modifier key used to click-zoom to part of the slide
316− zoomKey: '$zoomKey$',
317−$endif$
318−$if(display)$
319− // The display mode that will be used to show slides
320− display: $display$,
321−$endif$
322$if(mathjax)$
283$if(mathjax)$
284+
323 math: {
285 math: {
324 mathjax: '$mathjaxurl$',
286 mathjax: '$mathjaxurl$',
325 config: 'TeX-AMS_HTML-full',
287 config: 'TeX-AMS_HTML-full',
data/templates/default.s5+3
@@ -61,6 +61,9 @@ $endif$
61$if(author)$
61$if(author)$
62 <h3 class="author">$for(author)$$author$$sep$<br/>$endfor$</h3>
62 <h3 class="author">$for(author)$$author$$sep$<br/>$endfor$</h3>
63$endif$
63$endif$
64+$if(institute)$
65+ <h3 class="institute">$for(institute)$$institute$$sep$<br/>$endfor$</h3>
66+$endif$
64$if(date)$
67$if(date)$
65 <h4 class="date">$date$</h4>
68 <h4 class="date">$date$</h4>
66$endif$
69$endif$
data/templates/default.slideous+7
@@ -63,9 +63,16 @@ $if(title)$
63$if(subtitle)$
63$if(subtitle)$
64 <h1 class="subtitle">$subtitle$</h1>
64 <h1 class="subtitle">$subtitle$</h1>
65$endif$
65$endif$
66+$if(author)$
66 <p class="author">
67 <p class="author">
67$for(author)$$author$$sep$<br/>$endfor$
68$for(author)$$author$$sep$<br/>$endfor$
68 </p>
69 </p>
70+$endif$
71+$if(institute)$
72+ <p class="institute">
73+$for(institute)$$institute$$sep$<br/>$endfor$
74+ </p>
75+$endif$
69$if(date)$
76$if(date)$
70 <p class="date">$date$</p>
77 <p class="date">$date$</p>
71$endif$
78$endif$
data/templates/default.slidy+5
@@ -52,6 +52,11 @@ $if(author)$
52$for(author)$$author$$sep$<br/>$endfor$
52$for(author)$$author$$sep$<br/>$endfor$
53 </p>
53 </p>
54$endif$
54$endif$
55+$if(institute)$
56+ <p class="institute">
57+$for(institute)$$institute$$sep$<br/>$endfor$
58+ </p>
59+$endif$
55$if(date)$
60$if(date)$
56 <p class="date">$date$</p>
61 <p class="date">$date$</p>
57$endif$
62$endif$
data/templates/styles.html+75−18
@@ -1,6 +1,6 @@
1$if(document-css)$
1$if(document-css)$
2html {
2html {
3− line-height: $if(linestretch)$$linestretch$$else$1.7$endif$;
3+ line-height: $if(linestretch)$$linestretch$$else$1.5$endif$;
4 font-family: $if(mainfont)$$mainfont$$else$Georgia, serif$endif$;
4 font-family: $if(mainfont)$$mainfont$$else$Georgia, serif$endif$;
5 font-size: $if(fontsize)$$fontsize$$else$20px$endif$;
5 font-size: $if(fontsize)$$fontsize$$else$20px$endif$;
6 color: $if(fontcolor)$$fontcolor$$else$#1a1a1a$endif$;
6 color: $if(fontcolor)$$fontcolor$$else$#1a1a1a$endif$;
@@ -8,13 +8,13 @@ html {
8}
8}
9body {
9body {
10 margin: 0 auto;
10 margin: 0 auto;
11− max-width: 40em;
11+ max-width: 36em;
12 padding-left: $if(margin-left)$$margin-left$$else$50px$endif$;
12 padding-left: $if(margin-left)$$margin-left$$else$50px$endif$;
13 padding-right: $if(margin-right)$$margin-right$$else$50px$endif$;
13 padding-right: $if(margin-right)$$margin-right$$else$50px$endif$;
14 padding-top: $if(margin-top)$$margin-top$$else$50px$endif$;
14 padding-top: $if(margin-top)$$margin-top$$else$50px$endif$;
15 padding-bottom: $if(margin-bottom)$$margin-bottom$$else$50px$endif$;
15 padding-bottom: $if(margin-bottom)$$margin-bottom$$else$50px$endif$;
16 hyphens: auto;
16 hyphens: auto;
17− word-wrap: break-word;
17+ overflow-wrap: break-word;
18 text-rendering: optimizeLegibility;
18 text-rendering: optimizeLegibility;
19 font-kerning: normal;
19 font-kerning: normal;
20}
20}
@@ -28,6 +28,7 @@ body {
28 body {
28 body {
29 background-color: transparent;
29 background-color: transparent;
30 color: black;
30 color: black;
31+ font-size: 12pt;
31 }
32 }
32 p, h2, h3 {
33 p, h2, h3 {
33 orphans: 3;
34 orphans: 3;
@@ -38,7 +39,7 @@ body {
38 }
39 }
39}
40}
40p {
41p {
41− margin-top: 1.7em;
42+ margin: 1em 0;
42}
43}
43a {
44a {
44 color: $if(linkcolor)$$linkcolor$$else$#1a1a1a$endif$;
45 color: $if(linkcolor)$$linkcolor$$else$#1a1a1a$endif$;
@@ -50,59 +51,91 @@ img {
50 max-width: 100%;
51 max-width: 100%;
51}
52}
52h1, h2, h3, h4, h5, h6 {
53h1, h2, h3, h4, h5, h6 {
53− margin-top: 1.7em;
54+ margin-top: 1.4em;
55+}
56+h5, h6 {
57+ font-size: 1em;
58+ font-style: italic;
59+}
60+h6 {
61+ font-weight: normal;
54}
62}
55ol, ul {
63ol, ul {
56 padding-left: 1.7em;
64 padding-left: 1.7em;
57− margin-top: 1.7em;
65+ margin-top: 1em;
58}
66}
59li > ol, li > ul {
67li > ol, li > ul {
60 margin-top: 0;
68 margin-top: 0;
61}
69}
62blockquote {
70blockquote {
63− margin: 1.7em 0 1.7em 1.7em;
71+ margin: 1em 0 1em 1.7em;
64 padding-left: 1em;
72 padding-left: 1em;
65 border-left: 2px solid #e6e6e6;
73 border-left: 2px solid #e6e6e6;
66− font-style: italic;
74+ color: #606060;
67}
75}
68code {
76code {
69 font-family: $if(monofont)$$monofont$$else$Menlo, Monaco, 'Lucida Console', Consolas, monospace$endif$;
77 font-family: $if(monofont)$$monofont$$else$Menlo, Monaco, 'Lucida Console', Consolas, monospace$endif$;
78+$if(monobackgroundcolor)$
70− background-color: #f0f0f0;
79+ background-color: $monobackgroundcolor$;
80+ padding: .2em .4em;
81+$endif$
71 font-size: 85%;
82 font-size: 85%;
72 margin: 0;
83 margin: 0;
73− padding: .2em .4em;
74}
84}
75pre {
85pre {
76− line-height: 1.5em;
86+ margin: 1em 0;
87+$if(monobackgroundcolor)$
88+ background-color: $monobackgroundcolor$;
77 padding: 1em;
89 padding: 1em;
78− background-color: #f0f0f0;
90+$endif$
79 overflow: auto;
91 overflow: auto;
80}
92}
81pre code {
93pre code {
82 padding: 0;
94 padding: 0;
83 overflow: visible;
95 overflow: visible;
96+ overflow-wrap: normal;
97+}
98+.sourceCode {
99+ background-color: transparent;
100+ overflow: visible;
84}
101}
85hr {
102hr {
86 background-color: #1a1a1a;
103 background-color: #1a1a1a;
87 border: none;
104 border: none;
88 height: 1px;
105 height: 1px;
89− margin-top: 1.7em;
106+ margin: 1em 0;
90}
107}
91table {
108table {
109+ margin: 1em 0;
92 border-collapse: collapse;
110 border-collapse: collapse;
93 width: 100%;
111 width: 100%;
94 overflow-x: auto;
112 overflow-x: auto;
95 display: block;
113 display: block;
114+ font-variant-numeric: lining-nums tabular-nums;
115+}
116+table caption {
117+ margin-bottom: 0.75em;
96}
118}
119+tbody {
120+ margin-top: 0.5em;
121+ border-top: 1px solid $if(fontcolor)$$fontcolor$$else$#1a1a1a$endif$;
122+ border-bottom: 1px solid $if(fontcolor)$$fontcolor$$else$#1a1a1a$endif$;
123+}
97−th, td {
124+th {
98− border-bottom: 1px solid lightgray;
125+ border-top: 1px solid $if(fontcolor)$$fontcolor$$else$#1a1a1a$endif$;
99− padding: 1em 3em 1em 0;
126+ padding: 0.25em 0.5em 0.25em 0.5em;
127+}
128+td {
129+ padding: 0.125em 0.5em 0.25em 0.5em;
100}
130}
101header {
131header {
102− margin-bottom: 6em;
132+ margin-bottom: 4em;
103 text-align: center;
133 text-align: center;
104}
134}
135+#TOC li {
136+ list-style: none;
137+}
105−nav a:not(:hover) {
138+#TOC a:not(:hover) {
106 text-decoration: none;
139 text-decoration: none;
107}
140}
108$endif$
141$endif$
@@ -121,3 +154,27 @@ $endif$
121$if(displaymath-css)$
154$if(displaymath-css)$
122.display.math{display: block; text-align: center; margin: 0.5rem auto;}
155.display.math{display: block; text-align: center; margin: 0.5rem auto;}
123$endif$
156$endif$
157+$if(csl-css)$
158+div.csl-bib-body { }
159+div.csl-entry {
160+ clear: both;
161+$if(csl-entry-spacing)$
162+ margin-bottom: $csl-entry-spacing$;
163+$endif$
164+}
165+.hanging div.csl-entry {
166+ margin-left:2em;
167+ text-indent:-2em;
168+}
169+div.csl-left-margin {
170+ min-width:2em;
171+ float:left;
172+}
173+div.csl-right-inline {
174+ margin-left:2em;
175+ padding-left:1em;
176+}
177+div.csl-indent {
178+ margin-left: 2em;
179+}
180+$endif$
data/translations/zh-Hans.yamlnew file+22
@@ -0,0 +1,22 @@
1+Abstract: 摘要
2+Appendix: 附录
3+Bibliography: 文献目录
4+Cc: 副本
5+Chapter: 章
6+Contents: 目录
7+Encl: 附件
8+Figure: 图
9+Glossary: 术语
10+Index: 索引
11+Listing: 列表
12+ListOfFigures: 附图目录
13+ListOfTables: 表格索引
14+Page: 页
15+Part: 段
16+Preface: 序
17+Proof: 校对
18+References: 参考文献
19+See: 见
20+SeeAlso: 参见
21+Table: 表
22+To: 到
data/translations/zh-Hant.yamlnew file+22
@@ -0,0 +1,22 @@
1+Abstract: 摘要
2+Appendix: 附錄
3+Bibliography: 文獻目錄
4+Cc: 副本
5+Chapter: 章
6+Contents: 目錄
7+Encl: 附件
8+Figure: 圖
9+Glossary: 術語
10+Index: 索引
11+Listing: 列表
12+ListOfFigures: 附圖目錄
13+ListOfTables: 表格索引
14+Page: 頁
15+Part: 段
16+Preface: 序
17+Proof: 校對
18+References: 參考文獻
19+See: 見
20+SeeAlso: 參見
21+Table: 表
22+To: 到
data/vimwiki.cssdeleted−82
@@ -1,82 +0,0 @@
1−pre{
2− font-size: 1.5em
3−}
4−
5−img {vertical-align: middle}
6−
7−body {font-family: Tahoma, Geneva, sans-serif; margin: 1em 2em 1em 2em; font-size: 120%; line-height: 130%;}
8−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;}
9−h1 {font-size: 2.6em; color: #000000;}
10−h2 {font-size: 2.2em; color: #404040;}
11−h3 {font-size: 1.8em; color: #707070;}
12−h4 {font-size: 1.4em; color: #909090;}
13−h5 {font-size: 1.3em; color: #989898;}
14−h6 {font-size: 1.2em; color: #9c9c9c;}
15−p, pre, blockquote, table, ul, ol, dl {margin-top: 1em; margin-bottom: 1em;}
16−ul ul, ul ol, ol ol, ol ul {margin-top: 0.5em; margin-bottom: 0.5em;}
17−li {margin: 0.3em auto;}
18−ul {margin-left: 2em; padding-left: 0.5em;}
19−dt {font-weight: bold;}
20−img {border: none;}
21−pre {border-left: 1px solid #ccc; margin-left: 2em; padding-left: 0.5em;}
22−blockquote {padding: 0.4em; background-color: #f6f5eb;}
23−th, td {border: 1px solid #ccc; padding: 0.3em;}
24−th {background-color: #f0f0f0;}
25−hr {border: none; border-top: 1px solid #ccc; width: 100%;}
26−del {text-decoration: line-through; color: #777777;}
27−.toc li {list-style-type: none;}
28−.todo {font-weight: bold; background-color: #f0ece8; color: #a03020;}
29−.justleft {text-align: left;}
30−.justright {text-align: right;}
31−.justcenter {text-align: center;}
32−.center {margin-left: auto; margin-right: auto;}
33−div.center > table {margin-left: auto; margin-right: auto;}
34−.tag {background-color: #eeeeee; font-family: monospace; padding: 2px;}
35−
36−/* classes for items of todo lists */
37−.done0 {
38− /* list-style: none; */
39− background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAYAAAA71pVKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAAxQAAAMUBHc26qAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAA7SURBVCiR7dMxEgAgCANBI3yVRzF5KxNbW6wsuH7LQ2YKQK1mkswBVERYF5Os3UV3gwd/jF2SkXy66gAZkxS6BniubAAAAABJRU5ErkJggg==);
40− background-repeat: no-repeat;
41− background-position: 0 .2em;
42− padding-left: 1.5em;
43−}
44−.done1 {
45− background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAYAAAA71pVKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAAxQAAAMUBHc26qAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAABtSURBVCiR1ZO7DYAwDER9BDmTeZQMFXmUbGYpOjrEryA0wOvO8itOslFrJYAug5BMM4BeSkmjsrv3aVTa8p48Xw1JSkSsWVUFwD05IqS1tmYzk5zzae9jnVVVzGyXb8sALjse+euRkEzu/uirFomVIdDGOLjuAAAAAElFTkSuQmCC);
46− background-repeat: no-repeat;
47− background-position: 0 .15em;
48− padding-left: 1.5em;
49−}
50−.done2 {
51− background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAYAAAA71pVKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAAxQAAAMUBHc26qAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAB1SURBVCiRzdO5DcAgDAVQGxjAYgTvxlDIu1FTIRYAp8qlFISkSH7l5kk+ZIwxKiI2mIyqWoeILYRgZ7GINDOLjnmF3VqklKCUMgTee2DmM661Qs55iI3Zm/1u5h9sm4ig9z4ERHTFzLyd4G4+nFlVrYg8+qoF/c0kdpeMsmcAAAAASUVORK5CYII=);
52− background-repeat: no-repeat;
53− background-position: 0 .15em;
54− padding-left: 1.5em;
55−}
56−.done3 {
57− background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAYAAAA71pVKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAAxQAAAMUBHc26qAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAABoSURBVCiR7dOxDcAgDATA/0DtUdiKoZC3YhLkHjkVKF3idJHiztKfvrHZWnOSE8Fx95RJzlprimJVnXktvXeY2S0SEZRSAAAbmxnGGKH2I5T+8VfxPhIReQSuuY3XyYWa3T2p6quvOgGrvSFGlewuUAAAAABJRU5ErkJggg==);
58− background-repeat: no-repeat;
59− background-position: 0 .15em;
60− padding-left: 1.5em;
61−}
62−.done4 {
63− 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);
64− background-repeat: no-repeat;
65− background-position: 0 .15em;
66− padding-left: 1.5em;
67−}
68−
69−*:not(pre) > code {
70− font-family: Monaco,"Courier New","DejaVu Sans Mono","Bitstream Vera Sans Mono",monospace;
71− -webkit-border-radius: 1px;
72− -moz-border-radius: 1px;
73− border-radius: 1px;
74− -moz-background-clip: padding;
75− -webkit-background-clip: padding-box;
76− background-clip: padding-box;
77− padding: 0px 3px;
78− display: inline-block;
79− color: #52595d;
80− border: 1px solid #ccc;
81− background-color: #f9f9f9;
82−}
default.nixnew file+13
@@ -0,0 +1,13 @@
1+# default.nix
2+let
3+ pkgs = import <nixpkgs> { };
4+in
5+ pkgs.haskellPackages.developPackage {
6+ root = ./.;
7+ modifier = drv:
8+ pkgs.haskell.lib.addBuildTools drv (with pkgs.haskellPackages;
9+ [ cabal-install
10+ ghcid
11+ ]);
12+ }
13+
doc/epub.md+9−2
@@ -141,8 +141,15 @@ Pandoc has an EPUB3 writer. It renders LaTeX math into MathML, which
141EPUB3 readers are supposed to support (but unfortunately few do).
141EPUB3 readers are supposed to support (but unfortunately few do).
142
142
143Of course, this isn't much help if you want EPUB2 output (`pandoc -t epub2`)
143Of course, this isn't much help if you want EPUB2 output (`pandoc -t epub2`)
144−or target readers that don't support MathML. Then you should try using the
144+or target readers that don't support MathML. Then you have two options:
145+
146+1. Use the [`--webtex`](https://pandoc.org/MANUAL.html#option--webtex) option,
145−`--webtex` option, which will use a web service to convert the TeX to an image.
147+ which will use a web service to convert the TeX to an image.
148+2. Use the [`--gladtex`](https://pandoc.org/MANUAL.html#option--gladtex) option
149+ to convert maths into SVG images on your local machine.
150+
151+Both GladTeX and WebTeX add the LaTeX source of the formula as alternative text
152+of the image, increasing accessibility for blind users.
146
153
147[KindleGen]: https://www.amazon.com/gp/feature.html?ie=UTF8&docId=1000765211
154[KindleGen]: https://www.amazon.com/gp/feature.html?ie=UTF8&docId=1000765211
148[EPUB]: https://en.wikipedia.org/wiki/EPUB
155[EPUB]: https://en.wikipedia.org/wiki/EPUB
doc/faqs.mdnew file+128
@@ -0,0 +1,128 @@
1+% FAQs
2+
3+::: faqs
4+
5+## How can I convert a whole directory of files from Markdown to RTF?
6+
7+On linux or OSX:
8+
9+ for f in *.txt; do pandoc "$f" -s -o "${f%.txt}.rtf"; done
10+
11+
12+In Windows Powershell:
13+
14+ gci -r -i *.txt |foreach{$rtf=$_.directoryname+"\"+$_.basename+".rtf";pandoc -f markdown -s $_.name -o $rtf}
15+
16+## I used pandoc to convert a document to ICML (or OPML or RTF), and when I try to open it I'm told it's invalid. What have I done wrong?
17+
18+Be sure to use the `-s` or `--standalone` flag, or you just get a
19+fragment, not a full document with the required header:
20+
21+ pandoc -s -f markdown -t icml -o my.icml my.md
22+
23+## I get a blank document when I try to convert a markdown document in Chinese to PDF.
24+
25+By default, pandoc uses pdflatex to generate the PDF, and pdflatex
26+doesn't handle Chinese characters. But you can change the default to
27+use xelatex instead. You should also make sure you're using a font
28+with Chinese glyphs. For example:
29+
30+ pandoc -o c.pdf --pdf-engine=xelatex -V mainfont='Adobe Ming Std'
31+
32+## The Windows installer does a single user install, rather than installing pandoc for all users. How can I install pandoc for all users?
33+
34+Run the following command as admin:
35+
36+ msiexec /i pandoc-VERSION.msi ALLUSERS=1
37+
38+This will put pandoc in `C:\Program Files\Pandoc`.
39+You can install Pandoc to a different directory by setting APPLICATIONFOLDER parameter,
40+for example:
41+
42+ msiexec /i pandoc-1.11.1.msi ALLUSERS=1 APPLICATIONFOLDER="C:\Pandoc"
43+
44+## How do I change the margins in PDF output?
45+
46+The option
47+
48+ -V geometry:margin=1in
49+
50+will set the margins to one inch on each side. If you don't want uniform
51+margins, you can do something like
52+
53+ -V geometry:"top=2cm, bottom=1.5cm, left=1cm, right=1cm"
54+
55+Or
56+
57+ -V geometry:"left=3cm, width=10cm"
58+
59+For more options, see the documentation for the LaTeX [geometry
60+package](https://www.ctan.org/pkg/geometry).
61+
62+## How does pandoc compare to multimarkdown?
63+
64+Here is a [wiki
65+page](https://github.com/jgm/pandoc/wiki/Pandoc-vs-Multimarkdown)
66+comparing the two.
67+
68+## When I specify an image width of 50% and convert to LaTeX, pandoc sets the height to textheight and the aspect ratio isn't preserved. How can I prevent this?
69+
70+For example, if you convert an image with `{width="50%"}`, the LaTeX produced
71+will be `\includegraphics[width=0.5\textwidth,height=\textheight]`.
72+
73+This output presupposes the following code in pandoc's default latex
74+template:
75+
76+```
77+% Scale images if necessary, so that they will not overflow the page
78+% margins by default, and it is still possible to overwrite the defaults
79+% using explicit options in \includegraphics[width, height, ...]{}
80+\setkeys{Gin}{width=\maxwidth,height=\maxheight,keepaspectratio}
81+```
82+
83+If you don't have this in your custom template, you should
84+add it. If we didn't set the `height` explicitly in this way,
85+the image would not be resized correctly unless it was
86+being resized to smaller than its original size.
87+
88+## Pandoc sometimes uses too much memory. How can I limit the memory used by pandoc?
89+
90+`pandoc +RTS -M30m -RTS` will limit heap memory to 30MB.
91+When converting a document requires more than this, an out of
92+memory error will be issued.
93+
94+## When using `--include-in-header` with PDF or LaTeX output, how do I reference tex declarations coming after `$header-includes$` in the default template?
95+
96+For various reasons, the `$header-includes$` are not at the very
97+end of the LaTeX preamble. This poses a problem when the code
98+you are inserting depends on declarations in the preamble coming
99+after the `$header-includes$` location. For example, you might
100+want to reference the `\author` and `\title` metadata values
101+(set at the very bottom of the preamble) and present them in
102+margins. In that case you can wrap your code in `etoolbox`'s
103+`\AtEndPreamble`. The technique is demonstrated in [this
104+gist](https://gist.github.com/JohnLukeBentley/9dda6166b9ee5c4127afd2b8cd16b70a).
105+When using `\AtEndPreamble`, keep any `makeatletter` or
106+`makeatother` outside of the `\AtEndPreamble`, as shown in the
107+example.
108+
109+## How can I convert PDFs to other formats using pandoc?
110+
111+You can't. You can try opening the PDF in Word or Google Docs
112+and saving in a format from which pandoc can convert directly.
113+
114+## Do I really need to install a 1 GB TeX installation to produce a PDF using pandoc?
115+
116+No. You can get by with a relatively small TeX installation,
117+for example, by starting with MacTeX's Basic TeX distribution
118+and using the `tlmgr` tool to install a few packages required by pandoc
119+(see https://pandoc.org/MANUAL.html#creating-a-pdf).
120+
121+Or, you can produce PDFs via HTML and `wkhtmltopdf`,
122+or via groff ms and `pdfroff`. (These don't produce as nice
123+topography as TeX, particularly when it comes to math, but they
124+may be fine for many purposes.)
125+
126+
127+:::
128+
doc/filters.md+91−6
@@ -253,12 +253,15 @@ repository](https://github.com/jgm/pandocfilters).
253
253
254For a more Pythonic alternative to pandocfilters, see
254For a more Pythonic alternative to pandocfilters, see
255the [panflute](https://pypi.org/project/panflute) library.
255the [panflute](https://pypi.org/project/panflute) library.
256−Don't like Python? There are also ports of pandocfilters in
256+Don't like Python? There are also ports of pandocfilters in
257+
257−[PHP](https://github.com/vinai/pandocfilters-php),
258+- [PHP](https://github.com/vinai/pandocfilters-php),
258−[perl](https://metacpan.org/pod/Pandoc::Filter),
259+- [perl](https://metacpan.org/pod/Pandoc::Filter),
260+- TypeScript/JavaScript via Node.js
259−[javascript/node.js](https://github.com/mvhenderson/pandoc-filter-node),
261+ - [pandoc-filter](https://github.com/mvhenderson/pandoc-filter-node),
262+ - [node-pandoc-filter](https://github.com/mu-io/node-pandoc-filter),
260−[Groovy](https://github.com/dfrommi/groovy-pandoc), and
263+- [Groovy](https://github.com/dfrommi/groovy-pandoc), and
261−[Ruby](https://heerdebeer.org/Software/markdown/paru/).
264+- [Ruby](https://heerdebeer.org/Software/markdown/paru/).
262
265
263Starting with pandoc 2.0, pandoc includes built-in support for
266Starting with pandoc 2.0, pandoc includes built-in support for
264writing filters in lua. The lua interpreter is built in to
267writing filters in lua. The lua interpreter is built in to
@@ -391,6 +394,8 @@ automatically assign it `Just` the target format or `Nothing`.
391
394
392We compile our script:
395We compile our script:
393
396
397+ # first, make sure pandoc-types is installed:
398+ cabal install --lib pandoc-types --package-env .
394 ghc --make handleRuby
399 ghc --make handleRuby
395
400
396Then run it:
401Then run it:
@@ -425,3 +430,83 @@ the Japanese characters (e.g. "Noto Sans CJK TC"), and add
4255. Find all code blocks with class `python` and run them
4305. Find all code blocks with class `python` and run them
426 using the python interpreter, printing the results to the console.
431 using the python interpreter, printing the results to the console.
427
432
433+# Technical details of JSON filters
434+
435+A JSON filter is any program which can consume and produce a
436+valid pandoc JSON document representation. This section describes
437+the technical details surrounding the invocation of filters.
438+
439+## Arguments
440+
441+The program will always be called with the target format as the
442+only argument. A pandoc invocation like
443+
444+ pandoc --filter demo --to=html
445+
446+will cause pandoc to call the program `demo` with argument `html`.
447+
448+## Environment variables
449+
450+Pandoc sets additional environment variables before calling a
451+filter.
452+
453+`PANDOC_VERSION`
454+: The version of the pandoc binary used to process the document.
455+ Example: `2.11.1`.
456+
457+`PANDOC_READER_OPTIONS`
458+: JSON object representation of the options passed to the input
459+ parser.
460+
461+ Object fields:
462+
463+ `readerAbbreviations`
464+ : set of known abbreviations (array of strings).
465+
466+ `readerColumns`
467+ : number of columns in terminal; an integer.
468+
469+ `readerDefaultImageExtension`
470+ : default extension for images; a string.
471+
472+ `readerExtensions`
473+ : integer representation of the syntax extensions bit
474+ field.
475+
476+ `readerIndentedCodeClasses`
477+ : default classes for indented code blocks; array of
478+ strings.
479+
480+ `readerStandalone`
481+ : whether the input was a standalone document with header;
482+ either `true` or `false`.
483+
484+ `readerStripComments`
485+ : HTML comments are stripped instead of parsed as raw HTML;
486+ either `true` or `false`.
487+
488+ `readerTabStop`
489+ : width (i.e. equivalent number of spaces) of tab stops;
490+ integer.
491+
492+ `readerTrackChanges`
493+ : track changes setting for docx; one of
494+ `"accept-changes"`, `"reject-changes"`, and
495+ `"all-changes"`.
496+
497+## Supported interpreters
498+
499+Files passed to the `--filter`/`-F` parameter are expected to be
500+executable. However, if the executable bit is not set, then
501+pandoc tries to guess a suitable interpreter from the file
502+extension.
503+
504+ file extension interpreter
505+ ---------------- --------------
506+ .py `python`
507+ .hs `runhaskell`
508+ .pl `perl`
509+ .rb `ruby`
510+ .php `php`
511+ .js `node`
512+ .r `Rscript`
doc/jats.mdnew file+414
@@ -0,0 +1,414 @@
1+---
2+title: JATS
3+author: Albert Krewinkel
4+---
5+
6+This document describes pandoc's handling of JATS.
7+
8+Metadata Values
9+===============
10+
11+`abstract`
12+: Article summary. Added via the document's front matter via the
13+ [`<abstract>`][elem:abstract] element.
14+
15+`author`
16+: list of article contributors. Each author should have a surname
17+ and a given name listed in the entry; if the author has no
18+ `surname` value, then the item will be used as the contributors
19+ [`string-name`][elem:string-name].
20+
21+ `orcid`
22+ : the contributor's ORCID identifier.
23+
24+ `surname`
25+ : surname of the contributor. Usually the family name in
26+ western names.
27+
28+ See [`<surname>`][elem:surname].
29+
30+ `given-names`
31+ : personal names of the contributor; this includes middle
32+ names (if any) in western-style names.
33+
34+ See [`<given-names>`][elem:given-names].
35+
36+ `name`
37+ : full name of the author; included only as a fallback if
38+ `author.surname` is not available. Tagged with
39+ [`<string-name>`][elem:string-name].
40+
41+ `email`
42+ : the contributor's email address.
43+
44+ Used as the contents of the [`<email>`][elem:given-names]
45+ element.
46+
47+ `affiliation`
48+ : list of affiliation identifiers; marks the organizations
49+ with which an author is affiliated. Each identifier in this
50+ list must also occur as the `id` of an affiliation listed in
51+ the top-level `affiliation` list.
52+
53+ `equal-contrib`
54+ : boolean attribute used to mark authors who contributed
55+ equally to the work. The
56+ [`equal-contrib`][attr:equal-contrib] attribute is added
57+ to the author's [`<contrib>`] element if this is set to a
58+ truthy value.
59+
60+ `cor-id`
61+ : identifier linking to the contributor's correspondence
62+ information. The info itself must be stored in as an item in
63+ `article.author-notes.corresp`. If the `cor-id` value is
64+ then, an [`<xref>`][elem:xref] link of
65+ [`ref-type`][attr:ref-type] `corresp` is added. The
66+ [`rid`][attr:rid] attribute is set to `cor-<ID>`, where
67+ `<ID>` is the stringified value of this attribute.
68+
69+`affiliation`
70+: the list of organizations with which contributors are
71+ affiliated. Each institution is added as an [`<aff>`] element to
72+ the author's contrib-group.
73+
74+ The fields are given in the order in which they are included in
75+ the output.
76+
77+ `id`
78+ : internal identifier; used as the [`<aff>`] element's `id`
79+ value, prefixed with `aff-`.
80+
81+ `group`
82+ : name of the research group or other low-level organizational
83+ structure; used as value of an [`<institution>`] element with
84+ [`content-type`][attr:content-type] set to `group`.
85+
86+ `department`
87+ : name of the department or other mid-level organizational
88+ structure; used as value of an [`<institution>`] element with
89+ [`content-type`][attr:content-type] set to `dept`.
90+
91+ `organization`
92+ : name of the company, university, or other top-level
93+ organizational structure; used as value of an
94+ [`<institution>`] element. The institution element is wrapped
95+ in an [`<institution-wrap>`] element; any identifiers, like
96+ `ringgold` or `ror`, are added to the wrapper and must hence
97+ belong to this organization (not the department or group).
98+
99+ `isni`
100+ : International Standard Name Identifier of the organization.
101+ Added via an [`<institution-id>`] element with
102+ [`institution-id-type`](attr:institution-id-type) set to
103+ `ISNI`.
104+
105+ `ringgold`
106+ : [Ringgold] identifier of the organization. Added via an
107+ [`<institution-id>`] element with
108+ [`institution-id-type`](attr:institution-id-type) set to
109+ `Ringgold`.
110+
111+ `ror`
112+ : Research Organization Registry identifier of the
113+ organization. Added via an [`<institution-id>`] element with
114+ [`institution-id-type`](attr:institution-id-type) set to
115+ `ROR`.
116+
117+ `pid`
118+ : Array of persistent identifiers which are added as
119+ [`<institution-id>`] elements. Each item must contain a map
120+ with keys `type`, used as
121+ [`institution-id-type`](attr:institution-id-type), and `id`,
122+ used as element content.
123+
124+ `street-address`
125+ : The organization's street address; each list item is wrapped
126+ in an [`<addr-line>`] element, separated by a comma and
127+ space (`, `).
128+
129+ `city`
130+ : City in which the organization is located; used only if
131+ `street-address` is not given, in which case the value is
132+ wrapped in a [`<city>`] element.
133+
134+ `country`
135+ : Country in which the organization is located; used as the
136+ value of a [`<country>`] element.
137+
138+ `country-code`
139+ : Two letter ISO-3166-1 country identifier; used as the
140+ [`country`][attr:country] attribute in element [`<country>`]
141+ (if the latter is present).
142+
143+`copyright`
144+: Licensing and copyright information. This information is
145+ rendered via the [`<permissions>`][elem:permissions] element.
146+
147+ The variables `type`, `link`, and `text` should always be used
148+ together.
149+
150+ `statement`
151+ : the year of copyright; used as content of the
152+ [`<copyright-statement>`][elem:copyright-statement]
153+
154+ `year`
155+ : the year of copyright; used as content of the
156+ [`<copyright-year>`][elem:copyright-year]
157+
158+ `holder`
159+ : the copyright holder; included via the
160+ [`<copyright-holder>`][elem:copyright-holder] element.
161+
162+ `text`
163+ : inline text setting the license under which the text is
164+ published; included via the
165+ [`<license-p>`][elem:copyright-holder] element.
166+
167+ `type`
168+ : type of the license; used as value of the
169+ [`license-type`][attr:license-type] attribute.
170+
171+ `link`
172+ : external link describing the license; used as value of a
173+ `xlink:href` attribute in the `<license>` element.
174+
175+`date`
176+: publication date. This value should usually be a string
177+ representation of a date. Pandoc will parse and deconstruct the
178+ date into the components given below. It is also possible to
179+ pass these components directly.
180+
181+ The publication date is recorded in the document via the
182+ [`<pub-date>`] element and its sub-elements. The
183+ [`publication-format`][attr:publication-format] attribute is
184+ always set to `electronic`.
185+
186+ `iso-8601`
187+ : ISO-8601 representation of the publication date. Used as the
188+ value of the [`<pub-date>`] element's
189+ [`iso-8601-date`][attr:iso-8601-date] attribute.
190+
191+ This value is set automatically if pandoc can parse the
192+ `date` value as a date.
193+
194+ `day`, `month`, `year`
195+ : Day, month, and year of the publication date. Only the
196+ publication year is required. The values are used as the
197+ contents of the elements with the respective names.
198+
199+ The values are set automatically if pandoc can parse the
200+ `date` value as a date.
201+
202+ `type`
203+ : The type of event marked by this date. The value is set as
204+ the [`date-type`][attr:date-type] attribute on the
205+ [`<pub-date>`] element and defaults to "pub" if not
206+ specified.
207+
208+`article`
209+: information concerning the article that identifies or describes
210+ it. The key-value pairs within this map are typically used
211+ within the [`<article-meta>`][elem:article-meta] element.
212+
213+ `publisher-id`
214+ : external article identifier assigned by the publisher. Used
215+ as the content of the [`<article-id>`][elem:article-id]
216+ element with attribute [`pub-id-type`][attr:pub-id-type] set
217+ to `publisher-id`.
218+
219+ `doi`
220+ : Digital Object Identifier (DOI) assigned to the article.
221+ Used as the content of the [`<article-id>`][elem:article-id]
222+ element with attribute [`pub-id-type`][attr:pub-id-type] set
223+ to `doi`.
224+
225+ `pmid`
226+ : PubMed Identifier (PubMed ID) assigned to the article. Used
227+ as the content of the [`<article-id>`][elem:article-id]
228+ element with attribute [`pub-id-type`][attr:pub-id-type] set
229+ to `pmid`.
230+
231+ `pmcid`
232+ : PubMed Central Identifier assigned to the article. Used as
233+ the content of the [`<article-id>`][elem:article-id] element
234+ with attribute [`pub-id-type`][attr:pub-id-type] set to
235+ `pmcid`.
236+
237+ `art-access-id`
238+ : generic article accession identifier. Used as the content of
239+ the [`<article-id>`][elem:article-id] element with attribute
240+ [`pub-id-type`][attr:pub-id-type] set to `art-access-id`.
241+
242+ `heading`
243+ : name of a subject or topic describing the article. Used as
244+ the content of the [`<subject>`][elem:subject] element,
245+ nested in a [`<subj-group>`][elem:subj-group] element which
246+ has `heading` as its
247+ [`subj-group-type`][attr:subj-group-type] attribute.
248+
249+ `categories`
250+ : list a subject or topic describing the article. Items are
251+ each used as the content a the [`<subject>`][elem:subject]
252+ element, grouped in a single
253+ [`<subj-group>`][elem:subj-group] element with its
254+ [`subj-group-type`][attr:subj-group-type] attribute set to
255+ `categories`.
256+
257+ `author-notes`
258+ : Additional information about authors, like conflict of
259+ interest statements and corresponding author contact info.
260+ Wrapped in an [`<author-notes>`][elem:author-notes] element.
261+
262+ `conflict`
263+ : Conflict of interest statement. Rendered as a footnote
264+ ([`<fn>`][elem:fn]) of [`fn-type`](attr:fn-type)
265+ `conflict`.
266+
267+ `con`
268+ : Contributed-by information. Rendered as a footnote
269+ ([`<fn>`][elem:fn]) of [`fn-type`](attr:fn-type) `con`.
270+
271+ `corresp`
272+ : Correspondence information. This must be a list of
273+ contributor correspondence items, where each item must
274+ have the properties `id` and `email`. The info is then
275+ rendered via a [`<corresp>`][elem:corresp] element.
276+
277+ `funding-statement`
278+ : Prose describing the funding. Added to the article's
279+ frontmatter via the
280+ [`funding-statement`][elem:funding-statement] element.
281+
282+`journal`
283+: information on the journal in which the article is published.
284+ This must be a map; the following key/value pairs are
285+ recognized.
286+
287+ `publisher-id`
288+ : journal identifier assigned by the publisher. Used as
289+ content of element [`<journal-id>`][elem:journal-id] with
290+ attribute [`journal-id-type`][attr:journal-id-type] set to
291+ `publisher-id`.
292+
293+ `nlm-ta`
294+ : journal identifier assigned by PubMed. Used as content of
295+ element [`<journal-id>`][elem:journal-id] with attribute
296+ [`journal-id-type`][attr:journal-id-type] set to `nlm-ta`.
297+
298+ `pmc`
299+ : journal identifier assigned by PubMed Central. Used as
300+ content of element [`<journal-id>`][elem:journal-id] with
301+ attribute [`journal-id-type`][attr:journal-id-type] set to
302+ `pmc`.
303+
304+ `title`
305+ : full title of the journal in which the article is published.
306+ Used as content of the
307+ [`<journal-title>`][elem:journal-title] element.
308+
309+ `abbrev-title`
310+ : short form of the journal title. Used as content of the
311+ [`<abbrev-journal-title>`][elem:abbrev-journal-title]
312+ element.
313+
314+ `pissn`
315+ : ISSN identifier of the publication's print version. Used as
316+ content of the [`<issn>`][elem:issn] element with the
317+ [`publication-format`][attr:publication-format] attribute
318+ set to `print`.
319+
320+ `eissn`
321+ : ISSN identifier of the publication's electronic version.
322+ Used as content of the [`<issn>`][elem:issn] element with
323+ the [`publication-format`][attr:publication-format]
324+ attribute set to `electronic`.
325+
326+ `publisher-name`
327+ : name of the publishing entity (person, company, or other).
328+ Used as the content of the
329+ [`<publisher-name>`][elem:publisher-name] element.
330+
331+ `publisher-loc`
332+ : place of publication. Used as the content of the
333+ [`<publisher-loc>`][elem:publisher-loc] element.
334+
335+`notes`
336+: Additional notes concerning the whole article. Added to the
337+ article's frontmatter via the [`<notes>`][elem:notes] element.
338+
339+`tags`
340+: list of keywords. Items are used as contents of the
341+ [`<kwd>`][elem:kwd] element; the elements are grouped in a
342+ [`<kwd-group>`][elem:kwd-group] with the
343+ [`kwd-group-type`][attr:kwd-group-type] value `author`.
344+
345+Required Metadata
346+-----------------
347+
348+Pandoc will try to generate a valid JATS document even when
349+information is missing, filling in placeholders or using empty
350+values. This circumvents the intend to ensure a minimum set of
351+information being present in documents of a certain tag set. It is
352+hence recommended to always provide the information listed below.
353+
354+### Publishing Tag Set
355+
356+Required metadata values:
357+
358+- One or more of `journal.publisher-id`, `journal.nlm-ta`,
359+ `journal.pmc`.
360+- One or more of `journal.pissn`, `journal.eissn`.
361+
362+[Ringgold]: https://ringgold.com/
363+[attr:content-type]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/attribute/content-type.html
364+[attr:date-type]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/attribute/date-type.html
365+[attr:equal-contrib]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/attribute/equal-contrib.html
366+[attr:fn-type]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/attribute/fn-type.html
367+[attr:institution-id-type]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/attribute/institution-id-type.html
368+[attr:iso-8601-date]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/attribute/iso-8601-date.html
369+[attr:journal-id-type]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/attribute/journal-id-type.html
370+[attr:kwd-group-type]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/attribute/kwd-group-type.html
371+[attr:license-type]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/attribute/license-type.html
372+[attr:pub-id-type]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/attribute/pub-id-type.html
373+[attr:publication-format]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/attribute/publication-format.html
374+[attr:ref-type]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/attribute/ref-type.html
375+[attr:rid]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/attribute/rid.html
376+[attr:subj-group-type]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/attribute/subj-group-type.html
377+[elem:abbrev-journal-title]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/abbrev-journal-title.html
378+[elem:abstract]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/abstract.html
379+[elem:article-id]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/article-id.html
380+[elem:article-meta]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/article-meta.html
381+[elem:copyright-holder]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/copyright-holder.html
382+[elem:copyright-statement]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/copyright-statement.html
383+[elem:copyright-year]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/copyright-year.html
384+[elem:corresp]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/corresp.html
385+[elem:email]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/email.html
386+[elem:fn]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/fn.html
387+[elem:funding-statement]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/funding-statement.html
388+[elem:given-names]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/given-names.html
389+[elem:issn]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/issn.html
390+[elem:journal-id]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/journal-id.html
391+[elem:journal-title]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/journal-title.html
392+[elem:kwd-group]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/kwd-group.html
393+[elem:kwd]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/kwd.html
394+[elem:license-p]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/license-p.html
395+[elem:license]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/license.html
396+[elem:notes]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/notes.html
397+[elem:permissions]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/permissions.html
398+[elem:publisher-loc]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/publisher-loc.html
399+[elem:publisher-name]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/publisher-name.html
400+[elem:string-name]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/string-name.html
401+[elem:subj-group]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/subj-group.html
402+[elem:subject]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/subject.html
403+[elem:surname]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/surname.html
404+[elem:xref]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/xref.html
405+
406+[`<addr-line>`]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/addr-line.html
407+[`<aff>`]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/aff.html
408+[`<city>`]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/city.html
409+[`<contrib>`]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/contrib.html
410+[`<country>`]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/country.html
411+[`<institution-id>`]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/institution-id.html
412+[`<institution-wrap>`]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/institution-wrap.html
413+[`<institution>`]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/institution.html
414+[`<pub-date>`]: https://jats.nlm.nih.gov/publishing/tag-library/1.2/element/pub-date.html
doc/libraries.mdnew file+63
@@ -0,0 +1,63 @@
1+---
2+title: The pandoc family of libraries
3+author: John MacFarlane
4+---
5+
6+The following Haskell libraries have been developed to support
7+pandoc:
8+
9+[skylighting-core] and [skylighting]
10+: Syntax highlighting engine supporting over 140 languages.
11+
12+[citeproc]
13+: Citation processing using CSL stylesheets.
14+
15+[texmath]
16+: Conversion of math between tex, Word equation, MathML, and GNU eqn.
17+
18+[unicode-collation]
19+: Proper Unicode collation (sorting).
20+
21+[doclayout]
22+: Combinators for laying out a textual document, with support
23+ for line wrapping, tabular layout, and more.
24+
25+[doctemplates]
26+: Supports pandoc's templates.
27+
28+[commonmark], [commonmark-extensions], and [commonmark-pandoc]
29+: Efficient, standards-compliant parser for commonmark and extensions.
30+
31+[ipynb]
32+: Representation of Jupyter notebooks and conversion to and
33+ from JSON.
34+
35+[zip-archive]
36+: A pure zip file creator and extractor, used by pandoc for
37+ docx, ODT, and EPUB.
38+
39+[rfc5051]
40+: Simple unicode collation (used for citation sorting).
41+
42+[emojis]
43+: Conversion between emoji characters and aliases.
44+
45+[jira-wiki-markup]
46+: Support for parsing Jira wiki syntax.
47+
48+[skylighting]: https://hackage.haskell.org/package/skylighting
49+[skylighting-core]: https://hackage.haskell.org/package/skylighting-core
50+[citeproc]: https://hackage.haskell.org/package/citeproc
51+[texmath]: https://hackage.haskell.org/package/texmath
52+[doclayout]: https://hackage.haskell.org/package/doclayout
53+[doctemplates]: https://hackage.haskell.org/package/doctemplates
54+[commonmark]: https://hackage.haskell.org/package/commonmark
55+[commonmark-extensions]: https://hackage.haskell.org/package/commonmark-extensions
56+[commonmark-pandoc]: https://hackage.haskell.org/package/commonmark-pandoc
57+[ipynb]: https://hackage.haskell.org/package/ipynb
58+[zip-archive]: https://hackage.haskell.org/package/zip-archive
59+[rfc5051]: https://hackage.haskell.org/package/rfc5051
60+[emojis]: https://hackage.haskell.org/package/emojis
61+[jira-wiki-markup]: https://hackage.haskell.org/package/jira-wiki-markup
62+[unicode-collation]: https://hackage.haskell.org/package/unicode-collation
63+
doc/lua-filters.md+379−15
@@ -32,7 +32,7 @@ Starting with version 2.0, pandoc makes it possible to write
32filters in Lua without any external dependencies at all. A Lua
32filters in Lua without any external dependencies at all. A Lua
33interpreter (version 5.3) and a Lua library for creating pandoc
33interpreter (version 5.3) and a Lua library for creating pandoc
34filters is built into the pandoc executable. Pandoc data types
34filters is built into the pandoc executable. Pandoc data types
35−are marshalled to Lua directly, avoiding the overhead of writing
35+are marshaled to Lua directly, avoiding the overhead of writing
36JSON to stdout and reading it from stdin.
36JSON to stdout and reading it from stdin.
37
37
38Here is an example of a Lua filter that converts strong emphasis
38Here is an example of a Lua filter that converts strong emphasis
@@ -75,7 +75,7 @@ Python (`smallcaps.py`):
75 `pandoc --lua-filter ./smallcaps.lua` 1.03s
75 `pandoc --lua-filter ./smallcaps.lua` 1.03s
76
76
77As you can see, the Lua filter avoids the substantial overhead
77As you can see, the Lua filter avoids the substantial overhead
78−associated with marshalling to and from JSON over a pipe.
78+associated with marshaling to and from JSON over a pipe.
79
79
80# Lua filter structure
80# Lua filter structure
81
81
@@ -109,7 +109,7 @@ element filtering function. In other words, filter entries will
109be called for each corresponding element in the document,
109be called for each corresponding element in the document,
110getting the respective element as input.
110getting the respective element as input.
111
111
112−The return of a filter function must one of the following:
112+The return of a filter function must be one of the following:
113
113
114- nil: this means that the object should remain unchanged.
114- nil: this means that the object should remain unchanged.
115- a pandoc object: this must be of the same type as the input
115- a pandoc object: this must be of the same type as the input
@@ -292,7 +292,7 @@ use-case would be to load additional modules, or even to alter
292default modules.
292default modules.
293
293
294The following snippet is an example of code that might be useful
294The following snippet is an example of code that might be useful
295−when added to `init.lua`. The snippet adds all unicode-aware
295+when added to `init.lua`. The snippet adds all Unicode-aware
296functions defined in the [`text` module](#module-text) to the
296functions defined in the [`text` module](#module-text) to the
297default `string` module, prefixed with the string `uc_`.
297default `string` module, prefixed with the string `uc_`.
298
298
@@ -305,6 +305,29 @@ end
305This makes it possible to apply these functions on strings using
305This makes it possible to apply these functions on strings using
306colon syntax (`mystring:uc_upper()`).
306colon syntax (`mystring:uc_upper()`).
307
307
308+# Debugging Lua filters
309+
310+It is possible to use a debugging interface to halt execution and
311+step through a Lua filter line by line as it is run inside Pandoc.
312+This is accomplished using the remote-debugging interface of the
313+package [`mobdebug`](https://github.com/pkulchenko/MobDebug).
314+Although mobdebug can be run from the terminal, it is more useful
315+run within the donation-ware Lua editor and IDE,
316+[ZeroBrane](https://studio.zerobrane.com/). ZeroBrane offers a
317+REPL console and UI to step-through and view all variables and
318+state.
319+
320+If you already have Lua 5.3 installed, you can add
321+[`mobdebug`](https://luarocks.org/modules/paulclinger/mobdebug)
322+and its dependency
323+[`luasocket`](https://luarocks.org/modules/luasocket/luasocket)
324+using [`luarocks`](https://luarocks.org), which should then be
325+available on the path. ZeroBrane also includes both of these in
326+its package, so if you don't want to install Lua separately, you
327+should add/modify your `LUA_PATH` and `LUA_CPATH` to include the
328+correct locations; [see detailed instructions
329+here](https://studio.zerobrane.com/doc-remote-debugging).
330+
308# Examples
331# Examples
309
332
310The following filters are presented as examples. A repository of
333The following filters are presented as examples. A repository of
@@ -1465,6 +1488,22 @@ Fields:
1465`tag`, `t`
1488`tag`, `t`
1466: the literal `Superscript` (string)
1489: the literal `Superscript` (string)
1467
1490
1491+### Underline {#type-underline}
1492+
1493+Underlined text
1494+
1495+Values of this type can be created with the
1496+[`pandoc.Underline`](#pandoc.underline) constructor.
1497+
1498+Fields:
1499+
1500+`content`
1501+: inline content ([List] of [Inlines])
1502+
1503+`tag`, `t`
1504+: the literal `Underline` (string)
1505+
1506+
1468## Element components
1507## Element components
1469
1508
1470### Attr {#type-attr}
1509### Attr {#type-attr}
@@ -1474,7 +1513,7 @@ with the [`pandoc.Attr`](#pandoc.attr) constructor. For
1474convenience, it is usually not necessary to construct the value
1513convenience, it is usually not necessary to construct the value
1475directly if it is part of an element, and it is sufficient to
1514directly if it is part of an element, and it is sufficient to
1476pass an HTML-like table. E.g., to create a span with identifier
1515pass an HTML-like table. E.g., to create a span with identifier
1477−"text" and classes "a" and "b", on can write:
1516+"text" and classes "a" and "b", one can write:
1478
1517
1479 local span = pandoc.Span('text', {id = 'text', class = 'a b'})
1518 local span = pandoc.Span('text', {id = 'text', class = 'a b'})
1480
1519
@@ -1730,7 +1769,7 @@ A list is any Lua table with integer indices. Indices start at
1730one, so if `alist = {'value'}` then `alist[1] == 'value'`.
1769one, so if `alist = {'value'}` then `alist[1] == 'value'`.
1731
1770
1732Lists, when part of an element, or when generated during
1771Lists, when part of an element, or when generated during
1733−marshalling, are made instances of the `pandoc.List` type for
1772+marshaling, are made instances of the `pandoc.List` type for
1734convenience. The `pandoc.List` type is defined in the
1773convenience. The `pandoc.List` type is defined in the
1735[*pandoc.List*](#module-pandoc.list) module. See there for
1774[*pandoc.List*](#module-pandoc.list) module. See there for
1736available methods.
1775available methods.
@@ -1744,6 +1783,36 @@ table into a List.
1744A pandoc log message. Objects have no fields, but can be
1783A pandoc log message. Objects have no fields, but can be
1745converted to a string via `tostring`.
1784converted to a string via `tostring`.
1746
1785
1786+## SimpleTable {#type-simpletable}
1787+
1788+A simple table is a table structure which resembles the old (pre
1789+pandoc 2.10) Table type. Bi-directional conversion from and to
1790+[Tables](#type-table) is possible with the
1791+[`pandoc.utils.to_simple_table`](#pandoc.utils.to_simple_table)
1792+and
1793+[`pandoc.utils.from_simple_table`](#pandoc.utils.from_simple_table)
1794+function, respectively. Instances of this type can also be created
1795+directly with the [`pandoc.SimpleTable`](#pandoc.simpletable)
1796+constructor.
1797+
1798+Fields:
1799+
1800+`caption`:
1801+: [List] of [Inlines]
1802+
1803+`aligns`:
1804+: column alignments ([List] of [Alignments](#type-alignment))
1805+
1806+`widths`:
1807+: column widths; a ([List] of numbers)
1808+
1809+`headers`:
1810+: table header row ([List] of lists of [Blocks])
1811+
1812+`rows`:
1813+: table rows ([List] of rows, where a row is a list of lists of
1814+ [Blocks])
1815+
1747## Version {#type-version}
1816## Version {#type-version}
1748
1817
1749A version object. This represents a software version like
1818A version object. This represents a software version like
@@ -1816,6 +1885,8 @@ Usage:
1816[Pandoc]: #type-pandoc
1885[Pandoc]: #type-pandoc
1817[Para]: #type-para
1886[Para]: #type-para
1818[Rows]: #type-row
1887[Rows]: #type-row
1888+[SimpleTable]: #type-simpletable
1889+[Table]: #type-table
1819[TableBody]: #type-tablebody
1890[TableBody]: #type-tablebody
1820[TableFoot]: #type-tablefoot
1891[TableFoot]: #type-tablefoot
1821[TableHead]: #type-tablehead
1892[TableHead]: #type-tablehead
@@ -2183,7 +2254,7 @@ format, and functions to filter and modify a subtree.
2183
2254
2184[`Emph (content)`]{#pandoc.emph}
2255[`Emph (content)`]{#pandoc.emph}
2185
2256
2186−: Creates an inline element representing emphasised text.
2257+: Creates an inline element representing emphasized text.
2187
2258
2188 Parameters:
2259 Parameters:
2189
2260
@@ -2386,7 +2457,7 @@ format, and functions to filter and modify a subtree.
2386
2457
2387[`Strikeout (content)`]{#pandoc.strikeout}
2458[`Strikeout (content)`]{#pandoc.strikeout}
2388
2459
2389−: Creates text which is striked out.
2460+: Creates text which is struck out.
2390
2461
2391 Parameters:
2462 Parameters:
2392
2463
@@ -2429,6 +2500,17 @@ format, and functions to filter and modify a subtree.
2429
2500
2430 Returns: [Superscript](#type-superscript) object
2501 Returns: [Superscript](#type-superscript) object
2431
2502
2503+[`Underline (content)`]{#pandoc.underline}
2504+
2505+: Creates an Underline inline element
2506+
2507+ Parameters:
2508+
2509+ `content`:
2510+ : inline content
2511+
2512+ Returns: [Underline](#type-underline) object
2513+
2432## Element components
2514## Element components
2433
2515
2434[`Attr ([identifier[, classes[, attributes]]])`]{#pandoc.attr}
2516[`Attr ([identifier[, classes[, attributes]]])`]{#pandoc.attr}
@@ -2491,6 +2573,52 @@ format, and functions to filter and modify a subtree.
2491
2573
2492 Returns: [ListAttributes](#type-listattributes) object
2574 Returns: [ListAttributes](#type-listattributes) object
2493
2575
2576+## Legacy types
2577+
2578+[`SimpleTable (caption, aligns, widths, headers, rows)`]{#pandoc.simpletable}
2579+
2580+: Creates a simple table resembling the old (pre pandoc 2.10)
2581+ table type.
2582+
2583+ Parameters:
2584+
2585+ `caption`:
2586+ : [List] of [Inlines]
2587+
2588+ `aligns`:
2589+ : column alignments ([List] of [Alignments](#type-alignment))
2590+
2591+ `widths`:
2592+ : column widths; a ([List] of numbers)
2593+
2594+ `headers`:
2595+ : table header row ([List] of lists of [Blocks])
2596+
2597+ `rows`:
2598+ : table rows ([List] of rows, where a row is a list of lists
2599+ of [Blocks])
2600+
2601+ Returns: [SimpleTable] object
2602+
2603+ Usage:
2604+
2605+ local caption = "Overview"
2606+ local aligns = {pandoc.AlignDefault, pandoc.AlignDefault}
2607+ local widths = {0, 0} -- let pandoc determine col widths
2608+ local headers = {{pandoc.Plain({pandoc.Str "Language"})},
2609+ {pandoc.Plain({pandoc.Str "Typing"})}}
2610+ local rows = {
2611+ {{pandoc.Plain "Haskell"}, {pandoc.Plain "static"}},
2612+ {{pandoc.Plain "Lua"}, {pandoc.Plain "Dynamic"}},
2613+ }
2614+ simple_table = pandoc.SimpleTable(
2615+ caption,
2616+ aligns,
2617+ widths,
2618+ headers,
2619+ rows
2620+ )
2621+
2494## Constants
2622## Constants
2495
2623
2496[`AuthorInText`]{#pandoc.authorintext}
2624[`AuthorInText`]{#pandoc.authorintext}
@@ -2615,9 +2743,21 @@ format, and functions to filter and modify a subtree.
2615Runs command with arguments, passing it some input, and returns
2743Runs command with arguments, passing it some input, and returns
2616the output.
2744the output.
2617
2745
2746+Parameters:
2747+
2748+`command`
2749+: program to run; the executable will be resolved using default
2750+ system methods (string).
2751+
2752+`args`
2753+: list of arguments to pass to the program (list of strings).
2754+
2755+`input`
2756+: data which is piped into the program via stdin (string).
2757+
2618Returns:
2758Returns:
2619
2759
2620−- Output of command.
2760+- Output of command, i.e. data printed to stdout (string)
2621
2761
2622Raises:
2762Raises:
2623
2763
@@ -2753,11 +2893,31 @@ Returns:
2753
2893
2754- Whether the two objects represent the same element (boolean)
2894- Whether the two objects represent the same element (boolean)
2755
2895
2896+### from\_simple\_table {#pandoc.utils.from_simple_table}
2897+
2898+`from_simple_table (table)`
2899+
2900+Creates a [Table] block element from a [SimpleTable]. This is
2901+useful for dealing with legacy code which was written for pandoc
2902+versions older than 2.10.
2903+
2904+Returns:
2905+
2906+- table block element ([Table])
2907+
2908+Usage:
2909+
2910+ local simple = pandoc.SimpleTable(table)
2911+ -- modify, using pre pandoc 2.10 methods
2912+ simple.caption = pandoc.SmallCaps(simple.caption)
2913+ -- create normal table block again
2914+ table = pandoc.utils.from_simple_table(simple)
2915+
2756### make\_sections {#pandoc.utils.make_sections}
2916### make\_sections {#pandoc.utils.make_sections}
2757
2917
2758`make_sections (number_sections, base_level, blocks)`
2918`make_sections (number_sections, base_level, blocks)`
2759
2919
2760−Converst list of [Blocks](#type-block) into sections.
2920+Converts list of [Blocks](#type-block) into sections.
2761`Div`s will be created beginning at each `Header`
2921`Div`s will be created beginning at each `Header`
2762and containing following content until the next `Header`
2922and containing following content until the next `Header`
2763of comparable level. If `number_sections` is true,
2923of comparable level. If `number_sections` is true,
@@ -2872,6 +3032,24 @@ Usage:
2872 local pandoc_birth_year = to_roman_numeral(2006)
3032 local pandoc_birth_year = to_roman_numeral(2006)
2873 -- pandoc_birth_year == 'MMVI'
3033 -- pandoc_birth_year == 'MMVI'
2874
3034
3035+### to\_simple\_table {#pandoc.utils.to_simple_table}
3036+
3037+`to_simple_table (table)`
3038+
3039+Creates a [SimpleTable] out of a [Table] block.
3040+
3041+Returns:
3042+
3043+- a simple table object ([SimpleTable])
3044+
3045+Usage:
3046+
3047+ local simple = pandoc.utils.to_simple_table(table)
3048+ -- modify, using pre pandoc 2.10 methods
3049+ simple.caption = pandoc.SmallCaps(simple.caption)
3050+ -- create normal table block again
3051+ table = pandoc.utils.from_simple_table(simple)
3052+
2875# Module pandoc.mediabag
3053# Module pandoc.mediabag
2876
3054
2877The `pandoc.mediabag` module allows accessing pandoc's media
3055The `pandoc.mediabag` module allows accessing pandoc's media
@@ -2906,7 +3084,8 @@ Clear-out the media bag, deleting all items.
2906
3084
2907`insert (filepath, mime_type, contents)`
3085`insert (filepath, mime_type, contents)`
2908
3086
2909−Adds a new entry to pandoc's media bag.
3087+Adds a new entry to pandoc's media bag. Replaces any existing
3088+mediabag entry with the same `filepath`.
2910
3089
2911Parameters:
3090Parameters:
2912
3091
@@ -2914,7 +3093,7 @@ Parameters:
2914: filename and path relative to the output folder.
3093: filename and path relative to the output folder.
2915
3094
2916`mime_type`:
3095`mime_type`:
2917−: the file's MIME type
3096+: the file's MIME type; use `nil` if unknown or unavailable.
2918
3097
2919`contents`:
3098`contents`:
2920: the binary contents of the file.
3099: the binary contents of the file.
@@ -2998,12 +3177,22 @@ Usage:
2998
3177
2999### fetch {#pandoc.mediabag.fetch}
3178### fetch {#pandoc.mediabag.fetch}
3000
3179
3001−`fetch (source, base_url)`
3180+`fetch (source)`
3002
3181
3003Fetches the given source from a URL or local file. Returns two
3182Fetches the given source from a URL or local file. Returns two
3004values: the contents of the file and the MIME type (or an empty
3183values: the contents of the file and the MIME type (or an empty
3005string).
3184string).
3006
3185
3186+The function will first try to retrieve `source` from the
3187+mediabag; if that fails, it will try to download it or read it
3188+from the local file system while respecting pandoc's "resource
3189+path" setting.
3190+
3191+Parameters:
3192+
3193+`source`:
3194+: path to a resource; either a local file path or URI
3195+
3007Returns:
3196Returns:
3008
3197
3009- the entries MIME type, or nil if the file was not found.
3198- the entries MIME type, or nil if the file was not found.
@@ -3012,11 +3201,11 @@ Returns:
3012Usage:
3201Usage:
3013
3202
3014 local diagram_url = "https://pandoc.org/diagram.jpg"
3203 local diagram_url = "https://pandoc.org/diagram.jpg"
3015− local mt, contents = pandoc.mediabag.fetch(diagram_url, ".")
3204+ local mt, contents = pandoc.mediabag.fetch(diagram_url)
3016
3205
3017# Module pandoc.List
3206# Module pandoc.List
3018
3207
3019−The this module defines pandoc's list type. It comes with useful
3208+This module defines pandoc's list type. It comes with useful
3020methods and convenience functions.
3209methods and convenience functions.
3021
3210
3022## Constructor
3211## Constructor
@@ -3198,6 +3387,181 @@ methods and convenience functions.
3198 `comp`:
3387 `comp`:
3199 : Comparison function as described above.
3388 : Comparison function as described above.
3200
3389
3390+# Module pandoc.path
3391+
3392+Module for file path manipulations.
3393+
3394+## Static Fields {#pandoc.path-fields}
3395+
3396+### separator {#pandoc.path.separator}
3397+
3398+The character that separates directories.
3399+
3400+### search_path_separator {#pandoc.path.search_path_separator}
3401+
3402+The character that is used to separate the entries in the `PATH`
3403+environment variable.
3404+
3405+## Functions {#pandoc.path-functions}
3406+
3407+### directory (filepath) {#pandoc.path.directory}
3408+
3409+Gets the directory name, i.e., removes the last directory
3410+separator and everything after from the given path.
3411+
3412+Parameters:
3413+
3414+filepath
3415+: path (string)
3416+
3417+Returns:
3418+
3419+- The filepath up to the last directory separator. (string)
3420+
3421+### filename (filepath) {#pandoc.path.filename}
3422+
3423+Get the file name.
3424+
3425+Parameters:
3426+
3427+filepath
3428+: path (string)
3429+
3430+Returns:
3431+
3432+- File name part of the input path. (string)
3433+
3434+### is_absolute (filepath) {#pandoc.path.is_absolute}
3435+
3436+Checks whether a path is absolute, i.e. not fixed to a root.
3437+
3438+Parameters:
3439+
3440+filepath
3441+: path (string)
3442+
3443+Returns:
3444+
3445+- `true` iff `filepath` is an absolute path, `false` otherwise.
3446+ (boolean)
3447+
3448+### is_relative (filepath) {#pandoc.path.is_relative}
3449+
3450+Checks whether a path is relative or fixed to a root.
3451+
3452+Parameters:
3453+
3454+filepath
3455+: path (string)
3456+
3457+Returns:
3458+
3459+- `true` iff `filepath` is a relative path, `false` otherwise.
3460+ (boolean)
3461+
3462+### join (filepaths) {#pandoc.path.join}
3463+
3464+Join path elements back together by the directory separator.
3465+
3466+Parameters:
3467+
3468+filepaths
3469+: path components (list of strings)
3470+
3471+Returns:
3472+
3473+- The joined path. (string)
3474+
3475+### make_relative (path, root[, unsafe]) {#pandoc.path.make_relative}
3476+
3477+Contract a filename, based on a relative path. Note that the
3478+resulting path will usually not introduce `..` paths, as the
3479+presence of symlinks means `../b` may not reach `a/b` if it starts
3480+from `a/c`. For a worked example see [this blog
3481+post](https://neilmitchell.blogspot.co.uk/2015/10/filepaths-are-subtle-symlinks-are-hard.html).
3482+
3483+Set `unsafe` to a truthy value to a allow `..` in paths.
3484+
3485+Parameters:
3486+
3487+path
3488+: path to be made relative (string)
3489+
3490+root
3491+: root path (string)
3492+
3493+unsafe
3494+: whether to allow `..` in the result. (boolean)
3495+
3496+Returns:
3497+
3498+- contracted filename (string)
3499+
3500+### normalize (filepath) {#pandoc.path.normalize}
3501+
3502+Normalizes a path.
3503+
3504+- `//` makes sense only as part of a (Windows) network drive;
3505+ elsewhere, multiple slashes are reduced to a single
3506+ `path.separator` (platform dependent).
3507+- `/` becomes `path.separator` (platform dependent)
3508+- `./` -\> ''
3509+- an empty path becomes `.`
3510+
3511+Parameters:
3512+
3513+filepath
3514+: path (string)
3515+
3516+Returns:
3517+
3518+- The normalized path. (string)
3519+
3520+### split (filepath) {#pandoc.path.split}
3521+
3522+Splits a path by the directory separator.
3523+
3524+Parameters:
3525+
3526+filepath
3527+: path (string)
3528+
3529+Returns:
3530+
3531+- List of all path components. (list of strings)
3532+
3533+### split_extension (filepath) {#pandoc.path.split_extension}
3534+
3535+Splits the last extension from a file path and returns the parts. The
3536+extension, if present, includes the leading separator; if the path has
3537+no extension, then the empty string is returned as the extension.
3538+
3539+Parameters:
3540+
3541+filepath
3542+: path (string)
3543+
3544+Returns:
3545+
3546+- filepath without extension (string)
3547+
3548+- extension or empty string (string)
3549+
3550+### split_search_path (search_path) {#pandoc.path.split_search_path}
3551+
3552+Takes a string and splits it on the `search_path_separator` character.
3553+Blank items are ignored on Windows, and converted to `.` on Posix. On
3554+Windows path elements are stripped of quotes.
3555+
3556+Parameters:
3557+
3558+search_path
3559+: platform-specific search path (string)
3560+
3561+Returns:
3562+
3563+- list of directories in search path (list of strings)
3564+
3201# Module pandoc.system
3565# Module pandoc.system
3202
3566
3203Access to system information and functionality.
3567Access to system information and functionality.
doc/org.md+96−4
@@ -22,10 +22,10 @@ The following export keywords are supported:
22- EMAIL: author email address; passed as plain-text metadata
22- EMAIL: author email address; passed as plain-text metadata
23 field `email`, but not used by any default templates.
23 field `email`, but not used by any default templates.
24
24
25−- LANGUAGE: currently unsupported; use `#+LANG:` instead.
25+- LANGUAGE: document language; included as plain-text metadata
26+ field `lang`. The value should be a [BCP47 language tag].
26
27
27−- SELECT_TAGS: tags which select a tree for export. Currently
28+- SELECT_TAGS: tags which select a tree for export.
28− *unsupported*.
29
29
30- EXCLUDE\_TAGS: tags which prevent a subtree from being
30- EXCLUDE\_TAGS: tags which prevent a subtree from being
31 exported. Fully supported.
31 exported. Fully supported.
@@ -36,6 +36,23 @@ The following export keywords are supported:
36 defaults to stdout unless a target has to be given as a command
36 defaults to stdout unless a target has to be given as a command
37 line option.
37 line option.
38
38
39+::: {.alert .alert-info}
40+Pandoc tries to be compatible with org-mode when exporting an org document. If
41+you find some behavior confusing, please do refer to org-mode
42+[Export-Settings](https://orgmode.org/manual/Export-Settings.html)
43+documentation. For example, a common confusion
44+([#3214](https://github.com/jgm/pandoc/issues/3214 "Problem with headers lower
45+then 3 in org-mode reader"), [#5169](https://github.com/jgm/pandoc/issues/5169
46+"org mode headings past level three converted to numbered outline list"),
47+[#6145](https://github.com/jgm/pandoc/issues/6145 "Headers 4 levels deep render
48+differently"), [#7236](https://github.com/jgm/pandoc/issues/7236 "In Org mode,
49+Header with level > 3 are not recognized as headers")) is treatment of headers
50+with level > 3 differently because org-mode sets `org-export-headline-levels`
51+(configurable with `#+OPTIONS: H:3`) to 3 by default.
52+:::
53+
54+[BCP47 language tag]: https://tools.ietf.org/html/bcp47
55+
39Format-specific options
56Format-specific options
40-----------------------
57-----------------------
41
58
@@ -102,6 +119,53 @@ Pandoc recognizes some export options not used by Emacs Org.
102 field is included by default on the title slide of beamer
119 field is included by default on the title slide of beamer
103 presentations.
120 presentations.
104
121
122+Other options
123+-------------
124+
125+Any export option or directive not listed above has no effect when
126+parsing with pandoc. However, the information is retained as a
127+*raw block*. It can be accessed through a
128+[filter](https://pandoc.org/filters.html) and will be included in
129+org output.
130+
131+### Directives as metadata
132+
133+As an example, we will restore an old behavior of pandoc versions
134+prior to 2.10. Unknown keywords were treated as variable
135+definitions, and were added the document's metadata. Typing
136+`#+key: value` in the org-file used to have the same effect as
137+running pandoc with the `--metadata key=value` option.
138+
139+Since pandoc 2.10, each unhandled line starting with `#+` is kept
140+internally as a raw block with format `org`. This block can be
141+inspected and processed by a filter. Below is a [Lua
142+filter](https://pandoc.org/lua-filters.html) which converts these
143+unhandled lines into metadata key-value pairs.
144+
145+``` lua
146+-- intermediate store for variables and their values
147+local variables = {}
148+
149+--- Function called for each raw block element.
150+function RawBlock (raw)
151+ -- Don't do anything unless the block contains *org* markup.
152+ if raw.format ~= 'org' then return nil end
153+
154+ -- extract variable name and value
155+ local name, value = raw.text:match '#%+(%w+):%s*(.+)$'
156+ if name and value then
157+ variables[name] = value
158+ end
159+end
160+
161+-- Add the extracted variables to the document's metadata.
162+function Meta (meta)
163+ for name, value in pairs(variables) do
164+ meta[name] = value
165+ end
166+ return meta
167+end
168+```
105
169
106Citations
170Citations
107=========
171=========
@@ -159,7 +223,7 @@ Example:
159
223
160### Parenthetical citation
224### Parenthetical citation
161
225
162−Citations surrounded by parantheses. The syntax is identical to
226+Citations surrounded by parentheses. The syntax is identical to
163in-text citations, except for the additional parentheses enclosing
227in-text citations, except for the additional parentheses enclosing
164the initial `cite` tag.
228the initial `cite` tag.
165
229
@@ -217,6 +281,34 @@ Use normal latex citation commands like `\cite{x}` or
217[org-ref]: https://github.com/jkitchin/org-ref
281[org-ref]: https://github.com/jkitchin/org-ref
218[John Kitchen]: https://kitchingroup.cheme.cmu.edu/
282[John Kitchen]: https://kitchingroup.cheme.cmu.edu/
219
283
284+Tables
285+======
286+
287+Pandoc supports normal org tables (sometimes called "pipe tables")
288+and grid tables (tables created by [table.el]).
289+
290+Column widths
291+-------------
292+
293+Org mode tables don't allow line-breaks within cells, and lines
294+which contain text can get very long. This often leads to tables
295+which run off the page when exporting, especially when exporting
296+to PDF via LaTeX. Overlong lines in the source text are this is
297+usually hidden by setting a [column width], but the default Emacs
298+exporters ignore that setting. Pandoc deviates from Emacs's
299+behavior and uses this information to resize the table columns
300+when exporting.
301+
302+Limitations
303+-----------
304+
305+There is no support yet for cells spanning multiple columns or
306+rows. The table.el grid tables allows rowspans and colspans and so
307+does pandoc's internal structure since 2.10, but the parser has
308+not been updated yet.
309+
310+[table.el]: http://table.sourceforge.net/
311+[column width]: https://orgmode.org/manual/Column-Width-and-Alignment.html
220
312
221Emphasis rules
313Emphasis rules
222==============
314==============
doc/using-the-pandoc-api.md+28−15
@@ -14,7 +14,7 @@ and types is available at
14Pandoc is structured as a set of *readers*, which translate
14Pandoc is structured as a set of *readers*, which translate
15various input formats into an abstract syntax tree (the
15various input formats into an abstract syntax tree (the
16Pandoc AST) representing a structured document, and a set of
16Pandoc AST) representing a structured document, and a set of
17−*writers*, which render this AST into various input formats.
17+*writers*, which render this AST into various output formats.
18Pictorially:
18Pictorially:
19
19
20```
20```
@@ -90,8 +90,14 @@ Some notes:
90Let's look at the types of `readMarkdown` and `writeRST`:
90Let's look at the types of `readMarkdown` and `writeRST`:
91
91
92```haskell
92```haskell
93−readMarkdown :: PandocMonad m => ReaderOptions -> Text -> m Pandoc
93+readMarkdown :: (PandocMonad m, ToSources a)
94+ => ReaderOptions
95+ -> a
96+ -> m Pandoc
94−writeRST :: PandocMonad m => WriterOptions -> Pandoc -> m Text
97+writeRST :: PandocMonad m
98+ => WriterOptions
99+ -> Pandoc
100+ -> m Text
95```
101```
96
102
97The `PandocMonad m =>` part is a typeclass constraint.
103The `PandocMonad m =>` part is a typeclass constraint.
@@ -120,7 +126,7 @@ getVerbosity :: PandocMonad m => m Verbosity
120-- | Set the verbosity level.
126-- | Set the verbosity level.
121setVerbosity :: PandocMonad m => Verbosity -> m ()
127setVerbosity :: PandocMonad m => Verbosity -> m ()
122
128
123−-- Get the accomulated log messages (in temporal order).
129+-- Get the accumulated log messages (in temporal order).
124getLog :: PandocMonad m => m [LogMessage]
130getLog :: PandocMonad m => m [LogMessage]
125getLog = reverse <$> getsCommonState stLog
131getLog = reverse <$> getsCommonState stLog
126
132
@@ -133,7 +139,7 @@ report :: PandocMonad m => LogMessage -> m ()
133-- | Fetch an image or other item from the local filesystem or the net.
139-- | Fetch an image or other item from the local filesystem or the net.
134-- Returns raw content and maybe mime type.
140-- Returns raw content and maybe mime type.
135fetchItem :: PandocMonad m
141fetchItem :: PandocMonad m
136− => String
142+ => Text
137 -> m (B.ByteString, Maybe MimeType)
143 -> m (B.ByteString, Maybe MimeType)
138
144
139-- Set the resource path searched by 'fetchItem'.
145-- Set the resource path searched by 'fetchItem'.
@@ -155,6 +161,13 @@ Note that `PandocIO` is an instance of `MonadIO`, so you can
155use `liftIO` to perform arbitrary IO operations inside a pandoc
161use `liftIO` to perform arbitrary IO operations inside a pandoc
156conversion chain.
162conversion chain.
157
163
164+`readMarkdown` is polymorphic in its second argument, which
165+can be any type that is an instance of the `ToSources`
166+typeclass. You can use `Text`, as in the example above.
167+But you can also use `[(FilePath, Text)]`, if the input comes
168+from multiple files and you want to track source positions
169+accurately.
170+
158# Options
171# Options
159
172
160The first argument of each reader or writer is for
173The first argument of each reader or writer is for
@@ -200,8 +213,8 @@ of the Monoid typeclass and can easily be concatenated:
200import Text.Pandoc.Builder
213import Text.Pandoc.Builder
201
214
202mydoc :: Pandoc
215mydoc :: Pandoc
203−mydoc = doc $ header 1 (text "Hello!")
216+mydoc = doc $ header 1 (text (T.pack "Hello!"))
204− <> para (emph (text "hello world") <> text ".")
217+ <> para (emph (text (T.pack "hello world")) <> text (T.pack "."))
205
218
206main :: IO ()
219main :: IO ()
207main = print mydoc
220main = print mydoc
@@ -248,16 +261,16 @@ import qualified Data.Text as T
248import Data.List (intersperse)
261import Data.List (intersperse)
249
262
250data Station = Station{
263data Station = Station{
251− address :: String
264+ address :: T.Text
252− , name :: String
265+ , name :: T.Text
253− , cardsAccepted :: [String]
266+ , cardsAccepted :: [T.Text]
254 } deriving Show
267 } deriving Show
255
268
256instance FromJSON Station where
269instance FromJSON Station where
257 parseJSON (Object v) = Station <$>
270 parseJSON (Object v) = Station <$>
258 v .: "street_address" <*>
271 v .: "street_address" <*>
259 v .: "station_name" <*>
272 v .: "station_name" <*>
260− (words <$> (v .:? "cards_accepted" .!= ""))
273+ (T.words <$> (v .:? "cards_accepted" .!= ""))
261 parseJSON _ = mzero
274 parseJSON _ = mzero
262
275
263createLetter :: [Station] -> Pandoc
276createLetter :: [Station] -> Pandoc
@@ -315,7 +328,7 @@ users to override the system defaults. If you want to disable
315this behavior, use `setUserDataDir Nothing`.
328this behavior, use `setUserDataDir Nothing`.
316
329
317To render a template, use `renderTemplate'`, which takes two
330To render a template, use `renderTemplate'`, which takes two
318−arguments, a template (String) and a context (any instance
331+arguments, a template (Text) and a context (any instance
319of ToJSON). If you want to create a context from the metadata
332of ToJSON). If you want to create a context from the metadata
320part of a Pandoc document, use `metaToJSON'` from
333part of a Pandoc document, use `metaToJSON'` from
321[Text.Pandoc.Writers.Shared]. If you also want to incorporate
334[Text.Pandoc.Writers.Shared]. If you also want to incorporate
@@ -337,7 +350,7 @@ use `throwError`.
337In addition to errors, which stop execution of the conversion
350In addition to errors, which stop execution of the conversion
338pipeline, one can generate informational messages.
351pipeline, one can generate informational messages.
339Use `report` from [Text.Pandoc.Class] to issue a `LogMessage`.
352Use `report` from [Text.Pandoc.Class] to issue a `LogMessage`.
340−For a list of cosntructors for `LogMessage`, see
353+For a list of constructors for `LogMessage`, see
341[Text.Pandoc.Logging]. Note that each type of log message
354[Text.Pandoc.Logging]. Note that each type of log message
342is associated with a verbosity level. The verbosity level
355is associated with a verbosity level. The verbosity level
343(`setVerbosity`/`getVerbosity`) determines whether the report
356(`setVerbosity`/`getVerbosity`) determines whether the report
@@ -413,7 +426,7 @@ concatenated together. Here's an example that returns a
413list of the URLs linked to in a document:
426list of the URLs linked to in a document:
414
427
415```haskell
428```haskell
416−listURLs :: Pandoc -> [String]
429+listURLs :: Pandoc -> [Text]
417listURLs = query urls
430listURLs = query urls
418 where urls (Link _ _ (src, _)) = [src]
431 where urls (Link _ _ (src, _)) = [src]
419 urls _ = []
432 urls _ = []
@@ -432,7 +445,7 @@ structure and calling this function.
4321. Pandoc's parsers can exhibit pathological behavior on some
4451. Pandoc's parsers can exhibit pathological behavior on some
433 inputs. So it is always a good idea to wrap uses of pandoc
446 inputs. So it is always a good idea to wrap uses of pandoc
434 in a timeout function (e.g. `System.Timeout.timeout` from `base`)
447 in a timeout function (e.g. `System.Timeout.timeout` from `base`)
435− to prevent DOS attacks.
448+ to prevent DoS attacks.
436
449
4372. If pandoc generates HTML from untrusted user input, it is
4502. If pandoc generates HTML from untrusted user input, it is
438 always a good idea to filter the generated HTML through
451 always a good idea to filter the generated HTML through
linux/control.in+1−1
@@ -5,7 +5,7 @@ Priority: optional
5Architecture: ARCHITECTURE
5Architecture: ARCHITECTURE
6Installed-Size: INSTALLED_SIZE
6Installed-Size: INSTALLED_SIZE
7Depends: libc6 (>= 2.13), libgmp10, zlib1g (>= 1:1.1.4)
7Depends: libc6 (>= 2.13), libgmp10, zlib1g (>= 1:1.1.4)
8−Replaces: pandoc-data, pandoc-citeproc
8+Replaces: pandoc-data
9Suggests: texlive-latex-recommended, texlive-xetex,
9Suggests: texlive-latex-recommended, texlive-xetex,
10 texlive-fonts-recommended
10 texlive-fonts-recommended
11Maintainer: John MacFarlane <jgm@berkeley.edu>
11Maintainer: John MacFarlane <jgm@berkeley.edu>
linux/make_artifacts.sh+21−19
@@ -2,13 +2,23 @@ set -e
2
2
3MACHINE=$(uname -m)
3MACHINE=$(uname -m)
4case "$MACHINE" in
4case "$MACHINE" in
5− x86_64) ARCHITECTURE=amd64;;
5+ x86_64) ARCHITECTURE=amd64;;
6− i686) ARCHITECTURE=i386;;
6+ i686) ARCHITECTURE=i386;;
7− i386) ARCHITECTURE=i386;;
7+ i386) ARCHITECTURE=i386;;
8+ aarch64) ARCHITECTURE=arm64;;
9+ *) ARCHITECTURE=unknown;;
8esac
10esac
9
11
10ARTIFACTS="${ARTIFACTS:-/artifacts}"
12ARTIFACTS="${ARTIFACTS:-/artifacts}"
11
13
14+# This is our sentinel that tells us when we're done.
15+rm -f $ARTIFACTS/DONE
16+
17+clean_up() {
18+ echo "All done!" > "$ARTIFACTS/DONE"
19+}
20+trap clean_up EXIT
21+
12# build binaries
22# build binaries
13
23
14cabal --version
24cabal --version
@@ -16,10 +26,10 @@ ghc --version
16
26
17cabal v2-update
27cabal v2-update
18cabal v2-clean
28cabal v2-clean
19−cabal v2-configure --enable-tests -f-export-dynamic -fstatic -fembed_data_files -fbibutils --enable-executable-static --ghc-options '-optc-Os -optl=-pthread -split-sections' . pandoc-citeproc
29+cabal v2-configure --enable-tests -f-export-dynamic -fembed_data_files --enable-executable-static --ghc-options '-j4 +RTS -A256m -RTS -split-sections -optc-Os -optl=-pthread' pandoc
20−cabal v2-build . pandoc-citeproc
30+cabal v2-build -j4
21−cabal v2-test -j1 . pandoc-citeproc
31+cabal v2-test -j4
22−for f in $(find dist-newstyle -name 'pandoc*' -type f -perm /400); do cp $f /artifacts/; done
32+for f in $(find dist-newstyle -name 'pandoc' -type f -perm /400); do cp $f /artifacts/; done
23
33
24# make deb
34# make deb
25
35
@@ -35,21 +45,14 @@ mkdir -p $DEST/bin
35mkdir -p $DEST/share/man/man1
45mkdir -p $DEST/share/man/man1
36mkdir -p $DEST/share/doc/pandoc
46mkdir -p $DEST/share/doc/pandoc
37
47
38−mkdir -p $DEST/share/doc/pandoc-citeproc
39find $DIST -type d | xargs chmod 755
48find $DIST -type d | xargs chmod 755
40cp $ARTIFACTS/pandoc $DEST/bin/
49cp $ARTIFACTS/pandoc $DEST/bin/
41−cp $ARTIFACTS/pandoc-citeproc $DEST/bin/
42strip $DEST/bin/pandoc
50strip $DEST/bin/pandoc
43−strip $DEST/bin/pandoc-citeproc
44cp /mnt/man/pandoc.1 $DEST/share/man/man1/pandoc.1
51cp /mnt/man/pandoc.1 $DEST/share/man/man1/pandoc.1
45−$ARTIFACTS/pandoc-citeproc --man > $DEST/share/man/man1/pandoc-citeproc.1
46gzip -9 $DEST/share/man/man1/pandoc.1
52gzip -9 $DEST/share/man/man1/pandoc.1
47−gzip -9 $DEST/share/man/man1/pandoc-citeproc.1
48
53
49cp /mnt/COPYRIGHT $COPYRIGHT
54cp /mnt/COPYRIGHT $COPYRIGHT
50echo "" >> $COPYRIGHT
55echo "" >> $COPYRIGHT
51−echo "pandoc-citeproc" >> $COPYRIGHT
52−$ARTIFACTS/pandoc-citeproc --license >> $COPYRIGHT
53
56
54INSTALLED_SIZE=$(du -k -s $DEST | awk '{print $1}')
57INSTALLED_SIZE=$(du -k -s $DEST | awk '{print $1}')
55mkdir $DIST/DEBIAN
58mkdir $DIST/DEBIAN
@@ -70,13 +73,12 @@ cd $ARTIFACTS
70rm -rf $TARGET
73rm -rf $TARGET
71mkdir $TARGET
74mkdir $TARGET
72mkdir $TARGET/bin $TARGET/share $TARGET/share/man $TARGET/share/man/man1
75mkdir $TARGET/bin $TARGET/share $TARGET/share/man $TARGET/share/man/man1
73−./pandoc-citeproc --man > $TARGET/share/man/man1/pandoc-citeproc.1
74cp /mnt/man/pandoc.1 $TARGET/share/man/man1
76cp /mnt/man/pandoc.1 $TARGET/share/man/man1
75−mv pandoc pandoc-citeproc $TARGET/bin
77+mv pandoc $TARGET/bin
76strip $TARGET/bin/pandoc
78strip $TARGET/bin/pandoc
77−strip $TARGET/bin/pandoc-citeproc
78gzip -9 $TARGET/share/man/man1/pandoc.1
79gzip -9 $TARGET/share/man/man1/pandoc.1
79−gzip -9 $TARGET/share/man/man1/pandoc-citeproc.1
80
80
81−tar cvzf $TARGET-linux-amd64.tar.gz $TARGET
81+tar cvzf $TARGET-linux-$ARCHITECTURE.tar.gz $TARGET
82rm -r $TARGET
82rm -r $TARGET
83+
84+exit 0
macos/Makefile+1−2
@@ -6,9 +6,8 @@ ALL=$(BASE)-macOS.pkg $(BASE)-macOS.zip
6all: $(ALL) notarize
6all: $(ALL) notarize
7
7
8signed.txt: $(DEST)
8signed.txt: $(DEST)
9− chmod +x $(DEST)/bin/pandoc $(DEST)/bin/pandoc-citeproc
9+ chmod +x $(DEST)/bin/pandoc
10 codesign --force --options runtime -s "5U2WKE6DES" $(DEST)/bin/pandoc
10 codesign --force --options runtime -s "5U2WKE6DES" $(DEST)/bin/pandoc
11− codesign --force --options runtime -s "5U2WKE6DES" $(DEST)/bin/pandoc-citeproc
12 echo "SIGNED" > signed.txt
11 echo "SIGNED" > signed.txt
13
12
14pandoc.pkg: signed.txt
13pandoc.pkg: signed.txt
man/pandoc.1+1144−650
@@ -1,13 +1,13 @@
1−.\"t
1+'\" t
2−.\" Automatically generated by Pandoc 2.10.1
2+.\" Automatically generated by Pandoc 2.14.0.1
3.\"
3.\"
4−.TH "Pandoc User\[aq]s Guide" "" "July 23, 2020" "pandoc 2.10.1" ""
4+.TH "Pandoc User\[cq]s Guide" "" "June 20, 2021" "pandoc 2.14.0.3" ""
5.hy
5.hy
6.SH NAME
6.SH NAME
7pandoc - general markup converter
7pandoc - general markup converter
8.SH SYNOPSIS
8.SH SYNOPSIS
9.PP
9.PP
10−\f[C]pandoc\f[R] [\f[I]options\f[R]] [\f[I]input-file\f[R]]...
10+\f[C]pandoc\f[R] [\f[I]options\f[R]] [\f[I]input-file\f[R]]\&...
11.SH DESCRIPTION
11.SH DESCRIPTION
12.PP
12.PP
13Pandoc is a Haskell library for converting from one markup format to
13Pandoc is a Haskell library for converting from one markup format to
@@ -20,10 +20,10 @@ For the full lists of input and output formats, see the \f[C]--from\f[R]
20and \f[C]--to\f[R] options below.
20and \f[C]--to\f[R] options below.
21Pandoc can also produce PDF output: see creating a PDF, below.
21Pandoc can also produce PDF output: see creating a PDF, below.
22.PP
22.PP
23−Pandoc\[aq]s enhanced version of Markdown includes syntax for tables,
23+Pandoc\[cq]s enhanced version of Markdown includes syntax for tables,
24definition lists, metadata blocks, footnotes, citations, math, and much
24definition lists, metadata blocks, footnotes, citations, math, and much
25more.
25more.
26−See below under Pandoc\[aq]s Markdown.
26+See below under Pandoc\[cq]s Markdown.
27.PP
27.PP
28Pandoc has a modular design: it consists of a set of readers, which
28Pandoc has a modular design: it consists of a set of readers, which
29parse text in a given format and produce a native representation of the
29parse text in a given format and produce a native representation of the
@@ -33,15 +33,15 @@ Thus, adding an input or output format requires only adding a reader or
33writer.
33writer.
34Users can also run custom pandoc filters to modify the intermediate AST.
34Users can also run custom pandoc filters to modify the intermediate AST.
35.PP
35.PP
36−Because pandoc\[aq]s intermediate representation of a document is less
36+Because pandoc\[cq]s intermediate representation of a document is less
37expressive than many of the formats it converts between, one should not
37expressive than many of the formats it converts between, one should not
38expect perfect conversions between every format and every other.
38expect perfect conversions between every format and every other.
39Pandoc attempts to preserve the structural elements of a document, but
39Pandoc attempts to preserve the structural elements of a document, but
40not formatting details such as margin size.
40not formatting details such as margin size.
41And some document elements, such as complex tables, may not fit into
41And some document elements, such as complex tables, may not fit into
42−pandoc\[aq]s simple document model.
42+pandoc\[cq]s simple document model.
43−While conversions from pandoc\[aq]s Markdown to all formats aspire to be
43+While conversions from pandoc\[cq]s Markdown to all formats aspire to be
44−perfect, conversions from formats more expressive than pandoc\[aq]s
44+perfect, conversions from formats more expressive than pandoc\[cq]s
45Markdown can be expected to be lossy.
45Markdown can be expected to be lossy.
46.SS Using pandoc
46.SS Using pandoc
47.PP
47.PP
@@ -57,9 +57,9 @@ pandoc -o output.html input.txt
57.fi
57.fi
58.PP
58.PP
59By default, pandoc produces a document fragment.
59By default, pandoc produces a document fragment.
60−To produce a standalone document (e.g.
60+To produce a standalone document (e.g.\ a valid HTML file including
61−a valid HTML file including \f[C]<head>\f[R] and \f[C]<body>\f[R]), use
61+\f[C]<head>\f[R] and \f[C]<body>\f[R]), use the \f[C]-s\f[R] or
62−the \f[C]-s\f[R] or \f[C]--standalone\f[R] flag:
62+\f[C]--standalone\f[R] flag:
63.IP
63.IP
64.nf
64.nf
65\f[C]
65\f[C]
@@ -115,10 +115,10 @@ pandoc -o hello.tex hello.txt
115.PP
115.PP
116will convert \f[C]hello.txt\f[R] from Markdown to LaTeX.
116will convert \f[C]hello.txt\f[R] from Markdown to LaTeX.
117If no output file is specified (so that output goes to
117If no output file is specified (so that output goes to
118−\f[I]stdout\f[R]), or if the output file\[aq]s extension is unknown, the
118+\f[I]stdout\f[R]), or if the output file\[cq]s extension is unknown, the
119output format will default to HTML.
119output format will default to HTML.
120If no input file is specified (so that input comes from
120If no input file is specified (so that input comes from
121−\f[I]stdin\f[R]), or if the input files\[aq] extensions are unknown, the
121+\f[I]stdin\f[R]), or if the input files\[cq] extensions are unknown, the
122input format will be assumed to be Markdown.
122input format will be assumed to be Markdown.
123.SS Character encoding
123.SS Character encoding
124.PP
124.PP
@@ -172,15 +172,15 @@ You can then test it with \f[C]pdflatex test.tex\f[R].
172When using LaTeX, the following packages need to be available (they are
172When using LaTeX, the following packages need to be available (they are
173included with all recent versions of TeX Live): \f[C]amsfonts\f[R],
173included with all recent versions of TeX Live): \f[C]amsfonts\f[R],
174\f[C]amsmath\f[R], \f[C]lm\f[R], \f[C]unicode-math\f[R],
174\f[C]amsmath\f[R], \f[C]lm\f[R], \f[C]unicode-math\f[R],
175−\f[C]ifxetex\f[R], \f[C]ifluatex\f[R], \f[C]listings\f[R] (if the
175+\f[C]iftex\f[R], \f[C]listings\f[R] (if the \f[C]--listings\f[R] option
176−\f[C]--listings\f[R] option is used), \f[C]fancyvrb\f[R],
177−\f[C]longtable\f[R], \f[C]booktabs\f[R], \f[C]graphicx\f[R] (if the
176+is used), \f[C]fancyvrb\f[R], \f[C]longtable\f[R], \f[C]booktabs\f[R],
178−document contains images), \f[C]hyperref\f[R], \f[C]xcolor\f[R],
177+\f[C]graphicx\f[R] (if the document contains images),
178+\f[C]hyperref\f[R], \f[C]xcolor\f[R], \f[C]ulem\f[R], \f[C]geometry\f[R]
179−\f[C]ulem\f[R], \f[C]geometry\f[R] (with the \f[C]geometry\f[R] variable
179+(with the \f[C]geometry\f[R] variable set), \f[C]setspace\f[R] (with
180−set), \f[C]setspace\f[R] (with \f[C]linestretch\f[R]), and
181−\f[C]babel\f[R] (with \f[C]lang\f[R]).
180+\f[C]linestretch\f[R]), and \f[C]babel\f[R] (with \f[C]lang\f[R]).
182The use of \f[C]xelatex\f[R] or \f[C]lualatex\f[R] as the PDF engine
181The use of \f[C]xelatex\f[R] or \f[C]lualatex\f[R] as the PDF engine
183requires \f[C]fontspec\f[R].
182requires \f[C]fontspec\f[R].
183+\f[C]lualatex\f[R] uses \f[C]selnolig\f[R].
184\f[C]xelatex\f[R] uses \f[C]polyglossia\f[R] (with \f[C]lang\f[R]),
184\f[C]xelatex\f[R] uses \f[C]polyglossia\f[R] (with \f[C]lang\f[R]),
185\f[C]xecjk\f[R], and \f[C]bidi\f[R] (with the \f[C]dir\f[R] variable
185\f[C]xecjk\f[R], and \f[C]bidi\f[R] (with the \f[C]dir\f[R] variable
186set).
186set).
@@ -227,12 +227,18 @@ Specify input format.
227\f[I]FORMAT\f[R] can be:
227\f[I]FORMAT\f[R] can be:
228.RS
228.RS
229.IP \[bu] 2
229.IP \[bu] 2
230+\f[C]bibtex\f[R] (BibTeX bibliography)
231+.IP \[bu] 2
232+\f[C]biblatex\f[R] (BibLaTeX bibliography)
233+.IP \[bu] 2
230\f[C]commonmark\f[R] (CommonMark Markdown)
234\f[C]commonmark\f[R] (CommonMark Markdown)
231.IP \[bu] 2
235.IP \[bu] 2
232\f[C]commonmark_x\f[R] (CommonMark Markdown with extensions)
236\f[C]commonmark_x\f[R] (CommonMark Markdown with extensions)
233.IP \[bu] 2
237.IP \[bu] 2
234\f[C]creole\f[R] (Creole 1.0)
238\f[C]creole\f[R] (Creole 1.0)
235.IP \[bu] 2
239.IP \[bu] 2
240+\f[C]csljson\f[R] (CSL JSON bibliography)
241+.IP \[bu] 2
236\f[C]csv\f[R] (CSV table)
242\f[C]csv\f[R] (CSV table)
237.IP \[bu] 2
243.IP \[bu] 2
238\f[C]docbook\f[R] (DocBook)
244\f[C]docbook\f[R] (DocBook)
@@ -263,7 +269,7 @@ if you need extensions not supported in \f[C]gfm\f[R].
263.IP \[bu] 2
269.IP \[bu] 2
264\f[C]latex\f[R] (LaTeX)
270\f[C]latex\f[R] (LaTeX)
265.IP \[bu] 2
271.IP \[bu] 2
266−\f[C]markdown\f[R] (Pandoc\[aq]s Markdown)
272+\f[C]markdown\f[R] (Pandoc\[cq]s Markdown)
267.IP \[bu] 2
273.IP \[bu] 2
268\f[C]markdown_mmd\f[R] (MultiMarkdown)
274\f[C]markdown_mmd\f[R] (MultiMarkdown)
269.IP \[bu] 2
275.IP \[bu] 2
@@ -313,12 +319,18 @@ Specify output format.
313.IP \[bu] 2
319.IP \[bu] 2
314\f[C]beamer\f[R] (LaTeX beamer slide show)
320\f[C]beamer\f[R] (LaTeX beamer slide show)
315.IP \[bu] 2
321.IP \[bu] 2
322+\f[C]bibtex\f[R] (BibTeX bibliography)
323+.IP \[bu] 2
324+\f[C]biblatex\f[R] (BibLaTeX bibliography)
325+.IP \[bu] 2
316\f[C]commonmark\f[R] (CommonMark Markdown)
326\f[C]commonmark\f[R] (CommonMark Markdown)
317.IP \[bu] 2
327.IP \[bu] 2
318\f[C]commonmark_x\f[R] (CommonMark Markdown with extensions)
328\f[C]commonmark_x\f[R] (CommonMark Markdown with extensions)
319.IP \[bu] 2
329.IP \[bu] 2
320\f[C]context\f[R] (ConTeXt)
330\f[C]context\f[R] (ConTeXt)
321.IP \[bu] 2
331.IP \[bu] 2
332+\f[C]csljson\f[R] (CSL JSON bibliography)
333+.IP \[bu] 2
322\f[C]docbook\f[R] or \f[C]docbook4\f[R] (DocBook 4)
334\f[C]docbook\f[R] or \f[C]docbook4\f[R] (DocBook 4)
323.IP \[bu] 2
335.IP \[bu] 2
324\f[C]docbook5\f[R] (DocBook 5)
336\f[C]docbook5\f[R] (DocBook 5)
@@ -339,8 +351,8 @@ if you need extensions not supported in \f[C]gfm\f[R].
339.IP \[bu] 2
351.IP \[bu] 2
340\f[C]haddock\f[R] (Haddock markup)
352\f[C]haddock\f[R] (Haddock markup)
341.IP \[bu] 2
353.IP \[bu] 2
342−\f[C]html\f[R] or \f[C]html5\f[R] (HTML, i.e.
354+\f[C]html\f[R] or \f[C]html5\f[R] (HTML, i.e.\ HTML5/XHTML polyglot
343−HTML5/XHTML polyglot markup)
355+markup)
344.IP \[bu] 2
356.IP \[bu] 2
345\f[C]html4\f[R] (XHTML 1.0 Transitional)
357\f[C]html4\f[R] (XHTML 1.0 Transitional)
346.IP \[bu] 2
358.IP \[bu] 2
@@ -364,7 +376,7 @@ HTML5/XHTML polyglot markup)
364.IP \[bu] 2
376.IP \[bu] 2
365\f[C]man\f[R] (roff man)
377\f[C]man\f[R] (roff man)
366.IP \[bu] 2
378.IP \[bu] 2
367−\f[C]markdown\f[R] (Pandoc\[aq]s Markdown)
379+\f[C]markdown\f[R] (Pandoc\[cq]s Markdown)
368.IP \[bu] 2
380.IP \[bu] 2
369\f[C]markdown_mmd\f[R] (MultiMarkdown)
381\f[C]markdown_mmd\f[R] (MultiMarkdown)
370.IP \[bu] 2
382.IP \[bu] 2
@@ -445,16 +457,15 @@ On *nix and macOS systems this will be the \f[C]pandoc\f[R] subdirectory
445of the XDG data directory (by default, \f[C]$HOME/.local/share\f[R],
457of the XDG data directory (by default, \f[C]$HOME/.local/share\f[R],
446overridable by setting the \f[C]XDG_DATA_HOME\f[R] environment
458overridable by setting the \f[C]XDG_DATA_HOME\f[R] environment
447variable).
459variable).
448−If that directory does not exist, \f[C]$HOME/.pandoc\f[R] will be used
460+If that directory does not exist and \f[C]$HOME/.pandoc\f[R] exists, it
449−(for backwards compatibility).
461+will be used (for backwards compatibility).
450−In Windows the default user data directory is
462+On Windows the default user data directory is
451\f[C]C:\[rs]Users\[rs]USERNAME\[rs]AppData\[rs]Roaming\[rs]pandoc\f[R].
463\f[C]C:\[rs]Users\[rs]USERNAME\[rs]AppData\[rs]Roaming\[rs]pandoc\f[R].
452You can find the default user data directory on your system by looking
464You can find the default user data directory on your system by looking
453at the output of \f[C]pandoc --version\f[R].
465at the output of \f[C]pandoc --version\f[R].
466+Data files placed in this directory (for example,
454−A \f[C]reference.odt\f[R], \f[C]reference.docx\f[R], \f[C]epub.css\f[R],
467+\f[C]reference.odt\f[R], \f[C]reference.docx\f[R], \f[C]epub.css\f[R],
455−\f[C]templates\f[R], \f[C]slidy\f[R], \f[C]slideous\f[R], or
456−\f[C]s5\f[R] directory placed in this directory will override
457−pandoc\[aq]s normal defaults.
468+\f[C]templates\f[R]) will override pandoc\[cq]s normal defaults.
458.TP
469.TP
459\f[B]\f[CB]-d\f[B]\f[R] \f[I]FILE\f[R], \f[B]\f[CB]--defaults=\f[B]\f[R]\f[I]FILE\f[R]
470\f[B]\f[CB]-d\f[B]\f[R] \f[I]FILE\f[R], \f[B]\f[CB]--defaults=\f[B]\f[R]\f[I]FILE\f[R]
460Specify a set of default option settings.
471Specify a set of default option settings.
@@ -507,7 +518,7 @@ List supported output formats, one per line.
507List supported extensions for \f[I]FORMAT\f[R], one per line, preceded
518List supported extensions for \f[I]FORMAT\f[R], one per line, preceded
508by a \f[C]+\f[R] or \f[C]-\f[R] indicating whether it is enabled by
519by a \f[C]+\f[R] or \f[C]-\f[R] indicating whether it is enabled by
509default in \f[I]FORMAT\f[R].
520default in \f[I]FORMAT\f[R].
510−If \f[I]FORMAT\f[R] is not specified, defaults for pandoc\[aq]s Markdown
521+If \f[I]FORMAT\f[R] is not specified, defaults for pandoc\[cq]s Markdown
511are given.
522are given.
512.TP
523.TP
513\f[B]\f[CB]--list-highlight-languages\f[B]\f[R]
524\f[B]\f[CB]--list-highlight-languages\f[B]\f[R]
@@ -552,7 +563,7 @@ This option is useful for converting word processing documents where
552users have used empty paragraphs to create inter-paragraph space.
563users have used empty paragraphs to create inter-paragraph space.
553.TP
564.TP
554\f[B]\f[CB]--indented-code-classes=\f[B]\f[R]\f[I]CLASSES\f[R]
565\f[B]\f[CB]--indented-code-classes=\f[B]\f[R]\f[I]CLASSES\f[R]
555−Specify classes to use for indented code blocks--for example,
566+Specify classes to use for indented code blocks\[en]for example,
556\f[C]perl,numberLines\f[R] or \f[C]haskell\f[R].
567\f[C]perl,numberLines\f[R] or \f[C]haskell\f[R].
557Multiple classes may be separated by spaces or commas.
568Multiple classes may be separated by spaces or commas.
558.TP
569.TP
@@ -574,7 +585,7 @@ Reading binary files (docx, odt, epub) implies \f[C]--file-scope\f[R].
574Specify an executable to be used as a filter transforming the pandoc AST
585Specify an executable to be used as a filter transforming the pandoc AST
575after the input is parsed and before the output is written.
586after the input is parsed and before the output is written.
576The executable should read JSON from stdin and write JSON to stdout.
587The executable should read JSON from stdin and write JSON to stdout.
577−The JSON must be formatted like pandoc\[aq]s own JSON input and output.
588+The JSON must be formatted like pandoc\[cq]s own JSON input and output.
578The name of the output format will be passed to the filter as the first
589The name of the output format will be passed to the filter as the first
579argument.
590argument.
580Hence,
591Hence,
@@ -614,13 +625,13 @@ above).
614.IP "3." 3
625.IP "3." 3
615\f[C]$PATH\f[R] (executable only)
626\f[C]$PATH\f[R] (executable only)
616.PP
627.PP
617−Filters and Lua-filters are applied in the order specified on the
628+Filters, Lua-filters, and citeproc processing are applied in the order
618−command line.
629+specified on the command line.
619.RE
630.RE
620.TP
631.TP
621\f[B]\f[CB]-L\f[B]\f[R] \f[I]SCRIPT\f[R], \f[B]\f[CB]--lua-filter=\f[B]\f[R]\f[I]SCRIPT\f[R]
632\f[B]\f[CB]-L\f[B]\f[R] \f[I]SCRIPT\f[R], \f[B]\f[CB]--lua-filter=\f[B]\f[R]\f[I]SCRIPT\f[R]
622Transform the document in a similar fashion as JSON filters (see
633Transform the document in a similar fashion as JSON filters (see
623−\f[C]--filter\f[R]), but use pandoc\[aq]s build-in Lua filtering system.
634+\f[C]--filter\f[R]), but use pandoc\[cq]s built-in Lua filtering system.
624The given Lua script is expected to return a list of Lua filters which
635The given Lua script is expected to return a list of Lua filters which
625will be applied in order.
636will be applied in order.
626Each Lua filter must contain element-transforming functions indexed by
637Each Lua filter must contain element-transforming functions indexed by
@@ -630,31 +641,19 @@ applied.
630.PP
641.PP
631The \f[C]pandoc\f[R] Lua module provides helper functions for element
642The \f[C]pandoc\f[R] Lua module provides helper functions for element
632creation.
643creation.
633−It is always loaded into the script\[aq]s Lua environment.
644+It is always loaded into the script\[cq]s Lua environment.
634.PP
645.PP
635−The following is an example Lua script for macro-expansion:
646+See the Lua filters documentation for further details.
636−.IP
637−.nf
638−\f[C]
639−function expand_hello_world(inline)
640− if inline.c == \[aq]{{helloworld}}\[aq] then
641− return pandoc.Emph{ pandoc.Str \[dq]Hello, World\[dq] }
642− else
643− return inline
644− end
645−end
646−
647−return {{Str = expand_hello_world}}
648−\f[R]
649−.fi
650.PP
647.PP
651In order of preference, pandoc will look for Lua filters in
648In order of preference, pandoc will look for Lua filters in
652.IP "1." 3
649.IP "1." 3
653−a specified full or relative path (executable or non-executable)
650+a specified full or relative path
654.IP "2." 3
651.IP "2." 3
655−\f[C]$DATADIR/filters\f[R] (executable or non-executable) where
652+\f[C]$DATADIR/filters\f[R] where \f[C]$DATADIR\f[R] is the user data
656−\f[C]$DATADIR\f[R] is the user data directory (see \f[C]--data-dir\f[R],
653+directory (see \f[C]--data-dir\f[R], above).
657−above).
654+.PP
655+Filters, Lua filters, and citeproc processing are applied in the order
656+specified on the command line.
658.RE
657.RE
659.TP
658.TP
660\f[B]\f[CB]-M\f[B]\f[R] \f[I]KEY\f[R][\f[B]\f[CB]=\f[B]\f[R]\f[I]VAL\f[R]], \f[B]\f[CB]--metadata=\f[B]\f[R]\f[I]KEY\f[R][\f[B]\f[CB]:\f[B]\f[R]\f[I]VAL\f[R]]
659\f[B]\f[CB]-M\f[B]\f[R] \f[I]KEY\f[R][\f[B]\f[CB]=\f[B]\f[R]\f[I]VAL\f[R]], \f[B]\f[CB]--metadata=\f[B]\f[R]\f[I]KEY\f[R][\f[B]\f[CB]:\f[B]\f[R]\f[I]VAL\f[R]]
@@ -694,13 +693,13 @@ Specify the number of spaces per tab (default is 4).
694.TP
693.TP
695\f[B]\f[CB]--track-changes=accept\f[B]\f[R]|\f[B]\f[CB]reject\f[B]\f[R]|\f[B]\f[CB]all\f[B]\f[R]
694\f[B]\f[CB]--track-changes=accept\f[B]\f[R]|\f[B]\f[CB]reject\f[B]\f[R]|\f[B]\f[CB]all\f[B]\f[R]
696Specifies what to do with insertions, deletions, and comments produced
695Specifies what to do with insertions, deletions, and comments produced
697−by the MS Word \[dq]Track Changes\[dq] feature.
696+by the MS Word \[lq]Track Changes\[rq] feature.
698−\f[C]accept\f[R] (the default), inserts all insertions, and ignores all
697+\f[C]accept\f[R] (the default) processes all the insertions and
699deletions.
698deletions.
700−\f[C]reject\f[R] inserts all deletions and ignores insertions.
699+\f[C]reject\f[R] ignores them.
701Both \f[C]accept\f[R] and \f[C]reject\f[R] ignore comments.
700Both \f[C]accept\f[R] and \f[C]reject\f[R] ignore comments.
702−\f[C]all\f[R] puts in insertions, deletions, and comments, wrapped in
701+\f[C]all\f[R] includes all insertions, deletions, and comments, wrapped
703−spans with \f[C]insertion\f[R], \f[C]deletion\f[R],
702+in spans with \f[C]insertion\f[R], \f[C]deletion\f[R],
704\f[C]comment-start\f[R], and \f[C]comment-end\f[R] classes,
703\f[C]comment-start\f[R], and \f[C]comment-end\f[R] classes,
705respectively.
704respectively.
706The author and time of change is included.
705The author and time of change is included.
@@ -717,11 +716,11 @@ Extract images and other media contained in or linked from the source
717document to the path \f[I]DIR\f[R], creating it if necessary, and adjust
716document to the path \f[I]DIR\f[R], creating it if necessary, and adjust
718the images references in the document so they point to the extracted
717the images references in the document so they point to the extracted
719files.
718files.
719+Media are downloaded, read from the file system, or extracted from a
720−If the source format is a binary container (docx, epub, or odt), the
720+binary container (e.g.\ docx), as needed.
721−media is extracted from the container and the original filenames are
721+The original file paths are used if they are relative paths not
722−used.
722+containing \f[C]..\f[R].
723−Otherwise the media is read from the file system or downloaded, and new
724−filenames are constructed based on SHA1 hashes of the contents.
723+Otherwise filenames are constructed from the SHA1 hash of the contents.
725.TP
724.TP
726\f[B]\f[CB]--abbreviations=\f[B]\f[R]\f[I]FILE\f[R]
725\f[B]\f[CB]--abbreviations=\f[B]\f[R]\f[I]FILE\f[R]
727Specifies a custom abbreviations file, with abbreviations one to a line.
726Specifies a custom abbreviations file, with abbreviations one to a line.
@@ -731,14 +730,14 @@ system default.
731To see the system default, use
730To see the system default, use
732\f[C]pandoc --print-default-data-file=abbreviations\f[R].
731\f[C]pandoc --print-default-data-file=abbreviations\f[R].
733The only use pandoc makes of this list is in the Markdown reader.
732The only use pandoc makes of this list is in the Markdown reader.
734−Strings ending in a period that are found in this list will be followed
733+Strings found in this list will be followed by a nonbreaking space, and
735−by a nonbreaking space, so that the period will not produce
736−sentence-ending space in formats like LaTeX.
734+the period will not produce sentence-ending space in formats like LaTeX.
735+The strings may not contain spaces.
737.SS General writer options
736.SS General writer options
738.TP
737.TP
739\f[B]\f[CB]-s\f[B]\f[R], \f[B]\f[CB]--standalone\f[B]\f[R]
738\f[B]\f[CB]-s\f[B]\f[R], \f[B]\f[CB]--standalone\f[B]\f[R]
740−Produce output with an appropriate header and footer (e.g.
739+Produce output with an appropriate header and footer (e.g.\ a standalone
741−a standalone HTML, LaTeX, TEI, or RTF file, not a fragment).
740+HTML, LaTeX, TEI, or RTF file, not a fragment).
742This option is set automatically for \f[C]pdf\f[R], \f[C]epub\f[R],
741This option is set automatically for \f[C]pdf\f[R], \f[C]epub\f[R],
743\f[C]epub3\f[R], \f[C]fb2\f[R], \f[C]docx\f[R], and \f[C]odt\f[R]
742\f[C]epub3\f[R], \f[C]fb2\f[R], \f[C]docx\f[R], and \f[C]odt\f[R]
744output.
743output.
@@ -898,8 +897,7 @@ Implies \f[C]--standalone\f[R].
898.TP
897.TP
899\f[B]\f[CB]-B\f[B]\f[R] \f[I]FILE\f[R], \f[B]\f[CB]--include-before-body=\f[B]\f[R]\f[I]FILE\f[R]|\f[I]URL\f[R]
898\f[B]\f[CB]-B\f[B]\f[R] \f[I]FILE\f[R], \f[B]\f[CB]--include-before-body=\f[B]\f[R]\f[I]FILE\f[R]|\f[I]URL\f[R]
900Include contents of \f[I]FILE\f[R], verbatim, at the beginning of the
899Include contents of \f[I]FILE\f[R], verbatim, at the beginning of the
901−document body (e.g.
902−after the \f[C]<body>\f[R] tag in HTML, or the
900+document body (e.g.\ after the \f[C]<body>\f[R] tag in HTML, or the
903\f[C]\[rs]begin{document}\f[R] command in LaTeX).
901\f[C]\[rs]begin{document}\f[R] command in LaTeX).
904This can be used to include navigation bars or banners in HTML
902This can be used to include navigation bars or banners in HTML
905documents.
903documents.
@@ -925,19 +923,17 @@ Note that, if \f[C]--resource-path\f[R] is specified, the working
925directory must be explicitly listed or it will not be searched.
923directory must be explicitly listed or it will not be searched.
926For example: \f[C]--resource-path=.:test\f[R] will search the working
924For example: \f[C]--resource-path=.:test\f[R] will search the working
927directory and the \f[C]test\f[R] subdirectory, in that order.
925directory and the \f[C]test\f[R] subdirectory, in that order.
928−.RS
926+This option can be used repeatedly.
929−.PP
927+Search path components that come later on the command line will be
930−\f[C]--resource-path\f[R] only has an effect if (a) the output format
928+searched before those that come earlier, so
931−embeds images (for example, \f[C]docx\f[R], \f[C]pdf\f[R], or
929+\f[C]--resource-path foo:bar --resource-path baz:bim\f[R] is equivalent
932−\f[C]html\f[R] with \f[C]--self-contained\f[R]) or (b) it is used
930+to \f[C]--resource-path baz:bim:foo:bar\f[R].
933−together with \f[C]--extract-media\f[R].
934−.RE
935.TP
931.TP
936\f[B]\f[CB]--request-header=\f[B]\f[R]\f[I]NAME\f[R]\f[B]\f[CB]:\f[B]\f[R]\f[I]VAL\f[R]
932\f[B]\f[CB]--request-header=\f[B]\f[R]\f[I]NAME\f[R]\f[B]\f[CB]:\f[B]\f[R]\f[I]VAL\f[R]
937Set the request header \f[I]NAME\f[R] to the value \f[I]VAL\f[R] when
933Set the request header \f[I]NAME\f[R] to the value \f[I]VAL\f[R] when
938making HTTP requests (for example, when a URL is given on the command
934making HTTP requests (for example, when a URL is given on the command
939line, or when resources used in a document must be downloaded).
935line, or when resources used in a document must be downloaded).
940−If you\[aq]re behind a proxy, you also need to set the environment
936+If you\[cq]re behind a proxy, you also need to set the environment
941variable \f[C]http_proxy\f[R] to \f[C]http://...\f[R].
937variable \f[C]http_proxy\f[R] to \f[C]http://...\f[R].
942.TP
938.TP
943\f[B]\f[CB]--no-check-certificate\f[B]\f[R]
939\f[B]\f[CB]--no-check-certificate\f[B]\f[R]
@@ -951,7 +947,7 @@ Produce a standalone HTML file with no external dependencies, using
951\f[C]data:\f[R] URIs to incorporate the contents of linked scripts,
947\f[C]data:\f[R] URIs to incorporate the contents of linked scripts,
952stylesheets, images, and videos.
948stylesheets, images, and videos.
953Implies \f[C]--standalone\f[R].
949Implies \f[C]--standalone\f[R].
954−The resulting file should be \[dq]self-contained,\[dq] in the sense that
950+The resulting file should be \[lq]self-contained,\[rq] in the sense that
955it needs no external files and no net access to be displayed properly by
951it needs no external files and no net access to be displayed properly by
956a browser.
952a browser.
957This option works only with HTML output formats, including
953This option works only with HTML output formats, including
@@ -967,12 +963,14 @@ left alone; the documents they link to will not be incorporated in the
967document.
963document.
968Limitation: resources that are loaded dynamically through JavaScript
964Limitation: resources that are loaded dynamically through JavaScript
969cannot be incorporated; as a result, \f[C]--self-contained\f[R] does not
965cannot be incorporated; as a result, \f[C]--self-contained\f[R] does not
970−work with \f[C]--mathjax\f[R], and some advanced features (e.g.
966+work with \f[C]--mathjax\f[R], and some advanced features (e.g.\ zoom or
971−zoom or speaker notes) may not work in an offline
967+speaker notes) may not work in an offline \[lq]self-contained\[rq]
972−\[dq]self-contained\[dq] \f[C]reveal.js\f[R] slide show.
968+\f[C]reveal.js\f[R] slide show.
973.TP
969.TP
974\f[B]\f[CB]--html-q-tags\f[B]\f[R]
970\f[B]\f[CB]--html-q-tags\f[B]\f[R]
975Use \f[C]<q>\f[R] tags for quotes in HTML.
971Use \f[C]<q>\f[R] tags for quotes in HTML.
972+(This option only has an effect if the \f[C]smart\f[R] extension is
973+enabled for the input format used.)
976.TP
974.TP
977\f[B]\f[CB]--ascii\f[B]\f[R]
975\f[B]\f[CB]--ascii\f[B]\f[R]
978Use only ASCII characters in output.
976Use only ASCII characters in output.
@@ -990,21 +988,24 @@ By default inline links are used.
990The placement of link references is affected by the
988The placement of link references is affected by the
991\f[C]--reference-location\f[R] option.
989\f[C]--reference-location\f[R] option.
992.TP
990.TP
993−\f[B]\f[CB]--reference-location = block\f[B]\f[R]|\f[B]\f[CB]section\f[B]\f[R]|\f[B]\f[CB]document\f[B]\f[R]
991+\f[B]\f[CB]--reference-location=block\f[B]\f[R]|\f[B]\f[CB]section\f[B]\f[R]|\f[B]\f[CB]document\f[B]\f[R]
994Specify whether footnotes (and references, if \f[C]reference-links\f[R]
992Specify whether footnotes (and references, if \f[C]reference-links\f[R]
995is set) are placed at the end of the current (top-level) block, the
993is set) are placed at the end of the current (top-level) block, the
996current section, or the document.
994current section, or the document.
997The default is \f[C]document\f[R].
995The default is \f[C]document\f[R].
998Currently only affects the markdown writer.
996Currently only affects the markdown writer.
999.TP
997.TP
998+\f[B]\f[CB]--markdown-headings=setext\f[B]\f[R]|\f[B]\f[CB]atx\f[B]\f[R]
999+Specify whether to use ATX-style (\f[C]#\f[R]-prefixed) or Setext-style
1000+(underlined) headings for level 1 and 2 headings in Markdown output.
1001+(The default is \f[C]atx\f[R].) ATX-style headings are always used for
1002+levels 3+.
1003+This option also affects Markdown cells in \f[C]ipynb\f[R] output.
1004+.TP
1000\f[B]\f[CB]--atx-headers\f[B]\f[R]
1005\f[B]\f[CB]--atx-headers\f[B]\f[R]
1001−Use ATX-style headings in Markdown output.
1006+\f[I]Deprecated synonym for \f[CI]--markdown-headings=atx\f[I].\f[R]
1002−The default is to use setext-style headings for levels 1 to 2, and then
1003−ATX headings.
1004−(Note: for \f[C]gfm\f[R] output, ATX headings are always used.) This
1005−option also affects markdown cells in \f[C]ipynb\f[R] output.
1006.TP
1007.TP
1007−\f[B]\f[CB]--top-level-division=[default|section|chapter|part]\f[B]\f[R]
1008+\f[B]\f[CB]--top-level-division=default\f[B]\f[R]|\f[B]\f[CB]section\f[B]\f[R]|\f[B]\f[CB]chapter\f[B]\f[R]|\f[B]\f[CB]part\f[B]\f[R]
1008Treat top-level headings as the given division type in LaTeX, ConTeXt,
1009Treat top-level headings as the given division type in LaTeX, ConTeXt,
1009DocBook, and TEI output.
1010DocBook, and TEI output.
1010The hierarchy order is part, chapter, then section; all headings are
1011The hierarchy order is part, chapter, then section; all headings are
@@ -1021,21 +1022,22 @@ become \f[C]\[rs]part{..}\f[R], while second-level headings remain as
1021their default type.
1022their default type.
1022.TP
1023.TP
1023\f[B]\f[CB]-N\f[B]\f[R], \f[B]\f[CB]--number-sections\f[B]\f[R]
1024\f[B]\f[CB]-N\f[B]\f[R], \f[B]\f[CB]--number-sections\f[B]\f[R]
1024−Number section headings in LaTeX, ConTeXt, HTML, Docx, or EPUB output.
1025+Number section headings in LaTeX, ConTeXt, HTML, Docx, ms, or EPUB
1026+output.
1025By default, sections are not numbered.
1027By default, sections are not numbered.
1026Sections with class \f[C]unnumbered\f[R] will never be numbered, even if
1028Sections with class \f[C]unnumbered\f[R] will never be numbered, even if
1027\f[C]--number-sections\f[R] is specified.
1029\f[C]--number-sections\f[R] is specified.
1028.TP
1030.TP
1029−\f[B]\f[CB]--number-offset=\f[B]\f[R]\f[I]NUMBER\f[R][\f[B]\f[CB],\f[B]\f[R]\f[I]NUMBER\f[R]\f[B]\f[CB],\f[B]\f[R]\f[I]...\f[R]]
1031+\f[B]\f[CB]--number-offset=\f[B]\f[R]\f[I]NUMBER\f[R][\f[B]\f[CB],\f[B]\f[R]\f[I]NUMBER\f[R]\f[B]\f[CB],\f[B]\f[R]\f[I]\&...\f[R]]
1030Offset for section headings in HTML output (ignored in other output
1032Offset for section headings in HTML output (ignored in other output
1031formats).
1033formats).
1032The first number is added to the section number for top-level headings,
1034The first number is added to the section number for top-level headings,
1033the second for second-level headings, and so on.
1035the second for second-level headings, and so on.
1034So, for example, if you want the first top-level heading in your
1036So, for example, if you want the first top-level heading in your
1035−document to be numbered \[dq]6\[dq], specify
1037+document to be numbered \[lq]6\[rq], specify
1036\f[C]--number-offset=5\f[R].
1038\f[C]--number-offset=5\f[R].
1037If your document starts with a level-2 heading which you want to be
1039If your document starts with a level-2 heading which you want to be
1038−numbered \[dq]1.5\[dq], specify \f[C]--number-offset=1,4\f[R].
1040+numbered \[lq]1.5\[rq], specify \f[C]--number-offset=1,4\f[R].
1039Offsets are 0 by default.
1041Offsets are 0 by default.
1040Implies \f[C]--number-sections\f[R].
1042Implies \f[C]--number-sections\f[R].
1041.TP
1043.TP
@@ -1334,7 +1336,7 @@ body { font-family: \[dq]DejaVuSans\[dq]; }
1334.TP
1336.TP
1335\f[B]\f[CB]--epub-chapter-level=\f[B]\f[R]\f[I]NUMBER\f[R]
1337\f[B]\f[CB]--epub-chapter-level=\f[B]\f[R]\f[I]NUMBER\f[R]
1336Specify the heading level at which to split the EPUB into separate
1338Specify the heading level at which to split the EPUB into separate
1337−\[dq]chapter\[dq] files.
1339+\[lq]chapter\[rq] files.
1338The default is to split into chapters at level-1 headings.
1340The default is to split into chapters at level-1 headings.
1339This option only affects the internal composition of the EPUB, not the
1341This option only affects the internal composition of the EPUB, not the
1340way chapters and sections are displayed to users.
1342way chapters and sections are displayed to users.
@@ -1386,47 +1388,69 @@ introduction to PDF generation from HTML/CSS.)
1386Use the given string as a command-line argument to the
1388Use the given string as a command-line argument to the
1387\f[C]pdf-engine\f[R].
1389\f[C]pdf-engine\f[R].
1388For example, to use a persistent directory \f[C]foo\f[R] for
1390For example, to use a persistent directory \f[C]foo\f[R] for
1389−\f[C]latexmk\f[R]\[aq]s auxiliary files, use
1391+\f[C]latexmk\f[R]\[cq]s auxiliary files, use
1390\f[C]--pdf-engine-opt=-outdir=foo\f[R].
1392\f[C]--pdf-engine-opt=-outdir=foo\f[R].
1391Note that no check for duplicate options is done.
1393Note that no check for duplicate options is done.
1392.SS Citation rendering
1394.SS Citation rendering
1393.TP
1395.TP
1396+\f[B]\f[CB]-C\f[B]\f[R], \f[B]\f[CB]--citeproc\f[B]\f[R]
1397+Process the citations in the file, replacing them with rendered
1398+citations and adding a bibliography.
1399+Citation processing will not take place unless bibliographic data is
1400+supplied, either through an external file specified using the
1401+\f[C]--bibliography\f[R] option or the \f[C]bibliography\f[R] field in
1402+metadata, or via a \f[C]references\f[R] section in metadata containing a
1403+list of citations in CSL YAML format with Markdown formatting.
1404+The style is controlled by a CSL stylesheet specified using the
1405+\f[C]--csl\f[R] option or the \f[C]csl\f[R] field in metadata.
1406+(If no stylesheet is specified, the \f[C]chicago-author-date\f[R] style
1407+will be used by default.) The citation processing transformation may be
1408+applied before or after filters or Lua filters (see \f[C]--filter\f[R],
1409+\f[C]--lua-filter\f[R]): these transformations are applied in the order
1410+they appear on the command line.
1411+For more information, see the section on Citations.
1412+.TP
1394\f[B]\f[CB]--bibliography=\f[B]\f[R]\f[I]FILE\f[R]
1413\f[B]\f[CB]--bibliography=\f[B]\f[R]\f[I]FILE\f[R]
1395−Set the \f[C]bibliography\f[R] field in the document\[aq]s metadata to
1414+Set the \f[C]bibliography\f[R] field in the document\[cq]s metadata to
1396−\f[I]FILE\f[R], overriding any value set in the metadata, and process
1415+\f[I]FILE\f[R], overriding any value set in the metadata.
1397−citations using \f[C]pandoc-citeproc\f[R].
1398−(This is equivalent to
1399−\f[C]--metadata bibliography=FILE --filter pandoc-citeproc\f[R].) If
1400−\f[C]--natbib\f[R] or \f[C]--biblatex\f[R] is also supplied,
1401−\f[C]pandoc-citeproc\f[R] is not used, making this equivalent to
1402−\f[C]--metadata bibliography=FILE\f[R].
1403If you supply this argument multiple times, each \f[I]FILE\f[R] will be
1416If you supply this argument multiple times, each \f[I]FILE\f[R] will be
1404added to bibliography.
1417added to bibliography.
1418+If \f[I]FILE\f[R] is a URL, it will be fetched via HTTP.
1419+If \f[I]FILE\f[R] is not found relative to the working directory, it
1420+will be sought in the resource path (see \f[C]--resource-path\f[R]).
1405.TP
1421.TP
1406\f[B]\f[CB]--csl=\f[B]\f[R]\f[I]FILE\f[R]
1422\f[B]\f[CB]--csl=\f[B]\f[R]\f[I]FILE\f[R]
1407−Set the \f[C]csl\f[R] field in the document\[aq]s metadata to
1423+Set the \f[C]csl\f[R] field in the document\[cq]s metadata to
1408\f[I]FILE\f[R], overriding any value set in the metadata.
1424\f[I]FILE\f[R], overriding any value set in the metadata.
1409−(This is equivalent to \f[C]--metadata csl=FILE\f[R].) This option is
1425+(This is equivalent to \f[C]--metadata csl=FILE\f[R].) If \f[I]FILE\f[R]
1410−only relevant with \f[C]pandoc-citeproc\f[R].
1426+is a URL, it will be fetched via HTTP.
1427+If \f[I]FILE\f[R] is not found relative to the working directory, it
1428+will be sought in the resource path (see \f[C]--resource-path\f[R]) and
1429+finally in the \f[C]csl\f[R] subdirectory of the pandoc user data
1430+directory.
1411.TP
1431.TP
1412\f[B]\f[CB]--citation-abbreviations=\f[B]\f[R]\f[I]FILE\f[R]
1432\f[B]\f[CB]--citation-abbreviations=\f[B]\f[R]\f[I]FILE\f[R]
1413−Set the \f[C]citation-abbreviations\f[R] field in the document\[aq]s
1433+Set the \f[C]citation-abbreviations\f[R] field in the document\[cq]s
1414metadata to \f[I]FILE\f[R], overriding any value set in the metadata.
1434metadata to \f[I]FILE\f[R], overriding any value set in the metadata.
1415(This is equivalent to
1435(This is equivalent to
1416−\f[C]--metadata citation-abbreviations=FILE\f[R].) This option is only
1436+\f[C]--metadata citation-abbreviations=FILE\f[R].) If \f[I]FILE\f[R] is
1417−relevant with \f[C]pandoc-citeproc\f[R].
1437+a URL, it will be fetched via HTTP.
1438+If \f[I]FILE\f[R] is not found relative to the working directory, it
1439+will be sought in the resource path (see \f[C]--resource-path\f[R]) and
1440+finally in the \f[C]csl\f[R] subdirectory of the pandoc user data
1441+directory.
1418.TP
1442.TP
1419\f[B]\f[CB]--natbib\f[B]\f[R]
1443\f[B]\f[CB]--natbib\f[B]\f[R]
1420Use \f[C]natbib\f[R] for citations in LaTeX output.
1444Use \f[C]natbib\f[R] for citations in LaTeX output.
1421−This option is not for use with the \f[C]pandoc-citeproc\f[R] filter or
1445+This option is not for use with the \f[C]--citeproc\f[R] option or with
1422−with PDF output.
1446+PDF output.
1423It is intended for use in producing a LaTeX file that can be processed
1447It is intended for use in producing a LaTeX file that can be processed
1424with \f[C]bibtex\f[R].
1448with \f[C]bibtex\f[R].
1425.TP
1449.TP
1426\f[B]\f[CB]--biblatex\f[B]\f[R]
1450\f[B]\f[CB]--biblatex\f[B]\f[R]
1427Use \f[C]biblatex\f[R] for citations in LaTeX output.
1451Use \f[C]biblatex\f[R] for citations in LaTeX output.
1428−This option is not for use with the \f[C]pandoc-citeproc\f[R] filter or
1452+This option is not for use with the \f[C]--citeproc\f[R] option or with
1429−with PDF output.
1453+PDF output.
1430It is intended for use in producing a LaTeX file that can be processed
1454It is intended for use in producing a LaTeX file that can be processed
1431with \f[C]bibtex\f[R] or \f[C]biber\f[R].
1455with \f[C]bibtex\f[R] or \f[C]biber\f[R].
1432.SS Math rendering in HTML
1456.SS Math rendering in HTML
@@ -1467,7 +1491,7 @@ For SVG images you can for example use
1467If no URL is specified, the CodeCogs URL generating PNGs will be used
1491If no URL is specified, the CodeCogs URL generating PNGs will be used
1468(\f[C]https://latex.codecogs.com/png.latex?\f[R]).
1492(\f[C]https://latex.codecogs.com/png.latex?\f[R]).
1469Note: the \f[C]--webtex\f[R] option will affect Markdown output as well
1493Note: the \f[C]--webtex\f[R] option will affect Markdown output as well
1470−as HTML, which is useful if you\[aq]re targeting a version of Markdown
1494+as HTML, which is useful if you\[cq]re targeting a version of Markdown
1471without native math support.
1495without native math support.
1472.TP
1496.TP
1473\f[B]\f[CB]--katex\f[B]\f[R][\f[B]\f[CB]=\f[B]\f[R]\f[I]URL\f[R]]
1497\f[B]\f[CB]--katex\f[B]\f[R][\f[B]\f[CB]=\f[B]\f[R]\f[I]URL\f[R]]
@@ -1480,16 +1504,16 @@ inserted.
1480.TP
1504.TP
1481\f[B]\f[CB]--gladtex\f[B]\f[R]
1505\f[B]\f[CB]--gladtex\f[B]\f[R]
1482Enclose TeX math in \f[C]<eq>\f[R] tags in HTML output.
1506Enclose TeX math in \f[C]<eq>\f[R] tags in HTML output.
1483−The resulting HTML can then be processed by GladTeX to produce images of
1507+The resulting HTML can then be processed by GladTeX to produce SVG
1484−the typeset formulas and an HTML file with links to these images.
1508+images of the typeset formulas and an HTML file with these images
1485−So, the procedure is:
1509+embedded.
1486.RS
1510.RS
1487.IP
1511.IP
1488.nf
1512.nf
1489\f[C]
1513\f[C]
1490pandoc -s --gladtex input.md -o myfile.htex
1514pandoc -s --gladtex input.md -o myfile.htex
1491−gladtex -d myfile-images myfile.htex
1515+gladtex -d image_dir myfile.htex
1492−# produces myfile.html and images in myfile-images
1516+# produces myfile.html and images in image_dir
1493\f[R]
1517\f[R]
1494.fi
1518.fi
1495.RE
1519.RE
@@ -1578,6 +1602,11 @@ T}@T{
1578PandocUnsupportedExtensionError
1602PandocUnsupportedExtensionError
1579T}
1603T}
1580T{
1604T{
1605+24
1606+T}@T{
1607+PandocCiteprocError
1608+T}
1609+T{
158131
161031
1582T}@T{
1611T}@T{
1583PandocEpubSubdirectoryError
1612PandocEpubSubdirectoryError
@@ -1588,6 +1617,11 @@ T}@T{
1588PandocPDFError
1617PandocPDFError
1589T}
1618T}
1590T{
1619T{
1620+44
1621+T}@T{
1622+PandocXMLError
1623+T}
1624+T{
159147
162547
1592T}@T{
1626T}@T{
1593PandocPDFProgramNotFoundError
1627PandocPDFProgramNotFoundError
@@ -1648,6 +1682,11 @@ T}@T{
1648PandocIpynbDecodingError
1682PandocIpynbDecodingError
1649T}
1683T}
1650T{
1684T{
1685+94
1686+T}@T{
1687+PandocUnsupportedCharsetError
1688+T}
1689+T{
165197
169097
1652T}@T{
1691T}@T{
1653PandocCouldNotFindDataFileError
1692PandocCouldNotFindDataFileError
@@ -1680,6 +1719,16 @@ input-files:
1680- content.md
1719- content.md
1681# or you may use input-file: with a single value
1720# or you may use input-file: with a single value
1682
1721
1722+# Include options from the specified defaults files.
1723+# The files will be searched for first in the working directory
1724+# and then in the defaults subdirectory of the user data directory.
1725+# The files are included in the same order in which they appear in
1726+# the list. Options specified in this defaults file always have
1727+# priority over the included ones.
1728+defaults:
1729+- defsA
1730+- defsB
1731+
1683template: letter
1732template: letter
1684standalone: true
1733standalone: true
1685self-contained: false
1734self-contained: false
@@ -1707,11 +1756,24 @@ include-after-body: []
1707include-in-header: []
1756include-in-header: []
1708resource-path: [\[dq].\[dq]]
1757resource-path: [\[dq].\[dq]]
1709
1758
1759+# turn on built-in citation processing. Note that if you need
1760+# control over when the citeproc processing is done relative
1761+# to other filters, you should instead use \[ga]citeproc\[ga] in the
1762+# list of \[ga]filters\[ga] (see below).
1763+citeproc: true
1764+csl: ieee
1765+bibliography:
1766+- foobar.bib
1767+- barbaz.json
1768+citation-abbreviations: abbrevs.json
1769+
1710−# filters will be assumed to be Lua filters if they have
1770+# Filters will be assumed to be Lua filters if they have
1711# the .lua extension, and json filters otherwise. But
1771# the .lua extension, and json filters otherwise. But
1712−# the filter type can also be specified explicitly, as shown:
1772+# the filter type can also be specified explicitly, as shown.
1773+# Filters are run in the order specified.
1774+# To include the built-in citeproc filter, use either \[ga]citeproc\[ga]
1775+# or \[ga]{type: citeproc}\[ga].
1713filters:
1776filters:
1714−- pandoc-citeproc
1715- wordcount.lua
1777- wordcount.lua
1716- type: json
1778- type: json
1717 path: foo.lua
1779 path: foo.lua
@@ -1724,8 +1786,11 @@ data-dir:
1724verbosity: INFO
1786verbosity: INFO
1725log-file: log.json
1787log-file: log.json
1726
1788
1727−# citeproc, natbib, or biblatex
1789+# citeproc, natbib, or biblatex. This only affects LaTeX
1790+# output. If you want to use citeproc to format citations,
1791+# you should also set \[aq]citeproc: true\[aq] (see above).
1728cite-method: citeproc
1792cite-method: citeproc
1793+
1729# part, chapter, section, or default:
1794# part, chapter, section, or default:
1730top-level-division: chapter
1795top-level-division: chapter
1731abbreviations:
1796abbreviations:
@@ -1794,7 +1859,7 @@ epub-cover-image: cover.jpg
1794reference-links: true
1859reference-links: true
1795# block, section, or document
1860# block, section, or document
1796reference-location: block
1861reference-location: block
1797−atx-headers: false
1862+markdown-headings: setext
1798
1863
1799# accept, reject, or all
1864# accept, reject, or all
1800track-changes: accept
1865track-changes: accept
@@ -1826,6 +1891,38 @@ verbosity: INFO
1826\f[R]
1891\f[R]
1827.fi
1892.fi
1828.PP
1893.PP
1894+In fields that expect a file path (or list of file paths), the following
1895+syntax may be used to interpolate environment variables:
1896+.IP
1897+.nf
1898+\f[C]
1899+csl: ${HOME}/mycsldir/special.csl
1900+\f[R]
1901+.fi
1902+.PP
1903+\f[C]${USERDATA}\f[R] may also be used; this will always resolve to the
1904+user data directory that is current when the defaults file is parsed,
1905+regardless of the setting of the environment variable
1906+\f[C]USERDATA\f[R].
1907+.PP
1908+\f[C]${.}\f[R] will resolve to the directory containing the default file
1909+itself.
1910+This allows you to refer to resources contained in that directory:
1911+.IP
1912+.nf
1913+\f[C]
1914+epub-cover-image: ${.}/cover.jpg
1915+epub-metadata: ${.}/meta.xml
1916+resource-path:
1917+- . # the working directory from which pandoc is run
1918+- ${.}/images # the images subdirectory of the directory
1919+ # containing this defaults file
1920+\f[R]
1921+.fi
1922+.PP
1923+This environment variable interpolation syntax \f[I]only\f[R] works in
1924+fields that expect file paths.
1925+.PP
1829Default files can be placed in the \f[C]defaults\f[R] subdirectory of
1926Default files can be placed in the \f[C]defaults\f[R] subdirectory of
1830the user data directory and used from any directory.
1927the user data directory and used from any directory.
1831For example, one could create a file specifying defaults for writing
1928For example, one could create a file specifying defaults for writing
@@ -1882,10 +1979,10 @@ arbitrary information at any point in the file.
1882They may be set at the command line using the \f[C]-V/--variable\f[R]
1979They may be set at the command line using the \f[C]-V/--variable\f[R]
1883option.
1980option.
1884If a variable is not set, pandoc will look for the key in the
1981If a variable is not set, pandoc will look for the key in the
1885−document\[aq]s metadata, which can be set using either YAML metadata
1982+document\[cq]s metadata, which can be set using either YAML metadata
1886blocks or with the \f[C]-M/--metadata\f[R] option.
1983blocks or with the \f[C]-M/--metadata\f[R] option.
1887In addition, some variables are given default values by pandoc.
1984In addition, some variables are given default values by pandoc.
1888−See Variables below for a list of variables used in pandoc\[aq]s default
1985+See Variables below for a list of variables used in pandoc\[cq]s default
1889templates.
1986templates.
1890.PP
1987.PP
1891If you use custom templates, you may need to revise them as pandoc
1988If you use custom templates, you may need to revise them as pandoc
@@ -1902,8 +1999,8 @@ be treated as a comment and omitted from the output.
1902.SS Delimiters
1999.SS Delimiters
1903.PP
2000.PP
1904To mark variables and control structures in the template, either
2001To mark variables and control structures in the template, either
1905−\f[C]$\f[R]...\f[C]$\f[R] or \f[C]${\f[R]...\f[C]}\f[R] may be used as
2002+\f[C]$\f[R]\&...\f[C]$\f[R] or \f[C]${\f[R]\&...\f[C]}\f[R] may be used
1906−delimiters.
2003+as delimiters.
1907The styles may also be mixed in the same template, but the opening and
2004The styles may also be mixed in the same template, but the opening and
1908closing delimiter must match in each case.
2005closing delimiter must match in each case.
1909The opening delimiter may be followed by one or more spaces or tabs,
2006The opening delimiter may be followed by one or more spaces or tabs,
@@ -2085,9 +2182,9 @@ ${ styles.html() }
2085\f[R]
2182\f[R]
2086.fi
2183.fi
2087.PP
2184.PP
2088−(If a partial is not found in the directory of the template, it will
2185+(If a partial is not found in the directory of the template and the
2186+template path is given as a relative path, it will also be sought in the
2089−also be sought in the \f[C]templates\f[R] subdirectory of the user data
2187+\f[C]templates\f[R] subdirectory of the user data directory.)
2090−directory.)
2091.PP
2188.PP
2092Partials may optionally be applied to variables using a colon:
2189Partials may optionally be applied to variables using a colon:
2093.IP
2190.IP
@@ -2136,7 +2233,7 @@ an explicit \f[C]for\f[R] loop) cannot contain interpolated variables or
2136other template directives.
2233other template directives.
2137.SS Nesting
2234.SS Nesting
2138.PP
2235.PP
2139−To ensure that content is \[dq]nested,\[dq] that is, subsequent lines
2236+To ensure that content is \[lq]nested,\[rq] that is, subsequent lines
2140indented, use the \f[C]\[ha]\f[R] directive:
2237indented, use the \f[C]\[ha]\f[R] directive:
2141.IP
2238.IP
2142.nf
2239.nf
@@ -2178,7 +2275,7 @@ will produce
2178.PP
2275.PP
2179If a variable occurs by itself on a line, preceded by whitespace and not
2276If a variable occurs by itself on a line, preceded by whitespace and not
2180followed by further text or directives on the same line, and the
2277followed by further text or directives on the same line, and the
2181−variable\[aq]s value contains multiple lines, it will be nested
2278+variable\[cq]s value contains multiple lines, it will be nested
2182automatically.
2279automatically.
2183.SS Breakable spaces
2280.SS Breakable spaces
2184.PP
2281.PP
@@ -2320,7 +2417,8 @@ including a title block in the document itself, you can set the
2320\f[C]title-meta\f[R], \f[C]author-meta\f[R], and \f[C]date-meta\f[R]
2417\f[C]title-meta\f[R], \f[C]author-meta\f[R], and \f[C]date-meta\f[R]
2321variables.
2418variables.
2322(By default these are set automatically, based on \f[C]title\f[R],
2419(By default these are set automatically, based on \f[C]title\f[R],
2323−\f[C]author\f[R], and \f[C]date\f[R].)
2420+\f[C]author\f[R], and \f[C]date\f[R].) The page title in HTML is set by
2421+\f[C]pagetitle\f[R], which is equal to \f[C]title\f[R] by default.
2324.RE
2422.RE
2325.TP
2423.TP
2326\f[B]\f[CB]subtitle\f[B]\f[R]
2424\f[B]\f[CB]subtitle\f[B]\f[R]
@@ -2410,13 +2508,81 @@ For bidirectional documents, native pandoc \f[C]span\f[R]s and
2410\f[C]div\f[R]s with the \f[C]dir\f[R] attribute (value \f[C]rtl\f[R] or
2508\f[C]div\f[R]s with the \f[C]dir\f[R] attribute (value \f[C]rtl\f[R] or
2411\f[C]ltr\f[R]) can be used to override the base direction in some output
2509\f[C]ltr\f[R]) can be used to override the base direction in some output
2412formats.
2510formats.
2413−This may not always be necessary if the final renderer (e.g.
2511+This may not always be necessary if the final renderer (e.g.\ the
2414−the browser, when generating HTML) supports the Unicode Bidirectional
2512+browser, when generating HTML) supports the Unicode Bidirectional
2415Algorithm.
2513Algorithm.
2416.PP
2514.PP
2417When using LaTeX for bidirectional documents, only the \f[C]xelatex\f[R]
2515When using LaTeX for bidirectional documents, only the \f[C]xelatex\f[R]
2418engine is fully supported (use \f[C]--pdf-engine=xelatex\f[R]).
2516engine is fully supported (use \f[C]--pdf-engine=xelatex\f[R]).
2419.RE
2517.RE
2518+.SS Variables for HTML
2519+.TP
2520+\f[B]\f[CB]document-css\f[B]\f[R]
2521+Enables inclusion of most of the CSS in the \f[C]styles.html\f[R]
2522+partial (have a look with
2523+\f[C]pandoc --print-default-data-file=templates/styles.html\f[R]).
2524+Unless you use \f[C]--css\f[R], this variable is set to \f[C]true\f[R]
2525+by default.
2526+You can disable it with e.g.\ \f[C]pandoc -M document-css=false\f[R].
2527+.TP
2528+\f[B]\f[CB]mainfont\f[B]\f[R]
2529+sets the CSS \f[C]font-family\f[R] property on the \f[C]html\f[R]
2530+element.
2531+.TP
2532+\f[B]\f[CB]fontsize\f[B]\f[R]
2533+sets the base CSS \f[C]font-size\f[R], which you\[cq]d usually set to
2534+e.g.\ \f[C]20px\f[R], but it also accepts \f[C]pt\f[R] (12pt = 16px in
2535+most browsers).
2536+.TP
2537+\f[B]\f[CB]fontcolor\f[B]\f[R]
2538+sets the CSS \f[C]color\f[R] property on the \f[C]html\f[R] element.
2539+.TP
2540+\f[B]\f[CB]linkcolor\f[B]\f[R]
2541+sets the CSS \f[C]color\f[R] property on all links.
2542+.TP
2543+\f[B]\f[CB]monofont\f[B]\f[R]
2544+sets the CSS \f[C]font-family\f[R] property on \f[C]code\f[R] elements.
2545+.TP
2546+\f[B]\f[CB]monobackgroundcolor\f[B]\f[R]
2547+sets the CSS \f[C]background-color\f[R] property on \f[C]code\f[R]
2548+elements and adds extra padding.
2549+.TP
2550+\f[B]\f[CB]linestretch\f[B]\f[R]
2551+sets the CSS \f[C]line-height\f[R] property on the \f[C]html\f[R]
2552+element, which is preferred to be unitless.
2553+.TP
2554+\f[B]\f[CB]backgroundcolor\f[B]\f[R]
2555+sets the CSS \f[C]background-color\f[R] property on the \f[C]html\f[R]
2556+element.
2557+.TP
2558+\f[B]\f[CB]margin-left\f[B]\f[R], \f[B]\f[CB]margin-right\f[B]\f[R], \f[B]\f[CB]margin-top\f[B]\f[R], \f[B]\f[CB]margin-bottom\f[B]\f[R]
2559+sets the corresponding CSS \f[C]padding\f[R] properties on the
2560+\f[C]body\f[R] element.
2561+.PP
2562+To override or extend some CSS for just one document, include for
2563+example:
2564+.IP
2565+.nf
2566+\f[C]
2567+---
2568+header-includes: |
2569+ <style>
2570+ blockquote {
2571+ font-style: italic;
2572+ }
2573+ tr.even {
2574+ background-color: #f0f0f0;
2575+ }
2576+ td, th {
2577+ padding: 0.5em 2em 0.5em 0.5em;
2578+ }
2579+ tbody {
2580+ border-bottom: none;
2581+ }
2582+ </style>
2583+---
2584+\f[R]
2585+.fi
2420.SS Variables for HTML math
2586.SS Variables for HTML math
2421.TP
2587.TP
2422\f[B]\f[CB]classoption\f[B]\f[R]
2588\f[B]\f[CB]classoption\f[B]\f[R]
@@ -2424,11 +2590,10 @@ when using KaTeX, you can render display math equations flush left using
2424YAML metadata or with \f[C]-M classoption=fleqn\f[R].
2590YAML metadata or with \f[C]-M classoption=fleqn\f[R].
2425.SS Variables for HTML slides
2591.SS Variables for HTML slides
2426.PP
2592.PP
2427−These affect HTML output when producing slide shows with pandoc.
2593+These affect HTML output when [producing slide shows with pandoc].
2428−.PP
2594+.TP
2429−All reveal.js configuration options are available as variables.
2595+\f[B]\f[CB]institute\f[B]\f[R]
2430−To turn off boolean flags that default to true in reveal.js, use
2596+author affiliations: can be a list when there are multiple authors
2431−\f[C]0\f[R].
2432.TP
2597.TP
2433\f[B]\f[CB]revealjs-url\f[B]\f[R]
2598\f[B]\f[CB]revealjs-url\f[B]\f[R]
2434base URL for reveal.js documents (defaults to
2599base URL for reveal.js documents (defaults to
@@ -2447,6 +2612,10 @@ base URL for Slideous documents (defaults to \f[C]slideous\f[R])
2447\f[B]\f[CB]title-slide-attributes\f[B]\f[R]
2612\f[B]\f[CB]title-slide-attributes\f[B]\f[R]
2448additional attributes for the title slide of reveal.js slide shows.
2613additional attributes for the title slide of reveal.js slide shows.
2449See background in reveal.js and beamer for an example.
2614See background in reveal.js and beamer for an example.
2615+.PP
2616+All reveal.js configuration options are available as variables.
2617+To turn off boolean flags that default to true in reveal.js, use
2618+\f[C]0\f[R].
2450.SS Variables for Beamer slides
2619.SS Variables for Beamer slides
2451.PP
2620.PP
2452These variables change the appearance of PDF slides using
2621These variables change the appearance of PDF slides using
@@ -2475,7 +2644,7 @@ navigation symbols; other valid values are \f[C]frame\f[R],
2475\f[C]vertical\f[R], and \f[C]horizontal\f[R])
2644\f[C]vertical\f[R], and \f[C]horizontal\f[R])
2476.TP
2645.TP
2477\f[B]\f[CB]section-titles\f[B]\f[R]
2646\f[B]\f[CB]section-titles\f[B]\f[R]
2478−enables \[dq]title pages\[dq] for new sections (default is true)
2647+enables \[lq]title pages\[rq] for new sections (default is true)
2479.TP
2648.TP
2480\f[B]\f[CB]theme\f[B]\f[R], \f[B]\f[CB]colortheme\f[B]\f[R], \f[B]\f[CB]fonttheme\f[B]\f[R], \f[B]\f[CB]innertheme\f[B]\f[R], \f[B]\f[CB]outertheme\f[B]\f[R]
2649\f[B]\f[CB]theme\f[B]\f[R], \f[B]\f[CB]colortheme\f[B]\f[R], \f[B]\f[CB]fonttheme\f[B]\f[R], \f[B]\f[CB]innertheme\f[B]\f[R], \f[B]\f[CB]outertheme\f[B]\f[R]
2481beamer themes
2650beamer themes
@@ -2527,8 +2696,8 @@ header-includes: |
2527.RE
2696.RE
2528.TP
2697.TP
2529\f[B]\f[CB]classoption\f[B]\f[R]
2698\f[B]\f[CB]classoption\f[B]\f[R]
2530−option for document class, e.g.
2531−\f[C]oneside\f[R]; repeat for multiple options:
2699+option for document class, e.g.\ \f[C]oneside\f[R]; repeat for multiple
2700+options:
2532.RS
2701.RS
2533.IP
2702.IP
2534.nf
2703.nf
@@ -2549,8 +2718,8 @@ document class: usually one of the standard classes, \f[C]article\f[R],
2549default to smaller margins; or \f[C]memoir\f[R]
2718default to smaller margins; or \f[C]memoir\f[R]
2550.TP
2719.TP
2551\f[B]\f[CB]geometry\f[B]\f[R]
2720\f[B]\f[CB]geometry\f[B]\f[R]
2552−option for \f[C]geometry\f[R] package, e.g.
2721+option for \f[C]geometry\f[R] package, e.g.\ \f[C]margin=1in\f[R];
2553−\f[C]margin=1in\f[R]; repeat for multiple options:
2722+repeat for multiple options:
2554.RS
2723.RS
2555.IP
2724.IP
2556.nf
2725.nf
@@ -2566,8 +2735,8 @@ geometry:
2566.RE
2735.RE
2567.TP
2736.TP
2568\f[B]\f[CB]hyperrefoptions\f[B]\f[R]
2737\f[B]\f[CB]hyperrefoptions\f[B]\f[R]
2569−option for \f[C]hyperref\f[R] package, e.g.
2738+option for \f[C]hyperref\f[R] package, e.g.\ \f[C]linktoc=all\f[R];
2570−\f[C]linktoc=all\f[R]; repeat for multiple options:
2739+repeat for multiple options:
2571.RS
2740.RS
2572.IP
2741.IP
2573.nf
2742.nf
@@ -2583,12 +2752,13 @@ hyperrefoptions:
2583.RE
2752.RE
2584.TP
2753.TP
2585\f[B]\f[CB]indent\f[B]\f[R]
2754\f[B]\f[CB]indent\f[B]\f[R]
2586−uses document class settings for indentation (the default LaTeX template
2755+if true, pandoc will use document class settings for indentation (the
2587−otherwise removes indentation and adds space between paragraphs)
2756+default LaTeX template otherwise removes indentation and adds space
2757+between paragraphs)
2588.TP
2758.TP
2589\f[B]\f[CB]linestretch\f[B]\f[R]
2759\f[B]\f[CB]linestretch\f[B]\f[R]
2590−adjusts line spacing using the \f[C]setspace\f[R] package, e.g.
2760+adjusts line spacing using the \f[C]setspace\f[R] package,
2591−\f[C]1.25\f[R], \f[C]1.5\f[R]
2761+e.g.\ \f[C]1.25\f[R], \f[C]1.5\f[R]
2592.TP
2762.TP
2593\f[B]\f[CB]margin-left\f[B]\f[R], \f[B]\f[CB]margin-right\f[B]\f[R], \f[B]\f[CB]margin-top\f[B]\f[R], \f[B]\f[CB]margin-bottom\f[B]\f[R]
2763\f[B]\f[CB]margin-left\f[B]\f[R], \f[B]\f[CB]margin-right\f[B]\f[R], \f[B]\f[CB]margin-top\f[B]\f[R], \f[B]\f[CB]margin-bottom\f[B]\f[R]
2594sets margins if \f[C]geometry\f[R] is not used (otherwise
2764sets margins if \f[C]geometry\f[R] is not used (otherwise
@@ -2600,8 +2770,7 @@ control \f[C]\[rs]pagestyle{}\f[R]: the default article class supports
2600numbers), and \f[C]headings\f[R] (section titles in running heads)
2770numbers), and \f[C]headings\f[R] (section titles in running heads)
2601.TP
2771.TP
2602\f[B]\f[CB]papersize\f[B]\f[R]
2772\f[B]\f[CB]papersize\f[B]\f[R]
2603−paper size, e.g.
2604−\f[C]letter\f[R], \f[C]a4\f[R]
2773+paper size, e.g.\ \f[C]letter\f[R], \f[C]a4\f[R]
2605.TP
2774.TP
2606\f[B]\f[CB]secnumdepth\f[B]\f[R]
2775\f[B]\f[CB]secnumdepth\f[B]\f[R]
2607numbering depth for sections (with \f[C]--number-sections\f[R] option or
2776numbering depth for sections (with \f[C]--number-sections\f[R] option or
@@ -2726,35 +2895,32 @@ list of options for natbib
2726Pandoc uses these variables when creating a PDF with ConTeXt.
2895Pandoc uses these variables when creating a PDF with ConTeXt.
2727.TP
2896.TP
2728\f[B]\f[CB]fontsize\f[B]\f[R]
2897\f[B]\f[CB]fontsize\f[B]\f[R]
2729−font size for body text (e.g.
2898+font size for body text (e.g.\ \f[C]10pt\f[R], \f[C]12pt\f[R])
2730−\f[C]10pt\f[R], \f[C]12pt\f[R])
2731.TP
2899.TP
2732\f[B]\f[CB]headertext\f[B]\f[R], \f[B]\f[CB]footertext\f[B]\f[R]
2900\f[B]\f[CB]headertext\f[B]\f[R], \f[B]\f[CB]footertext\f[B]\f[R]
2733text to be placed in running header or footer (see ConTeXt Headers and
2901text to be placed in running header or footer (see ConTeXt Headers and
2734Footers); repeat up to four times for different placement
2902Footers); repeat up to four times for different placement
2735.TP
2903.TP
2736\f[B]\f[CB]indenting\f[B]\f[R]
2904\f[B]\f[CB]indenting\f[B]\f[R]
2737−controls indentation of paragraphs, e.g.
2905+controls indentation of paragraphs, e.g.\ \f[C]yes,small,next\f[R] (see
2738−\f[C]yes,small,next\f[R] (see ConTeXt Indentation); repeat for multiple
2906+ConTeXt Indentation); repeat for multiple options
2739−options
2740.TP
2907.TP
2741\f[B]\f[CB]interlinespace\f[B]\f[R]
2908\f[B]\f[CB]interlinespace\f[B]\f[R]
2742−adjusts line spacing, e.g.
2909+adjusts line spacing, e.g.\ \f[C]4ex\f[R] (using
2743−\f[C]4ex\f[R] (using \f[C]setupinterlinespace\f[R]); repeat for multiple
2910+\f[C]setupinterlinespace\f[R]); repeat for multiple options
2744−options
2745.TP
2911.TP
2746\f[B]\f[CB]layout\f[B]\f[R]
2912\f[B]\f[CB]layout\f[B]\f[R]
2747options for page margins and text arrangement (see ConTeXt Layout);
2913options for page margins and text arrangement (see ConTeXt Layout);
2748repeat for multiple options
2914repeat for multiple options
2749.TP
2915.TP
2750\f[B]\f[CB]linkcolor\f[B]\f[R], \f[B]\f[CB]contrastcolor\f[B]\f[R]
2916\f[B]\f[CB]linkcolor\f[B]\f[R], \f[B]\f[CB]contrastcolor\f[B]\f[R]
2751−color for links outside and inside a page, e.g.
2917+color for links outside and inside a page, e.g.\ \f[C]red\f[R],
2752−\f[C]red\f[R], \f[C]blue\f[R] (see ConTeXt Color)
2918+\f[C]blue\f[R] (see ConTeXt Color)
2753.TP
2919.TP
2754\f[B]\f[CB]linkstyle\f[B]\f[R]
2920\f[B]\f[CB]linkstyle\f[B]\f[R]
2755−typeface style for links, e.g.
2921+typeface style for links, e.g.\ \f[C]normal\f[R], \f[C]bold\f[R],
2756−\f[C]normal\f[R], \f[C]bold\f[R], \f[C]slanted\f[R],
2757−\f[C]boldslanted\f[R], \f[C]type\f[R], \f[C]cap\f[R], \f[C]small\f[R]
2922+\f[C]slanted\f[R], \f[C]boldslanted\f[R], \f[C]type\f[R], \f[C]cap\f[R],
2923+\f[C]small\f[R]
2758.TP
2924.TP
2759\f[B]\f[CB]lof\f[B]\f[R], \f[B]\f[CB]lot\f[B]\f[R]
2925\f[B]\f[CB]lof\f[B]\f[R], \f[B]\f[CB]lot\f[B]\f[R]
2760include list of figures, list of tables
2926include list of figures, list of tables
@@ -2772,16 +2938,13 @@ page number style and location (using \f[C]setuppagenumbering\f[R]);
2772repeat for multiple options
2938repeat for multiple options
2773.TP
2939.TP
2774\f[B]\f[CB]papersize\f[B]\f[R]
2940\f[B]\f[CB]papersize\f[B]\f[R]
2775−paper size, e.g.
2776−\f[C]letter\f[R], \f[C]A4\f[R], \f[C]landscape\f[R] (see ConTeXt Paper
2941+paper size, e.g.\ \f[C]letter\f[R], \f[C]A4\f[R], \f[C]landscape\f[R]
2777−Setup); repeat for multiple options
2942+(see ConTeXt Paper Setup); repeat for multiple options
2778.TP
2943.TP
2779\f[B]\f[CB]pdfa\f[B]\f[R]
2944\f[B]\f[CB]pdfa\f[B]\f[R]
2780adds to the preamble the setup necessary to generate PDF/A of the type
2945adds to the preamble the setup necessary to generate PDF/A of the type
2781−specified, e.g.
2782−\f[C]1a:2005\f[R], \f[C]2a\f[R].
2946+specified, e.g.\ \f[C]1a:2005\f[R], \f[C]2a\f[R].
2783−If no type is specified (i.e.
2784−the value is set to True, by e.g.
2947+If no type is specified (i.e.\ the value is set to True, by e.g.
2785\f[C]--metadata=pdfa\f[R] or \f[C]pdfa: true\f[R] in a YAML metadata
2948\f[C]--metadata=pdfa\f[R] or \f[C]pdfa: true\f[R] in a YAML metadata
2786block), \f[C]1b:2005\f[R] will be used as default, for reasons of
2949block), \f[C]1b:2005\f[R] will be used as default, for reasons of
2787backwards compatibility.
2950backwards compatibility.
@@ -2796,8 +2959,7 @@ See also ConTeXt PDFA for more details.
2796.TP
2959.TP
2797\f[B]\f[CB]pdfaiccprofile\f[B]\f[R]
2960\f[B]\f[CB]pdfaiccprofile\f[B]\f[R]
2798when used in conjunction with \f[C]pdfa\f[R], specifies the ICC profile
2961when used in conjunction with \f[C]pdfa\f[R], specifies the ICC profile
2799−to use in the PDF, e.g.
2962+to use in the PDF, e.g.\ \f[C]default.cmyk\f[R].
2800−\f[C]default.cmyk\f[R].
2801If left unspecified, \f[C]sRGB.icc\f[R] is used as default.
2963If left unspecified, \f[C]sRGB.icc\f[R] is used as default.
2802May be repeated to include multiple profiles.
2964May be repeated to include multiple profiles.
2803Note that the profiles have to be available on the system.
2965Note that the profiles have to be available on the system.
@@ -2805,17 +2967,17 @@ They can be obtained from ConTeXt ICC Profiles.
2805.TP
2967.TP
2806\f[B]\f[CB]pdfaintent\f[B]\f[R]
2968\f[B]\f[CB]pdfaintent\f[B]\f[R]
2807when used in conjunction with \f[C]pdfa\f[R], specifies the output
2969when used in conjunction with \f[C]pdfa\f[R], specifies the output
2808−intent for the colors, e.g.
2970+intent for the colors,
2809−\f[C]ISO coated v2 300\[rs]letterpercent\[rs]space (ECI)\f[R] If left
2971+e.g.\ \f[C]ISO coated v2 300\[rs]letterpercent\[rs]space (ECI)\f[R] If
2810−unspecified, \f[C]sRGB IEC61966-2.1\f[R] is used as default.
2972+left unspecified, \f[C]sRGB IEC61966-2.1\f[R] is used as default.
2811.TP
2973.TP
2812\f[B]\f[CB]toc\f[B]\f[R]
2974\f[B]\f[CB]toc\f[B]\f[R]
2813include table of contents (can also be set using
2975include table of contents (can also be set using
2814\f[C]--toc/--table-of-contents\f[R])
2976\f[C]--toc/--table-of-contents\f[R])
2815.TP
2977.TP
2816\f[B]\f[CB]whitespace\f[B]\f[R]
2978\f[B]\f[CB]whitespace\f[B]\f[R]
2817−spacing between paragraphs, e.g.
2979+spacing between paragraphs, e.g.\ \f[C]none\f[R], \f[C]small\f[R] (using
2818−\f[C]none\f[R], \f[C]small\f[R] (using \f[C]setupwhitespace\f[R])
2980+\f[C]setupwhitespace\f[R])
2819.TP
2981.TP
2820\f[B]\f[CB]includesource\f[B]\f[R]
2982\f[B]\f[CB]includesource\f[B]\f[R]
2821include all source documents as file attachments in the PDF file
2983include all source documents as file attachments in the PDF file
@@ -2853,20 +3015,16 @@ section number in man pages
2853.SS Variables for ms
3015.SS Variables for ms
2854.TP
3016.TP
2855\f[B]\f[CB]fontfamily\f[B]\f[R]
3017\f[B]\f[CB]fontfamily\f[B]\f[R]
2856−font family (e.g.
3018+font family (e.g.\ \f[C]T\f[R] or \f[C]P\f[R])
2857−\f[C]T\f[R] or \f[C]P\f[R])
2858.TP
3019.TP
2859\f[B]\f[CB]indent\f[B]\f[R]
3020\f[B]\f[CB]indent\f[B]\f[R]
2860−paragraph indent (e.g.
3021+paragraph indent (e.g.\ \f[C]2m\f[R])
2861−\f[C]2m\f[R])
2862.TP
3022.TP
2863\f[B]\f[CB]lineheight\f[B]\f[R]
3023\f[B]\f[CB]lineheight\f[B]\f[R]
2864−line height (e.g.
3024+line height (e.g.\ \f[C]12p\f[R])
2865−\f[C]12p\f[R])
2866.TP
3025.TP
2867\f[B]\f[CB]pointsize\f[B]\f[R]
3026\f[B]\f[CB]pointsize\f[B]\f[R]
2868−point size (e.g.
3027+point size (e.g.\ \f[C]10p\f[R])
2869−\f[C]10p\f[R])
2870.SS Variables set automatically
3028.SS Variables set automatically
2871.PP
3029.PP
2872Pandoc sets these variables automatically in response to options or
3030Pandoc sets these variables automatically in response to options or
@@ -2882,10 +3040,9 @@ in all HTML based formats (dzslides, epub, html, html4, html5, revealjs,
2882s5, slideous, slidy).
3040s5, slideous, slidy).
2883The recognized formats for \f[C]date\f[R] are: \f[C]mm/dd/yyyy\f[R],
3041The recognized formats for \f[C]date\f[R] are: \f[C]mm/dd/yyyy\f[R],
2884\f[C]mm/dd/yy\f[R], \f[C]yyyy-mm-dd\f[R] (ISO 8601),
3042\f[C]mm/dd/yy\f[R], \f[C]yyyy-mm-dd\f[R] (ISO 8601),
2885−\f[C]dd MM yyyy\f[R] (e.g.
2886−either \f[C]02 Apr 2018\f[R] or \f[C]02 April 2018\f[R]),
3043+\f[C]dd MM yyyy\f[R] (e.g.\ either \f[C]02 Apr 2018\f[R] or
2887−\f[C]MM dd, yyyy\f[R] (e.g.
3044+\f[C]02 April 2018\f[R]), \f[C]MM dd, yyyy\f[R]
2888−\f[C]Apr. 02, 2018\f[R] or
3045+(e.g.\ \f[C]Apr. 02, 2018\f[R] or
2889\f[C]April 02, 2018),\f[R]yyyy[mm[dd]]]\f[C](e.g.\f[R]20180402,
3046\f[C]April 02, 2018),\f[R]yyyy[mm[dd]]]\f[C](e.g.\f[R]20180402,
2890\f[C]201804\f[R] or \f[C]2018\f[R]).
3047\f[C]201804\f[R] or \f[C]2018\f[R]).
2891.TP
3048.TP
@@ -2902,7 +3059,7 @@ contents specified by \f[C]-A/--include-after-body\f[R] (may have
2902multiple values)
3059multiple values)
2903.TP
3060.TP
2904\f[B]\f[CB]meta-json\f[B]\f[R]
3061\f[B]\f[CB]meta-json\f[B]\f[R]
2905−JSON representation of all of the document\[aq]s metadata.
3062+JSON representation of all of the document\[cq]s metadata.
2906Field values are transformed to the selected output format.
3063Field values are transformed to the selected output format.
2907.TP
3064.TP
2908\f[B]\f[CB]numbersections\f[B]\f[R]
3065\f[B]\f[CB]numbersections\f[B]\f[R]
@@ -2930,8 +3087,7 @@ $endif$
2930Similarly, \f[C]outputfile\f[R] can be \f[C]-\f[R] if output goes to the
3087Similarly, \f[C]outputfile\f[R] can be \f[C]-\f[R] if output goes to the
2931terminal.
3088terminal.
2932.PP
3089.PP
2933−If you need absolute paths, use e.g.
3090+If you need absolute paths, use e.g.\ \f[C]$curdir$/$sourcefile$\f[R].
2934−\f[C]$curdir$/$sourcefile$\f[R].
2935.RE
3091.RE
2936.TP
3092.TP
2937\f[B]\f[CB]curdir\f[B]\f[R]
3093\f[B]\f[CB]curdir\f[B]\f[R]
@@ -2952,12 +3108,12 @@ An extension can be enabled by adding \f[C]+EXTENSION\f[R] to the format
2952name and disabled by adding \f[C]-EXTENSION\f[R].
3108name and disabled by adding \f[C]-EXTENSION\f[R].
2953For example, \f[C]--from markdown_strict+footnotes\f[R] is strict
3109For example, \f[C]--from markdown_strict+footnotes\f[R] is strict
2954Markdown with footnotes enabled, while
3110Markdown with footnotes enabled, while
2955−\f[C]--from markdown-footnotes-pipe_tables\f[R] is pandoc\[aq]s Markdown
3111+\f[C]--from markdown-footnotes-pipe_tables\f[R] is pandoc\[cq]s Markdown
2956without footnotes or pipe tables.
3112without footnotes or pipe tables.
2957.PP
3113.PP
2958The markdown reader and writer make by far the most use of extensions.
3114The markdown reader and writer make by far the most use of extensions.
2959Extensions only used by them are therefore covered in the section
3115Extensions only used by them are therefore covered in the section
2960−Pandoc\[aq]s Markdown below (See Markdown variants for
3116+Pandoc\[cq]s Markdown below (See Markdown variants for
2961\f[C]commonmark\f[R] and \f[C]gfm\f[R].) In the following, extensions
3117\f[C]commonmark\f[R] and \f[C]gfm\f[R].) In the following, extensions
2962that also work for other formats are covered.
3118that also work for other formats are covered.
2963.PP
3119.PP
@@ -2970,7 +3126,7 @@ Markdown cells in Jupyter notebooks (as do command-line options like
2970Interpret straight quotes as curly quotes, \f[C]---\f[R] as em-dashes,
3126Interpret straight quotes as curly quotes, \f[C]---\f[R] as em-dashes,
2971\f[C]--\f[R] as en-dashes, and \f[C]...\f[R] as ellipses.
3127\f[C]--\f[R] as en-dashes, and \f[C]...\f[R] as ellipses.
2972Nonbreaking spaces are inserted after certain abbreviations, such as
3128Nonbreaking spaces are inserted after certain abbreviations, such as
2973−\[dq]Mr.\[dq]
3129+\[lq]Mr.\[rq]
2974.PP
3130.PP
2975This extension can be enabled/disabled for the following formats:
3131This extension can be enabled/disabled for the following formats:
2976.TP
3132.TP
@@ -3120,7 +3276,7 @@ letters are omitted.
3120.SS Extension: \f[C]gfm_auto_identifiers\f[R]
3276.SS Extension: \f[C]gfm_auto_identifiers\f[R]
3121.PP
3277.PP
3122Changes the algorithm used by \f[C]auto_identifiers\f[R] to conform to
3278Changes the algorithm used by \f[C]auto_identifiers\f[R] to conform to
3123−GitHub\[aq]s method.
3279+GitHub\[cq]s method.
3124Spaces are converted to dashes (\f[C]-\f[R]), uppercase characters to
3280Spaces are converted to dashes (\f[C]-\f[R]), uppercase characters to
3125lowercase characters, and punctuation characters other than \f[C]-\f[R]
3281lowercase characters, and punctuation characters other than \f[C]-\f[R]
3126and \f[C]_\f[R] are removed.
3282and \f[C]_\f[R] are removed.
@@ -3130,7 +3286,7 @@ Emojis are replaced by their names.
3130The extensions \f[C]tex_math_dollars\f[R],
3286The extensions \f[C]tex_math_dollars\f[R],
3131\f[C]tex_math_single_backslash\f[R], and
3287\f[C]tex_math_single_backslash\f[R], and
3132\f[C]tex_math_double_backslash\f[R] are described in the section about
3288\f[C]tex_math_double_backslash\f[R] are described in the section about
3133−Pandoc\[aq]s Markdown.
3289+Pandoc\[cq]s Markdown.
3134.PP
3290.PP
3135However, they can also be used with HTML input.
3291However, they can also be used with HTML input.
3136This is handy for reading web pages formatted using MathJax, for
3292This is handy for reading web pages formatted using MathJax, for
@@ -3138,10 +3294,10 @@ example.
3138.SS Raw HTML/TeX
3294.SS Raw HTML/TeX
3139.PP
3295.PP
3140The following extensions are described in more detail in their
3296The following extensions are described in more detail in their
3141−respective sections of Pandoc\[aq]s Markdown:
3297+respective sections of Pandoc\[cq]s Markdown:
3142.IP \[bu] 2
3298.IP \[bu] 2
3143\f[C]raw_html\f[R] allows HTML elements which are not representable in
3299\f[C]raw_html\f[R] allows HTML elements which are not representable in
3144−pandoc\[aq]s AST to be parsed as raw HTML.
3300+pandoc\[cq]s AST to be parsed as raw HTML.
3145By default, this is disabled for HTML input.
3301By default, this is disabled for HTML input.
3146.IP \[bu] 2
3302.IP \[bu] 2
3147\f[C]raw_tex\f[R] allows raw LaTeX, TeX, and ConTeXt to be included in a
3303\f[C]raw_tex\f[R] allows raw LaTeX, TeX, and ConTeXt to be included in a
@@ -3151,9 +3307,8 @@ addition to \f[C]markdown\f[R]):
3151.RS 2
3307.RS 2
3152.TP
3308.TP
3153input formats
3309input formats
3154−\f[C]latex\f[R], \f[C]org\f[R], \f[C]textile\f[R], \f[C]html\f[R]
3310+\f[C]latex\f[R], \f[C]textile\f[R], \f[C]html\f[R] (environments,
3155−(environments, \f[C]\[rs]ref\f[R], and \f[C]\[rs]eqref\f[R] only),
3311+\f[C]\[rs]ref\f[R], and \f[C]\[rs]eqref\f[R] only), \f[C]ipynb\f[R]
3156−\f[C]ipynb\f[R]
3157.TP
3312.TP
3158output formats
3313output formats
3159\f[C]textile\f[R], \f[C]commonmark\f[R]
3314\f[C]textile\f[R], \f[C]commonmark\f[R]
@@ -3164,7 +3319,7 @@ with mime type \f[C]text/html\f[R] in output cells.
3164Since the \f[C]ipynb\f[R] reader attempts to preserve the richest
3319Since the \f[C]ipynb\f[R] reader attempts to preserve the richest
3165possible outputs when several options are given, you will get best
3320possible outputs when several options are given, you will get best
3166results if you disable \f[C]raw_html\f[R] and \f[C]raw_tex\f[R] when
3321results if you disable \f[C]raw_html\f[R] and \f[C]raw_tex\f[R] when
3167−converting to formats like \f[C]docx\f[R] which don\[aq]t allow raw
3322+converting to formats like \f[C]docx\f[R] which don\[cq]t allow raw
3168\f[C]html\f[R] or \f[C]tex\f[R].
3323\f[C]html\f[R] or \f[C]tex\f[R].
3169.RE
3324.RE
3170.IP \[bu] 2
3325.IP \[bu] 2
@@ -3198,23 +3353,22 @@ the formats above, pandoc will treat the document as literate Haskell
3198source.
3353source.
3199This means that
3354This means that
3200.IP \[bu] 2
3355.IP \[bu] 2
3201−In Markdown input, \[dq]bird track\[dq] sections will be parsed as
3356+In Markdown input, \[lq]bird track\[rq] sections will be parsed as
3202Haskell code rather than block quotations.
3357Haskell code rather than block quotations.
3203Text between \f[C]\[rs]begin{code}\f[R] and \f[C]\[rs]end{code}\f[R]
3358Text between \f[C]\[rs]begin{code}\f[R] and \f[C]\[rs]end{code}\f[R]
3204will also be treated as Haskell code.
3359will also be treated as Haskell code.
3205−For ATX-style headings the character \[aq]=\[aq] will be used instead of
3360+For ATX-style headings the character `=' will be used instead of `#'.
3206−\[aq]#\[aq].
3207.IP \[bu] 2
3361.IP \[bu] 2
3208In Markdown output, code blocks with classes \f[C]haskell\f[R] and
3362In Markdown output, code blocks with classes \f[C]haskell\f[R] and
3209\f[C]literate\f[R] will be rendered using bird tracks, and block
3363\f[C]literate\f[R] will be rendered using bird tracks, and block
3210quotations will be indented one space, so they will not be treated as
3364quotations will be indented one space, so they will not be treated as
3211Haskell code.
3365Haskell code.
3212In addition, headings will be rendered setext-style (with underlines)
3366In addition, headings will be rendered setext-style (with underlines)
3213−rather than ATX-style (with \[aq]#\[aq] characters).
3367+rather than ATX-style (with `#' characters).
3214−(This is because ghc treats \[aq]#\[aq] characters in column 1 as
3368+(This is because ghc treats `#' characters in column 1 as introducing
3215−introducing line numbers.)
3369+line numbers.)
3216.IP \[bu] 2
3370.IP \[bu] 2
3217−In restructured text input, \[dq]bird track\[dq] sections will be parsed
3371+In restructured text input, \[lq]bird track\[rq] sections will be parsed
3218as Haskell code.
3372as Haskell code.
3219.IP \[bu] 2
3373.IP \[bu] 2
3220In restructured text output, code blocks with class \f[C]haskell\f[R]
3374In restructured text output, code blocks with class \f[C]haskell\f[R]
@@ -3250,9 +3404,8 @@ writes HTML with the Haskell code in bird tracks, so it can be copied
3250and pasted as literate Haskell source.
3404and pasted as literate Haskell source.
3251.PP
3405.PP
3252Note that GHC expects the bird tracks in the first column, so indented
3406Note that GHC expects the bird tracks in the first column, so indented
3253−literate code blocks (e.g.
3254−inside an itemized environment) will not be picked up by the Haskell
3407+literate code blocks (e.g.\ inside an itemized environment) will not be
3255−compiler.
3408+picked up by the Haskell compiler.
3256.SS Other extensions
3409.SS Other extensions
3257.SS Extension: \f[C]empty_paragraphs\f[R]
3410.SS Extension: \f[C]empty_paragraphs\f[R]
3258.PP
3411.PP
@@ -3275,7 +3428,44 @@ This extension can be enabled/disabled for the following formats:
3275.TP
3428.TP
3276output formats
3429output formats
3277\f[C]odt\f[R], \f[C]opendocument\f[R]
3430\f[C]odt\f[R], \f[C]opendocument\f[R]
3278−.SS Extension: \f[C]styles\f[R] {#ext-styles}
3431+.SS Extension: \f[C]xrefs_name\f[R]
3432+.PP
3433+Links to headings, figures and tables inside the document are
3434+substituted with cross-references that will use the name or caption of
3435+the referenced item.
3436+The original link text is replaced once the generated document is
3437+refreshed.
3438+This extension can be combined with \f[C]xrefs_number\f[R] in which case
3439+numbers will appear before the name.
3440+.PP
3441+Text in cross-references is only made consistent with the referenced
3442+item once the document has been refreshed.
3443+.PP
3444+This extension can be enabled/disabled for the following formats:
3445+.TP
3446+output formats
3447+\f[C]odt\f[R], \f[C]opendocument\f[R]
3448+.SS Extension: \f[C]xrefs_number\f[R]
3449+.PP
3450+Links to headings, figures and tables inside the document are
3451+substituted with cross-references that will use the number of the
3452+referenced item.
3453+The original link text is discarded.
3454+This extension can be combined with \f[C]xrefs_name\f[R] in which case
3455+the name or caption numbers will appear after the number.
3456+.PP
3457+For the \f[C]xrefs_number\f[R] to be useful heading numbers must be
3458+enabled in the generated document, also table and figure captions must
3459+be enabled using for example the \f[C]native_numbering\f[R] extension.
3460+.PP
3461+Numbers in cross-references are only visible in the final document once
3462+it has been refreshed.
3463+.PP
3464+This extension can be enabled/disabled for the following formats:
3465+.TP
3466+output formats
3467+\f[C]odt\f[R], \f[C]opendocument\f[R]
3468+.SS Extension: \f[C]styles\f[R]
3279.PP
3469.PP
3280When converting from docx, read all docx styles as divs (for paragraph
3470When converting from docx, read all docx styles as divs (for paragraph
3281styles) and spans (for character styles) regardless of whether pandoc
3471styles) and spans (for character styles) regardless of whether pandoc
@@ -3294,22 +3484,28 @@ to Emacs Muse markup.
3294In the \f[C]ipynb\f[R] input format, this causes Markdown cells to be
3484In the \f[C]ipynb\f[R] input format, this causes Markdown cells to be
3295included as raw Markdown blocks (allowing lossless round-tripping)
3485included as raw Markdown blocks (allowing lossless round-tripping)
3296rather than being parsed.
3486rather than being parsed.
3297−Use this only when you are targetting \f[C]ipynb\f[R] or a
3487+Use this only when you are targeting \f[C]ipynb\f[R] or a markdown-based
3298−markdown-based output format.
3488+output format.
3299.SS Extension: \f[C]citations\f[R]
3489.SS Extension: \f[C]citations\f[R]
3300.PP
3490.PP
3301−Some aspects of Pandoc\[aq]s Markdown citation syntax are also accepted
3491+Some aspects of Pandoc\[cq]s Markdown citation syntax are also accepted
3302in \f[C]org\f[R] input.
3492in \f[C]org\f[R] input.
3493+.SS Extension: \f[C]element_citations\f[R]
3494+.PP
3495+In the \f[C]jats\f[R] output formats, this causes reference items to be
3496+replaced with \f[C]<element-citation>\f[R] elements.
3497+These elements are not influenced by CSL styles, but all information on
3498+the item is included in tags.
3303.SS Extension: \f[C]ntb\f[R]
3499.SS Extension: \f[C]ntb\f[R]
3304.PP
3500.PP
3305In the \f[C]context\f[R] output format this enables the use of Natural
3501In the \f[C]context\f[R] output format this enables the use of Natural
3306Tables (TABLE) instead of the default Extreme Tables (xtables).
3502Tables (TABLE) instead of the default Extreme Tables (xtables).
3307Natural tables allow more fine-grained global customization but come at
3503Natural tables allow more fine-grained global customization but come at
3308a performance penalty compared to extreme tables.
3504a performance penalty compared to extreme tables.
3309−.SH PANDOC\[aq]S MARKDOWN
3505+.SH PANDOC\[cq]S MARKDOWN
3310.PP
3506.PP
3311Pandoc understands an extended and slightly revised version of John
3507Pandoc understands an extended and slightly revised version of John
3312−Gruber\[aq]s Markdown syntax.
3508+Gruber\[cq]s Markdown syntax.
3313This document explains the syntax, noting differences from standard
3509This document explains the syntax, noting differences from standard
3314Markdown.
3510Markdown.
3315Except where noted, these differences can be suppressed by using the
3511Except where noted, these differences can be suppressed by using the
@@ -3326,15 +3522,15 @@ easy to read:
3326.RS
3522.RS
3327.PP
3523.PP
3328A Markdown-formatted document should be publishable as-is, as plain
3524A Markdown-formatted document should be publishable as-is, as plain
3329−text, without looking like it\[aq]s been marked up with tags or
3525+text, without looking like it\[cq]s been marked up with tags or
3330formatting instructions.
3526formatting instructions.
3331−-- John Gruber
3527+\[en] John Gruber
3332.RE
3528.RE
3333.PP
3529.PP
3334−This principle has guided pandoc\[aq]s decisions in finding syntax for
3530+This principle has guided pandoc\[cq]s decisions in finding syntax for
3335tables, footnotes, and other extensions.
3531tables, footnotes, and other extensions.
3336.PP
3532.PP
3337−There is, however, one respect in which pandoc\[aq]s aims are different
3533+There is, however, one respect in which pandoc\[cq]s aims are different
3338from the original aims of Markdown.
3534from the original aims of Markdown.
3339Whereas Markdown was originally designed with HTML generation in mind,
3535Whereas Markdown was originally designed with HTML generation in mind,
3340pandoc is designed for multiple output formats.
3536pandoc is designed for multiple output formats.
@@ -3359,7 +3555,7 @@ a hard line break, since trailing spaces in the cells are ignored.
3359There are two kinds of headings: Setext and ATX.
3555There are two kinds of headings: Setext and ATX.
3360.SS Setext-style headings
3556.SS Setext-style headings
3361.PP
3557.PP
3362−A setext-style heading is a line of text \[dq]underlined\[dq] with a row
3558+A setext-style heading is a line of text \[lq]underlined\[rq] with a row
3363of \f[C]=\f[R] signs (for a level-one heading) or \f[C]-\f[R] signs (for
3559of \f[C]=\f[R] signs (for a level-one heading) or \f[C]-\f[R] signs (for
3364a level-two heading):
3560a level-two heading):
3365.IP
3561.IP
@@ -3450,7 +3646,7 @@ My other heading {#foo}
3450(This syntax is compatible with PHP Markdown Extra.)
3646(This syntax is compatible with PHP Markdown Extra.)
3451.PP
3647.PP
3452Note that although this syntax allows assignment of classes and
3648Note that although this syntax allows assignment of classes and
3453−key/value attributes, writers generally don\[aq]t use all of this
3649+key/value attributes, writers generally don\[cq]t use all of this
3454information.
3650information.
3455Identifiers, classes, and key/value attributes are used in HTML and
3651Identifiers, classes, and key/value attributes are used in HTML and
3456HTML-based formats such as EPUB and slidy.
3652HTML-based formats such as EPUB and slidy.
@@ -3565,7 +3761,7 @@ indented more than three spaces.)
3565\f[R]
3761\f[R]
3566.fi
3762.fi
3567.PP
3763.PP
3568−A \[dq]lazy\[dq] form, which requires the \f[C]>\f[R] character only on
3764+A \[lq]lazy\[rq] form, which requires the \f[C]>\f[R] character only on
3569the first line of each block, is also allowed:
3765the first line of each block, is also allowed:
3570.IP
3766.IP
3571.nf
3767.nf
@@ -3783,6 +3979,9 @@ begin with a space.
3783\f[R]
3979\f[R]
3784.fi
3980.fi
3785.PP
3981.PP
3982+Inline formatting (such as emphasis) is allowed in the content, but not
3983+block-level formatting (such as block quotes or lists).
3984+.PP
3786This syntax is borrowed from reStructuredText.
3985This syntax is borrowed from reStructuredText.
3787.SS Lists
3986.SS Lists
3788.SS Bullet lists
3987.SS Bullet lists
@@ -3800,8 +3999,8 @@ Here is a simple example:
3800\f[R]
3999\f[R]
3801.fi
4000.fi
3802.PP
4001.PP
3803−This will produce a \[dq]compact\[dq] list.
4002+This will produce a \[lq]compact\[rq] list.
3804−If you want a \[dq]loose\[dq] list, in which each item is formatted as a
4003+If you want a \[lq]loose\[rq] list, in which each item is formatted as a
3805paragraph, put spaces between the items:
4004paragraph, put spaces between the items:
3806.IP
4005.IP
3807.nf
4006.nf
@@ -3829,7 +4028,7 @@ List items look best if subsequent lines are flush with the first line
3829\f[R]
4028\f[R]
3830.fi
4029.fi
3831.PP
4030.PP
3832−But Markdown also allows a \[dq]lazy\[dq] format:
4031+But Markdown also allows a \[lq]lazy\[rq] format:
3833.IP
4032.IP
3834.nf
4033.nf
3835\f[C]
4034\f[C]
@@ -3892,7 +4091,7 @@ character after the list marker of the containing list item.
3892.fi
4091.fi
3893.PP
4092.PP
3894As noted above, Markdown allows you to write list items
4093As noted above, Markdown allows you to write list items
3895−\[dq]lazily,\[dq] instead of indenting continuation lines.
4094+\[lq]lazily,\[rq] instead of indenting continuation lines.
3896However, if there are multiple paragraphs or other blocks in a list
4095However, if there are multiple paragraphs or other blocks in a list
3897item, the first line of each must be indented.
4096item, the first line of each must be indented.
3898.IP
4097.IP
@@ -3946,8 +4145,8 @@ They must be separated from the text that follows by at least one space,
3946and, if the list marker is a capital letter with a period, by at least
4145and, if the list marker is a capital letter with a period, by at least
3947two spaces.
4146two spaces.
3948.PP
4147.PP
3949−The \f[C]fancy_lists\f[R] extension also allows \[aq]\f[C]#\f[R]\[aq] to
4148+The \f[C]fancy_lists\f[R] extension also allows `\f[C]#\f[R]' to be used
3950−be used as an ordered list marker in place of a numeral:
4149+as an ordered list marker in place of a numeral:
3951.IP
4150.IP
3952.nf
4151.nf
3953\f[C]
4152\f[C]
@@ -4040,7 +4239,7 @@ one or more block elements (paragraph, code block, list, etc.), each
4040indented four spaces or one tab stop.
4239indented four spaces or one tab stop.
4041The body of the definition (including the first line, aside from the
4240The body of the definition (including the first line, aside from the
4042colon or tilde) should be indented four spaces.
4241colon or tilde) should be indented four spaces.
4043−However, as with other Markdown lists, you can \[dq]lazily\[dq] omit
4242+However, as with other Markdown lists, you can \[lq]lazily\[rq] omit
4044indentation except at the beginning of a paragraph or other block
4243indentation except at the beginning of a paragraph or other block
4045element:
4244element:
4046.IP
4245.IP
@@ -4074,16 +4273,16 @@ Term 2
4074.fi
4273.fi
4075.PP
4274.PP
4076Note that space between items in a definition list is required.
4275Note that space between items in a definition list is required.
4077−(A variant that loosens this requirement, but disallows \[dq]lazy\[dq]
4276+(A variant that loosens this requirement, but disallows \[lq]lazy\[rq]
4078hard wrapping, can be activated with \f[C]compact_definition_lists\f[R]:
4277hard wrapping, can be activated with \f[C]compact_definition_lists\f[R]:
4079−see Non-pandoc extensions, below.)
4278+see Non-default extensions, below.)
4080.SS Numbered example lists
4279.SS Numbered example lists
4081.SS Extension: \f[C]example_lists\f[R]
4280.SS Extension: \f[C]example_lists\f[R]
4082.PP
4281.PP
4083The special list marker \f[C]\[at]\f[R] can be used for sequentially
4282The special list marker \f[C]\[at]\f[R] can be used for sequentially
4084numbered examples.
4283numbered examples.
4085−The first list item with a \f[C]\[at]\f[R] marker will be numbered
4284+The first list item with a \f[C]\[at]\f[R] marker will be numbered `1',
4086−\[aq]1\[aq], the next \[aq]2\[aq], and so on, throughout the document.
4285+the next `2', and so on, throughout the document.
4087The numbered examples need not occur in a single list; each new list
4286The numbered examples need not occur in a single list; each new list
4088using \f[C]\[at]\f[R] will take up where the last stopped.
4287using \f[C]\[at]\f[R] will take up where the last stopped.
4089So, for example:
4288So, for example:
@@ -4119,39 +4318,6 @@ That is, example lists always behave as if the \f[C]four_space_rule\f[R]
4119extension is set.
4318extension is set.
4120This is because example labels tend to be long, and indenting content to
4319This is because example labels tend to be long, and indenting content to
4121the first non-space character after the label would be awkward.
4320the first non-space character after the label would be awkward.
4122−.SS Compact and loose lists
4123−.PP
4124−Pandoc behaves differently from \f[C]Markdown.pl\f[R] on some \[dq]edge
4125−cases\[dq] involving lists.
4126−Consider this source:
4127−.IP
4128−.nf
4129−\f[C]
4130−+ First
4131−+ Second:
4132− - Fee
4133− - Fie
4134− - Foe
4135−
4136−+ Third
4137−\f[R]
4138−.fi
4139−.PP
4140−Pandoc transforms this into a \[dq]compact list\[dq] (with no
4141−\f[C]<p>\f[R] tags around \[dq]First\[dq], \[dq]Second\[dq], or
4142−\[dq]Third\[dq]), while Markdown puts \f[C]<p>\f[R] tags around
4143−\[dq]Second\[dq] and \[dq]Third\[dq] (but not \[dq]First\[dq]), because
4144−of the blank space around \[dq]Third\[dq].
4145−Pandoc follows a simple rule: if the text is followed by a blank line,
4146−it is treated as a paragraph.
4147−Since \[dq]Second\[dq] is followed by a list, and not a blank line, it
4148−isn\[aq]t treated as a paragraph.
4149−The fact that the list is followed by a blank line is irrelevant.
4150−(Note: Pandoc works this way even when the \f[C]markdown_strict\f[R]
4151−format is specified.
4152−This behavior is consistent with the official Markdown syntax
4153−description, even though it is different from that of
4154−\f[C]Markdown.pl\f[R].)
4155.SS Ending a list
4321.SS Ending a list
4156.PP
4322.PP
4157What if you want to put an indented code block after a list?
4323What if you want to put an indented code block after a list?
@@ -4169,8 +4335,8 @@ Trouble! Here pandoc (like other Markdown implementations) will treat
4169\f[C]{ my code block }\f[R] as the second paragraph of item two, and not
4335\f[C]{ my code block }\f[R] as the second paragraph of item two, and not
4170as a code block.
4336as a code block.
4171.PP
4337.PP
4172−To \[dq]cut off\[dq] the list after item two, you can insert some
4338+To \[lq]cut off\[rq] the list after item two, you can insert some
4173−non-indented content, like an HTML comment, which won\[aq]t produce
4339+non-indented content, like an HTML comment, which won\[cq]t produce
4174visible output in any format:
4340visible output in any format:
4175.IP
4341.IP
4176.nf
4342.nf
@@ -4366,7 +4532,7 @@ can be omitted for a headerless table.
4366The cells of grid tables may contain arbitrary block elements (multiple
4532The cells of grid tables may contain arbitrary block elements (multiple
4367paragraphs, code blocks, lists, etc.).
4533paragraphs, code blocks, lists, etc.).
4368Cells that span multiple columns or rows are not supported.
4534Cells that span multiple columns or rows are not supported.
4369−Grid tables can be created easily using Emacs\[aq] table-mode
4535+Grid tables can be created easily using Emacs\[cq] table-mode
4370(\f[C]M-x table-insert\f[R]).
4536(\f[C]M-x table-insert\f[R]).
4371.PP
4537.PP
4372Alignments can be specified as with pipe tables, by putting colons at
4538Alignments can be specified as with pipe tables, by putting colons at
@@ -4450,7 +4616,7 @@ lines are wider than column width, then cell contents will not be
4450wrapped, and the cells will be sized to their contents.
4616wrapped, and the cells will be sized to their contents.
4451.PP
4617.PP
4452Note: pandoc also recognizes pipe tables of the following form, as can
4618Note: pandoc also recognizes pipe tables of the following form, as can
4453−be produced by Emacs\[aq] orgtbl-mode:
4619+be produced by Emacs\[cq] orgtbl-mode:
4454.IP
4620.IP
4455.nf
4621.nf
4456\f[C]
4622\f[C]
@@ -4463,7 +4629,7 @@ be produced by Emacs\[aq] orgtbl-mode:
4463.PP
4629.PP
4464The difference is that \f[C]+\f[R] is used instead of \f[C]|\f[R].
4630The difference is that \f[C]+\f[R] is used instead of \f[C]|\f[R].
4465Other orgtbl features are not supported.
4631Other orgtbl features are not supported.
4466−In particular, to get non-default column alignment, you\[aq]ll need to
4632+In particular, to get non-default column alignment, you\[cq]ll need to
4467add colons as above.
4633add colons as above.
4468.SS Metadata blocks
4634.SS Metadata blocks
4469.SS Extension: \f[C]pandoc_title_block\f[R]
4635.SS Extension: \f[C]pandoc_title_block\f[R]
@@ -4541,13 +4707,13 @@ All three metadata fields may contain standard inline formatting
4541.PP
4707.PP
4542Title blocks will always be parsed, but they will affect the output only
4708Title blocks will always be parsed, but they will affect the output only
4543when the \f[C]--standalone\f[R] (\f[C]-s\f[R]) option is chosen.
4709when the \f[C]--standalone\f[R] (\f[C]-s\f[R]) option is chosen.
4544−In HTML output, titles will appear twice: once in the document head --
4710+In HTML output, titles will appear twice: once in the document head
4545−this is the title that will appear at the top of the window in a browser
4711+\[en] this is the title that will appear at the top of the window in a
4546−-- and once at the beginning of the document body.
4712+browser \[en] and once at the beginning of the document body.
4547The title in the document head can have an optional prefix attached
4713The title in the document head can have an optional prefix attached
4548(\f[C]--title-prefix\f[R] or \f[C]-T\f[R] option).
4714(\f[C]--title-prefix\f[R] or \f[C]-T\f[R] option).
4549The title in the body appears as an H1 element with class
4715The title in the body appears as an H1 element with class
4550−\[dq]title\[dq], so it can be suppressed or reformatted with CSS.
4716+\[lq]title\[rq], so it can be suppressed or reformatted with CSS.
4551If a title prefix is specified with \f[C]-T\f[R] and no title block
4717If a title prefix is specified with \f[C]-T\f[R] and no title block
4552appears in the document, the title prefix will be used by itself as the
4718appears in the document, the title prefix will be used by itself as the
4553HTML title.
4719HTML title.
@@ -4576,7 +4742,7 @@ will yield a man page with the title \f[C]PANDOC\f[R] and section 1.
4576\f[R]
4742\f[R]
4577.fi
4743.fi
4578.PP
4744.PP
4579−will also have \[dq]Pandoc User Manuals\[dq] in the footer.
4745+will also have \[lq]Pandoc User Manuals\[rq] in the footer.
4580.IP
4746.IP
4581.nf
4747.nf
4582\f[C]
4748\f[C]
@@ -4584,7 +4750,7 @@ will also have \[dq]Pandoc User Manuals\[dq] in the footer.
4584\f[R]
4750\f[R]
4585.fi
4751.fi
4586.PP
4752.PP
4587−will also have \[dq]Version 4.0\[dq] in the header.
4753+will also have \[lq]Version 4.0\[rq] in the header.
4588.SS Extension: \f[C]yaml_metadata_block\f[R]
4754.SS Extension: \f[C]yaml_metadata_block\f[R]
4589.PP
4755.PP
4590A YAML metadata block is a valid YAML object, delimited by a line of
4756A YAML metadata block is a valid YAML object, delimited by a line of
@@ -4630,7 +4796,9 @@ All of the metadata will appear in a single block at the beginning of
4630the document.
4796the document.
4631.PP
4797.PP
4632Note that YAML escaping rules must be followed.
4798Note that YAML escaping rules must be followed.
4633−Thus, for example, if a title contains a colon, it must be quoted.
4799+Thus, for example, if a title contains a colon, it must be quoted, and
4800+if it contains a backslash escape, then it must be ensured that it is
4801+not treated as a YAML escape sequence.
4634The pipe character (\f[C]|\f[R]) can be used to begin an indented block
4802The pipe character (\f[C]|\f[R]) can be used to begin an indented block
4635that will be interpreted literally, without need for escaping.
4803that will be interpreted literally, without need for escaping.
4636This form is necessary when the field contains blank lines or
4804This form is necessary when the field contains blank lines or
@@ -4652,6 +4820,13 @@ abstract: |
4652\f[R]
4820\f[R]
4653.fi
4821.fi
4654.PP
4822.PP
4823+The literal block after the \f[C]|\f[R] must be indented relative to the
4824+line containing the \f[C]|\f[R].
4825+If it is not, the YAML will be invalid and pandoc will not interpret it
4826+as metadata.
4827+For an overview of the complex rules governing YAML, see the Wikipedia
4828+entry on YAML syntax.
4829+.PP
4655Template variables will be set automatically from the metadata.
4830Template variables will be set automatically from the metadata.
4656Thus, for example, in writing HTML, the variable \f[C]abstract\f[R] will
4831Thus, for example, in writing HTML, the variable \f[C]abstract\f[R] will
4657be set to the HTML equivalent of the Markdown in the \f[C]abstract\f[R]
4832be set to the HTML equivalent of the Markdown in the \f[C]abstract\f[R]
@@ -4700,7 +4875,7 @@ $endfor$
4700\f[R]
4875\f[R]
4701.fi
4876.fi
4702.PP
4877.PP
4703−Raw content to include in the document\[aq]s header may be specified
4878+Raw content to include in the document\[cq]s header may be specified
4704using \f[C]header-includes\f[R]; however, it is important to mark up
4879using \f[C]header-includes\f[R]; however, it is important to mark up
4705this content as raw code for a particular output format, using the
4880this content as raw code for a particular output format, using the
4706\f[C]raw_attribute\f[R] extension), or it will be interpreted as
4881\f[C]raw_attribute\f[R] extension), or it will be interpreted as
@@ -4717,6 +4892,21 @@ header-includes:
4717 \[ga]\[ga]\[ga]
4892 \[ga]\[ga]\[ga]
4718\f[R]
4893\f[R]
4719.fi
4894.fi
4895+.PP
4896+Note: the \f[C]yaml_metadata_block\f[R] extension works with
4897+\f[C]commonmark\f[R] as well as \f[C]markdown\f[R] (and it is enabled by
4898+default in \f[C]gfm\f[R] and \f[C]commonmark_x\f[R]).
4899+However, in these formats the following restrictions apply:
4900+.IP \[bu] 2
4901+The YAML metadata block must occur at the beginning of the document (and
4902+there can be only one).
4903+If multiple files are given as arguments to pandoc, only the first can
4904+be a YAML metadata block.
4905+.IP \[bu] 2
4906+The leaf nodes of the YAML structure are parsed in isolation from each
4907+other and from the rest of the document.
4908+So, for example, you can\[cq]t use a reference link in these contexts if
4909+the link definition is somewhere else in the document.
4720.SS Backslash escapes
4910.SS Backslash escapes
4721.SS Extension: \f[C]all_symbols_escapable\f[R]
4911.SS Extension: \f[C]all_symbols_escapable\f[R]
4722.PP
4912.PP
@@ -4747,7 +4937,7 @@ instead of
4747\f[R]
4937\f[R]
4748.fi
4938.fi
4749.PP
4939.PP
4750−This rule is easier to remember than standard Markdown\[aq]s rule, which
4940+This rule is easier to remember than standard Markdown\[cq]s rule, which
4751allows only the following characters to be backslash-escaped:
4941allows only the following characters to be backslash-escaped:
4752.IP
4942.IP
4753.nf
4943.nf
@@ -4763,16 +4953,15 @@ A backslash-escaped space is parsed as a nonbreaking space.
4763In TeX output, it will appear as \f[C]\[ti]\f[R].
4953In TeX output, it will appear as \f[C]\[ti]\f[R].
4764In HTML and XML output, it will appear as a literal unicode nonbreaking
4954In HTML and XML output, it will appear as a literal unicode nonbreaking
4765space character (note that it will thus actually look
4955space character (note that it will thus actually look
4766−\[dq]invisible\[dq] in the generated HTML source; you can still use the
4956+\[lq]invisible\[rq] in the generated HTML source; you can still use the
4767\f[C]--ascii\f[R] command-line option to make it appear as an explicit
4957\f[C]--ascii\f[R] command-line option to make it appear as an explicit
4768entity).
4958entity).
4769.PP
4959.PP
4770−A backslash-escaped newline (i.e.
4960+A backslash-escaped newline (i.e.\ a backslash occurring at the end of a
4771−a backslash occurring at the end of a line) is parsed as a hard line
4961+line) is parsed as a hard line break.
4772−break.
4773It will appear in TeX output as \f[C]\[rs]\[rs]\f[R] and in HTML as
4962It will appear in TeX output as \f[C]\[rs]\[rs]\f[R] and in HTML as
4774\f[C]<br />\f[R].
4963\f[C]<br />\f[R].
4775−This is a nice alternative to Markdown\[aq]s \[dq]invisible\[dq] way of
4964+This is a nice alternative to Markdown\[cq]s \[lq]invisible\[rq] way of
4776indicating hard line breaks using two trailing spaces on a line.
4965indicating hard line breaks using two trailing spaces on a line.
4777.PP
4966.PP
4778Backslash escapes do not work in verbatim contexts.
4967Backslash escapes do not work in verbatim contexts.
@@ -4849,8 +5038,8 @@ If the superscripted or subscripted text contains spaces, these spaces
4849must be escaped with backslashes.
5038must be escaped with backslashes.
4850(This is to prevent accidental superscripting and subscripting through
5039(This is to prevent accidental superscripting and subscripting through
4851the ordinary use of \f[C]\[ti]\f[R] and \f[C]\[ha]\f[R], and also bad
5040the ordinary use of \f[C]\[ti]\f[R] and \f[C]\[ha]\f[R], and also bad
4852−interactions with footnotes.) Thus, if you want the letter P with \[aq]a
5041+interactions with footnotes.) Thus, if you want the letter P with `a
4853−cat\[aq] in subscripts, use \f[C]P\[ti]a\[rs] cat\[ti]\f[R], not
5042+cat' in subscripts, use \f[C]P\[ti]a\[rs] cat\[ti]\f[R], not
4854\f[C]P\[ti]a cat\[ti]\f[R].
5043\f[C]P\[ti]a cat\[ti]\f[R].
4855.SS Verbatim
5044.SS Verbatim
4856.PP
5045.PP
@@ -4930,14 +5119,16 @@ The opening \f[C]$\f[R] must have a non-space character immediately to
4930its right, while the closing \f[C]$\f[R] must have a non-space character
5119its right, while the closing \f[C]$\f[R] must have a non-space character
4931immediately to its left, and must not be followed immediately by a
5120immediately to its left, and must not be followed immediately by a
4932digit.
5121digit.
4933−Thus, \f[C]$20,000 and $30,000\f[R] won\[aq]t parse as math.
5122+Thus, \f[C]$20,000 and $30,000\f[R] won\[cq]t parse as math.
4934If for some reason you need to enclose text in literal \f[C]$\f[R]
5123If for some reason you need to enclose text in literal \f[C]$\f[R]
4935−characters, backslash-escape them and they won\[aq]t be treated as math
5124+characters, backslash-escape them and they won\[cq]t be treated as math
4936delimiters.
5125delimiters.
4937.PP
5126.PP
4938For display math, use \f[C]$$\f[R] delimiters.
5127For display math, use \f[C]$$\f[R] delimiters.
4939(In this case, the delimiters may be separated from the formula by
5128(In this case, the delimiters may be separated from the formula by
4940−whitespace.)
5129+whitespace.
5130+However, there can be no blank lines betwen the opening and closing
5131+\f[C]$$\f[R] delimiters.)
4941.PP
5132.PP
4942TeX math will be printed in all output formats.
5133TeX math will be printed in all output formats.
4943How it is rendered depends on the output format:
5134How it is rendered depends on the output format:
@@ -4968,7 +5159,7 @@ Texinfo
4968It will be rendered inside a \f[C]\[at]math\f[R] command.
5159It will be rendered inside a \f[C]\[at]math\f[R] command.
4969.TP
5160.TP
4970roff man, Jira markup
5161roff man, Jira markup
4971−It will be rendered verbatim without \f[C]$\f[R]\[aq]s.
5162+It will be rendered verbatim without \f[C]$\f[R]\[cq]s.
4972.TP
5163.TP
4973MediaWiki, DokuWiki
5164MediaWiki, DokuWiki
4974It will be rendered inside \f[C]<math>\f[R] tags.
5165It will be rendered inside \f[C]<math>\f[R] tags.
@@ -5026,7 +5217,7 @@ Note that even if \f[C]raw_html\f[R] is disabled, tables will be
5026rendered with HTML syntax if they cannot use pipe syntax.
5217rendered with HTML syntax if they cannot use pipe syntax.
5027.SS Extension: \f[C]markdown_in_html_blocks\f[R]
5218.SS Extension: \f[C]markdown_in_html_blocks\f[R]
5028.PP
5219.PP
5029−Standard Markdown allows you to include HTML \[dq]blocks\[dq]: blocks of
5220+Standard Markdown allows you to include HTML \[lq]blocks\[rq]: blocks of
5030HTML between balanced tags that are separated from the surrounding text
5221HTML between balanced tags that are separated from the surrounding text
5031with blank lines, and start and end at the left margin.
5222with blank lines, and start and end at the left margin.
5032Within these blocks, everything is interpreted as HTML, not Markdown; so
5223Within these blocks, everything is interpreted as HTML, not Markdown; so
@@ -5063,8 +5254,9 @@ into
5063.PP
5254.PP
5064whereas \f[C]Markdown.pl\f[R] will preserve it as is.
5255whereas \f[C]Markdown.pl\f[R] will preserve it as is.
5065.PP
5256.PP
5066−There is one exception to this rule: text between \f[C]<script>\f[R] and
5257+There is one exception to this rule: text between \f[C]<script>\f[R],
5067−\f[C]<style>\f[R] tags is not interpreted as Markdown.
5258+\f[C]<style>\f[R], and \f[C]<textarea>\f[R] tags is not interpreted as
5259+Markdown.
5068.PP
5260.PP
5069This departure from standard Markdown should make it easier to mix
5261This departure from standard Markdown should make it easier to mix
5070Markdown with HTML block elements.
5262Markdown with HTML block elements.
@@ -5364,7 +5556,7 @@ slide shows and EPUB), LaTeX, and ConTeXt.
5364.PP
5556.PP
5365A link immediately preceded by a \f[C]!\f[R] will be treated as an
5557A link immediately preceded by a \f[C]!\f[R] will be treated as an
5366image.
5558image.
5367−The link text will be used as the image\[aq]s alt text:
5559+The link text will be used as the image\[cq]s alt text:
5368.IP
5560.IP
5369.nf
5561.nf
5370\f[C]
5562\f[C]
@@ -5379,7 +5571,7 @@ The link text will be used as the image\[aq]s alt text:
5379.PP
5571.PP
5380An image with nonempty alt text, occurring by itself in a paragraph,
5572An image with nonempty alt text, occurring by itself in a paragraph,
5381will be rendered as a figure with a caption.
5573will be rendered as a figure with a caption.
5382−The image\[aq]s alt text will be used as the caption.
5574+The image\[cq]s alt text will be used as the caption.
5383.IP
5575.IP
5384.nf
5576.nf
5385\f[C]
5577\f[C]
@@ -5388,9 +5580,8 @@ The image\[aq]s alt text will be used as the caption.
5388.fi
5580.fi
5389.PP
5581.PP
5390How this is rendered depends on the output format.
5582How this is rendered depends on the output format.
5391−Some output formats (e.g.
5392−RTF) do not yet support figures.
5583+Some output formats (e.g.\ RTF) do not yet support figures.
5393−In those formats, you\[aq]ll just get an image in a paragraph by itself,
5584+In those formats, you\[cq]ll just get an image in a paragraph by itself,
5394with no caption.
5585with no caption.
5395.PP
5586.PP
5396If you just want a regular inline image, just make sure it is not the
5587If you just want a regular inline image, just make sure it is not the
@@ -5461,7 +5652,7 @@ HTML:
5461.IP \[bu] 2
5652.IP \[bu] 2
5462LaTeX:
5653LaTeX:
5463\f[C]\[rs]includegraphics[width=0.5\[rs]textwidth,height=\[rs]textheight]{file.jpg}\f[R]
5654\f[C]\[rs]includegraphics[width=0.5\[rs]textwidth,height=\[rs]textheight]{file.jpg}\f[R]
5464−(If you\[aq]re using a custom template, you need to configure
5655+(If you\[cq]re using a custom template, you need to configure
5465\f[C]graphicx\f[R] as in the default template.)
5656\f[C]graphicx\f[R] as in the default template.)
5466.IP \[bu] 2
5657.IP \[bu] 2
5467ConTeXt:
5658ConTeXt:
@@ -5544,7 +5735,7 @@ immediately by attributes:
5544.SS Footnotes
5735.SS Footnotes
5545.SS Extension: \f[C]footnotes\f[R]
5736.SS Extension: \f[C]footnotes\f[R]
5546.PP
5737.PP
5547−Pandoc\[aq]s Markdown allows footnotes, using the following syntax:
5738+Pandoc\[cq]s Markdown allows footnotes, using the following syntax:
5548.IP
5739.IP
5549.nf
5740.nf
5550\f[C]
5741\f[C]
@@ -5593,198 +5784,73 @@ note.]
5593.fi
5784.fi
5594.PP
5785.PP
5595Inline and regular footnotes may be mixed freely.
5786Inline and regular footnotes may be mixed freely.
5596−.SS Citations
5787+.SS Citation syntax
5597.SS Extension: \f[C]citations\f[R]
5788.SS Extension: \f[C]citations\f[R]
5598.PP
5789.PP
5599−Using an external filter, \f[C]pandoc-citeproc\f[R], pandoc can
5790+To cite a bibliographic item with an identifier foo, use the syntax
5600−automatically generate citations and a bibliography in a number of
5791+\f[C]\[at]foo\f[R].
5601−styles.
5792+Normal citations should be included in square brackets, with semicolons
5602−Basic usage is
5793+separating distinct items:
5603.IP
5794.IP
5604.nf
5795.nf
5605\f[C]
5796\f[C]
5606−pandoc --filter pandoc-citeproc myinput.txt
5797+Blah blah [\[at]doe99; \[at]smith2000; \[at]smith2004].
5607\f[R]
5798\f[R]
5608.fi
5799.fi
5609.PP
5800.PP
5610−In order to use this feature, you will need to specify a bibliography
5801+How this is rendered depends on the citation style.
5611−file using the \f[C]bibliography\f[R] metadata field in a YAML metadata
5802+In an author-date style, it might render as
5612−section, or \f[C]--bibliography\f[R] command line argument.
5803+.IP
5613−You can supply multiple \f[C]--bibliography\f[R] arguments or set
5804+.nf
5614−\f[C]bibliography\f[R] metadata field to YAML array, if you want to use
5805+\f[C]
5615−multiple bibliography files.
5806+Blah blah (Doe 1999, Smith 2000, 2004).
5616−The bibliography may have any of these formats:
5807+\f[R]
5617−.PP
5808+.fi
5618−.TS
5619−tab(@);
5620−l l.
5621−T{
5622−Format
5623−T}@T{
5624−File extension
5625−T}
5626−_
5627−T{
5628−BibLaTeX
5629−T}@T{
5630−\&.bib
5631−T}
5632−T{
5633−BibTeX
5634−T}@T{
5635−\&.bibtex
5636−T}
5637−T{
5638−Copac
5639−T}@T{
5640−\&.copac
5641−T}
5642−T{
5643−CSL JSON
5644−T}@T{
5645−\&.json
5646−T}
5647−T{
5648−CSL YAML
5649−T}@T{
5650−\&.yaml
5651−T}
5652−T{
5653−EndNote
5654−T}@T{
5655−\&.enl
5656−T}
5657−T{
5658−EndNote XML
5659−T}@T{
5660−\&.xml
5661−T}
5662−T{
5663−ISI
5664−T}@T{
5665−\&.wos
5666−T}
5667−T{
5668−MEDLINE
5669−T}@T{
5670−\&.medline
5671−T}
5672−T{
5673−MODS
5674−T}@T{
5675−\&.mods
5676−T}
5677−T{
5678−RIS
5679−T}@T{
5680−\&.ris
5681−T}
5682−.TE
5683−.PP
5684−Note that \f[C].bib\f[R] can be used with both BibTeX and BibLaTeX
5685−files; use \f[C].bibtex\f[R] to force BibTeX.
5686−.PP
5687−Note that \f[C]pandoc-citeproc --bib2json\f[R] and
5688−\f[C]pandoc-citeproc --bib2yaml\f[R] can produce \f[C].json\f[R] and
5689−\f[C].yaml\f[R] files from any of the supported formats.
5690−.PP
5691−In-field markup: In BibTeX and BibLaTeX databases, pandoc-citeproc
5692−parses a subset of LaTeX markup; in CSL YAML databases, pandoc Markdown;
5693−and in CSL JSON databases, an HTML-like markup:
5694−.TP
5695−\f[B]\f[CB]<i>...</i>\f[B]\f[R]
5696−italics
5697−.TP
5698−\f[B]\f[CB]<b>...</b>\f[B]\f[R]
5699−bold
5700−.TP
5701−\f[B]\f[CB]<span style=\[dq]font-variant:small-caps;\[dq]>...</span>\f[B]\f[R] or \f[B]\f[CB]<sc>...</sc>\f[B]\f[R]
5702−small capitals
5703−.TP
5704−\f[B]\f[CB]<sub>...</sub>\f[B]\f[R]
5705−subscript
5706−.TP
5707−\f[B]\f[CB]<sup>...</sup>\f[B]\f[R]
5708−superscript
5709−.TP
5710−\f[B]\f[CB]<span class=\[dq]nocase\[dq]>...</span>\f[B]\f[R]
5711−prevent a phrase from being capitalized as title case
5712−.PP
5713−\f[C]pandoc-citeproc -j\f[R] and \f[C]-y\f[R] interconvert the CSL JSON
5714−and CSL YAML formats as far as possible.
5715.PP
5809.PP
5716−As an alternative to specifying a bibliography file using
5810+In a footnote style, it might render as
5717−\f[C]--bibliography\f[R] or the YAML metadata field
5718−\f[C]bibliography\f[R], you can include the citation data directly in
5719−the \f[C]references\f[R] field of the document\[aq]s YAML metadata.
5720−The field should contain an array of YAML-encoded references, for
5721−example:
5722.IP
5811.IP
5723.nf
5812.nf
5724\f[C]
5813\f[C]
5725−---
5814+Blah blah.[\[ha]1]
5726−references:
5815+
5727−- type: article-journal
5816+[\[ha]1]: John Doe, \[dq]Frogs,\[dq] *Journal of Amphibians* 44 (1999);
5728− id: WatsonCrick1953
5817+Susan Smith, \[dq]Flies,\[dq] *Journal of Insects* (2000);
5729− author:
5818+Susan Smith, \[dq]Bees,\[dq] *Journal of Insects* (2004).
5730− - family: Watson
5731− given: J. D.
5732− - family: Crick
5733− given: F. H. C.
5734− issued:
5735− date-parts:
5736− - - 1953
5737− - 4
5738− - 25
5739− title: \[aq]Molecular structure of nucleic acids: a structure for deoxyribose
5740− nucleic acid\[aq]
5741− title-short: Molecular structure of nucleic acids
5742− container-title: Nature
5743− volume: 171
5744− issue: 4356
5745− page: 737-738
5746− DOI: 10.1038/171737a0
5747− URL: https://www.nature.com/articles/171737a0
5748− language: en-GB
5749−\&...
5750\f[R]
5819\f[R]
5751.fi
5820.fi
5752.PP
5821.PP
5753−(\f[C]pandoc-citeproc --bib2yaml\f[R] can produce these from a
5822+See the CSL user documentation for more information about CSL styles and
5754−bibliography file in one of the supported formats.)
5823+how they affect rendering.
5755.PP
5824.PP
5756−Citations and references can be formatted using any style supported by
5757−the Citation Style Language, listed in the Zotero Style Repository.
5758−These files are specified using the \f[C]--csl\f[R] option or the
5759−\f[C]csl\f[R] metadata field.
5760−By default, \f[C]pandoc-citeproc\f[R] will use the Chicago Manual of
5761−Style author-date format.
5762−The CSL project provides further information on finding and editing
5763−styles.
5764−.PP
5765−To make your citations hyperlinks to the corresponding bibliography
5766−entries, add \f[C]link-citations: true\f[R] to your YAML metadata.
5767−.PP
5768−Citations go inside square brackets and are separated by semicolons.
5769−Each citation must have a key, composed of \[aq]\[at]\[aq] + the
5770−citation identifier from the database, and may optionally have a prefix,
5771−a locator, and a suffix.
5772−The citation key must begin with a letter, digit, or \f[C]_\f[R], and
5825+Unless a citation key start with a letter, digit, or \f[C]_\f[R], and
5773−may contain alphanumerics, \f[C]_\f[R], and internal punctuation
5826+contains only alphanumerics and internal punctuation characters
5774−characters (\f[C]:.#$%&-+?<>\[ti]/\f[R]).
5827+(\f[C]:.#$%&-+?<>\[ti]/\f[R]), it must be surrounded by curly braces,
5775−Here are some examples:
5828+which are not considered part of the key.
5829+In \f[C]\[at]Foo_bar.baz.\f[R], the key is \f[C]Foo_bar.baz\f[R].
5830+The final period is not \f[I]internal\f[R] punctuation, so it is not
5831+included in the key.
5832+In \f[C]\[at]{Foo_bar.baz.}\f[R], the key is \f[C]Foo_bar.baz.\f[R],
5833+including the final period.
5834+The curly braces are recommended if you use URLs as keys:
5835+\f[C][\[at]{https://example.com/bib?name=foobar&date=2000}, p. 33]\f[R].
5836+.PP
5837+Citation items may optionally include a prefix, a locator, and a suffix.
5838+In
5776.IP
5839.IP
5777.nf
5840.nf
5778\f[C]
5841\f[C]
5779−Blah blah [see \[at]doe99, pp. 33-35; also \[at]smith04, chap. 1].
5842+Blah blah [see \[at]doe99, pp. 33-35 and *passim*; \[at]smith04, chap. 1].
5780−
5781−Blah blah [\[at]doe99, pp. 33-35, 38-39 and *passim*].
5782−
5783−Blah blah [\[at]smith04; \[at]doe99].
5784\f[R]
5843\f[R]
5785.fi
5844.fi
5786.PP
5845.PP
5846+The first item (\f[C]doe99\f[R]) has prefix \f[C]see\f[R], locator
5847+\f[C]pp. 33-35\f[R], and suffix \f[C]and *passim*\f[R].
5848+The second item (\f[C]smith04\f[R]) has locator \f[C]chap. 1\f[R] and no
5849+prefix or suffix.
5850+.PP
5851+Pandoc uses some heuristics to separate the locator from the rest of the
5852+subject.
5787−\f[C]pandoc-citeproc\f[R] detects locator terms in the CSL locale files.
5853+It is sensitive to the locator terms defined in the CSL locale files.
5788Either abbreviated or unabbreviated forms are accepted.
5854Either abbreviated or unabbreviated forms are accepted.
5789In the \f[C]en-US\f[R] locale, locator terms can be written in either
5855In the \f[C]en-US\f[R] locale, locator terms can be written in either
5790singular or plural forms, as \f[C]book\f[R],
5856singular or plural forms, as \f[C]book\f[R],
@@ -5804,17 +5870,17 @@ singular or plural forms, as \f[C]book\f[R],
5804\f[C]v.\f[R]/\f[C]vv.\f[R]; \f[C]volume\f[R],
5870\f[C]v.\f[R]/\f[C]vv.\f[R]; \f[C]volume\f[R],
5805\f[C]vol.\f[R]/\f[C]vols.\f[R]; \f[C]\[ps]\f[R]/\f[C]\[ps]\[ps]\f[R];
5871\f[C]vol.\f[R]/\f[C]vols.\f[R]; \f[C]\[ps]\f[R]/\f[C]\[ps]\[ps]\f[R];
5806\f[C]\[sc]\f[R]/\f[C]\[sc]\[sc]\f[R].
5872\f[C]\[sc]\f[R]/\f[C]\[sc]\[sc]\f[R].
5807−If no locator term is used, \[dq]page\[dq] is assumed.
5873+If no locator term is used, \[lq]page\[rq] is assumed.
5808.PP
5874.PP
5809−\f[C]pandoc-citeproc\f[R] will use heuristics to distinguish the locator
5875+In complex cases, you can force something to be treated as a locator by
5810−from the suffix.
5876+enclosing it in curly braces or prevent parsing the suffix as locator by
5811−In complex cases, the locator can be enclosed in curly braces (using
5877+prepending curly braces:
5812−\f[C]pandoc-citeproc\f[R] 0.15 and higher only):
5813.IP
5878.IP
5814.nf
5879.nf
5815\f[C]
5880\f[C]
5816[\[at]smith{ii, A, D-Z}, with a suffix]
5881[\[at]smith{ii, A, D-Z}, with a suffix]
5817[\[at]smith, {pp. iv, vi-xi, (xv)-(xvii)} with suffix here]
5882[\[at]smith, {pp. iv, vi-xi, (xv)-(xvii)} with suffix here]
5883+[\[at]smith{}, 99 years later]
5818\f[R]
5884\f[R]
5819.fi
5885.fi
5820.PP
5886.PP
@@ -5828,7 +5894,8 @@ Smith says blah [-\[at]smith04].
5828\f[R]
5894\f[R]
5829.fi
5895.fi
5830.PP
5896.PP
5831−You can also write an in-text citation, as follows:
5897+You can also write an author-in-text citation, by omitting the square
5898+brackets:
5832.IP
5899.IP
5833.nf
5900.nf
5834\f[C]
5901\f[C]
@@ -5838,84 +5905,63 @@ You can also write an in-text citation, as follows:
5838\f[R]
5905\f[R]
5839.fi
5906.fi
5840.PP
5907.PP
5841−If the style calls for a list of works cited, it will be placed in a div
5908+This will cause the author\[cq]s name to be rendered, followed by the
5842−with id \f[C]refs\f[R], if one exists:
5909+bibliographical details.
5910+Use this form when you want to make the citation the subject of a
5911+sentence.
5912+.PP
5913+When you are using a note style, it is usually better to let citeproc
5914+create the footnotes from citations rather than writing an explicit
5915+note.
5916+If you do write an explicit note that contains a citation, note that
5917+normal citations will be put in parentheses, while author-in-text
5918+citations will not.
5919+For this reason, it is sometimes preferable to use the author-in-text
5920+style inside notes when using a note style.
5921+.SS Non-default extensions
5922+.PP
5923+The following Markdown syntax extensions are not enabled by default in
5924+pandoc, but may be enabled by adding \f[C]+EXTENSION\f[R] to the format
5925+name, where \f[C]EXTENSION\f[R] is the name of the extension.
5926+Thus, for example, \f[C]markdown+hard_line_breaks\f[R] is Markdown with
5927+hard line breaks.
5928+.SS Extension: \f[C]rebase_relative_paths\f[R]
5929+.PP
5930+Rewrite relative paths for Markdown links and images, depending on the
5931+path of the file containing the link or image link.
5932+For each link or image, pandoc will compute the directory of the
5933+containing file, relative to the working directory, and prepend the
5934+resulting path to the link or image path.
5935+.PP
5936+The use of this extension is best understood by example.
5937+Suppose you have a a subdirectory for each chapter of a book,
5938+\f[C]chap1\f[R], \f[C]chap2\f[R], \f[C]chap3\f[R].
5939+Each contains a file \f[C]text.md\f[R] and a number of images used in
5940+the chapter.
5941+You would like to have \f[C]![image](spider.jpg)\f[R] in
5942+\f[C]chap1/text.md\f[R] refer to \f[C]chap1/spider.jpg\f[R] and
5943+\f[C]![image](spider.jpg)\f[R] in \f[C]chap2/text.md\f[R] refer to
5944+\f[C]chap2/spider.jpg\f[R].
5945+To do this, use
5843.IP
5946.IP
5844.nf
5947.nf
5845\f[C]
5948\f[C]
5846−::: {#refs}
5949+pandoc chap*/*.md -f markdown+rebase_relative_paths
5847−:::
5848\f[R]
5950\f[R]
5849.fi
5951.fi
5850.PP
5952.PP
5851−Otherwise, it will be placed at the end of the document.
5953+Without this extension, you would have to use
5852−Generation of the bibliography can be suppressed by setting
5954+\f[C]![image](chap1/spider.jpg)\f[R] in \f[C]chap1/text.md\f[R] and
5853−\f[C]suppress-bibliography: true\f[R] in the YAML metadata.
5955+\f[C]![image](chap2/spider.jpg)\f[R] in \f[C]chap2/text.md\f[R].
5956+Links with relative paths will be rewritten in the same way as images.
5854.PP
5957.PP
5855−If you wish the bibliography to have a section heading, you can set
5958+Absolute paths and URLs are not changed.
5856−\f[C]reference-section-title\f[R] in the metadata, or put the heading at
5959+Neither are empty paths or paths consisting entirely of a fragment,
5857−the beginning of the div with id \f[C]refs\f[R] (if you are using it) or
5960+e.g., \f[C]#foo\f[R].
5858−at the end of your document:
5859−.IP
5860−.nf
5861−\f[C]
5862−last paragraph...
5863−
5864−# References
5865−\f[R]
5866−.fi
5867−.PP
5868−The bibliography will be inserted after this heading.
5869−Note that the \f[C]unnumbered\f[R] class will be added to this heading,
5870−so that the section will not be numbered.
5871−.PP
5872−If you want to include items in the bibliography without actually citing
5873−them in the body text, you can define a dummy \f[C]nocite\f[R] metadata
5874−field and put the citations there:
5875−.IP
5876−.nf
5877−\f[C]
5878−---
5879−nocite: |
5880− \[at]item1, \[at]item2
5881−\&...
5882−
5883−\[at]item3
5884−\f[R]
5885−.fi
5886−.PP
5887−In this example, the document will contain a citation for
5888−\f[C]item3\f[R] only, but the bibliography will contain entries for
5889−\f[C]item1\f[R], \f[C]item2\f[R], and \f[C]item3\f[R].
5890−.PP
5891−It is possible to create a bibliography with all the citations, whether
5892−or not they appear in the document, by using a wildcard:
5893−.IP
5894−.nf
5895−\f[C]
5896−---
5897−nocite: |
5898− \[at]*
5899−\&...
5900−\f[R]
5901−.fi
5902−.PP
5903−For LaTeX output, you can also use \f[C]natbib\f[R] or
5904−\f[C]biblatex\f[R] to render the bibliography.
5905−In order to do so, specify bibliography files as outlined above, and add
5906−\f[C]--natbib\f[R] or \f[C]--biblatex\f[R] argument to \f[C]pandoc\f[R]
5907−invocation.
5908−Bear in mind that bibliography files have to be in respective format
5909−(either BibTeX or BibLaTeX).
5910−.PP
5911−For more information, see the pandoc-citeproc man page.
5912−.SS Non-pandoc extensions
5913.PP
5961.PP
5914−The following Markdown syntax extensions are not enabled by default in
5962+Note that relative paths in reference links and images will be rewritten
5915−pandoc, but may be enabled by adding \f[C]+EXTENSION\f[R] to the format
5963+relative to the file containing the link reference definition, not the
5916−name, where \f[C]EXTENSION\f[R] is the name of the extension.
5964+file containing the reference link or image itself, if these differ.
5917−Thus, for example, \f[C]markdown+hard_line_breaks\f[R] is Markdown with
5918−hard line breaks.
5919.SS Extension: \f[C]attributes\f[R]
5965.SS Extension: \f[C]attributes\f[R]
5920.PP
5966.PP
5921Allows attributes to be attached to any inline or block-level element.
5967Allows attributes to be attached to any inline or block-level element.
@@ -5946,7 +5992,7 @@ affect the code block element.
5946Attributes that occur at the end of a reference link definition affect
5992Attributes that occur at the end of a reference link definition affect
5947links that refer to that definition.
5993links that refer to that definition.
5948.PP
5994.PP
5949−Note that pandoc\[aq]s AST does not currently allow attributes to be
5995+Note that pandoc\[cq]s AST does not currently allow attributes to be
5950attached to arbitrary elements.
5996attached to arbitrary elements.
5951Hence a Span or Div container will be added if needed.
5997Hence a Span or Div container will be added if needed.
5952.SS Extension: \f[C]old_dashes\f[R]
5998.SS Extension: \f[C]old_dashes\f[R]
@@ -5960,7 +6006,7 @@ It is selected automatically for \f[C]textile\f[R] input.
5960.PP
6006.PP
5961Allow \f[C]<\f[R] and \f[C]>\f[R] to be backslash-escaped, as they can
6007Allow \f[C]<\f[R] and \f[C]>\f[R] to be backslash-escaped, as they can
5962be in GitHub flavored Markdown but not original Markdown.
6008be in GitHub flavored Markdown but not original Markdown.
5963−This is implied by pandoc\[aq]s default \f[C]all_symbols_escapable\f[R].
6009+This is implied by pandoc\[cq]s default \f[C]all_symbols_escapable\f[R].
5964.SS Extension: \f[C]lists_without_preceding_blankline\f[R]
6010.SS Extension: \f[C]lists_without_preceding_blankline\f[R]
5965.PP
6011.PP
5966Allow a list to occur right after a paragraph, with no intervening blank
6012Allow a list to occur right after a paragraph, with no intervening blank
@@ -6084,7 +6130,7 @@ in several respects:
6084No blank line is required between consecutive items of the definition
6130No blank line is required between consecutive items of the definition
6085list.
6131list.
6086.IP \[bu] 2
6132.IP \[bu] 2
6087−To get a \[dq]tight\[dq] or \[dq]compact\[dq] list, omit space between
6133+To get a \[lq]tight\[rq] or \[lq]compact\[rq] list, omit space between
6088consecutive items; the space between a term and its definition does not
6134consecutive items; the space between a term and its definition does not
6089affect anything.
6135affect anything.
6090.IP \[bu] 2
6136.IP \[bu] 2
@@ -6095,65 +6141,489 @@ be indented four spaces.
6095Use Project Gutenberg conventions for \f[C]plain\f[R] output: all-caps
6141Use Project Gutenberg conventions for \f[C]plain\f[R] output: all-caps
6096for strong emphasis, surround by underscores for regular emphasis, add
6142for strong emphasis, surround by underscores for regular emphasis, add
6097extra blank space around headings.
6143extra blank space around headings.
6144+.SS Extension: \f[C]sourcepos\f[R]
6145+.PP
6146+Include source position attributes when parsing \f[C]commonmark\f[R].
6147+For elements that accept attributes, a \f[C]data-pos\f[R] attribute is
6148+added; other elements are placed in a surrounding Div or Span elemnet
6149+with a \f[C]data-pos\f[R] attribute.
6098.SS Markdown variants
6150.SS Markdown variants
6099.PP
6151.PP
6100−In addition to pandoc\[aq]s extended Markdown, the following Markdown
6152+In addition to pandoc\[cq]s extended Markdown, the following Markdown
6101variants are supported:
6153variants are supported:
6154+.IP \[bu] 2
6155+\f[C]markdown_phpextra\f[R] (PHP Markdown Extra)
6156+.IP \[bu] 2
6157+\f[C]markdown_github\f[R] (deprecated GitHub-Flavored Markdown)
6158+.IP \[bu] 2
6159+\f[C]markdown_mmd\f[R] (MultiMarkdown)
6160+.IP \[bu] 2
6161+\f[C]markdown_strict\f[R] (Markdown.pl)
6162+.IP \[bu] 2
6163+\f[C]commonmark\f[R] (CommonMark)
6164+.IP \[bu] 2
6165+\f[C]gfm\f[R] (Github-Flavored Markdown)
6166+.IP \[bu] 2
6167+\f[C]commonmark_x\f[R] (CommonMark with many pandoc extensions)
6168+.PP
6169+To see which extensions are supported for a given format, and which are
6170+enabled by default, you can use the command
6171+.IP
6172+.nf
6173+\f[C]
6174+pandoc --list-extensions=FORMAT
6175+\f[R]
6176+.fi
6177+.PP
6178+where \f[C]FORMAT\f[R] is replaced with the name of the format.
6179+.PP
6180+Note that the list of extensions for \f[C]commonmark\f[R],
6181+\f[C]gfm\f[R], and \f[C]commonmark_x\f[R] are defined relative to
6182+default commonmark.
6183+So, for example, \f[C]backtick_code_blocks\f[R] does not appear as an
6184+extension, since it is enabled by default and cannot be disabled.
6185+.SH CITATIONS
6186+.PP
6187+When the \f[C]--citeproc\f[R] option is used, pandoc can automatically
6188+generate citations and a bibliography in a number of styles.
6189+Basic usage is
6190+.IP
6191+.nf
6192+\f[C]
6193+pandoc --citeproc myinput.txt
6194+\f[R]
6195+.fi
6196+.PP
6197+To use this feature, you will need to have
6198+.IP \[bu] 2
6199+a document containing citations (see Extension: \f[C]citations\f[R]);
6200+.IP \[bu] 2
6201+a source of bibliographic data: either an external bibliography file or
6202+a list of \f[C]references\f[R] in the document\[cq]s YAML metadata
6203+.IP \[bu] 2
6204+optionally, a CSL citation style.
6205+.SS Specifying bibliographic data
6206+.PP
6207+You can specify an external bibliography using the
6208+\f[C]bibliography\f[R] metadata field in a YAML metadata section or the
6209+\f[C]--bibliography\f[R] command line argument.
6210+If you want to use multiple bibliography files, you can supply multiple
6211+\f[C]--bibliography\f[R] arguments or set \f[C]bibliography\f[R]
6212+metadata field to YAML array.
6213+A bibliography may have any of these formats:
6214+.PP
6215+.TS
6216+tab(@);
6217+l l.
6218+T{
6219+Format
6220+T}@T{
6221+File extension
6222+T}
6223+_
6224+T{
6225+BibLaTeX
6226+T}@T{
6227+\&.bib
6228+T}
6229+T{
6230+BibTeX
6231+T}@T{
6232+\&.bibtex
6233+T}
6234+T{
6235+CSL JSON
6236+T}@T{
6237+\&.json
6238+T}
6239+T{
6240+CSL YAML
6241+T}@T{
6242+\&.yaml
6243+T}
6244+.TE
6245+.PP
6246+Note that \f[C].bib\f[R] can be used with both BibTeX and BibLaTeX
6247+files; use the extension \f[C].bibtex\f[R] to force interpretation as
6248+BibTeX.
6249+.PP
6250+In BibTeX and BibLaTeX databases, pandoc parses LaTeX markup inside
6251+fields such as \f[C]title\f[R]; in CSL YAML databases, pandoc Markdown;
6252+and in CSL JSON databases, an HTML-like markup:
6253+.TP
6254+\f[B]\f[CB]<i>...</i>\f[B]\f[R]
6255+italics
6256+.TP
6257+\f[B]\f[CB]<b>...</b>\f[B]\f[R]
6258+bold
6259+.TP
6260+\f[B]\f[CB]<span style=\[dq]font-variant:small-caps;\[dq]>...</span>\f[B]\f[R] or \f[B]\f[CB]<sc>...</sc>\f[B]\f[R]
6261+small capitals
6102.TP
6262.TP
6103−\f[B]\f[CB]markdown_phpextra\f[B]\f[R] (PHP Markdown Extra)
6263+\f[B]\f[CB]<sub>...</sub>\f[B]\f[R]
6104−\f[C]footnotes\f[R], \f[C]pipe_tables\f[R], \f[C]raw_html\f[R],
6264+subscript
6105−\f[C]markdown_attribute\f[R], \f[C]fenced_code_blocks\f[R],
6106−\f[C]definition_lists\f[R], \f[C]intraword_underscores\f[R],
6107−\f[C]header_attributes\f[R], \f[C]link_attributes\f[R],
6108−\f[C]abbreviations\f[R], \f[C]shortcut_reference_links\f[R],
6109−\f[C]spaced_reference_links\f[R].
6110−.TP
6265+.TP
6111−\f[B]\f[CB]markdown_github\f[B]\f[R] (deprecated GitHub-Flavored Markdown)
6266+\f[B]\f[CB]<sup>...</sup>\f[B]\f[R]
6112−\f[C]pipe_tables\f[R], \f[C]raw_html\f[R], \f[C]fenced_code_blocks\f[R],
6113−\f[C]auto_identifiers\f[R], \f[C]gfm_auto_identifiers\f[R],
6114−\f[C]backtick_code_blocks\f[R], \f[C]autolink_bare_uris\f[R],
6115−\f[C]space_in_atx_header\f[R], \f[C]intraword_underscores\f[R],
6116−\f[C]strikeout\f[R], \f[C]task_lists\f[R], \f[C]emoji\f[R],
6117−\f[C]shortcut_reference_links\f[R], \f[C]angle_brackets_escapable\f[R],
6118−\f[C]lists_without_preceding_blankline\f[R].
6119−.TP
6120−\f[B]\f[CB]markdown_mmd\f[B]\f[R] (MultiMarkdown)
6121−\f[C]pipe_tables\f[R], \f[C]raw_html\f[R], \f[C]markdown_attribute\f[R],
6122−\f[C]mmd_link_attributes\f[R], \f[C]tex_math_double_backslash\f[R],
6123−\f[C]intraword_underscores\f[R], \f[C]mmd_title_block\f[R],
6124−\f[C]footnotes\f[R], \f[C]definition_lists\f[R],
6125−\f[C]all_symbols_escapable\f[R], \f[C]implicit_header_references\f[R],
6126−\f[C]auto_identifiers\f[R], \f[C]mmd_header_identifiers\f[R],
6127−\f[C]shortcut_reference_links\f[R], \f[C]implicit_figures\f[R],
6128−\f[C]superscript\f[R], \f[C]subscript\f[R],
6267+superscript
6129−\f[C]backtick_code_blocks\f[R], \f[C]spaced_reference_links\f[R],
6268+.TP
6130−\f[C]raw_attribute\f[R].
6269+\f[B]\f[CB]<span class=\[dq]nocase\[dq]>...</span>\f[B]\f[R]
6131−.TP
6270+prevent a phrase from being capitalized as title case
6132−\f[B]\f[CB]markdown_strict\f[B]\f[R] (Markdown.pl)
6271+.PP
6133−\f[C]raw_html\f[R], \f[C]shortcut_reference_links\f[R],
6272+As an alternative to specifying a bibliography file using
6134−\f[C]spaced_reference_links\f[R].
6273+\f[C]--bibliography\f[R] or the YAML metadata field
6135−.PP
6274+\f[C]bibliography\f[R], you can include the citation data directly in
6136−We also support \f[C]commonmark\f[R] and \f[C]gfm\f[R] (GitHub-Flavored
6275+the \f[C]references\f[R] field of the document\[cq]s YAML metadata.
6137−Markdown, which is implemented as a set of extensions on
6276+The field should contain an array of YAML-encoded references, for
6138−\f[C]commonmark\f[R]).
6277+example:
6139−.PP
6278+.IP
6140−Note, however, that \f[C]commonmark\f[R] and \f[C]gfm\f[R] have limited
6279+.nf
6141−support for extensions.
6280+\f[C]
6142−Only those listed below (and \f[C]smart\f[R], \f[C]raw_tex\f[R], and
6281+---
6143−\f[C]hard_line_breaks\f[R]) will work.
6282+references:
6144−The extensions can, however, all be individually disabled.
6283+- type: article-journal
6145−Also, \f[C]raw_tex\f[R] only affects \f[C]gfm\f[R] output, not input.
6284+ id: WatsonCrick1953
6146−.TP
6285+ author:
6147−\f[B]\f[CB]gfm\f[B]\f[R] (GitHub-Flavored Markdown)
6286+ - family: Watson
6148−\f[C]pipe_tables\f[R], \f[C]raw_html\f[R], \f[C]native_divs\f[R],
6287+ given: J. D.
6149−\f[C]fenced_code_blocks\f[R], \f[C]auto_identifiers\f[R],
6288+ - family: Crick
6150−\f[C]gfm_auto_identifiers\f[R], \f[C]backtick_code_blocks\f[R],
6289+ given: F. H. C.
6151−\f[C]autolink_bare_uris\f[R], \f[C]space_in_atx_header\f[R],
6290+ issued:
6152−\f[C]intraword_underscores\f[R], \f[C]strikeout\f[R],
6291+ date-parts:
6153−\f[C]task_lists\f[R], \f[C]emoji\f[R],
6292+ - - 1953
6154−\f[C]shortcut_reference_links\f[R], \f[C]angle_brackets_escapable\f[R],
6293+ - 4
6155−\f[C]lists_without_preceding_blankline\f[R].
6294+ - 25
6295+ title: \[aq]Molecular structure of nucleic acids: a structure for
6296+ deoxyribose nucleic acid\[aq]
6297+ title-short: Molecular structure of nucleic acids
6298+ container-title: Nature
6299+ volume: 171
6300+ issue: 4356
6301+ page: 737-738
6302+ DOI: 10.1038/171737a0
6303+ URL: https://www.nature.com/articles/171737a0
6304+ language: en-GB
6305+\&...
6306+\f[R]
6307+.fi
6308+.PP
6309+If both an external bibliography and inline (YAML metadata) references
6310+are provided, both will be used.
6311+In case of conflicting \f[C]id\f[R]s, the inline references will take
6312+precedence.
6313+.PP
6314+Note that \f[C]pandoc\f[R] can be used to produce such a YAML metadata
6315+section from a BibTeX, BibLaTeX, or CSL JSON bibliography:
6316+.IP
6317+.nf
6318+\f[C]
6319+pandoc chem.bib -s -f biblatex -t markdown
6320+pandoc chem.json -s -f csljson -t markdown
6321+\f[R]
6322+.fi
6323+.PP
6324+Indeed, \f[C]pandoc\f[R] can convert between any of these citation
6325+formats:
6326+.IP
6327+.nf
6328+\f[C]
6329+pandoc chem.bib -s -f biblatex -t csljson
6330+pandoc chem.yaml -s -f markdown -t biblatex
6331+\f[R]
6332+.fi
6333+.PP
6334+Running pandoc on a bibliography file with the \f[C]--citeproc\f[R]
6335+option will create a formatted bibliography in the format of your
6336+choice:
6337+.IP
6338+.nf
6339+\f[C]
6340+pandoc chem.bib -s --citeproc -o chem.html
6341+pandoc chem.bib -s --citeproc -o chem.pdf
6342+\f[R]
6343+.fi
6344+.SS Capitalization in titles
6345+.PP
6346+If you are using a bibtex or biblatex bibliography, then observe the
6347+following rules:
6348+.IP \[bu] 2
6349+English titles should be in title case.
6350+Non-English titles should be in sentence case, and the \f[C]langid\f[R]
6351+field in biblatex should be set to the relevant language.
6352+(The following values are treated as English: \f[C]american\f[R],
6353+\f[C]british\f[R], \f[C]canadian\f[R], \f[C]english\f[R],
6354+\f[C]australian\f[R], \f[C]newzealand\f[R], \f[C]USenglish\f[R], or
6355+\f[C]UKenglish\f[R].)
6356+.IP \[bu] 2
6357+As is standard with bibtex/biblatex, proper names should be protected
6358+with curly braces so that they won\[cq]t be lowercased in styles that
6359+call for sentence case.
6360+For example:
6361+.RS 2
6362+.IP
6363+.nf
6364+\f[C]
6365+title = {My Dinner with {Andre}}
6366+\f[R]
6367+.fi
6368+.RE
6369+.IP \[bu] 2
6370+In addition, words that should remain lowercase (or camelCase) should be
6371+protected:
6372+.RS 2
6373+.IP
6374+.nf
6375+\f[C]
6376+title = {Spin Wave Dispersion on the {nm} Scale}
6377+\f[R]
6378+.fi
6379+.PP
6380+Though this is not necessary in bibtex/biblatex, it is necessary with
6381+citeproc, which stores titles internally in sentence case, and converts
6382+to title case in styles that require it.
6383+Here we protect \[lq]nm\[rq] so that it doesn\[cq]t get converted to
6384+\[lq]Nm\[rq] at this stage.
6385+.RE
6386+.PP
6387+If you are using a CSL bibliography (either JSON or YAML), then observe
6388+the following rules:
6389+.IP \[bu] 2
6390+All titles should be in sentence case.
6391+.IP \[bu] 2
6392+Use the \f[C]language\f[R] field for non-English titles to prevent their
6393+conversion to title case in styles that call for this.
6394+(Conversion happens only if \f[C]language\f[R] begins with \f[C]en\f[R]
6395+or is left empty.)
6396+.IP \[bu] 2
6397+Protect words that should not be converted to title case using this
6398+syntax:
6399+.RS 2
6400+.IP
6401+.nf
6402+\f[C]
6403+Spin wave dispersion on the <span class=\[dq]nocase\[dq]>nm</span> scale
6404+\f[R]
6405+.fi
6406+.RE
6407+.SS Conference Papers, Published vs.\ Unpublished
6408+.PP
6409+For a formally published conference paper, use the biblatex entry type
6410+\f[C]inproceedings\f[R] (which will be mapped to CSL
6411+\f[C]paper-conference\f[R]).
6412+.PP
6413+For an unpublished manuscript, use the biblatex entry type
6414+\f[C]unpublished\f[R] without an \f[C]eventtitle\f[R] field (this entry
6415+type will be mapped to CSL \f[C]manuscript\f[R]).
6416+.PP
6417+For a talk, an unpublished conference paper, or a poster presentation,
6418+use the biblatex entry type \f[C]unpublished\f[R] with an
6419+\f[C]eventtitle\f[R] field (this entry type will be mapped to CSL
6420+\f[C]speech\f[R]).
6421+Use the biblatex \f[C]type\f[R] field to indicate the type,
6422+e.g.\ \[lq]Paper\[rq], or \[lq]Poster\[rq].
6423+\f[C]venue\f[R] and \f[C]eventdate\f[R] may be useful too, though
6424+\f[C]eventdate\f[R] will not be rendered by most CSL styles.
6425+Note that \f[C]venue\f[R] is for the event\[cq]s venue, unlike
6426+\f[C]location\f[R] which describes the publisher\[cq]s location; do not
6427+use the latter for an unpublished conference paper.
6428+.SS Specifying a citation style
6429+.PP
6430+Citations and references can be formatted using any style supported by
6431+the Citation Style Language, listed in the Zotero Style Repository.
6432+These files are specified using the \f[C]--csl\f[R] option or the
6433+\f[C]csl\f[R] (or \f[C]citation-style\f[R]) metadata field.
6434+By default, pandoc will use the Chicago Manual of Style author-date
6435+format.
6436+(You can override this default by copying a CSL style of your choice to
6437+\f[C]default.csl\f[R] in your user data directory.) The CSL project
6438+provides further information on finding and editing styles.
6439+.PP
6440+The \f[C]--citation-abbreviations\f[R] option (or the
6441+\f[C]citation-abbreviations\f[R] metadata field) may be used to specify
6442+a JSON file containing abbreviations of journals that should be used in
6443+formatted bibliographies when \f[C]form=\[dq]short\[dq]\f[R] is
6444+specified.
6445+The format of the file can be illustrated with an example:
6446+.IP
6447+.nf
6448+\f[C]
6449+{ \[dq]default\[dq]: {
6450+ \[dq]container-title\[dq]: {
6451+ \[dq]Lloyd\[aq]s Law Reports\[dq]: \[dq]Lloyd\[aq]s Rep\[dq],
6452+ \[dq]Estates Gazette\[dq]: \[dq]EG\[dq],
6453+ \[dq]Scots Law Times\[dq]: \[dq]SLT\[dq]
6454+ }
6455+ }
6456+}
6457+\f[R]
6458+.fi
6459+.SS Citations in note styles
6460+.PP
6461+Pandoc\[cq]s citation processing is designed to allow you to move
6462+between author-date, numerical, and note styles without modifying the
6463+markdown source.
6464+When you\[cq]re using a note style, avoid inserting footnotes manually.
6465+Instead, insert citations just as you would in an author-date
6466+style\[em]for example,
6467+.IP
6468+.nf
6469+\f[C]
6470+Blah blah [\[at]foo, p. 33].
6471+\f[R]
6472+.fi
6473+.PP
6474+The footnote will be created automatically.
6475+Pandoc will take care of removing the space and moving the note before
6476+or after the period, depending on the setting of
6477+\f[C]notes-after-punctuation\f[R], as described below in Other relevant
6478+metadata fields.
6479+.PP
6480+In some cases you may need to put a citation inside a regular footnote.
6481+Normal citations in footnotes (such as \f[C][\[at]foo, p. 33]\f[R]) will
6482+be rendered in parentheses.
6483+In-text citations (such as \f[C]\[at]foo [p. 33]\f[R]) will be rendered
6484+without parentheses.
6485+(A comma will be added if appropriate.) Thus:
6486+.IP
6487+.nf
6488+\f[C]
6489+[\[ha]1]: Some studies [\[at]foo; \[at]bar, p. 33] show that
6490+frubulicious zoosnaps are quantical. For a survey
6491+of the literature, see \[at]baz [chap. 1].
6492+\f[R]
6493+.fi
6494+.SS Raw content in a style
6495+.PP
6496+To include raw content in a prefix, suffix, delimiter, or term, surround
6497+it with these tags indicating the format:
6498+.IP
6499+.nf
6500+\f[C]
6501+{{jats}}&lt;ref&gt;{{/jats}}
6502+\f[R]
6503+.fi
6504+.PP
6505+Without the tags, the string will be interpreted as a string and escaped
6506+in the output, rather than being passed through raw.
6507+.PP
6508+This feature allows stylesheets to be customized to give different
6509+output for different output formats.
6510+However, stylesheets customized in this way will not be usable by other
6511+CSL implementations.
6512+.SS Placement of the bibliography
6513+.PP
6514+If the style calls for a list of works cited, it will be placed in a div
6515+with id \f[C]refs\f[R], if one exists:
6516+.IP
6517+.nf
6518+\f[C]
6519+::: {#refs}
6520+:::
6521+\f[R]
6522+.fi
6523+.PP
6524+Otherwise, it will be placed at the end of the document.
6525+Generation of the bibliography can be suppressed by setting
6526+\f[C]suppress-bibliography: true\f[R] in the YAML metadata.
6527+.PP
6528+If you wish the bibliography to have a section heading, you can set
6529+\f[C]reference-section-title\f[R] in the metadata, or put the heading at
6530+the beginning of the div with id \f[C]refs\f[R] (if you are using it) or
6531+at the end of your document:
6532+.IP
6533+.nf
6534+\f[C]
6535+last paragraph...
6536+
6537+# References
6538+\f[R]
6539+.fi
6540+.PP
6541+The bibliography will be inserted after this heading.
6542+Note that the \f[C]unnumbered\f[R] class will be added to this heading,
6543+so that the section will not be numbered.
6544+.SS Including uncited items in the bibliography
6545+.PP
6546+If you want to include items in the bibliography without actually citing
6547+them in the body text, you can define a dummy \f[C]nocite\f[R] metadata
6548+field and put the citations there:
6549+.IP
6550+.nf
6551+\f[C]
6552+---
6553+nocite: |
6554+ \[at]item1, \[at]item2
6555+\&...
6556+
6557+\[at]item3
6558+\f[R]
6559+.fi
6560+.PP
6561+In this example, the document will contain a citation for
6562+\f[C]item3\f[R] only, but the bibliography will contain entries for
6563+\f[C]item1\f[R], \f[C]item2\f[R], and \f[C]item3\f[R].
6564+.PP
6565+It is possible to create a bibliography with all the citations, whether
6566+or not they appear in the document, by using a wildcard:
6567+.IP
6568+.nf
6569+\f[C]
6570+---
6571+nocite: |
6572+ \[at]*
6573+\&...
6574+\f[R]
6575+.fi
6576+.PP
6577+For LaTeX output, you can also use \f[C]natbib\f[R] or
6578+\f[C]biblatex\f[R] to render the bibliography.
6579+In order to do so, specify bibliography files as outlined above, and add
6580+\f[C]--natbib\f[R] or \f[C]--biblatex\f[R] argument to \f[C]pandoc\f[R]
6581+invocation.
6582+Bear in mind that bibliography files have to be in either BibTeX (for
6583+\f[C]--natbib\f[R]) or BibLaTeX (for \f[C]--biblatex\f[R]) format.
6584+.SS Other relevant metadata fields
6585+.PP
6586+A few other metadata fields affect bibliography formatting:
6587+.TP
6588+\f[B]\f[CB]link-citations\f[B]\f[R]
6589+If true, citations will be hyperlinked to the corresponding bibliography
6590+entries (for author-date and numerical styles only).
6591+.TP
6592+\f[B]\f[CB]lang\f[B]\f[R]
6593+The \f[C]lang\f[R] field will affect how the style is localized, for
6594+example in the translation of labels, the use of quotation marks, and
6595+the way items are sorted.
6596+(For backwards compatibility, \f[C]locale\f[R] may be used instead of
6597+\f[C]lang\f[R], but this use is deprecated.)
6598+.RS
6599+.PP
6600+A BCP 47 language tag is expected: for example, \f[C]en\f[R],
6601+\f[C]de\f[R], \f[C]en-US\f[R], \f[C]fr-CA\f[R], \f[C]ug-Cyrl\f[R].
6602+The unicode extension syntax (after \f[C]-u-\f[R]) may be used to
6603+specify options for collation (sorting) more precisely.
6604+Here are some examples:
6605+.IP \[bu] 2
6606+\f[C]zh-u-co-pinyin\f[R] \[en] Chinese with the Pinyin collation.
6607+.IP \[bu] 2
6608+\f[C]es-u-co-trad\f[R] \[en] Spanish with the traditional collation
6609+(with \f[C]Ch\f[R] sorting after \f[C]C\f[R]).
6610+.IP \[bu] 2
6611+\f[C]fr-u-kb\f[R] \[en] French with \[lq]backwards\[rq] accent sorting
6612+(with \f[C]cot\['e]\f[R] sorting after \f[C]c\[^o]te\f[R]).
6613+.IP \[bu] 2
6614+\f[C]en-US-u-kf-upper\f[R] \[en] English with uppercase letters sorting
6615+before lower (default is lower before upper).
6616+.RE
6617+.TP
6618+\f[B]\f[CB]notes-after-punctuation\f[B]\f[R]
6619+If true (the default), pandoc will put footnote citations after
6620+following punctuation.
6621+For example, if the source contains \f[C]blah blah [\[at]jones99].\f[R],
6622+the result will look like \f[C]blah blah.[\[ha]1]\f[R], with the note
6623+moved after the period and the space collapsed.
6624+If false, the space will still be collapsed, but the footnote will not
6625+be moved after the punctuation.
6156−.SH PRODUCING SLIDE SHOWS WITH PANDOC
6626+.SH SLIDE SHOWS
6157.PP
6627.PP
6158You can use pandoc to produce an HTML + JavaScript slide presentation
6628You can use pandoc to produce an HTML + JavaScript slide presentation
6159that can be viewed via a web browser.
6629that can be viewed via a web browser.
@@ -6162,7 +6632,7 @@ reveal.js.
6162You can also produce a PDF slide show using LaTeX \f[C]beamer\f[R], or
6632You can also produce a PDF slide show using LaTeX \f[C]beamer\f[R], or
6163slides shows in Microsoft PowerPoint format.
6633slides shows in Microsoft PowerPoint format.
6164.PP
6634.PP
6165−Here\[aq]s the Markdown source for a simple slide show,
6635+Here\[cq]s the Markdown source for a simple slide show,
6166\f[C]habits.txt\f[R]:
6636\f[C]habits.txt\f[R]:
6167.IP
6637.IP
6168.nf
6638.nf
@@ -6264,21 +6734,26 @@ A heading at the slide level always starts a new slide.
6264.IP \[bu] 2
6734.IP \[bu] 2
6265Headings \f[I]below\f[R] the slide level in the hierarchy create
6735Headings \f[I]below\f[R] the slide level in the hierarchy create
6266headings \f[I]within\f[R] a slide.
6736headings \f[I]within\f[R] a slide.
6737+(In beamer, a \[lq]block\[rq] will be created.
6738+If the heading has the class \f[C]example\f[R], an
6739+\f[C]exampleblock\f[R] environment will be used; if it has the class
6740+\f[C]alert\f[R], an \f[C]alertblock\f[R] will be used; otherwise a
6741+regular \f[C]block\f[R] will be used.)
6267.IP \[bu] 2
6742.IP \[bu] 2
6268Headings \f[I]above\f[R] the slide level in the hierarchy create
6743Headings \f[I]above\f[R] the slide level in the hierarchy create
6269−\[dq]title slides,\[dq] which just contain the section title and help to
6744+\[lq]title slides,\[rq] which just contain the section title and help to
6270break the slide show into sections.
6745break the slide show into sections.
6271Non-slide content under these headings will be included on the title
6746Non-slide content under these headings will be included on the title
6272slide (for HTML slide shows) or in a subsequent slide with the same
6747slide (for HTML slide shows) or in a subsequent slide with the same
6273title (for beamer).
6748title (for beamer).
6274.IP \[bu] 2
6749.IP \[bu] 2
6275−A title page is constructed automatically from the document\[aq]s title
6750+A title page is constructed automatically from the document\[cq]s title
6276block, if present.
6751block, if present.
6277(In the case of beamer, this can be disabled by commenting out some
6752(In the case of beamer, this can be disabled by commenting out some
6278lines in the default template.)
6753lines in the default template.)
6279.PP
6754.PP
6280These rules are designed to support many different styles of slide show.
6755These rules are designed to support many different styles of slide show.
6281−If you don\[aq]t care about structuring your slides into sections and
6756+If you don\[cq]t care about structuring your slides into sections and
6282subsections, you can just use level-1 headings for all each slide.
6757subsections, you can just use level-1 headings for all each slide.
6283(In that case, level-1 will be the slide level.) But you can also
6758(In that case, level-1 will be the slide level.) But you can also
6284structure the slide show into sections, as in the example above.
6759structure the slide show into sections, as in the example above.
@@ -6290,8 +6765,8 @@ It is not recommended that you use deeper nesting of section levels with
6290reveal.js.
6765reveal.js.
6291.SS Incremental lists
6766.SS Incremental lists
6292.PP
6767.PP
6293−By default, these writers produce lists that display \[dq]all at
6768+By default, these writers produce lists that display \[lq]all at
6294−once.\[dq] If you want your lists to display incrementally (one item at
6769+once.\[rq] If you want your lists to display incrementally (one item at
6295a time), use the \f[C]-i\f[R] option.
6770a time), use the \f[C]-i\f[R] option.
6296If you want a particular list to depart from the default, put it in a
6771If you want a particular list to depart from the default, put it in a
6297\f[C]div\f[R] block with class \f[C]incremental\f[R] or
6772\f[C]div\f[R] block with class \f[C]incremental\f[R] or
@@ -6344,7 +6819,7 @@ Note: Neither the \f[C]-i/--incremental\f[R] option nor any of the
6344methods described here currently works for PowerPoint output.
6819methods described here currently works for PowerPoint output.
6345.SS Inserting pauses
6820.SS Inserting pauses
6346.PP
6821.PP
6347−You can add \[dq]pauses\[dq] within a slide by including a paragraph
6822+You can add \[lq]pauses\[rq] within a slide by including a paragraph
6348containing three dots, separated by spaces:
6823containing three dots, separated by spaces:
6349.IP
6824.IP
6350.nf
6825.nf
@@ -6367,7 +6842,7 @@ in \f[C]$DATADIR/s5/default\f[R] (for S5), \f[C]$DATADIR/slidy\f[R] (for
6367Slidy), or \f[C]$DATADIR/slideous\f[R] (for Slideous), where
6842Slidy), or \f[C]$DATADIR/slideous\f[R] (for Slideous), where
6368\f[C]$DATADIR\f[R] is the user data directory (see \f[C]--data-dir\f[R],
6843\f[C]$DATADIR\f[R] is the user data directory (see \f[C]--data-dir\f[R],
6369above).
6844above).
6370−The originals may be found in pandoc\[aq]s system data directory
6845+The originals may be found in pandoc\[cq]s system data directory
6371(generally \f[C]$CABALDIR/pandoc-VERSION/s5/default\f[R]).
6846(generally \f[C]$CABALDIR/pandoc-VERSION/s5/default\f[R]).
6372Pandoc will look there for any files it does not find in the user data
6847Pandoc will look there for any files it does not find in the user data
6373directory.
6848directory.
@@ -6497,7 +6972,7 @@ contents...
6497The class \f[C]onlytextwidth\f[R] sets the \f[C]totalwidth\f[R] to
6972The class \f[C]onlytextwidth\f[R] sets the \f[C]totalwidth\f[R] to
6498\f[C]\[rs]textwidth\f[R].
6973\f[C]\[rs]textwidth\f[R].
6499.PP
6974.PP
6500−See Section 12.7 of the Beamer User\[aq]s Guide for more details.
6975+See Section 12.7 of the Beamer User\[cq]s Guide for more details.
6501.SS Frame attributes in beamer
6976.SS Frame attributes in beamer
6502.PP
6977.PP
6503Sometimes it is necessary to add the LaTeX \f[C][fragile]\f[R] option to
6978Sometimes it is necessary to add the LaTeX \f[C][fragile]\f[R] option to
@@ -6513,7 +6988,7 @@ introducing the slide:
6513.fi
6988.fi
6514.PP
6989.PP
6515All of the other frame attributes described in Section 8.1 of the Beamer
6990All of the other frame attributes described in Section 8.1 of the Beamer
6516−User\[aq]s Guide may also be used: \f[C]allowdisplaybreaks\f[R],
6991+User\[cq]s Guide may also be used: \f[C]allowdisplaybreaks\f[R],
6517\f[C]allowframebreaks\f[R], \f[C]b\f[R], \f[C]c\f[R], \f[C]t\f[R],
6992\f[C]allowframebreaks\f[R], \f[C]b\f[R], \f[C]c\f[R], \f[C]t\f[R],
6518\f[C]environment\f[R], \f[C]label\f[R], \f[C]plain\f[R],
6993\f[C]environment\f[R], \f[C]label\f[R], \f[C]plain\f[R],
6519\f[C]shrink\f[R], \f[C]standout\f[R], \f[C]noframenumbering\f[R].
6994\f[C]shrink\f[R], \f[C]standout\f[R], \f[C]noframenumbering\f[R].
@@ -6538,7 +7013,7 @@ To set an image for a particular reveal.js slide, add
6538\f[C]{data-background-image=\[dq]/path/to/image\[dq]}\f[R] to the first
7013\f[C]{data-background-image=\[dq]/path/to/image\[dq]}\f[R] to the first
6539slide-level heading on the slide (which may even be empty).
7014slide-level heading on the slide (which may even be empty).
6540.PP
7015.PP
6541−In reveal.js\[aq]s overview mode, the parallaxBackgroundImage will show
7016+In reveal.js\[cq]s overview mode, the parallaxBackgroundImage will show
6542up only on the first slide.
7017up only on the first slide.
6543.PP
7018.PP
6544Other reveal.js background settings also work on individual slides,
7019Other reveal.js background settings also work on individual slides,
@@ -6574,7 +7049,7 @@ Slide 1 has background_image.png as its background.
6574Slide 2 has a special image for its background, even though the heading has no content.
7049Slide 2 has a special image for its background, even though the heading has no content.
6575\f[R]
7050\f[R]
6576.fi
7051.fi
6577−.SH CREATING EPUBS WITH PANDOC
7052+.SH EPUBS
6578.SS EPUB Metadata
7053.SS EPUB Metadata
6579.PP
7054.PP
6580EPUB metadata may be specified using the \f[C]--epub-metadata\f[R]
7055EPUB metadata may be specified using the \f[C]--epub-metadata\f[R]
@@ -6628,8 +7103,8 @@ Valid values for \f[C]type\f[R] are \f[C]main\f[R], \f[C]subtitle\f[R],
6628Either a string value, or an object with fields \f[C]role\f[R],
7103Either a string value, or an object with fields \f[C]role\f[R],
6629\f[C]file-as\f[R], and \f[C]text\f[R], or a list of such objects.
7104\f[C]file-as\f[R], and \f[C]text\f[R], or a list of such objects.
6630Valid values for \f[C]role\f[R] are MARC relators, but pandoc will
7105Valid values for \f[C]role\f[R] are MARC relators, but pandoc will
6631−attempt to translate the human-readable versions (like \[dq]author\[dq]
7106+attempt to translate the human-readable versions (like \[lq]author\[rq]
6632−and \[dq]editor\[dq]) to the appropriate marc relators.
7107+and \[lq]editor\[rq]) to the appropriate marc relators.
6633.TP
7108.TP
6634\f[B]\f[CB]contributor\f[B]\f[R]
7109\f[B]\f[CB]contributor\f[B]\f[R]
6635Same format as \f[C]creator\f[R].
7110Same format as \f[C]creator\f[R].
@@ -6664,6 +7139,16 @@ A string value.
6664\f[B]\f[CB]rights\f[B]\f[R]
7139\f[B]\f[CB]rights\f[B]\f[R]
6665A string value.
7140A string value.
6666.TP
7141.TP
7142+\f[B]\f[CB]belongs-to-collection\f[B]\f[R]
7143+A string value.
7144+identifies the name of a collection to which the EPUB Publication
7145+belongs.
7146+.TP
7147+\f[B]\f[CB]group-position\f[B]\f[R]
7148+The \f[C]group-position\f[R] field indicates the numeric position in
7149+which the EPUB Publication belongs relative to other works belonging to
7150+the same \f[C]belongs-to-collection\f[R] field.
7151+.TP
6667\f[B]\f[CB]cover-image\f[B]\f[R]
7152\f[B]\f[CB]cover-image\f[B]\f[R]
6668A string value (path to cover image).
7153A string value (path to cover image).
6669.TP
7154.TP
@@ -6818,11 +7303,6 @@ T}@T{
6818frontmatter
7303frontmatter
6819T}
7304T}
6820T{
7305T{
6821−seriespage
6822−T}@T{
6823−frontmatter
6824−T}
6825−T{
6826appendix
7306appendix
6827T}@T{
7307T}@T{
6828backmatter
7308backmatter
@@ -6863,7 +7343,7 @@ For example:
6863</audio>
7343</audio>
6864\f[R]
7344\f[R]
6865.fi
7345.fi
6866−.SH CREATING JUPYTER NOTEBOOKS WITH PANDOC
7346+.SH JUPYTER NOTEBOOKS
6867.PP
7347.PP
6868When creating a Jupyter notebook, pandoc will try to infer the notebook
7348When creating a Jupyter notebook, pandoc will try to infer the notebook
6869structure.
7349structure.
@@ -6978,7 +7458,7 @@ hello
6978If you include raw HTML or TeX in an output cell, use the [raw
7458If you include raw HTML or TeX in an output cell, use the [raw
6979attribute][Extension: \f[C]fenced_attribute\f[R]], as shown in the last
7459attribute][Extension: \f[C]fenced_attribute\f[R]], as shown in the last
6980cell of the example above.
7460cell of the example above.
6981−Although pandoc can process \[dq]bare\[dq] raw HTML and TeX, the result
7461+Although pandoc can process \[lq]bare\[rq] raw HTML and TeX, the result
6982is often interspersed raw elements and normal textual elements, and in
7462is often interspersed raw elements and normal textual elements, and in
6983an output cell pandoc expects a single, connected raw block.
7463an output cell pandoc expects a single, connected raw block.
6984To avoid using raw HTML or TeX except when marked explicitly using raw
7464To avoid using raw HTML or TeX except when marked explicitly using raw
@@ -7031,10 +7511,10 @@ pandoc --highlight-style my.theme
7031.fi
7511.fi
7032.PP
7512.PP
7033If you are not satisfied with the built-in highlighting, or you want
7513If you are not satisfied with the built-in highlighting, or you want
7034−highlight a language that isn\[aq]t supported, you can use the
7514+highlight a language that isn\[cq]t supported, you can use the
7035\f[C]--syntax-definition\f[R] option to load a KDE-style XML syntax
7515\f[C]--syntax-definition\f[R] option to load a KDE-style XML syntax
7036definition file.
7516definition file.
7037−Before writing your own, have a look at KDE\[aq]s repository of syntax
7517+Before writing your own, have a look at KDE\[cq]s repository of syntax
7038definitions.
7518definitions.
7039.PP
7519.PP
7040To disable highlighting, use the \f[C]--no-highlight\f[R] option.
7520To disable highlighting, use the \f[C]--no-highlight\f[R] option.
@@ -7043,7 +7523,7 @@ To disable highlighting, use the \f[C]--no-highlight\f[R] option.
7043Custom styles can be used in the docx and ICML formats.
7523Custom styles can be used in the docx and ICML formats.
7044.SS Output
7524.SS Output
7045.PP
7525.PP
7046−By default, pandoc\[aq]s docx and ICML output applies a predefined set
7526+By default, pandoc\[cq]s docx and ICML output applies a predefined set
7047of styles for blocks such as paragraphs and block quotes, and uses
7527of styles for blocks such as paragraphs and block quotes, and uses
7048largely default formatting (italics, bold) for inlines.
7528largely default formatting (italics, bold) for inlines.
7049This will work for most purposes, especially alongside a
7529This will work for most purposes, especially alongside a
@@ -7064,7 +7544,7 @@ So, for example, using the \f[C]bracketed_spans\f[R] syntax,
7064\f[R]
7544\f[R]
7065.fi
7545.fi
7066.PP
7546.PP
7067−would produce a docx file with \[dq]Get out\[dq] styled with character
7547+would produce a docx file with \[lq]Get out\[rq] styled with character
7068style \f[C]Emphatically\f[R].
7548style \f[C]Emphatically\f[R].
7069Similarly, using the \f[C]fenced_divs\f[R] syntax,
7549Similarly, using the \f[C]fenced_divs\f[R] syntax,
7070.IP
7550.IP
@@ -7095,13 +7575,13 @@ character style (perhaps to change their color), you can write a filter
7095which will transform all italicized inlines to inlines within an
7575which will transform all italicized inlines to inlines within an
7096\f[C]Emphasis\f[R] custom-style \f[C]span\f[R].
7576\f[C]Emphasis\f[R] custom-style \f[C]span\f[R].
7097.PP
7577.PP
7098−For docx output, you don\[aq]t need to enable any extensions for custom
7578+For docx output, you don\[cq]t need to enable any extensions for custom
7099styles to work.
7579styles to work.
7100.SS Input
7580.SS Input
7101.PP
7581.PP
7102The docx reader, by default, only reads those styles that it can convert
7582The docx reader, by default, only reads those styles that it can convert
7103into pandoc elements, either by direct conversion or interpreting the
7583into pandoc elements, either by direct conversion or interpreting the
7104−derivation of the input document\[aq]s styles.
7584+derivation of the input document\[cq]s styles.
7105.PP
7585.PP
7106By enabling the \f[C]styles\f[R] extension in the docx reader
7586By enabling the \f[C]styles\f[R] extension in the docx reader
7107(\f[C]-f docx+styles\f[R]), you can produce output that maintains the
7587(\f[C]-f docx+styles\f[R]), you can produce output that maintains the
@@ -7184,6 +7664,20 @@ need to specify a template manually using \f[C]--template\f[R] or add a
7184new default template with the name
7664new default template with the name
7185\f[C]default.NAME_OF_CUSTOM_WRITER.lua\f[R] to the \f[C]templates\f[R]
7665\f[C]default.NAME_OF_CUSTOM_WRITER.lua\f[R] to the \f[C]templates\f[R]
7186subdirectory of your user data directory (see Templates).
7666subdirectory of your user data directory (see Templates).
7667+.SH REPRODUCIBLE BUILDS
7668+.PP
7669+Some of the document formats pandoc targets (such as EPUB, docx, and
7670+ODT) include build timestamps in the generated document.
7671+That means that the files generated on successive builds will differ,
7672+even if the source does not.
7673+To avoid this, set the \f[C]SOURCE_DATE_EPOCH\f[R] environment variable,
7674+and the timestamp will be taken from it instead of the current time.
7675+\f[C]SOURCE_DATE_EPOCH\f[R] should contain an integer unix timestamp
7676+(specifying the number of second since midnight UTC January 1, 1970).
7677+.PP
7678+Some document formats also include a unique identifier.
7679+For EPUB, this can be set explicitly by setting the \f[C]identifier\f[R]
7680+metadata field (see EPUB Metadata, above).
7187.SH A NOTE ON SECURITY
7681.SH A NOTE ON SECURITY
7188.PP
7682.PP
7189If you use pandoc to convert user-contributed content in a web
7683If you use pandoc to convert user-contributed content in a web
@@ -7202,7 +7696,7 @@ fully isolates pandoc from your file system, by running the pandoc
7202operations in the \f[C]PandocPure\f[R] monad.
7696operations in the \f[C]PandocPure\f[R] monad.
7203See the document Using the pandoc API for more details.
7697See the document Using the pandoc API for more details.
7204.IP "3." 3
7698.IP "3." 3
7205−Pandoc\[aq]s parsers can exhibit pathological performance on some corner
7699+Pandoc\[cq]s parsers can exhibit pathological performance on some corner
7206cases.
7700cases.
7207It is wise to put any pandoc operations under a timeout, to avoid DOS
7701It is wise to put any pandoc operations under a timeout, to avoid DOS
7208attacks that exploit these issues.
7702attacks that exploit these issues.
@@ -7214,16 +7708,16 @@ The HTML generated by pandoc is not guaranteed to be safe.
7214If \f[C]raw_html\f[R] is enabled for the Markdown input, users can
7708If \f[C]raw_html\f[R] is enabled for the Markdown input, users can
7215inject arbitrary HTML.
7709inject arbitrary HTML.
7216Even if \f[C]raw_html\f[R] is disabled, users can include dangerous
7710Even if \f[C]raw_html\f[R] is disabled, users can include dangerous
7217−content in attributes for headings, spans, and code blocks.
7711+content in URLs and attributes.
7218To be safe, you should run all the generated HTML through an HTML
7712To be safe, you should run all the generated HTML through an HTML
7219sanitizer.
7713sanitizer.
7220.SH AUTHORS
7714.SH AUTHORS
7221.PP
7715.PP
7222−Copyright 2006--2020 John MacFarlane (jgm\[at]berkeley.edu).
7716+Copyright 2006\[en]2021 John MacFarlane (jgm\[at]berkeley.edu).
7223Released under the GPL, version 2 or greater.
7717Released under the GPL, version 2 or greater.
7224This software carries no warranty of any kind.
7718This software carries no warranty of any kind.
7225(See COPYRIGHT for full copyright and warranty notices.) For a full list
7719(See COPYRIGHT for full copyright and warranty notices.) For a full list
7226of contributors, see the file AUTHORS.md in the pandoc source code.
7720of contributors, see the file AUTHORS.md in the pandoc source code.
7227.PP
7721.PP
7228The Pandoc source code and all documentation may be downloaded
7722The Pandoc source code and all documentation may be downloaded
7229−from <http://pandoc.org>.
7723+from <https://pandoc.org>.
man/pandoc.1.after+1−1
@@ -1,3 +1,3 @@
1.PP
1.PP
2The Pandoc source code and all documentation may be downloaded
2The Pandoc source code and all documentation may be downloaded
3−from <http://pandoc.org>.
3+from <https://pandoc.org>.
pandoc.cabal+213−240
@@ -1,10 +1,10 @@
1cabal-version: 2.2
1cabal-version: 2.2
2name: pandoc
2name: pandoc
3−version: 2.10.1
3+version: 2.14.0.3
4build-type: Simple
4build-type: Simple
5license: GPL-2.0-or-later
5license: GPL-2.0-or-later
6license-file: COPYING.md
6license-file: COPYING.md
7−copyright: (c) 2006-2020 John MacFarlane
7+copyright: (c) 2006-2021 John MacFarlane
8author: John MacFarlane <jgm@berkeley.edu>
8author: John MacFarlane <jgm@berkeley.edu>
9maintainer: John MacFarlane <jgm@berkeley.edu>
9maintainer: John MacFarlane <jgm@berkeley.edu>
10bug-reports: https://github.com/jgm/pandoc/issues
10bug-reports: https://github.com/jgm/pandoc/issues
@@ -12,7 +12,7 @@ stability: alpha
12homepage: https://pandoc.org
12homepage: https://pandoc.org
13category: Text
13category: Text
14tested-with: GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5,
14tested-with: GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5,
15− GHC == 8.8.3, GHC == 8.10.1
15+ GHC == 8.8.4, GHC == 8.10.2, GHC == 9.0.1
16synopsis: Conversion between markup formats
16synopsis: Conversion between markup formats
17description: Pandoc is a Haskell library for converting from one markup
17description: Pandoc is a Haskell library for converting from one markup
18 format to another, and a command-line tool that uses
18 format to another, and a command-line tool that uses
@@ -22,14 +22,15 @@ description: Pandoc is a Haskell library for converting from one markup
22 TikiWiki markup, Jira markup, Creole 1.0, Haddock markup,
22 TikiWiki markup, Jira markup, Creole 1.0, Haddock markup,
23 OPML, Emacs Org-Mode, Emacs Muse, txt2tags, ipynb (Jupyter
23 OPML, Emacs Org-Mode, Emacs Muse, txt2tags, ipynb (Jupyter
24 notebooks), Vimwiki, Word Docx, ODT, EPUB, FictionBook2,
24 notebooks), Vimwiki, Word Docx, ODT, EPUB, FictionBook2,
25+ roff man, Textile, BibTeX, BibLaTeX, CSL JSON,
25− roff man, Textile, and CSV, and it can write Markdown,
26+ , and CSV, and it can write Markdown,
26 reStructuredText, XHTML, HTML 5, LaTeX, ConTeXt, DocBook,
27 reStructuredText, XHTML, HTML 5, LaTeX, ConTeXt, DocBook,
27 JATS, OPML, TEI, OpenDocument, ODT, Word docx,
28 JATS, OPML, TEI, OpenDocument, ODT, Word docx,
28 PowerPoint pptx, RTF, MediaWiki, DokuWiki, XWiki,
29 PowerPoint pptx, RTF, MediaWiki, DokuWiki, XWiki,
29 ZimWiki, Textile, Jira, roff man, roff ms, plain text,
30 ZimWiki, Textile, Jira, roff man, roff ms, plain text,
30 Emacs Org-Mode, AsciiDoc, Haddock markup,
31 Emacs Org-Mode, AsciiDoc, Haddock markup,
31 EPUB (v2 and v3), ipynb, FictionBook2,
32 EPUB (v2 and v3), ipynb, FictionBook2,
32− InDesign ICML, Muse, LaTeX beamer slides,
33+ InDesign ICML, Muse, CSL JSON, LaTeX beamer slides,
33 and several kinds of HTML/JavaScript slide shows
34 and several kinds of HTML/JavaScript slide shows
34 (S5, Slidy, Slideous, DZSlides, reveal.js).
35 (S5, Slidy, Slideous, DZSlides, reveal.js).
35 .
36 .
@@ -55,6 +56,8 @@ data-files:
55 data/templates/default.icml
56 data/templates/default.icml
56 data/templates/default.opml
57 data/templates/default.opml
57 data/templates/default.latex
58 data/templates/default.latex
59+ data/templates/default.bibtex
60+ data/templates/default.biblatex
58 data/templates/default.context
61 data/templates/default.context
59 data/templates/default.texinfo
62 data/templates/default.texinfo
60 data/templates/default.jira
63 data/templates/default.jira
@@ -83,6 +86,7 @@ data-files:
83 data/templates/default.epub2
86 data/templates/default.epub2
84 data/templates/default.epub3
87 data/templates/default.epub3
85 data/templates/article.jats_publishing
88 data/templates/article.jats_publishing
89+ data/templates/affiliations.jats
86 -- translations
90 -- translations
87 data/translations/*.yaml
91 data/translations/*.yaml
88 -- source files for reference.docx
92 -- source files for reference.docx
@@ -178,8 +182,9 @@ data-files:
178 data/pandoc.List.lua
182 data/pandoc.List.lua
179 -- bash completion template
183 -- bash completion template
180 data/bash_completion.tpl
184 data/bash_completion.tpl
181− -- jats csl
185+ -- citeproc
182− data/jats.csl
186+ data/default.csl
187+ citeproc/biblatex-localization/*.lbx.strings
183 -- documentation
188 -- documentation
184 MANUAL.txt, COPYRIGHT
189 MANUAL.txt, COPYRIGHT
185extra-source-files:
190extra-source-files:
@@ -201,13 +206,27 @@ extra-source-files:
201 test/bodybg.gif
206 test/bodybg.gif
202 test/*.native
207 test/*.native
203 test/command/*.md
208 test/command/*.md
209+ test/command/*.csl
210+ test/command/biblio.bib
211+ test/command/averroes.bib
204 test/command/A.txt
212 test/command/A.txt
205 test/command/B.txt
213 test/command/B.txt
206 test/command/C.txt
214 test/command/C.txt
207 test/command/D.txt
215 test/command/D.txt
208 test/command/01.csv
216 test/command/01.csv
217+ test/command/chap1/spider.png
218+ test/command/chap2/spider.png
219+ test/command/chap1/text.md
220+ test/command/chap2/text.md
209 test/command/defaults1.yaml
221 test/command/defaults1.yaml
210 test/command/defaults2.yaml
222 test/command/defaults2.yaml
223+ test/command/defaults3.yaml
224+ test/command/defaults4.yaml
225+ test/command/defaults5.yaml
226+ test/command/defaults6.yaml
227+ test/command/defaults7.yaml
228+ test/command/defaults8.yaml
229+ test/command/defaults9.yaml
211 test/command/3533-rst-csv-tables.csv
230 test/command/3533-rst-csv-tables.csv
212 test/command/3880.txt
231 test/command/3880.txt
213 test/command/5182.txt
232 test/command/5182.txt
@@ -279,6 +298,7 @@ extra-source-files:
279 test/tables.opendocument
298 test/tables.opendocument
280 test/tables.org
299 test/tables.org
281 test/tables.asciidoc
300 test/tables.asciidoc
301+ test/tables.asciidoctor
282 test/tables.haddock
302 test/tables.haddock
283 test/tables.texinfo
303 test/tables.texinfo
284 test/tables.rst
304 test/tables.rst
@@ -290,7 +310,9 @@ extra-source-files:
290 test/tables.xwiki
310 test/tables.xwiki
291 test/tables/*.html4
311 test/tables/*.html4
292 test/tables/*.html5
312 test/tables/*.html5
313+ test/tables/*.latex
293 test/tables/*.native
314 test/tables/*.native
315+ test/tables/*.jats_archiving
294 test/testsuite.txt
316 test/testsuite.txt
295 test/writer.latex
317 test/writer.latex
296 test/writer.context
318 test/writer.context
@@ -311,6 +333,7 @@ extra-source-files:
311 test/writer.opendocument
333 test/writer.opendocument
312 test/writer.org
334 test/writer.org
313 test/writer.asciidoc
335 test/writer.asciidoc
336+ test/writer.asciidoctor
314 test/writer.haddock
337 test/writer.haddock
315 test/writer.rst
338 test/writer.rst
316 test/writer.icml
339 test/writer.icml
@@ -369,10 +392,6 @@ source-repository head
369 type: git
392 type: git
370 location: git://github.com/jgm/pandoc.git
393 location: git://github.com/jgm/pandoc.git
371
394
372−flag static
373− Description: Use static linking for pandoc executable.
374− Default: False
375−
376flag embed_data_files
395flag embed_data_files
377 Description: Embed data files in binary for relocatable executable.
396 Description: Embed data files in binary for relocatable executable.
378 Default: False
397 Default: False
@@ -381,103 +400,116 @@ flag trypandoc
381 Description: Build trypandoc cgi executable.
400 Description: Build trypandoc cgi executable.
382 Default: False
401 Default: False
383
402
384−library
403+common common-options
385− build-depends: base >= 4.9 && < 5,
404+ default-language: Haskell2010
386− syb >= 0.1 && < 0.8,
405+ build-depends: base >= 4.9 && < 5
387− containers >= 0.4.2.1 && < 0.7,
406+ ghc-options: -Wall -fno-warn-unused-do-bind
388− unordered-containers >= 0.2 && < 0.3,
407+ -Wincomplete-record-updates
389− parsec >= 3.1 && < 3.2,
408+ -Wnoncanonical-monad-instances
390− mtl >= 2.2 && < 2.3,
409+
391− exceptions >= 0.8 && < 0.11,
392− filepath >= 1.1 && < 1.5,
393− process >= 1.2.3 && < 1.7,
394− directory >= 1.2.3 && < 1.4,
395− bytestring >= 0.9 && < 0.11,
396− text >= 1.1.1.0 && < 1.3,
397− time >= 1.5 && < 1.10,
398− safe >= 0.3 && < 0.4,
399− zip-archive >= 0.2.3.4 && < 0.5,
400− HTTP >= 4000.0.5 && < 4000.4,
401− texmath >= 0.12.0.2 && < 0.13,
402− xml >= 1.3.12 && < 1.4,
403− split >= 0.2 && < 0.3,
404− random >= 1 && < 1.2,
405− pandoc-types >= 1.22 && < 1.23,
406− aeson >= 0.7 && < 1.6,
407− scientific >= 0.3 && < 0.4,
408− aeson-pretty >= 0.8.5 && < 0.9,
409− tagsoup >= 0.14.6 && < 0.15,
410− base64-bytestring >= 0.1 && < 1.2,
411− zlib >= 0.5 && < 0.7,
412− skylighting >= 0.10 && < 0.11,
413− skylighting-core >= 0.10 && < 0.11,
414− data-default >= 0.4 && < 0.8,
415− temporary >= 1.1 && < 1.4,
416− blaze-html >= 0.9 && < 0.10,
417− blaze-markup >= 0.8 && < 0.9,
418− jira-wiki-markup >= 1.3.2 && < 1.4,
419− hslua >= 1.1 && < 1.3,
420− hslua-module-system >= 0.2 && < 0.3,
421− hslua-module-text >= 0.2.1 && < 0.4,
422− binary >= 0.5 && < 0.11,
423− SHA >= 1.6 && < 1.7,
424− haddock-library >= 1.8 && < 1.10,
425− deepseq >= 1.3 && < 1.5,
426− JuicyPixels >= 3.1.6.1 && < 3.4,
427− Glob >= 0.7 && < 0.11,
428− doctemplates >= 0.8.2 && < 0.9,
429− commonmark-pandoc >= 0.2 && < 0.3,
430− commonmark >= 0.1.0.2 && < 0.2,
431− commonmark-extensions >= 0.2 && < 0.3,
432− network-uri >= 2.6 && < 2.7,
433− network >= 2.6,
434− connection >= 0.3.1,
435− http-client >= 0.4.30 && < 0.8,
436− http-client-tls >= 0.2.4 && < 0.4,
437− http-types >= 0.8 && < 0.13,
438− case-insensitive >= 1.2 && < 1.3,
439− unicode-transforms >= 0.3 && < 0.4,
440− HsYAML >= 0.2 && < 0.3,
441− doclayout >= 0.3 && < 0.4,
442− ipynb >= 0.1 && < 0.2,
443− attoparsec >= 0.12 && < 0.14,
444− text-conversions >= 0.3 && < 0.4,
445− emojis >= 0.1 && < 0.2
446− if os(windows) && arch(i386)
447− build-depends: basement >= 0.0.10,
448− foundation >= 0.0.23
449− -- basement 0.0.9 won't build on 32-bit windows.
450 if impl(ghc < 8.4)
410 if impl(ghc < 8.4)
451− hs-source-dirs: prelude
411+ hs-source-dirs: prelude
452− other-modules: Prelude
412+ other-modules: Prelude
453− build-depends: base-compat >= 0.9
413+ build-depends: base-compat >= 0.9
454− if os(windows)
414+ other-extensions: NoImplicitPrelude
455− cpp-options: -D_WINDOWS
415+
456− else
457− build-depends: unix >= 2.4 && < 2.8
458− if flag(embed_data_files)
459− cpp-options: -DEMBED_DATA_FILES
460− build-depends: file-embed >= 0.0 && < 0.1
461− other-modules: Text.Pandoc.Data
462 if os(windows)
416 if os(windows)
463 cpp-options: -D_WINDOWS
417 cpp-options: -D_WINDOWS
464− ghc-options: -Wall -fno-warn-unused-do-bind
418+
465− -Wincomplete-record-updates
466− -Wnoncanonical-monad-instances
467 -- Later:
419 -- Later:
468 -- -Wpartial-fields (currently used in Powerpoint writer)
420 -- -Wpartial-fields (currently used in Powerpoint writer)
469 -- -Wmissing-export-lists (currently some Odt modules violate this)
421 -- -Wmissing-export-lists (currently some Odt modules violate this)
470 -- -Wredundant-constraints (problematic if we want to support older base)
422 -- -Wredundant-constraints (problematic if we want to support older base)
471 if impl(ghc >= 8.2)
423 if impl(ghc >= 8.2)
472− ghc-options: -Wcpp-undef
424+ ghc-options: -Wcpp-undef
473 if impl(ghc >= 8.4)
425 if impl(ghc >= 8.4)
474− ghc-options: -Wincomplete-uni-patterns
426+ ghc-options: -Wincomplete-uni-patterns
475− -Widentities
427+ -Widentities
476− -Werror=missing-home-modules
477− -fhide-source-paths
428+ -fhide-source-paths
478
429
479− default-language: Haskell2010
430+common common-executable
480− other-extensions: NoImplicitPrelude
431+ import: common-options
432+ build-depends: pandoc
433+ ghc-options: -rtsopts -with-rtsopts=-A8m -threaded
434+
435+
436+library
437+ import: common-options
438+ build-depends: Glob >= 0.7 && < 0.11,
439+ HTTP >= 4000.0.5 && < 4000.4,
440+ HsYAML >= 0.2 && < 0.3,
441+ JuicyPixels >= 3.1.6.1 && < 3.4,
442+ SHA >= 1.6 && < 1.7,
443+ aeson >= 0.7 && < 1.6,
444+ aeson-pretty >= 0.8.5 && < 0.9,
445+ array >= 0.5 && < 0.6,
446+ attoparsec >= 0.12 && < 0.15,
447+ base64-bytestring >= 0.1 && < 1.3,
448+ binary >= 0.7 && < 0.11,
449+ blaze-html >= 0.9 && < 0.10,
450+ blaze-markup >= 0.8 && < 0.9,
451+ bytestring >= 0.9 && < 0.12,
452+ case-insensitive >= 1.2 && < 1.3,
453+ citeproc >= 0.4.0.1 && < 0.4.1,
454+ commonmark >= 0.2.1 && < 0.3,
455+ commonmark-extensions >= 0.2.1.2 && < 0.3,
456+ commonmark-pandoc >= 0.2.1.1 && < 0.3,
457+ connection >= 0.3.1,
458+ containers >= 0.4.2.1 && < 0.7,
459+ data-default >= 0.4 && < 0.8,
460+ deepseq >= 1.3 && < 1.5,
461+ directory >= 1.2.3 && < 1.4,
462+ doclayout >= 0.3.0.1 && < 0.4,
463+ doctemplates >= 0.9 && < 0.10,
464+ emojis >= 0.1 && < 0.2,
465+ exceptions >= 0.8 && < 0.11,
466+ file-embed >= 0.0 && < 0.1,
467+ filepath >= 1.1 && < 1.5,
468+ haddock-library >= 1.10 && < 1.11,
469+ hslua >= 1.1 && < 1.4,
470+ hslua-module-path >= 0.1.0 && < 0.2.0,
471+ hslua-module-system >= 0.2 && < 0.3,
472+ hslua-module-text >= 0.2.1 && < 0.4,
473+ http-client >= 0.4.30 && < 0.8,
474+ http-client-tls >= 0.2.4 && < 0.4,
475+ http-types >= 0.8 && < 0.13,
476+ ipynb >= 0.1 && < 0.2,
477+ jira-wiki-markup >= 1.4 && < 1.5,
478+ mtl >= 2.2 && < 2.3,
479+ network >= 2.6,
480+ network-uri >= 2.6 && < 2.8,
481+ pandoc-types >= 1.22 && < 1.23,
482+ parsec >= 3.1 && < 3.2,
483+ process >= 1.2.3 && < 1.7,
484+ random >= 1 && < 1.3,
485+ safe >= 0.3.18 && < 0.4,
486+ scientific >= 0.3 && < 0.4,
487+ skylighting >= 0.10.5.2 && < 0.10.6,
488+ skylighting-core >= 0.10.5.2 && < 0.10.6,
489+ split >= 0.2 && < 0.3,
490+ syb >= 0.1 && < 0.8,
491+ tagsoup >= 0.14.6 && < 0.15,
492+ temporary >= 1.1 && < 1.4,
493+ texmath >= 0.12.3 && < 0.12.4,
494+ text >= 1.1.1.0 && < 1.3,
495+ text-conversions >= 0.3 && < 0.4,
496+ time >= 1.5 && < 1.12,
497+ unicode-transforms >= 0.3 && < 0.4,
498+ unordered-containers >= 0.2 && < 0.3,
499+ xml >= 1.3.12 && < 1.4,
500+ xml-conduit >= 1.9.1.1 && < 1.10,
501+ unicode-collation >= 0.1.1 && < 0.2,
502+ zip-archive >= 0.2.3.4 && < 0.5,
503+ zlib >= 0.5 && < 0.7
504+ if os(windows) && arch(i386)
505+ build-depends: basement >= 0.0.10,
506+ foundation >= 0.0.23
507+ -- basement 0.0.9 won't build on 32-bit windows.
508+ if !os(windows)
509+ build-depends: unix >= 2.4 && < 2.8
510+ if flag(embed_data_files)
511+ cpp-options: -DEMBED_DATA_FILES
512+ other-modules: Text.Pandoc.Data
481 hs-source-dirs: src
513 hs-source-dirs: src
482
514
483 exposed-modules: Text.Pandoc,
515 exposed-modules: Text.Pandoc,
@@ -485,16 +517,18 @@ library
485 Text.Pandoc.Options,
517 Text.Pandoc.Options,
486 Text.Pandoc.Extensions,
518 Text.Pandoc.Extensions,
487 Text.Pandoc.Shared,
519 Text.Pandoc.Shared,
520+ Text.Pandoc.Sources,
488 Text.Pandoc.MediaBag,
521 Text.Pandoc.MediaBag,
489 Text.Pandoc.Error,
522 Text.Pandoc.Error,
490 Text.Pandoc.Filter,
523 Text.Pandoc.Filter,
491 Text.Pandoc.Readers,
524 Text.Pandoc.Readers,
492 Text.Pandoc.Readers.HTML,
525 Text.Pandoc.Readers.HTML,
493 Text.Pandoc.Readers.LaTeX,
526 Text.Pandoc.Readers.LaTeX,
494− Text.Pandoc.Readers.LaTeX.Types,
495 Text.Pandoc.Readers.Markdown,
527 Text.Pandoc.Readers.Markdown,
496 Text.Pandoc.Readers.CommonMark,
528 Text.Pandoc.Readers.CommonMark,
497 Text.Pandoc.Readers.Creole,
529 Text.Pandoc.Readers.Creole,
530+ Text.Pandoc.Readers.BibTeX,
531+ Text.Pandoc.Readers.CslJson,
498 Text.Pandoc.Readers.MediaWiki,
532 Text.Pandoc.Readers.MediaWiki,
499 Text.Pandoc.Readers.Vimwiki,
533 Text.Pandoc.Readers.Vimwiki,
500 Text.Pandoc.Readers.RST,
534 Text.Pandoc.Readers.RST,
@@ -553,10 +587,12 @@ library
553 Text.Pandoc.Writers.FB2,
587 Text.Pandoc.Writers.FB2,
554 Text.Pandoc.Writers.TEI,
588 Text.Pandoc.Writers.TEI,
555 Text.Pandoc.Writers.Muse,
589 Text.Pandoc.Writers.Muse,
590+ Text.Pandoc.Writers.CslJson,
556 Text.Pandoc.Writers.Math,
591 Text.Pandoc.Writers.Math,
557 Text.Pandoc.Writers.Shared,
592 Text.Pandoc.Writers.Shared,
558 Text.Pandoc.Writers.OOXML,
593 Text.Pandoc.Writers.OOXML,
559 Text.Pandoc.Writers.AnnotatedTable,
594 Text.Pandoc.Writers.AnnotatedTable,
595+ Text.Pandoc.Writers.BibTeX,
560 Text.Pandoc.Lua,
596 Text.Pandoc.Lua,
561 Text.Pandoc.PDF,
597 Text.Pandoc.PDF,
562 Text.Pandoc.UTF8,
598 Text.Pandoc.UTF8,
@@ -571,8 +607,8 @@ library
571 Text.Pandoc.Asciify,
607 Text.Pandoc.Asciify,
572 Text.Pandoc.Emoji,
608 Text.Pandoc.Emoji,
573 Text.Pandoc.ImageSize,
609 Text.Pandoc.ImageSize,
574− Text.Pandoc.BCP47,
610+ Text.Pandoc.Class,
575− Text.Pandoc.Class
611+ Text.Pandoc.Citeproc
576 other-modules: Text.Pandoc.App.CommandLineOptions,
612 other-modules: Text.Pandoc.App.CommandLineOptions,
577 Text.Pandoc.App.FormatHeuristics,
613 Text.Pandoc.App.FormatHeuristics,
578 Text.Pandoc.App.Opt,
614 Text.Pandoc.App.Opt,
@@ -591,9 +627,19 @@ library
591 Text.Pandoc.Readers.Docx.Parse.Styles,
627 Text.Pandoc.Readers.Docx.Parse.Styles,
592 Text.Pandoc.Readers.Docx.Util,
628 Text.Pandoc.Readers.Docx.Util,
593 Text.Pandoc.Readers.Docx.Fields,
629 Text.Pandoc.Readers.Docx.Fields,
594− Text.Pandoc.Readers.LaTeX.Parsing,
630+ Text.Pandoc.Readers.HTML.Parsing,
631+ Text.Pandoc.Readers.HTML.Table,
632+ Text.Pandoc.Readers.HTML.TagCategories,
633+ Text.Pandoc.Readers.HTML.Types,
634+ Text.Pandoc.Readers.LaTeX.Inline,
635+ Text.Pandoc.Readers.LaTeX.Citation,
595 Text.Pandoc.Readers.LaTeX.Lang,
636 Text.Pandoc.Readers.LaTeX.Lang,
637+ Text.Pandoc.Readers.LaTeX.Macro,
638+ Text.Pandoc.Readers.LaTeX.Math,
639+ Text.Pandoc.Readers.LaTeX.Parsing,
596 Text.Pandoc.Readers.LaTeX.SIunitx,
640 Text.Pandoc.Readers.LaTeX.SIunitx,
641+ Text.Pandoc.Readers.LaTeX.Table,
642+ Text.Pandoc.Readers.LaTeX.Types,
597 Text.Pandoc.Readers.Odt.Base,
643 Text.Pandoc.Readers.Odt.Base,
598 Text.Pandoc.Readers.Odt.Namespaces,
644 Text.Pandoc.Readers.Odt.Namespaces,
599 Text.Pandoc.Readers.Odt.StyleReader,
645 Text.Pandoc.Readers.Odt.StyleReader,
@@ -617,6 +663,21 @@ library
617 Text.Pandoc.Readers.Metadata,
663 Text.Pandoc.Readers.Metadata,
618 Text.Pandoc.Readers.Roff,
664 Text.Pandoc.Readers.Roff,
619 Text.Pandoc.Writers.Docx.StyleMap,
665 Text.Pandoc.Writers.Docx.StyleMap,
666+ Text.Pandoc.Writers.Docx.Table,
667+ Text.Pandoc.Writers.Docx.Types,
668+ Text.Pandoc.Writers.GridTable
669+ Text.Pandoc.Writers.JATS.References,
670+ Text.Pandoc.Writers.JATS.Table,
671+ Text.Pandoc.Writers.JATS.Types,
672+ Text.Pandoc.Writers.LaTeX.Caption,
673+ Text.Pandoc.Writers.LaTeX.Notes,
674+ Text.Pandoc.Writers.LaTeX.Table,
675+ Text.Pandoc.Writers.LaTeX.Lang,
676+ Text.Pandoc.Writers.LaTeX.Types,
677+ Text.Pandoc.Writers.LaTeX.Citation,
678+ Text.Pandoc.Writers.LaTeX.Util,
679+ Text.Pandoc.Writers.Markdown.Types,
680+ Text.Pandoc.Writers.Markdown.Inline,
620 Text.Pandoc.Writers.Roff,
681 Text.Pandoc.Writers.Roff,
621 Text.Pandoc.Writers.Powerpoint.Presentation,
682 Text.Pandoc.Writers.Powerpoint.Presentation,
622 Text.Pandoc.Writers.Powerpoint.Output,
683 Text.Pandoc.Writers.Powerpoint.Output,
@@ -633,6 +694,7 @@ library
633 Text.Pandoc.Lua.Marshaling.MediaBag,
694 Text.Pandoc.Lua.Marshaling.MediaBag,
634 Text.Pandoc.Lua.Marshaling.PandocError,
695 Text.Pandoc.Lua.Marshaling.PandocError,
635 Text.Pandoc.Lua.Marshaling.ReaderOptions,
696 Text.Pandoc.Lua.Marshaling.ReaderOptions,
697+ Text.Pandoc.Lua.Marshaling.SimpleTable,
636 Text.Pandoc.Lua.Marshaling.Version,
698 Text.Pandoc.Lua.Marshaling.Version,
637 Text.Pandoc.Lua.Module.MediaBag,
699 Text.Pandoc.Lua.Module.MediaBag,
638 Text.Pandoc.Lua.Module.Pandoc,
700 Text.Pandoc.Lua.Module.Pandoc,
@@ -643,6 +705,10 @@ library
643 Text.Pandoc.Lua.PandocLua,
705 Text.Pandoc.Lua.PandocLua,
644 Text.Pandoc.Lua.Util,
706 Text.Pandoc.Lua.Util,
645 Text.Pandoc.Lua.Walk,
707 Text.Pandoc.Lua.Walk,
708+ Text.Pandoc.XML.Light,
709+ Text.Pandoc.XML.Light.Types,
710+ Text.Pandoc.XML.Light.Proc,
711+ Text.Pandoc.XML.Light.Output,
646 Text.Pandoc.CSS,
712 Text.Pandoc.CSS,
647 Text.Pandoc.CSV,
713 Text.Pandoc.CSV,
648 Text.Pandoc.RoffChar,
714 Text.Pandoc.RoffChar,
@@ -650,126 +716,61 @@ library
650 Text.Pandoc.Translations,
716 Text.Pandoc.Translations,
651 Text.Pandoc.Slides,
717 Text.Pandoc.Slides,
652 Text.Pandoc.Image,
718 Text.Pandoc.Image,
719+ Text.Pandoc.Citeproc.BibTeX,
720+ Text.Pandoc.Citeproc.CslJson,
721+ Text.Pandoc.Citeproc.Data,
722+ Text.Pandoc.Citeproc.Locator,
723+ Text.Pandoc.Citeproc.MetaValue,
724+ Text.Pandoc.Citeproc.Util,
653 Paths_pandoc
725 Paths_pandoc
654 autogen-modules: Paths_pandoc
726 autogen-modules: Paths_pandoc
655 buildable: True
727 buildable: True
656
728
657executable pandoc
729executable pandoc
658− build-depends: pandoc, base >= 4.8 && < 5
730+ import: common-executable
659− if impl(ghc < 8.4)
660− hs-source-dirs: prelude
661− other-modules: Prelude
662− build-depends: base-compat >= 0.9
663− if flag(static)
664− ld-options: -static
665− default-language: Haskell2010
666− other-extensions: NoImplicitPrelude
667− hs-source-dirs: .
731+ hs-source-dirs: app
668 main-is: pandoc.hs
732 main-is: pandoc.hs
669 buildable: True
733 buildable: True
670 other-modules: Paths_pandoc
734 other-modules: Paths_pandoc
671− ghc-options: -rtsopts -with-rtsopts=-K16m -threaded
672− -Wall -fno-warn-unused-do-bind
673− -Wincomplete-record-updates
674− -Wnoncanonical-monad-instances
675− if impl(ghc >= 8.2)
676− ghc-options: -Wcpp-undef
677− if impl(ghc >= 8.4)
678− ghc-options: -Wincomplete-uni-patterns
679− -Widentities
680− -Werror=missing-home-modules
681− -fhide-source-paths
682
735
683executable trypandoc
736executable trypandoc
737+ import: common-executable
684 main-is: trypandoc.hs
738 main-is: trypandoc.hs
685 hs-source-dirs: trypandoc
739 hs-source-dirs: trypandoc
686− default-language: Haskell2010
687− other-extensions: NoImplicitPrelude
688 if flag(trypandoc)
740 if flag(trypandoc)
689− build-depends: base, aeson, pandoc,
741+ build-depends: aeson, http-types, text, wai >= 0.3, wai-extra >= 3.0.24
690− text, wai-extra, wai >= 0.3, http-types
691 buildable: True
742 buildable: True
692 else
743 else
693 buildable: False
744 buildable: False
694− if impl(ghc < 8.4)
695− hs-source-dirs: prelude
696− other-modules: Prelude
697− build-depends: base-compat >= 0.9
698− ghc-options: -rtsopts -with-rtsopts=-K16m -threaded
699− -Wall -fno-warn-unused-do-bind
700− -Wincomplete-record-updates
701− -Wnoncanonical-monad-instances
702− if impl(ghc >= 8.2)
703− ghc-options: -Wcpp-undef
704− if impl(ghc >= 8.4)
705− ghc-options: -Wincomplete-uni-patterns
706− -Widentities
707− -Werror=missing-home-modules
708− -fhide-source-paths
709−
710−benchmark weigh-pandoc
711− type: exitcode-stdio-1.0
712− main-is: weigh-pandoc.hs
713− hs-source-dirs: benchmark
714− build-depends: pandoc,
715− base >= 4.8 && < 5,
716− text,
717− weigh >= 0.0 && < 0.1,
718− mtl >= 2.2 && < 2.3
719− if impl(ghc < 8.4)
720− hs-source-dirs: prelude
721− other-modules: Prelude
722− build-depends: base-compat >= 0.9
723− default-language: Haskell2010
724− other-extensions: NoImplicitPrelude
725− ghc-options: -rtsopts -with-rtsopts=-K16m -threaded
726− -Wall -fno-warn-unused-do-bind
727− -Wincomplete-record-updates
728− -Wnoncanonical-monad-instances
729− if impl(ghc >= 8.2)
730− ghc-options: -Wcpp-undef
731− if impl(ghc >= 8.4)
732− ghc-options: -Wincomplete-uni-patterns
733− -Widentities
734− -Werror=missing-home-modules
735− -fhide-source-paths
736−
737
745
738test-suite test-pandoc
746test-suite test-pandoc
747+ import: common-executable
739 type: exitcode-stdio-1.0
748 type: exitcode-stdio-1.0
740 main-is: test-pandoc.hs
749 main-is: test-pandoc.hs
741 hs-source-dirs: test
750 hs-source-dirs: test
742− build-depends: base >= 4.8 && < 5,
751+ build-depends: pandoc,
743− pandoc,
752+ Diff >= 0.2 && < 0.5,
753+ Glob >= 0.7 && < 0.11,
754+ QuickCheck >= 2.4 && < 2.15,
755+ bytestring >= 0.9 && < 0.12,
756+ containers >= 0.4.2.1 && < 0.7,
757+ directory >= 1.2.3 && < 1.4,
758+ doctemplates >= 0.9 && < 0.10,
759+ exceptions >= 0.8 && < 0.11,
760+ filepath >= 1.1 && < 1.5,
761+ hslua >= 1.1 && < 1.4,
762+ mtl >= 2.2 && < 2.3,
744− pandoc-types >= 1.22 && < 1.23,
763+ pandoc-types >= 1.22 && < 1.23,
745− mtl >= 2.2 && < 2.3,
746− bytestring >= 0.9 && < 0.11,
747− base64-bytestring >= 0.1 && < 1.2,
748− exceptions >= 0.8 && < 0.11,
749− text >= 1.1.1.0 && < 1.3,
750− time >= 1.5 && < 1.10,
751− directory >= 1.2.3 && < 1.4,
752− filepath >= 1.1 && < 1.5,
753− hslua >= 1.1 && < 1.3,
754− process >= 1.2.3 && < 1.7,
764+ process >= 1.2.3 && < 1.7,
755− temporary >= 1.1 && < 1.4,
765+ tasty >= 0.11 && < 1.5,
756− Diff >= 0.2 && < 0.5,
757− tasty >= 0.11 && < 1.4,
766+ tasty-golden >= 2.3 && < 2.4,
758− tasty-hunit >= 0.9 && < 0.11,
767+ tasty-hunit >= 0.9 && < 0.11,
759− tasty-lua >= 0.2 && < 0.3,
768+ tasty-lua >= 0.2 && < 0.3,
760− tasty-quickcheck >= 0.8 && < 0.11,
769+ tasty-quickcheck >= 0.8 && < 0.11,
761− tasty-golden >= 2.3 && < 2.4,
770+ text >= 1.1.1.0 && < 1.3,
762− QuickCheck >= 2.4 && < 2.15,
771+ time >= 1.5 && < 1.12,
763− containers >= 0.4.2.1 && < 0.7,
772+ xml >= 1.3.12 && < 1.4,
764− executable-path >= 0.0 && < 0.1,
765− zip-archive >= 0.2.3.4 && < 0.5,
773+ zip-archive >= 0.2.3.4 && < 0.5
766− xml >= 1.3.12 && < 1.4,
767− doctemplates >= 0.8.2 && < 0.9,
768− Glob >= 0.7 && < 0.11
769− if impl(ghc < 8.4)
770− hs-source-dirs: prelude
771− other-modules: Prelude
772− build-depends: base-compat >= 0.9
773 other-modules: Tests.Old
774 other-modules: Tests.Old
774 Tests.Command
775 Tests.Command
775 Tests.Helpers
776 Tests.Helpers
@@ -825,47 +826,19 @@ test-suite test-pandoc
825 Tests.Writers.OOXML
826 Tests.Writers.OOXML
826 Tests.Writers.Ms
827 Tests.Writers.Ms
827 Tests.Writers.AnnotatedTable
828 Tests.Writers.AnnotatedTable
828− if os(windows)
829− cpp-options: -D_WINDOWS
830− default-language: Haskell2010
831− other-extensions: NoImplicitPrelude
832− ghc-options: -rtsopts -with-rtsopts=-K16m -threaded
833− -Wall -fno-warn-unused-do-bind
834− -Wincomplete-record-updates
835− -Wnoncanonical-monad-instances
836− if impl(ghc >= 8.2)
837− ghc-options: -Wcpp-undef
838− if impl(ghc >= 8.4)
839− ghc-options: -Wincomplete-uni-patterns
840− -Widentities
841− -Werror=missing-home-modules
842− -fhide-source-paths
843−
844
829
845benchmark benchmark-pandoc
830benchmark benchmark-pandoc
831+ import: common-executable
846 type: exitcode-stdio-1.0
832 type: exitcode-stdio-1.0
847 main-is: benchmark-pandoc.hs
833 main-is: benchmark-pandoc.hs
848 hs-source-dirs: benchmark
834 hs-source-dirs: benchmark
849− build-depends: pandoc,
835+ build-depends: bytestring,
850− time, bytestring, containers,
836+ containers,
851− base >= 4.8 && < 5,
837+ -- gauge >= 0.2 && < 0.3,
838+ tasty-bench >= 0.2 && <= 0.3,
839+ mtl >= 2.2 && < 2.3,
852− text >= 1.1.1.0 && < 1.3,
840+ text >= 1.1.1.0 && < 1.3,
853− mtl >= 2.2 && < 2.3,
841+ time,
854− criterion >= 1.0 && < 1.6
842+ deepseq
855− if impl(ghc < 8.4)
843+ -- we increase heap size to avoid benchmarking garbage collection:
856− hs-source-dirs: prelude
857− other-modules: Prelude
858− build-depends: base-compat >= 0.9
859− default-language: Haskell2010
860− other-extensions: NoImplicitPrelude
861− ghc-options: -rtsopts -with-rtsopts=-K16m -threaded
844+ ghc-options: -rtsopts -with-rtsopts=-A8m -threaded
862− -Wall -fno-warn-unused-do-bind
863− -Wincomplete-record-updates
864− -Wnoncanonical-monad-instances
865− if impl(ghc >= 8.2)
866− ghc-options: -Wcpp-undef
867− if impl(ghc >= 8.4)
868− ghc-options: -Wincomplete-uni-patterns
869− -Widentities
870− -Werror=missing-home-modules
871− -fhide-source-paths
release.nixnew file+4
@@ -0,0 +1,4 @@
1+let
2+ pkgs = import <nixpkgs> { };
3+in
4+ pkgs.haskellPackages.callPackage ./project.nix { }
shell.nixnew file+106
@@ -0,0 +1,106 @@
1+{nixpkgs ? import <nixpkgs> {} }:
2+let
3+ inherit (nixpkgs) pkgs;
4+ inherit (pkgs) haskellPackages;
5+
6+ haskellDeps = ps: with ps; [
7+ Diff
8+ Glob
9+ HTTP
10+ HTTP
11+ HsYAML
12+ JuicyPixels
13+ QuickCheck
14+ SHA
15+ aeson
16+ aeson-pretty
17+ attoparsec
18+ base
19+ base-compat
20+ base64-bytestring
21+ binary
22+ blaze-html
23+ blaze-markup
24+ bytestring
25+ case-insensitive
26+ citeproc
27+ commonmark
28+ commonmark-extensions
29+ commonmark-pandoc
30+ conduit-extra
31+ connection
32+ connection
33+ containers
34+ data-default
35+ deepseq
36+ directory
37+ doclayout
38+ doctemplates
39+ emojis
40+ exceptions
41+ file-embed
42+ filepath
43+ haddock-library
44+ hsc2hs
45+ hslua
46+ hslua-module-system
47+ hslua-module-text
48+ http-client
49+ http-client
50+ http-client-tls
51+ http-client-tls
52+ http-types
53+ ipynb
54+ jira-wiki-markup
55+ mtl
56+ network
57+ network
58+ network-uri
59+ pandoc-types
60+ parsec
61+ process
62+ random
63+ safe
64+ scientific
65+ skylighting
66+ skylighting-core
67+ socks
68+ split
69+ streaming-commons
70+ syb
71+ tagsoup
72+ tasty
73+ tasty-golden
74+ tasty-hunit
75+ tasty-lua
76+ tasty-quickcheck
77+ temporary
78+ texmath
79+ text
80+ text-conversions
81+ time
82+ tls
83+ unicode-transforms
84+ unordered-containers
85+ weigh
86+ xml
87+ xml-conduit
88+ zip-archive
89+ zlib
90+ ];
91+
92+ ghc = haskellPackages.ghcWithPackages haskellDeps;
93+
94+ nixPackages = [
95+ pkgs.zlib
96+ ghc
97+ pkgs.gdb
98+ haskellPackages.ghcid
99+ haskellPackages.cabal2nix
100+ haskellPackages.cabal-install
101+ ];
102+in
103+pkgs.stdenv.mkDerivation {
104+ name = "env";
105+ buildInputs = nixPackages;
106+}
src/Text/Pandoc.hs+1−1
@@ -3,7 +3,7 @@
3{-# LANGUAGE ScopedTypeVariables #-}
3{-# LANGUAGE ScopedTypeVariables #-}
4{- |
4{- |
5 Module : Text.Pandoc
5 Module : Text.Pandoc
6− Copyright : Copyright (C) 2006-2020 John MacFarlane
6+ Copyright : Copyright (C) 2006-2021 John MacFarlane
7 License : GNU GPL, version 2 or above
7 License : GNU GPL, version 2 or above
8
8
9 Maintainer : John MacFarlane <jgm@berkeley.edu>
9 Maintainer : John MacFarlane <jgm@berkeley.edu>
src/Text/Pandoc/App.hs+98−66
@@ -1,9 +1,10 @@
1+{-# LANGUAGE LambdaCase #-}
1{-# LANGUAGE OverloadedStrings #-}
2{-# LANGUAGE OverloadedStrings #-}
2{-# LANGUAGE CPP #-}
3{-# LANGUAGE CPP #-}
3{-# LANGUAGE ScopedTypeVariables #-}
4{-# LANGUAGE ScopedTypeVariables #-}
4{- |
5{- |
5 Module : Text.Pandoc.App
6 Module : Text.Pandoc.App
6− Copyright : Copyright (C) 2006-2020 John MacFarlane
7+ Copyright : Copyright (C) 2006-2021 John MacFarlane
7 License : GNU GPL, version 2 or above
8 License : GNU GPL, version 2 or above
8
9
9 Maintainer : John MacFarlane <jgm@berkeley@edu>
10 Maintainer : John MacFarlane <jgm@berkeley@edu>
@@ -19,14 +20,16 @@ module Text.Pandoc.App (
19 , Filter(..)
20 , Filter(..)
20 , defaultOpts
21 , defaultOpts
21 , parseOptions
22 , parseOptions
23+ , parseOptionsFromArgs
22 , options
24 , options
23 , applyFilters
25 , applyFilters
24 ) where
26 ) where
25import qualified Control.Exception as E
27import qualified Control.Exception as E
26−import Control.Monad
28+import Control.Monad ( (>=>), when )
27−import Control.Monad.Trans
29+import Control.Monad.Trans ( MonadIO(..) )
28import Control.Monad.Except (throwError)
30import Control.Monad.Except (throwError)
29import qualified Data.ByteString as BS
31import qualified Data.ByteString as BS
32+import qualified Data.ByteString.Char8 as B8
30import qualified Data.ByteString.Lazy as BL
33import qualified Data.ByteString.Lazy as BL
31import Data.Char (toLower)
34import Data.Char (toLower)
32import Data.Maybe (fromMaybe, isJust, isNothing)
35import Data.Maybe (fromMaybe, isJust, isNothing)
@@ -40,23 +43,25 @@ import qualified Data.Text.Encoding.Error as TSE
40import Network.URI (URI (..), parseURI)
43import Network.URI (URI (..), parseURI)
41import System.Directory (doesDirectoryExist)
44import System.Directory (doesDirectoryExist)
42import System.Exit (exitSuccess)
45import System.Exit (exitSuccess)
43−import System.FilePath
46+import System.FilePath ( takeBaseName, takeExtension )
44import System.IO (nativeNewline, stdout)
47import System.IO (nativeNewline, stdout)
45import qualified System.IO as IO (Newline (..))
48import qualified System.IO as IO (Newline (..))
46import Text.Pandoc
49import Text.Pandoc
50+import Text.Pandoc.Builder (setMeta)
51+import Text.Pandoc.MIME (getCharset)
47import Text.Pandoc.App.FormatHeuristics (formatFromFilePaths)
52import Text.Pandoc.App.FormatHeuristics (formatFromFilePaths)
48import Text.Pandoc.App.Opt (Opt (..), LineEnding (..), defaultOpts,
53import Text.Pandoc.App.Opt (Opt (..), LineEnding (..), defaultOpts,
49− IpynbOutput (..) )
54+ IpynbOutput (..))
50−import Text.Pandoc.App.CommandLineOptions (parseOptions, options)
55+import Text.Pandoc.App.CommandLineOptions (parseOptions, parseOptionsFromArgs,
56+ options)
51import Text.Pandoc.App.OutputSettings (OutputSettings (..), optToOutputSettings)
57import Text.Pandoc.App.OutputSettings (OutputSettings (..), optToOutputSettings)
52−import Text.Pandoc.BCP47 (Lang (..), parseBCP47)
58+import Text.Collate.Lang (Lang (..), parseLang)
53−import Text.Pandoc.Builder (setMeta)
54import Text.Pandoc.Filter (Filter (JSONFilter, LuaFilter), applyFilters)
59import Text.Pandoc.Filter (Filter (JSONFilter, LuaFilter), applyFilters)
55import Text.Pandoc.PDF (makePDF)
60import Text.Pandoc.PDF (makePDF)
56−import Text.Pandoc.SelfContained (makeDataURI, makeSelfContained)
61+import Text.Pandoc.SelfContained (makeSelfContained)
57import Text.Pandoc.Shared (eastAsianLineBreakFilter, stripEmptyParagraphs,
62import Text.Pandoc.Shared (eastAsianLineBreakFilter, stripEmptyParagraphs,
58 headerShift, isURI, tabFilter, uriPathToPath, filterIpynbOutput,
63 headerShift, isURI, tabFilter, uriPathToPath, filterIpynbOutput,
59− defaultUserDataDirs, tshow, findM)
64+ defaultUserDataDir, tshow)
60import Text.Pandoc.Writers.Shared (lookupMetaString)
65import Text.Pandoc.Writers.Shared (lookupMetaString)
61import Text.Pandoc.Readers.Markdown (yamlToMeta)
66import Text.Pandoc.Readers.Markdown (yamlToMeta)
62import qualified Text.Pandoc.UTF8 as UTF8
67import qualified Text.Pandoc.UTF8 as UTF8
@@ -67,34 +72,29 @@ import System.Posix.Terminal (queryTerminal)
67
72
68convertWithOpts :: Opt -> IO ()
73convertWithOpts :: Opt -> IO ()
69convertWithOpts opts = do
74convertWithOpts opts = do
75+ datadir <- case optDataDir opts of
76+ Nothing -> do
77+ d <- defaultUserDataDir
78+ exists <- doesDirectoryExist d
79+ return $ if exists
80+ then Just d
81+ else Nothing
82+ Just _ -> return $ optDataDir opts
83+
70 let outputFile = fromMaybe "-" (optOutputFile opts)
84 let outputFile = fromMaybe "-" (optOutputFile opts)
71 let filters = optFilters opts
85 let filters = optFilters opts
72 let verbosity = optVerbosity opts
86 let verbosity = optVerbosity opts
73
87
74 when (optDumpArgs opts) $
88 when (optDumpArgs opts) $
75− do UTF8.hPutStrLn stdout outputFile
89+ do UTF8.hPutStrLn stdout (T.pack outputFile)
90+ mapM_ (UTF8.hPutStrLn stdout . T.pack)
76− mapM_ (UTF8.hPutStrLn stdout) (fromMaybe ["-"] $ optInputFiles opts)
91+ (fromMaybe ["-"] $ optInputFiles opts)
77 exitSuccess
92 exitSuccess
78
93
79− let isPandocCiteproc (JSONFilter f) = takeBaseName f == "pandoc-citeproc"
80− isPandocCiteproc _ = False
81− -- --bibliography implies -F pandoc-citeproc for backwards compatibility:
82− let needsCiteproc = isJust (lookupMeta "bibliography"
83− (optMetadata opts)) &&
84− optCiteMethod opts `notElem` [Natbib, Biblatex] &&
85− not (any isPandocCiteproc filters)
86− let filters' = filters ++ [ JSONFilter "pandoc-citeproc" | needsCiteproc ]
87−
88 let sources = case optInputFiles opts of
94 let sources = case optInputFiles opts of
89 Just xs | not (optIgnoreArgs opts) -> xs
95 Just xs | not (optIgnoreArgs opts) -> xs
90 _ -> ["-"]
96 _ -> ["-"]
91
97
92− datadir <- case optDataDir opts of
93− Nothing -> do
94− ds <- defaultUserDataDirs
95− findM doesDirectoryExist ds
96− Just _ -> return $ optDataDir opts
97−
98 let runIO' :: PandocIO a -> IO a
98 let runIO' :: PandocIO a -> IO a
99 runIO' f = do
99 runIO' f = do
100 (res, reports) <- runIOorExplode $ do
100 (res, reports) <- runIOorExplode $ do
@@ -140,9 +140,10 @@ convertWithOpts opts = do
140 (map (T.pack . takeExtension) sources) "markdown"
140 (map (T.pack . takeExtension) sources) "markdown"
141 return "markdown"
141 return "markdown"
142
142
143+ let readerNameBase = T.takeWhile (\c -> c /= '+' && c /= '-') readerName
143 let pdfOutput = map toLower (takeExtension outputFile) == ".pdf"
144 let pdfOutput = map toLower (takeExtension outputFile) == ".pdf"
144
145
145− when (pdfOutput && readerName == "latex") $
146+ when (pdfOutput && readerNameBase == "latex") $
146 case optInputFiles opts of
147 case optInputFiles opts of
147 Just (inputFile:_) -> report $ UnusualConversion $ T.pack $
148 Just (inputFile:_) -> report $ UnusualConversion $ T.pack $
148 "to convert a .tex file to PDF, you get better results by using pdflatex "
149 "to convert a .tex file to PDF, you get better results by using pdflatex "
@@ -153,24 +154,34 @@ convertWithOpts opts = do
153 (reader :: Reader PandocIO, readerExts) <- getReader readerName
154 (reader :: Reader PandocIO, readerExts) <- getReader readerName
154
155
155 let convertTabs = tabFilter (if optPreserveTabs opts ||
156 let convertTabs = tabFilter (if optPreserveTabs opts ||
156− readerName == "t2t" ||
157+ readerNameBase == "t2t" ||
157− readerName == "man"
158+ readerNameBase == "man"
158 then 0
159 then 0
159 else optTabStop opts)
160 else optTabStop opts)
160
161
161
162
162− let readSources :: [FilePath] -> PandocIO Text
163+ let readSources :: [FilePath] -> PandocIO [(FilePath, Text)]
163− readSources srcs = convertTabs . T.intercalate (T.pack "\n") <$>
164+ readSources srcs =
165+ mapM (\fp -> do
164− mapM readSource srcs
166+ t <- readSource fp
167+ return (if fp == "-" then "" else fp, convertTabs t)) srcs
165
168
166
169
167 outputSettings <- optToOutputSettings opts
170 outputSettings <- optToOutputSettings opts
168 let format = outputFormat outputSettings
171 let format = outputFormat outputSettings
169 let writer = outputWriter outputSettings
172 let writer = outputWriter outputSettings
170 let writerName = outputWriterName outputSettings
173 let writerName = outputWriterName outputSettings
174+ let writerNameBase = T.takeWhile (\c -> c /= '+' && c /= '-') writerName
171 let writerOptions = outputWriterOptions outputSettings
175 let writerOptions = outputWriterOptions outputSettings
172
176
177+ let bibOutput = writerNameBase == "bibtex" ||
178+ writerNameBase == "biblatex" ||
179+ writerNameBase == "csljson"
180+
173− let standalone = optStandalone opts || not (isTextFormat format) || pdfOutput
181+ let standalone = optStandalone opts ||
182+ not (isTextFormat format) ||
183+ pdfOutput ||
184+ bibOutput
174
185
175 -- We don't want to send output to the terminal if the user
186 -- We don't want to send output to the terminal if the user
176 -- does 'pandoc -t docx input.txt'; though we allow them to
187 -- does 'pandoc -t docx input.txt'; though we allow them to
@@ -190,20 +201,9 @@ convertWithOpts opts = do
190 Nothing -> readDataFile "abbreviations"
201 Nothing -> readDataFile "abbreviations"
191 Just f -> readFileStrict f
202 Just f -> readFileStrict f
192
203
193− metadata <- if format == "jats" &&
194− isNothing (lookupMeta "csl" (optMetadata opts)) &&
195− isNothing (lookupMeta "citation-style"
196− (optMetadata opts))
197− then do
198− jatsCSL <- readDataFile "jats.csl"
199− let jatsEncoded = makeDataURI
200− ("application/xml", jatsCSL)
201− return $ setMeta "csl" jatsEncoded $ optMetadata opts
202− else return $ optMetadata opts
203−
204 case lookupMetaString "lang" (optMetadata opts) of
204 case lookupMetaString "lang" (optMetadata opts) of
205− "" -> setTranslations $ Lang "en" "" "US" []
205+ "" -> setTranslations $ Lang "en" Nothing (Just "US") [] [] []
206− l -> case parseBCP47 l of
206+ l -> case parseLang l of
207 Left _ -> report $ InvalidLang l
207 Left _ -> report $ InvalidLang l
208 Right l' -> setTranslations l'
208 Right l' -> setTranslations l'
209
209
@@ -223,8 +223,9 @@ convertWithOpts opts = do
223 metadataFromFile <-
223 metadataFromFile <-
224 case optMetadataFiles opts of
224 case optMetadataFiles opts of
225 [] -> return mempty
225 [] -> return mempty
226+ paths -> mconcat <$>
226− paths -> mapM readFileLazy paths >>=
227+ mapM (\path -> do raw <- readFileLazy path
227− fmap mconcat . mapM (yamlToMeta readerOpts)
228+ yamlToMeta readerOpts (Just path) raw) paths
228
229
229 let transforms = (case optShiftHeadingLevelBy opts of
230 let transforms = (case optShiftHeadingLevelBy opts of
230 0 -> id
231 0 -> id
@@ -240,6 +241,7 @@ convertWithOpts opts = do
240 then (eastAsianLineBreakFilter :)
241 then (eastAsianLineBreakFilter :)
241 else id) .
242 else id) .
242 (case optIpynbOutput opts of
243 (case optIpynbOutput opts of
244+ _ | readerNameBase /= "ipynb" -> id
243 IpynbOutputAll -> id
245 IpynbOutputAll -> id
244 IpynbOutputNone -> (filterIpynbOutput Nothing :)
246 IpynbOutputNone -> (filterIpynbOutput Nothing :)
245 IpynbOutputBest -> (filterIpynbOutput (Just $
247 IpynbOutputBest -> (filterIpynbOutput (Just $
@@ -255,31 +257,51 @@ convertWithOpts opts = do
255 let sourceToDoc :: [FilePath] -> PandocIO Pandoc
257 let sourceToDoc :: [FilePath] -> PandocIO Pandoc
256 sourceToDoc sources' =
258 sourceToDoc sources' =
257 case reader of
259 case reader of
258− TextReader r
260+ TextReader r
261+ | readerNameBase == "json" ->
262+ mconcat <$> mapM (readSource >=> r readerOpts) sources'
259− | optFileScope opts || readerName == "json" ->
263+ | optFileScope opts ->
264+ -- Read source and convert tabs (see #6709)
265+ let readSource' = fmap convertTabs . readSource
260− mconcat <$> mapM (readSource >=> r readerOpts) sources'
266+ in mconcat <$> mapM (readSource' >=> r readerOpts) sources'
261− | otherwise ->
267+ | otherwise ->
262− readSources sources' >>= r readerOpts
268+ readSources sources' >>= r readerOpts
263− ByteStringReader r ->
269+ ByteStringReader r ->
264− mconcat <$> mapM (readFile' >=> r readerOpts) sources'
270+ mconcat <$> mapM (readFile' >=> r readerOpts) sources'
265−
271+
266−
272+
267− when (readerName == "markdown_github" ||
273+ when (readerNameBase == "markdown_github" ||
268− writerName == "markdown_github") $
274+ writerNameBase == "markdown_github") $
269 report $ Deprecated "markdown_github" "Use gfm instead."
275 report $ Deprecated "markdown_github" "Use gfm instead."
270
276
271 mapM_ (uncurry setRequestHeader) (optRequestHeaders opts)
277 mapM_ (uncurry setRequestHeader) (optRequestHeaders opts)
272
278
273 setNoCheckCertificate (optNoCheckCertificate opts)
279 setNoCheckCertificate (optNoCheckCertificate opts)
274
280
281+ let isPandocCiteproc (JSONFilter f) = takeBaseName f == "pandoc-citeproc"
282+ isPandocCiteproc _ = False
283+
284+ when (any isPandocCiteproc filters) $
285+ report $ Deprecated "pandoc-citeproc filter"
286+ "Use --citeproc instead."
287+
288+ let cslMetadata =
289+ maybe id (setMeta "csl") (optCSL opts) .
290+ (case optBibliography opts of
291+ [] -> id
292+ xs -> setMeta "bibliography" xs) .
293+ maybe id (setMeta "citation-abbreviations")
294+ (optCitationAbbreviations opts) $ mempty
295+
275 doc <- sourceToDoc sources >>=
296 doc <- sourceToDoc sources >>=
276 ( (if isJust (optExtractMedia opts)
297 ( (if isJust (optExtractMedia opts)
277 then fillMediaBag
298 then fillMediaBag
278 else return)
299 else return)
279 >=> return . adjustMetadata (metadataFromFile <>)
300 >=> return . adjustMetadata (metadataFromFile <>)
280− >=> return . adjustMetadata (<> metadata)
301+ >=> return . adjustMetadata (<> optMetadata opts)
302+ >=> return . adjustMetadata (<> cslMetadata)
281 >=> applyTransforms transforms
303 >=> applyTransforms transforms
282− >=> applyFilters readerOpts filters' [T.unpack format]
304+ >=> applyFilters readerOpts filters [T.unpack format]
283 >=> maybe return extractMedia (optExtractMedia opts)
305 >=> maybe return extractMedia (optExtractMedia opts)
284 )
306 )
285
307
@@ -344,7 +366,18 @@ readSource src = case parseURI src of
344 _ -> PandocAppError (tshow e))
366 _ -> PandocAppError (tshow e))
345
367
346readURI :: FilePath -> PandocIO Text
368readURI :: FilePath -> PandocIO Text
369+readURI src = do
347−readURI src = UTF8.toText . fst <$> openURL (T.pack src)
370+ (bs, mt) <- openURL (T.pack src)
371+ case mt >>= getCharset of
372+ Just "UTF-8" -> return $ UTF8.toText bs
373+ Just "ISO-8859-1" -> return $ T.pack $ B8.unpack bs
374+ Just charset -> throwError $ PandocUnsupportedCharsetError charset
375+ Nothing -> liftIO $ -- try first as UTF-8, then as latin1
376+ E.catch (return $! UTF8.toText bs)
377+ (\case
378+ TSE.DecodeError{} ->
379+ return $ T.pack $ B8.unpack bs
380+ e -> E.throwIO e)
348
381
349readFile' :: MonadIO m => FilePath -> m BL.ByteString
382readFile' :: MonadIO m => FilePath -> m BL.ByteString
350readFile' "-" = liftIO BL.getContents
383readFile' "-" = liftIO BL.getContents
@@ -355,6 +388,5 @@ writeFnBinary "-" = liftIO . BL.putStr
355writeFnBinary f = liftIO . BL.writeFile (UTF8.encodePath f)
388writeFnBinary f = liftIO . BL.writeFile (UTF8.encodePath f)
356
389
357writerFn :: MonadIO m => IO.Newline -> FilePath -> Text -> m ()
390writerFn :: MonadIO m => IO.Newline -> FilePath -> Text -> m ()
358−-- TODO this implementation isn't maximally efficient:
359−writerFn eol "-" = liftIO . UTF8.putStrWith eol . T.unpack
391+writerFn eol "-" = liftIO . UTF8.putStrWith eol
360−writerFn eol f = liftIO . UTF8.writeFileWith eol f . T.unpack
392+writerFn eol f = liftIO . UTF8.writeFileWith eol f
src/Text/Pandoc/App/CommandLineOptions.hs+94−57
@@ -6,7 +6,7 @@
6{-# LANGUAGE FlexibleContexts #-}
6{-# LANGUAGE FlexibleContexts #-}
7{- |
7{- |
8 Module : Text.Pandoc.App.CommandLineOptions
8 Module : Text.Pandoc.App.CommandLineOptions
9− Copyright : Copyright (C) 2006-2020 John MacFarlane
9+ Copyright : Copyright (C) 2006-2021 John MacFarlane
10 License : GNU GPL, version 2 or above
10 License : GNU GPL, version 2 or above
11
11
12 Maintainer : John MacFarlane <jgm@berkeley@edu>
12 Maintainer : John MacFarlane <jgm@berkeley@edu>
@@ -17,6 +17,7 @@ Does a pandoc conversion based on command-line options.
17-}
17-}
18module Text.Pandoc.App.CommandLineOptions (
18module Text.Pandoc.App.CommandLineOptions (
19 parseOptions
19 parseOptions
20+ , parseOptionsFromArgs
20 , options
21 , options
21 , engines
22 , engines
22 , lookupHighlightStyle
23 , lookupHighlightStyle
@@ -25,11 +26,12 @@ module Text.Pandoc.App.CommandLineOptions (
25import Control.Monad
26import Control.Monad
26import Control.Monad.Trans
27import Control.Monad.Trans
27import Control.Monad.Except (throwError)
28import Control.Monad.Except (throwError)
29+import Control.Monad.State.Strict
28import Data.Aeson.Encode.Pretty (encodePretty', Config(..), keyOrder,
30import Data.Aeson.Encode.Pretty (encodePretty', Config(..), keyOrder,
29 defConfig, Indent(..), NumberFormat(..))
31 defConfig, Indent(..), NumberFormat(..))
30import Data.Bifunctor (second)
32import Data.Bifunctor (second)
31import Data.Char (toLower)
33import Data.Char (toLower)
32−import Data.List (intercalate, sort)
34+import Data.List (intercalate, sort, foldl')
33#ifdef _WINDOWS
35#ifdef _WINDOWS
34#if MIN_VERSION_base(4,12,0)
36#if MIN_VERSION_base(4,12,0)
35import Data.List (isPrefixOf)
37import Data.List (isPrefixOf)
@@ -46,10 +48,13 @@ import System.FilePath
46import System.IO (stdout)
48import System.IO (stdout)
47import Text.DocTemplates (Context (..), ToContext (toVal), Val (..))
49import Text.DocTemplates (Context (..), ToContext (toVal), Val (..))
48import Text.Pandoc
50import Text.Pandoc
51+import Text.Pandoc.Builder (setMeta)
49−import Text.Pandoc.App.Opt (Opt (..), LineEnding (..), IpynbOutput (..), addMeta)
52+import Text.Pandoc.App.Opt (Opt (..), LineEnding (..), IpynbOutput (..),
53+ DefaultsState (..), applyDefaults,
54+ fullDefaultsPath)
50import Text.Pandoc.Filter (Filter (..))
55import Text.Pandoc.Filter (Filter (..))
51import Text.Pandoc.Highlighting (highlightingStyles)
56import Text.Pandoc.Highlighting (highlightingStyles)
52−import Text.Pandoc.Shared (ordNub, elemText, safeStrRead, defaultUserDataDirs, findM)
57+import Text.Pandoc.Shared (ordNub, elemText, safeStrRead, defaultUserDataDir)
53import Text.Printf
58import Text.Printf
54
59
55#ifdef EMBED_DATA_FILES
60#ifdef EMBED_DATA_FILES
@@ -64,16 +69,19 @@ import qualified Data.ByteString as BS
64import qualified Data.ByteString.Lazy as B
69import qualified Data.ByteString.Lazy as B
65import qualified Data.Map as M
70import qualified Data.Map as M
66import qualified Data.Text as T
71import qualified Data.Text as T
67−import qualified Data.YAML as Y
68import qualified Text.Pandoc.UTF8 as UTF8
72import qualified Text.Pandoc.UTF8 as UTF8
69
73
70parseOptions :: [OptDescr (Opt -> IO Opt)] -> Opt -> IO Opt
74parseOptions :: [OptDescr (Opt -> IO Opt)] -> Opt -> IO Opt
71parseOptions options' defaults = do
75parseOptions options' defaults = do
72 rawArgs <- map UTF8.decodeArg <$> getArgs
76 rawArgs <- map UTF8.decodeArg <$> getArgs
73 prg <- getProgName
77 prg <- getProgName
78+ parseOptionsFromArgs options' defaults prg rawArgs
74
79
80+parseOptionsFromArgs
81+ :: [OptDescr (Opt -> IO Opt)] -> Opt -> String -> [String] -> IO Opt
82+parseOptionsFromArgs options' defaults prg rawArgs = do
75 let (actions, args, unrecognizedOpts, errors) =
83 let (actions, args, unrecognizedOpts, errors) =
76− getOpt' Permute options' rawArgs
84+ getOpt' Permute options' (map UTF8.decodeArg rawArgs)
77
85
78 let unknownOptionErrors =
86 let unknownOptionErrors =
79 foldr (handleUnrecognizedOption . takeWhile (/= '=')) []
87 foldr (handleUnrecognizedOption . takeWhile (/= '=')) []
@@ -85,7 +93,7 @@ parseOptions options' defaults = do
85 ("Try " ++ prg ++ " --help for more information.")
93 ("Try " ++ prg ++ " --help for more information.")
86
94
87 -- thread option data structure through all supplied option actions
95 -- thread option data structure through all supplied option actions
88− opts <- foldl (>>=) (return defaults) actions
96+ opts <- foldl' (>>=) (return defaults) actions
89 let mbArgs = case args of
97 let mbArgs = case args of
90 [] -> Nothing
98 [] -> Nothing
91 xs -> Just xs
99 xs -> Just xs
@@ -166,7 +174,11 @@ options =
166
174
167 , Option "d" ["defaults"]
175 , Option "d" ["defaults"]
168 (ReqArg
176 (ReqArg
177+ (\arg opt -> runIOorExplode $ do
178+ let defsState = DefaultsState { curDefaults = Nothing,
179+ inheritanceGraph = [] }
180+ fp <- fullDefaultsPath (optDataDir opt) arg
169− (\arg opt -> applyDefaults opt arg
181+ evalStateT (applyDefaults opt fp) defsState
170 )
182 )
171 "FILE")
183 "FILE")
172 ""
184 ""
@@ -276,7 +288,8 @@ options =
276 , Option "" ["resource-path"]
288 , Option "" ["resource-path"]
277 (ReqArg
289 (ReqArg
278 (\arg opt -> return opt { optResourcePath =
290 (\arg opt -> return opt { optResourcePath =
279− splitSearchPath arg })
291+ splitSearchPath arg ++
292+ optResourcePath opt })
280 "SEARCHPATH")
293 "SEARCHPATH")
281 "" -- "Paths to search for images and other resources"
294 "" -- "Paths to search for images and other resources"
282
295
@@ -529,9 +542,26 @@ options =
529
542
530 , Option "" ["atx-headers"]
543 , Option "" ["atx-headers"]
531 (NoArg
544 (NoArg
545+ (\opt -> do
546+ deprecatedOption "--atx-headers"
547+ "Use --markdown-headings=atx instead."
532− (\opt -> return opt { optSetextHeaders = False } ))
548+ return opt { optSetextHeaders = False } ))
533 "" -- "Use atx-style headers for markdown"
549 "" -- "Use atx-style headers for markdown"
534
550
551+ , Option "" ["markdown-headings"]
552+ (ReqArg
553+ (\arg opt -> do
554+ headingFormat <- case arg of
555+ "setext" -> pure True
556+ "atx" -> pure False
557+ _ -> E.throwIO $ PandocOptionError $ T.pack
558+ ("Unknown markdown heading format: " ++ arg ++
559+ ". Expecting atx or setext")
560+ pure opt { optSetextHeaders = headingFormat }
561+ )
562+ "setext|atx")
563+ ""
564+
535 , Option "" ["listings"]
565 , Option "" ["listings"]
536 (NoArg
566 (NoArg
537 (\opt -> return opt { optListings = True }))
567 (\opt -> return opt { optListings = True }))
@@ -656,6 +686,12 @@ options =
656 "all|none|best")
686 "all|none|best")
657 "" -- "Starting number for sections, subsections, etc."
687 "" -- "Starting number for sections, subsections, etc."
658
688
689+ , Option "C" ["citeproc"]
690+ (NoArg
691+ (\opt -> return opt { optFilters =
692+ optFilters opt ++ [CiteprocFilter] }))
693+ "" -- "Process citations"
694+
659 , Option "" ["bibliography"]
695 , Option "" ["bibliography"]
660 (ReqArg
696 (ReqArg
661 (\arg opt -> return opt{ optMetadata =
697 (\arg opt -> return opt{ optMetadata =
@@ -778,10 +814,10 @@ options =
778 map (\c -> ['-',c]) shorts ++
814 map (\c -> ['-',c]) shorts ++
779 map ("--" ++) longs
815 map ("--" ++) longs
780 let allopts = unwords (concatMap optnames options)
816 let allopts = unwords (concatMap optnames options)
781− UTF8.hPutStrLn stdout $ printf tpl allopts
817+ UTF8.hPutStrLn stdout $ T.pack $ printf tpl allopts
782− (unwords readersNames)
818+ (T.unpack $ T.unwords readersNames)
783− (unwords writersNames)
819+ (T.unpack $ T.unwords writersNames)
784− (unwords $ map (T.unpack . fst) highlightingStyles)
820+ (T.unpack $ T.unwords $ map fst highlightingStyles)
785 (unwords datafiles)
821 (unwords datafiles)
786 exitSuccess ))
822 exitSuccess ))
787 "" -- "Print bash completion script"
823 "" -- "Print bash completion script"
@@ -820,7 +856,7 @@ options =
820 else if extensionEnabled x allExts
856 else if extensionEnabled x allExts
821 then '-'
857 then '-'
822 else ' ') : drop 4 (show x)
858 else ' ') : drop 4 (show x)
823− mapM_ (UTF8.hPutStrLn stdout . showExt)
859+ mapM_ (UTF8.hPutStrLn stdout . T.pack . showExt)
824 [ex | ex <- extList, extensionEnabled ex allExts]
860 [ex | ex <- extList, extensionEnabled ex allExts]
825 exitSuccess )
861 exitSuccess )
826 "FORMAT")
862 "FORMAT")
@@ -834,14 +870,14 @@ options =
834 , sShortname s `notElem`
870 , sShortname s `notElem`
835 [T.pack "Alert", T.pack "Alert_indent"]
871 [T.pack "Alert", T.pack "Alert_indent"]
836 ]
872 ]
837− mapM_ (UTF8.hPutStrLn stdout) langs
873+ mapM_ (UTF8.hPutStrLn stdout . T.pack) (sort langs)
838 exitSuccess ))
874 exitSuccess ))
839 ""
875 ""
840
876
841 , Option "" ["list-highlight-styles"]
877 , Option "" ["list-highlight-styles"]
842 (NoArg
878 (NoArg
843 (\_ -> do
879 (\_ -> do
844− mapM_ (UTF8.hPutStrLn stdout . T.unpack . fst) highlightingStyles
880+ mapM_ (UTF8.hPutStrLn stdout . fst) highlightingStyles
845 exitSuccess ))
881 exitSuccess ))
846 ""
882 ""
847
883
@@ -859,7 +895,7 @@ options =
859 | T.null t -> -- e.g. for docx, odt, json:
895 | T.null t -> -- e.g. for docx, odt, json:
860 E.throwIO $ PandocCouldNotFindDataFileError $ T.pack
896 E.throwIO $ PandocCouldNotFindDataFileError $ T.pack
861 ("templates/default." ++ arg)
897 ("templates/default." ++ arg)
862− | otherwise -> write . T.unpack $ t
898+ | otherwise -> write t
863 Left e -> E.throwIO e
899 Left e -> E.throwIO e
864 exitSuccess)
900 exitSuccess)
865 "FORMAT")
901 "FORMAT")
@@ -905,11 +941,13 @@ options =
905 (NoArg
941 (NoArg
906 (\_ -> do
942 (\_ -> do
907 prg <- getProgName
943 prg <- getProgName
908− defaultDatadirs <- defaultUserDataDirs
944+ defaultDatadir <- defaultUserDataDir
945+ UTF8.hPutStrLn stdout
946+ $ T.pack
909− UTF8.hPutStrLn stdout (prg ++ " " ++ T.unpack pandocVersion ++
947+ $ prg ++ " " ++ T.unpack pandocVersion ++
910− compileInfo ++ "\nDefault user data directory: " ++
948+ compileInfo ++
911− intercalate " or " defaultDatadirs ++
949+ "\nUser data directory: " ++ defaultDatadir ++
912− ('\n':copyrightMessage))
950+ ('\n':copyrightMessage)
913 exitSuccess ))
951 exitSuccess ))
914 "" -- "Print version"
952 "" -- "Print version"
915
953
@@ -917,7 +955,7 @@ options =
917 (NoArg
955 (NoArg
918 (\_ -> do
956 (\_ -> do
919 prg <- getProgName
957 prg <- getProgName
920− UTF8.hPutStr stdout (usageMessage prg options)
958+ UTF8.hPutStr stdout (T.pack $ usageMessage prg options)
921 exitSuccess ))
959 exitSuccess ))
922 "" -- "Show help"
960 "" -- "Show help"
923 ]
961 ]
@@ -938,16 +976,16 @@ usageMessage programName = usageInfo (programName ++ " [OPTIONS] [FILES]")
938
976
939copyrightMessage :: String
977copyrightMessage :: String
940copyrightMessage = intercalate "\n" [
978copyrightMessage = intercalate "\n" [
941− "Copyright (C) 2006-2020 John MacFarlane",
979+ "Copyright (C) 2006-2021 John MacFarlane. Web: https://pandoc.org",
942− "Web: https://pandoc.org",
943− "This is free software; see the source for copying conditions.",
980+ "This is free software; see the source for copying conditions. There is no",
944− "There is no warranty, not even for merchantability or fitness",
981+ "warranty, not even for merchantability or fitness for a particular purpose." ]
945− "for a particular purpose." ]
946
982
947compileInfo :: String
983compileInfo :: String
948compileInfo =
984compileInfo =
949− "\nCompiled with pandoc-types " ++ VERSION_pandoc_types ++ ", texmath " ++
985+ "\nCompiled with pandoc-types " ++ VERSION_pandoc_types ++
950− VERSION_texmath ++ ", skylighting " ++ VERSION_skylighting
986+ ", texmath " ++ VERSION_texmath ++ ", skylighting " ++
987+ VERSION_skylighting ++ ",\nciteproc " ++ VERSION_citeproc ++
988+ ", ipynb " ++ VERSION_ipynb
951
989
952handleUnrecognizedOption :: String -> [String] -> [String]
990handleUnrecognizedOption :: String -> [String] -> [String]
953handleUnrecognizedOption "--smart" =
991handleUnrecognizedOption "--smart" =
@@ -978,38 +1016,16 @@ handleUnrecognizedOption "-R" = handleUnrecognizedOption "--parse-raw"
978handleUnrecognizedOption x =
1016handleUnrecognizedOption x =
979 (("Unknown option " ++ x ++ ".") :)
1017 (("Unknown option " ++ x ++ ".") :)
980
1018
981−readersNames :: [String]
1019+readersNames :: [Text]
982−readersNames = sort (map (T.unpack . fst) (readers :: [(Text, Reader PandocIO)]))
1020+readersNames = sort (map fst (readers :: [(Text, Reader PandocIO)]))
983
1021
984−writersNames :: [String]
1022+writersNames :: [Text]
985writersNames = sort
1023writersNames = sort
986− ("pdf" : map (T.unpack . fst) (writers :: [(Text, Writer PandocIO)]))
1024+ ("pdf" : map fst (writers :: [(Text, Writer PandocIO)]))
987
1025
988splitField :: String -> (String, String)
1026splitField :: String -> (String, String)
989splitField = second (tailDef "true") . break (`elemText` ":=")
1027splitField = second (tailDef "true") . break (`elemText` ":=")
990
1028
991−-- | Apply defaults from --defaults file.
992−applyDefaults :: Opt -> FilePath -> IO Opt
993−applyDefaults opt file = runIOorExplode $ do
994− let fp = if null (takeExtension file)
995− then addExtension file "yaml"
996− else file
997− setVerbosity $ optVerbosity opt
998− dataDirs <- liftIO defaultUserDataDirs
999− let fps = fp : case optDataDir opt of
1000− Nothing -> map (</> ("defaults" </> fp))
1001− dataDirs
1002− Just dd -> [dd </> "defaults" </> fp]
1003− fp' <- fromMaybe fp <$> findM fileExists fps
1004− inp <- readFileLazy fp'
1005− case Y.decode1 inp of
1006− Right (f :: Opt -> Opt) -> return $ f opt
1007− Left (errpos, errmsg) -> throwError $
1008− PandocParseError $ T.pack $
1009− "Error parsing " ++ fp' ++ " line " ++
1010− show (Y.posLine errpos) ++ " column " ++
1011− show (Y.posColumn errpos) ++ ":\n" ++ errmsg
1012−
1013lookupHighlightStyle :: PandocMonad m => String -> m Style
1029lookupHighlightStyle :: PandocMonad m => String -> m Style
1014lookupHighlightStyle s
1030lookupHighlightStyle s
1015 | takeExtension s == ".theme" = -- attempt to load KDE theme
1031 | takeExtension s == ".theme" = -- attempt to load KDE theme
@@ -1038,6 +1054,27 @@ setVariable key val (Context ctx) = Context $ M.alter go key ctx
1038 go (Just (ListVal xs)) = Just $ ListVal $ xs ++ [toVal val]
1054 go (Just (ListVal xs)) = Just $ ListVal $ xs ++ [toVal val]
1039 go (Just x) = Just $ ListVal [x, toVal val]
1055 go (Just x) = Just $ ListVal [x, toVal val]
1040
1056
1057+addMeta :: String -> String -> Meta -> Meta
1058+addMeta k v meta =
1059+ case lookupMeta k' meta of
1060+ Nothing -> setMeta k' v' meta
1061+ Just (MetaList xs) ->
1062+ setMeta k' (MetaList (xs ++ [v'])) meta
1063+ Just x -> setMeta k' (MetaList [x, v']) meta
1064+ where
1065+ v' = readMetaValue v
1066+ k' = T.pack k
1067+
1068+readMetaValue :: String -> MetaValue
1069+readMetaValue s
1070+ | s == "true" = MetaBool True
1071+ | s == "True" = MetaBool True
1072+ | s == "TRUE" = MetaBool True
1073+ | s == "false" = MetaBool False
1074+ | s == "False" = MetaBool False
1075+ | s == "FALSE" = MetaBool False
1076+ | otherwise = MetaString $ T.pack s
1077+
1041-- On Windows with ghc 8.6+, we need to rewrite paths
1078-- On Windows with ghc 8.6+, we need to rewrite paths
1042-- beginning with \\ to \\?\UNC\. -- See #5127.
1079-- beginning with \\ to \\?\UNC\. -- See #5127.
1043normalizePath :: FilePath -> FilePath
1080normalizePath :: FilePath -> FilePath
src/Text/Pandoc/App/FormatHeuristics.hs+20−8
@@ -1,7 +1,7 @@
1{-# LANGUAGE OverloadedStrings #-}
1{-# LANGUAGE OverloadedStrings #-}
2{- |
2{- |
3 Module : Text.Pandoc.App.FormatHeuristics
3 Module : Text.Pandoc.App.FormatHeuristics
4− Copyright : Copyright (C) 2006-2020 John MacFarlane
4+ Copyright : Copyright (C) 2006-2021 John MacFarlane
5 License : GNU GPL, version 2 or above
5 License : GNU GPL, version 2 or above
6
6
7 Maintainer : John MacFarlane <jgm@berkeley@edu>
7 Maintainer : John MacFarlane <jgm@berkeley@edu>
@@ -15,18 +15,24 @@ module Text.Pandoc.App.FormatHeuristics
15 ) where
15 ) where
16
16
17import Data.Char (toLower)
17import Data.Char (toLower)
18+import Data.Foldable (asum)
18import Data.Text (Text)
19import Data.Text (Text)
19import System.FilePath (takeExtension)
20import System.FilePath (takeExtension)
20
21
21−-- Determine default format based on file extensions.
22+-- | Determines default format based on file extensions; uses the format
23+-- of the first extension that's associated with a format.
24+--
25+-- Examples:
26+--
27+-- > formatFromFilePaths ["text.unknown", "no-extension"]
28+-- Nothing
29+--
30+-- > formatFromFilePaths ["my.md", "other.rst"]
31+-- Just "markdown"
22formatFromFilePaths :: [FilePath] -> Maybe Text
32formatFromFilePaths :: [FilePath] -> Maybe Text
23−formatFromFilePaths [] = Nothing
33+formatFromFilePaths = asum . map formatFromFilePath
24−formatFromFilePaths (x:xs) =
25− case formatFromFilePath x of
26− Just f -> Just f
27− Nothing -> formatFromFilePaths xs
28
34
29−-- Determine format based on file extension
35+-- | Determines format based on file extension.
30formatFromFilePath :: FilePath -> Maybe Text
36formatFromFilePath :: FilePath -> Maybe Text
31formatFromFilePath x =
37formatFromFilePath x =
32 case takeExtension (map toLower x) of
38 case takeExtension (map toLower x) of
@@ -48,6 +54,11 @@ formatFromFilePath x =
48 ".lhs" -> Just "markdown+lhs"
54 ".lhs" -> Just "markdown+lhs"
49 ".ltx" -> Just "latex"
55 ".ltx" -> Just "latex"
50 ".markdown" -> Just "markdown"
56 ".markdown" -> Just "markdown"
57+ ".mkdn" -> Just "markdown"
58+ ".mkd" -> Just "markdown"
59+ ".mdwn" -> Just "markdown"
60+ ".mdown" -> Just "markdown"
61+ ".Rmd" -> Just "markdown"
51 ".md" -> Just "markdown"
62 ".md" -> Just "markdown"
52 ".ms" -> Just "ms"
63 ".ms" -> Just "ms"
53 ".muse" -> Just "muse"
64 ".muse" -> Just "muse"
@@ -74,5 +85,6 @@ formatFromFilePath x =
74 ".xhtml" -> Just "html"
85 ".xhtml" -> Just "html"
75 ".ipynb" -> Just "ipynb"
86 ".ipynb" -> Just "ipynb"
76 ".csv" -> Just "csv"
87 ".csv" -> Just "csv"
88+ ".bib" -> Just "biblatex"
77 ['.',y] | y `elem` ['1'..'9'] -> Just "man"
89 ['.',y] | y `elem` ['1'..'9'] -> Just "man"
78 _ -> Nothing
90 _ -> Nothing
src/Text/Pandoc/App/Opt.hs+274−48
@@ -7,7 +7,7 @@
7{-# LANGUAGE FlexibleContexts #-}
7{-# LANGUAGE FlexibleContexts #-}
8{- |
8{- |
9 Module : Text.Pandoc.App.Opt
9 Module : Text.Pandoc.App.Opt
10− Copyright : Copyright (C) 2006-2020 John MacFarlane
10+ Copyright : Copyright (C) 2006-2021 John MacFarlane
11 License : GNU GPL, version 2 or above
11 License : GNU GPL, version 2 or above
12
12
13 Maintainer : John MacFarlane <jgm@berkeley@edu>
13 Maintainer : John MacFarlane <jgm@berkeley@edu>
@@ -20,21 +20,31 @@ module Text.Pandoc.App.Opt (
20 Opt(..)
20 Opt(..)
21 , LineEnding (..)
21 , LineEnding (..)
22 , IpynbOutput (..)
22 , IpynbOutput (..)
23+ , DefaultsState (..)
23 , defaultOpts
24 , defaultOpts
24− , addMeta
25+ , applyDefaults
26+ , fullDefaultsPath
25 ) where
27 ) where
28+import Control.Monad.Except (MonadIO, liftIO, throwError, (>=>), foldM)
29+import Control.Monad.State.Strict (StateT, modify, gets)
30+import System.FilePath ( addExtension, (</>), takeExtension, takeDirectory )
31+import System.Directory ( canonicalizePath )
26import Data.Char (isLower, toLower)
32import Data.Char (isLower, toLower)
33+import Data.Maybe (fromMaybe)
27import GHC.Generics hiding (Meta)
34import GHC.Generics hiding (Meta)
28−import Text.Pandoc.Builder (setMeta)
29import Text.Pandoc.Filter (Filter (..))
35import Text.Pandoc.Filter (Filter (..))
30−import Text.Pandoc.Logging (Verbosity (WARNING))
36+import Text.Pandoc.Logging (Verbosity (WARNING), LogMessage(..))
31import Text.Pandoc.Options (TopLevelDivision (TopLevelDefault),
37import Text.Pandoc.Options (TopLevelDivision (TopLevelDefault),
32 TrackChanges (AcceptChanges),
38 TrackChanges (AcceptChanges),
33 WrapOption (WrapAuto), HTMLMathMethod (PlainMath),
39 WrapOption (WrapAuto), HTMLMathMethod (PlainMath),
34 ReferenceLocation (EndOfDocument),
40 ReferenceLocation (EndOfDocument),
35 ObfuscationMethod (NoObfuscation),
41 ObfuscationMethod (NoObfuscation),
36 CiteMethod (Citeproc))
42 CiteMethod (Citeproc))
43+import Text.Pandoc.Class (readFileLazy, fileExists, setVerbosity, report,
44+ PandocMonad(lookupEnv), getUserDataDir)
45+import Text.Pandoc.Error (PandocError (PandocParseError, PandocSomeError))
37−import Text.Pandoc.Shared (camelCaseStrToHyphenated)
46+import Text.Pandoc.Shared (camelCaseStrToHyphenated, defaultUserDataDir,
47+ findM, ordNub)
38import qualified Text.Pandoc.Parsing as P
48import qualified Text.Pandoc.Parsing as P
39import Text.Pandoc.Readers.Metadata (yamlMap)
49import Text.Pandoc.Readers.Metadata (yamlMap)
40import Text.Pandoc.Class.PandocPure
50import Text.Pandoc.Class.PandocPure
@@ -43,7 +53,7 @@ import Data.Text (Text, unpack)
43import Data.Default (def)
53import Data.Default (def)
44import qualified Data.Text as T
54import qualified Data.Text as T
45import qualified Data.Map as M
55import qualified Data.Map as M
46−import Text.Pandoc.Definition (Meta(..), MetaValue(..), lookupMeta)
56+import Text.Pandoc.Definition (Meta(..), MetaValue(..))
47import Data.Aeson (defaultOptions, Options(..))
57import Data.Aeson (defaultOptions, Options(..))
48import Data.Aeson.TH (deriveJSON)
58import Data.Aeson.TH (deriveJSON)
49import Control.Applicative ((<|>))
59import Control.Applicative ((<|>))
@@ -147,19 +157,194 @@ data Opt = Opt
147 , optNoCheckCertificate :: Bool -- ^ Disable certificate validation
157 , optNoCheckCertificate :: Bool -- ^ Disable certificate validation
148 , optEol :: LineEnding -- ^ Style of line-endings to use
158 , optEol :: LineEnding -- ^ Style of line-endings to use
149 , optStripComments :: Bool -- ^ Skip HTML comments
159 , optStripComments :: Bool -- ^ Skip HTML comments
160+ , optCSL :: Maybe FilePath -- ^ CSL stylesheet
161+ , optBibliography :: [FilePath] -- ^ Bibliography files
162+ , optCitationAbbreviations :: Maybe FilePath -- ^ Citation abbreviations
150 } deriving (Generic, Show)
163 } deriving (Generic, Show)
151
164
152instance FromYAML (Opt -> Opt) where
165instance FromYAML (Opt -> Opt) where
153− parseYAML (Mapping _ _ m) =
166+ parseYAML (Mapping _ _ m) = chain doOpt (M.toList m)
154− foldr (.) id <$> mapM doOpt (M.toList m)
155 parseYAML n = failAtNode n "Expected a mapping"
167 parseYAML n = failAtNode n "Expected a mapping"
156
168
169+data DefaultsState = DefaultsState
170+ {
171+ curDefaults :: Maybe FilePath -- currently parsed file
172+ , inheritanceGraph :: [[FilePath]] -- defaults file inheritance graph
173+ } deriving (Show)
174+
175+instance (PandocMonad m, MonadIO m)
176+ => FromYAML (Opt -> StateT DefaultsState m Opt) where
177+ parseYAML (Mapping _ _ m) = do
178+ let opts = M.mapKeys toText m
179+ dataDir <- case M.lookup "data-dir" opts of
180+ Nothing -> return Nothing
181+ Just v -> Just . unpack <$> parseYAML v
182+ f <- parseOptions (M.toList m)
183+ case M.lookup "defaults" opts of
184+ Just v -> do
185+ g <- parseDefaults v dataDir
186+ return $ g >=> f >=> resolveVarsInOpt
187+ Nothing -> return $ f >=> resolveVarsInOpt
188+ where
189+ toText (Scalar _ (SStr s)) = s
190+ toText _ = ""
191+ parseYAML n = failAtNode n "Expected a mapping"
192+
193+resolveVarsInOpt :: forall m. (PandocMonad m, MonadIO m)
194+ => Opt -> StateT DefaultsState m Opt
195+resolveVarsInOpt
196+ opt@Opt
197+ { optTemplate = oTemplate
198+ , optMetadataFiles = oMetadataFiles
199+ , optOutputFile = oOutputFile
200+ , optInputFiles = oInputFiles
201+ , optSyntaxDefinitions = oSyntaxDefinitions
202+ , optAbbreviations = oAbbreviations
203+ , optReferenceDoc = oReferenceDoc
204+ , optEpubMetadata = oEpubMetadata
205+ , optEpubFonts = oEpubFonts
206+ , optEpubCoverImage = oEpubCoverImage
207+ , optLogFile = oLogFile
208+ , optFilters = oFilters
209+ , optDataDir = oDataDir
210+ , optExtractMedia = oExtractMedia
211+ , optCss = oCss
212+ , optIncludeBeforeBody = oIncludeBeforeBody
213+ , optIncludeAfterBody = oIncludeAfterBody
214+ , optIncludeInHeader = oIncludeInHeader
215+ , optResourcePath = oResourcePath
216+ , optCSL = oCSL
217+ , optBibliography = oBibliography
218+ , optCitationAbbreviations = oCitationAbbreviations
219+ }
220+ = do
221+ oTemplate' <- mapM resolveVars oTemplate
222+ oMetadataFiles' <- mapM resolveVars oMetadataFiles
223+ oOutputFile' <- mapM resolveVars oOutputFile
224+ oInputFiles' <- mapM (mapM resolveVars) oInputFiles
225+ oSyntaxDefinitions' <- mapM resolveVars oSyntaxDefinitions
226+ oAbbreviations' <- mapM resolveVars oAbbreviations
227+ oReferenceDoc' <- mapM resolveVars oReferenceDoc
228+ oEpubMetadata' <- mapM resolveVars oEpubMetadata
229+ oEpubFonts' <- mapM resolveVars oEpubFonts
230+ oEpubCoverImage' <- mapM resolveVars oEpubCoverImage
231+ oLogFile' <- mapM resolveVars oLogFile
232+ oFilters' <- mapM resolveVarsInFilter oFilters
233+ oDataDir' <- mapM resolveVars oDataDir
234+ oExtractMedia' <- mapM resolveVars oExtractMedia
235+ oCss' <- mapM resolveVars oCss
236+ oIncludeBeforeBody' <- mapM resolveVars oIncludeBeforeBody
237+ oIncludeAfterBody' <- mapM resolveVars oIncludeAfterBody
238+ oIncludeInHeader' <- mapM resolveVars oIncludeInHeader
239+ oResourcePath' <- mapM resolveVars oResourcePath
240+ oCSL' <- mapM resolveVars oCSL
241+ oBibliography' <- mapM resolveVars oBibliography
242+ oCitationAbbreviations' <- mapM resolveVars oCitationAbbreviations
243+ return opt{ optTemplate = oTemplate'
244+ , optMetadataFiles = oMetadataFiles'
245+ , optOutputFile = oOutputFile'
246+ , optInputFiles = oInputFiles'
247+ , optSyntaxDefinitions = oSyntaxDefinitions'
248+ , optAbbreviations = oAbbreviations'
249+ , optReferenceDoc = oReferenceDoc'
250+ , optEpubMetadata = oEpubMetadata'
251+ , optEpubFonts = oEpubFonts'
252+ , optEpubCoverImage = oEpubCoverImage'
253+ , optLogFile = oLogFile'
254+ , optFilters = oFilters'
255+ , optDataDir = oDataDir'
256+ , optExtractMedia = oExtractMedia'
257+ , optCss = oCss'
258+ , optIncludeBeforeBody = oIncludeBeforeBody'
259+ , optIncludeAfterBody = oIncludeAfterBody'
260+ , optIncludeInHeader = oIncludeInHeader'
261+ , optResourcePath = oResourcePath'
262+ , optCSL = oCSL'
263+ , optBibliography = oBibliography'
264+ , optCitationAbbreviations = oCitationAbbreviations'
265+ }
266+
267+ where
268+ resolveVars :: FilePath -> StateT DefaultsState m FilePath
269+ resolveVars [] = return []
270+ resolveVars ('$':'{':xs) =
271+ let (ys, zs) = break (=='}') xs
272+ in if null zs
273+ then return $ '$':'{':xs
274+ else do
275+ val <- lookupEnv' ys
276+ (val ++) <$> resolveVars (drop 1 zs)
277+ resolveVars (c:cs) = (c:) <$> resolveVars cs
278+ lookupEnv' :: String -> StateT DefaultsState m String
279+ lookupEnv' "." = do
280+ mbCurDefaults <- gets curDefaults
281+ maybe (return "")
282+ (fmap takeDirectory . liftIO . canonicalizePath)
283+ mbCurDefaults
284+ lookupEnv' "USERDATA" = do
285+ mbodatadir <- mapM resolveVars oDataDir
286+ mbdatadir <- getUserDataDir
287+ defdatadir <- liftIO defaultUserDataDir
288+ return $ fromMaybe defdatadir (mbodatadir <|> mbdatadir)
289+ lookupEnv' v = do
290+ mbval <- fmap T.unpack <$> lookupEnv (T.pack v)
291+ case mbval of
292+ Nothing -> do
293+ report $ EnvironmentVariableUndefined (T.pack v)
294+ return mempty
295+ Just x -> return x
296+ resolveVarsInFilter (JSONFilter fp) =
297+ JSONFilter <$> resolveVars fp
298+ resolveVarsInFilter (LuaFilter fp) =
299+ LuaFilter <$> resolveVars fp
300+ resolveVarsInFilter CiteprocFilter = return CiteprocFilter
301+
302+
303+
304+parseDefaults :: (PandocMonad m, MonadIO m)
305+ => Node Pos
306+ -> Maybe FilePath
307+ -> Parser (Opt -> StateT DefaultsState m Opt)
308+parseDefaults n dataDir = parseDefsNames n >>= \ds -> return $ \o -> do
309+ -- get parent defaults:
310+ defsParent <- gets $ fromMaybe "" . curDefaults
311+ -- get child defaults:
312+ defsChildren <- mapM (fullDefaultsPath dataDir) ds
313+ -- expand parent in defaults inheritance graph by children:
314+ defsGraph <- gets inheritanceGraph
315+ let defsGraphExp = expand defsGraph defsChildren defsParent
316+ modify $ \defsState -> defsState{ inheritanceGraph = defsGraphExp }
317+ -- check for cyclic inheritance:
318+ if cyclic defsGraphExp
319+ then throwError $
320+ PandocSomeError $ T.pack $
321+ "Error: Circular defaults file reference in " ++
322+ "'" ++ defsParent ++ "'"
323+ else foldM applyDefaults o defsChildren
324+ where parseDefsNames x = (parseYAML x >>= \xs -> return $ map unpack xs)
325+ <|> (parseYAML x >>= \x' -> return [unpack x'])
326+
327+parseOptions :: Monad m
328+ => [(Node Pos, Node Pos)]
329+ -> Parser (Opt -> StateT DefaultsState m Opt)
330+parseOptions ns = do
331+ f <- chain doOpt' ns
332+ return $ return . f
333+
334+chain :: Monad m => (a -> m (b -> b)) -> [a] -> m (b -> b)
335+chain f = foldM g id
336+ where g o n = f n >>= \o' -> return $ o' . o
337+
338+doOpt' :: (Node Pos, Node Pos) -> Parser (Opt -> Opt)
339+doOpt' (k',v) = do
340+ k <- parseStringKey k'
341+ case k of
342+ "defaults" -> return id
343+ _ -> doOpt (k',v)
344+
157doOpt :: (Node Pos, Node Pos) -> Parser (Opt -> Opt)
345doOpt :: (Node Pos, Node Pos) -> Parser (Opt -> Opt)
158doOpt (k',v) = do
346doOpt (k',v) = do
159− k <- case k' of
347+ k <- parseStringKey k'
160− Scalar _ (SStr t) -> return t
161− Scalar _ _ -> failAtNode k' "Non-string key"
162− _ -> failAtNode k' "Non-scalar key"
163 case k of
348 case k of
164 "tab-stop" ->
349 "tab-stop" ->
165 parseYAML v >>= \x -> return (\o -> o{ optTabStop = x })
350 parseYAML v >>= \x -> return (\o -> o{ optTabStop = x })
@@ -294,6 +479,11 @@ doOpt (k',v) = do
294 parseYAML v >>= \x -> return (\o -> o{ optColumns = x })
479 parseYAML v >>= \x -> return (\o -> o{ optColumns = x })
295 "filters" ->
480 "filters" ->
296 parseYAML v >>= \x -> return (\o -> o{ optFilters = optFilters o <> x })
481 parseYAML v >>= \x -> return (\o -> o{ optFilters = optFilters o <> x })
482+ "citeproc" ->
483+ parseYAML v >>= \x ->
484+ if x
485+ then return (\o -> o{ optFilters = CiteprocFilter : optFilters o })
486+ else return id
297 "email-obfuscation" ->
487 "email-obfuscation" ->
298 parseYAML v >>= \x -> return (\o -> o{ optEmailObfuscation = x })
488 parseYAML v >>= \x -> return (\o -> o{ optEmailObfuscation = x })
299 "identifier-prefix" ->
489 "identifier-prefix" ->
@@ -325,6 +515,12 @@ doOpt (k',v) = do
325 parseYAML v >>= \x -> return (\o -> o{ optSlideLevel = x })
515 parseYAML v >>= \x -> return (\o -> o{ optSlideLevel = x })
326 "atx-headers" ->
516 "atx-headers" ->
327 parseYAML v >>= \x -> return (\o -> o{ optSetextHeaders = not x })
517 parseYAML v >>= \x -> return (\o -> o{ optSetextHeaders = not x })
518+ "markdown-headings" ->
519+ parseYAML v >>= \x -> return (\o ->
520+ case T.toLower x of
521+ "atx" -> o{ optSetextHeaders = False }
522+ "setext" -> o{ optSetextHeaders = True }
523+ _ -> o)
328 "ascii" ->
524 "ascii" ->
329 parseYAML v >>= \x -> return (\o -> o{ optAscii = x })
525 parseYAML v >>= \x -> return (\o -> o{ optAscii = x })
330 "default-image-extension" ->
526 "default-image-extension" ->
@@ -347,21 +543,18 @@ doOpt (k',v) = do
347 (parseYAML v >>= \x -> return (\o -> o{ optCss = optCss o <>
543 (parseYAML v >>= \x -> return (\o -> o{ optCss = optCss o <>
348 [unpack x] }))
544 [unpack x] }))
349 "bibliography" ->
545 "bibliography" ->
350− do let addItem x o = o{ optMetadata =
546+ (parseYAML v >>= \x -> return (\o ->
351− addMeta "bibliography" (T.unpack x)
547+ o{ optBibliography = optBibliography o <>
352− (optMetadata o) }
548+ map unpack x }))
549+ <|>
353− (parseYAML v >>= \(xs :: [Text]) -> return $ \o ->
550+ (parseYAML v >>= \x -> return (\o ->
354− foldr addItem o xs)
551+ o{ optBibliography = optBibliography o <>
355− <|>
552+ [unpack x] }))
356− (parseYAML v >>= \(x :: Text) -> return $ \o -> addItem x o)
357 "csl" ->
553 "csl" ->
358− do let addItem x o = o{ optMetadata =
554+ parseYAML v >>= \x -> return (\o -> o{ optCSL = unpack <$> x })
359− addMeta "csl" (T.unpack x)
555+ "citation-abbreviations" ->
360− (optMetadata o) }
361− (parseYAML v >>= \(xs :: [Text]) -> return $ \o ->
556+ parseYAML v >>= \x -> return (\o -> o{ optCitationAbbreviations =
362− foldr addItem o xs)
557+ unpack <$> x })
363− <|>
364− (parseYAML v >>= \(x :: Text) -> return $ \o -> addItem x o)
365 "ipynb-output" ->
558 "ipynb-output" ->
366 parseYAML v >>= \x -> return (\o -> o{ optIpynbOutput = x })
559 parseYAML v >>= \x -> return (\o -> o{ optIpynbOutput = x })
367 "include-before-body" ->
560 "include-before-body" ->
@@ -390,7 +583,8 @@ doOpt (k',v) = do
390 optIncludeInHeader o <> [unpack x] }))
583 optIncludeInHeader o <> [unpack x] }))
391 "resource-path" ->
584 "resource-path" ->
392 parseYAML v >>= \x ->
585 parseYAML v >>= \x ->
393− return (\o -> o{ optResourcePath = map unpack x })
586+ return (\o -> o{ optResourcePath = map unpack x <>
587+ optResourcePath o })
394 "request-headers" ->
588 "request-headers" ->
395 parseYAML v >>= \x ->
589 parseYAML v >>= \x ->
396 return (\o -> o{ optRequestHeaders = x })
590 return (\o -> o{ optRequestHeaders = x })
@@ -459,7 +653,7 @@ defaultOpts = Opt
459 , optPdfEngine = Nothing
653 , optPdfEngine = Nothing
460 , optPdfEngineOpts = []
654 , optPdfEngineOpts = []
461 , optSlideLevel = Nothing
655 , optSlideLevel = Nothing
462− , optSetextHeaders = True
656+ , optSetextHeaders = False
463 , optAscii = False
657 , optAscii = False
464 , optDefaultImageExtension = ""
658 , optDefaultImageExtension = ""
465 , optExtractMedia = Nothing
659 , optExtractMedia = Nothing
@@ -476,38 +670,70 @@ defaultOpts = Opt
476 , optNoCheckCertificate = False
670 , optNoCheckCertificate = False
477 , optEol = Native
671 , optEol = Native
478 , optStripComments = False
672 , optStripComments = False
673+ , optCSL = Nothing
674+ , optBibliography = []
675+ , optCitationAbbreviations = Nothing
479 }
676 }
480
677
678+parseStringKey :: Node Pos -> Parser Text
679+parseStringKey k = case k of
680+ Scalar _ (SStr t) -> return t
681+ Scalar _ _ -> failAtNode k "Non-string key"
682+ _ -> failAtNode k "Non-scalar key"
683+
481yamlToMeta :: Node Pos -> Parser Meta
684yamlToMeta :: Node Pos -> Parser Meta
482yamlToMeta (Mapping _ _ m) =
685yamlToMeta (Mapping _ _ m) =
483 either (fail . show) return $ runEverything (yamlMap pMetaString m)
686 either (fail . show) return $ runEverything (yamlMap pMetaString m)
484 where
687 where
485 pMetaString = pure . MetaString <$> P.manyChar P.anyChar
688 pMetaString = pure . MetaString <$> P.manyChar P.anyChar
689+ runEverything p =
486− runEverything p = runPure (P.readWithM p def "")
690+ runPure (P.readWithM p (def :: P.ParserState) ("" :: Text))
487 >>= fmap (Meta . flip P.runF def)
691 >>= fmap (Meta . flip P.runF def)
488yamlToMeta _ = return mempty
692yamlToMeta _ = return mempty
489
693
490−addMeta :: String -> String -> Meta -> Meta
694+-- | Apply defaults from --defaults file.
491−addMeta k v meta =
695+applyDefaults :: (PandocMonad m, MonadIO m)
492− case lookupMeta k' meta of
696+ => Opt
493− Nothing -> setMeta k' v' meta
697+ -> FilePath
494− Just (MetaList xs) ->
698+ -> StateT DefaultsState m Opt
495− setMeta k' (MetaList (xs ++ [v'])) meta
699+applyDefaults opt file = do
496− Just x -> setMeta k' (MetaList [x, v']) meta
700+ setVerbosity $ optVerbosity opt
497− where
701+ modify $ \defsState -> defsState{ curDefaults = Just file }
498− v' = readMetaValue v
702+ inp <- readFileLazy file
499− k' = T.pack k
703+ case decode1 inp of
704+ Right f -> f opt
705+ Left (errpos, errmsg) -> throwError $
706+ PandocParseError $ T.pack $
707+ "Error parsing " ++ file ++ " line " ++
708+ show (posLine errpos) ++ " column " ++
709+ show (posColumn errpos) ++ ":\n" ++ errmsg
500
710
501−readMetaValue :: String -> MetaValue
711+fullDefaultsPath :: (PandocMonad m, MonadIO m)
502−readMetaValue s
712+ => Maybe FilePath
503− | s == "true" = MetaBool True
713+ -> FilePath
504− | s == "True" = MetaBool True
714+ -> m FilePath
505− | s == "TRUE" = MetaBool True
715+fullDefaultsPath dataDir file = do
506− | s == "false" = MetaBool False
716+ let fp = if null (takeExtension file)
507− | s == "False" = MetaBool False
717+ then addExtension file "yaml"
508− | s == "FALSE" = MetaBool False
718+ else file
509− | otherwise = MetaString $ T.pack s
719+ defaultDataDir <- liftIO defaultUserDataDir
720+ let defaultFp = fromMaybe defaultDataDir dataDir </> "defaults" </> fp
721+ fromMaybe fp <$> findM fileExists [fp, defaultFp]
510
722
723+-- | In a list of lists, append another list in front of every list which
724+-- starts with specific element.
725+expand :: Ord a => [[a]] -> [a] -> a -> [[a]]
726+expand [] ns n = fmap (\x -> x : [n]) ns
727+expand ps ns n = concatMap (ext n ns) ps
728+ where
729+ ext x xs p = case p of
730+ (l : _) | x == l -> fmap (: p) xs
731+ _ -> [p]
732+
733+cyclic :: Ord a => [[a]] -> Bool
734+cyclic = any hasDuplicate
735+ where
736+ hasDuplicate xs = length (ordNub xs) /= length xs
511
737
512-- see https://github.com/jgm/pandoc/pull/4083
738-- see https://github.com/jgm/pandoc/pull/4083
513-- using generic deriving caused long compilation times
739-- using generic deriving caused long compilation times
src/Text/Pandoc/App/OutputSettings.hs+3−3
@@ -5,7 +5,7 @@
5{-# LANGUAGE TupleSections #-}
5{-# LANGUAGE TupleSections #-}
6{- |
6{- |
7 Module : Text.Pandoc.App
7 Module : Text.Pandoc.App
8− Copyright : Copyright (C) 2006-2020 John MacFarlane
8+ Copyright : Copyright (C) 2006-2021 John MacFarlane
9 License : GNU GPL, version 2 or above
9 License : GNU GPL, version 2 or above
10
10
11 Maintainer : John MacFarlane <jgm@berkeley@edu>
11 Maintainer : John MacFarlane <jgm@berkeley@edu>
@@ -59,8 +59,8 @@ optToOutputSettings opts = do
59 let outputFile = fromMaybe "-" (optOutputFile opts)
59 let outputFile = fromMaybe "-" (optOutputFile opts)
60
60
61 when (optDumpArgs opts) . liftIO $ do
61 when (optDumpArgs opts) . liftIO $ do
62− UTF8.hPutStrLn stdout outputFile
62+ UTF8.hPutStrLn stdout (T.pack outputFile)
63− mapM_ (UTF8.hPutStrLn stdout) (fromMaybe [] $ optInputFiles opts)
63+ mapM_ (UTF8.hPutStrLn stdout . T.pack) (fromMaybe [] $ optInputFiles opts)
64 exitSuccess
64 exitSuccess
65
65
66 epubMetadata <- traverse readUtf8File $ optEpubMetadata opts
66 epubMetadata <- traverse readUtf8File $ optEpubMetadata opts
src/Text/Pandoc/Asciify.hs+14−391
@@ -1,6 +1,6 @@
1{- |
1{- |
2 Module : Text.Pandoc.Asciify
2 Module : Text.Pandoc.Asciify
3− Copyright : Copyright (C) 2013-2020 John MacFarlane
3+ Copyright : Copyright (C) 2013-2021 John MacFarlane
4 License : GNU GPL, version 2 or above
4 License : GNU GPL, version 2 or above
5
5
6 Maintainer : John MacFarlane <jgm@berkeley.edu>
6 Maintainer : John MacFarlane <jgm@berkeley.edu>
@@ -10,396 +10,19 @@
10Function to convert accented latin letters to their unaccented
10Function to convert accented latin letters to their unaccented
11ascii equivalents (used in constructing HTML identifiers).
11ascii equivalents (used in constructing HTML identifiers).
12-}
12-}
13−module Text.Pandoc.Asciify (toAsciiChar)
13+module Text.Pandoc.Asciify (toAsciiChar, toAsciiText)
14where
14where
15−import Data.Char (isAscii)
15+import Data.Char (isAscii, isMark)
16−import qualified Data.Map as M
16+import qualified Data.Text.Normalize as TN
17+import Data.Text (Text)
18+import qualified Data.Text as T
17
19
18−toAsciiChar :: Char -> Maybe Char
20+toAsciiText :: Text -> Text
19−toAsciiChar c | isAscii c = Just c
21+toAsciiText = T.filter isAscii . TN.normalize (TN.NFD)
20− | otherwise = M.lookup c asciiMap
21
22
22−asciiMap :: M.Map Char Char
23+toAsciiChar :: Char -> Maybe Char
23−asciiMap = M.fromList
24+toAsciiChar c = case T.unpack (TN.normalize TN.NFD (T.singleton c)) of
24− [('\192','A')
25+ (x:xs) | isAscii x
25− ,('\193','A')
26+ , all isMark xs
26− ,('\194','A')
27+ -> Just x
27− ,('\195','A')
28+ _ -> Nothing
28− ,('\196','A')
29− ,('\197','A')
30− ,('\199','C')
31− ,('\200','E')
32− ,('\201','E')
33− ,('\202','E')
34− ,('\203','E')
35− ,('\204','I')
36− ,('\205','I')
37− ,('\206','I')
38− ,('\207','I')
39− ,('\209','N')
40− ,('\210','O')
41− ,('\211','O')
42− ,('\212','O')
43− ,('\213','O')
44− ,('\214','O')
45− ,('\217','U')
46− ,('\218','U')
47− ,('\219','U')
48− ,('\220','U')
49− ,('\221','Y')
50− ,('\224','a')
51− ,('\225','a')
52− ,('\226','a')
53− ,('\227','a')
54− ,('\228','a')
55− ,('\229','a')
56− ,('\231','c')
57− ,('\232','e')
58− ,('\233','e')
59− ,('\234','e')
60− ,('\235','e')
61− ,('\236','i')
62− ,('\237','i')
63− ,('\238','i')
64− ,('\239','i')
65− ,('\241','n')
66− ,('\242','o')
67− ,('\243','o')
68− ,('\244','o')
69− ,('\245','o')
70− ,('\246','o')
71− ,('\249','u')
72− ,('\250','u')
73− ,('\251','u')
74− ,('\252','u')
75− ,('\253','y')
76− ,('\255','y')
77− ,('\256','A')
78− ,('\257','a')
79− ,('\258','A')
80− ,('\259','a')
81− ,('\260','A')
82− ,('\261','a')
83− ,('\262','C')
84− ,('\263','c')
85− ,('\264','C')
86− ,('\265','c')
87− ,('\266','C')
88− ,('\267','c')
89− ,('\268','C')
90− ,('\269','c')
91− ,('\270','D')
92− ,('\271','d')
93− ,('\274','E')
94− ,('\275','e')
95− ,('\276','E')
96− ,('\277','e')
97− ,('\278','E')
98− ,('\279','e')
99− ,('\280','E')
100− ,('\281','e')
101− ,('\282','E')
102− ,('\283','e')
103− ,('\284','G')
104− ,('\285','g')
105− ,('\286','G')
106− ,('\287','g')
107− ,('\288','G')
108− ,('\289','g')
109− ,('\290','G')
110− ,('\291','g')
111− ,('\292','H')
112− ,('\293','h')
113− ,('\296','I')
114− ,('\297','i')
115− ,('\298','I')
116− ,('\299','i')
117− ,('\300','I')
118− ,('\301','i')
119− ,('\302','I')
120− ,('\303','i')
121− ,('\304','I')
122− ,('\305','i')
123− ,('\308','J')
124− ,('\309','j')
125− ,('\310','K')
126− ,('\311','k')
127− ,('\313','L')
128− ,('\314','l')
129− ,('\315','L')
130− ,('\316','l')
131− ,('\317','L')
132− ,('\318','l')
133− ,('\323','N')
134− ,('\324','n')
135− ,('\325','N')
136− ,('\326','n')
137− ,('\327','N')
138− ,('\328','n')
139− ,('\332','O')
140− ,('\333','o')
141− ,('\334','O')
142− ,('\335','o')
143− ,('\336','O')
144− ,('\337','o')
145− ,('\340','R')
146− ,('\341','r')
147− ,('\342','R')
148− ,('\343','r')
149− ,('\344','R')
150− ,('\345','r')
151− ,('\346','S')
152− ,('\347','s')
153− ,('\348','S')
154− ,('\349','s')
155− ,('\350','S')
156− ,('\351','s')
157− ,('\352','S')
158− ,('\353','s')
159− ,('\354','T')
160− ,('\355','t')
161− ,('\356','T')
162− ,('\357','t')
163− ,('\360','U')
164− ,('\361','u')
165− ,('\362','U')
166− ,('\363','u')
167− ,('\364','U')
168− ,('\365','u')
169− ,('\366','U')
170− ,('\367','u')
171− ,('\368','U')
172− ,('\369','u')
173− ,('\370','U')
174− ,('\371','u')
175− ,('\372','W')
176− ,('\373','w')
177− ,('\374','Y')
178− ,('\375','y')
179− ,('\376','Y')
180− ,('\377','Z')
181− ,('\378','z')
182− ,('\379','Z')
183− ,('\380','z')
184− ,('\381','Z')
185− ,('\382','z')
186− ,('\416','O')
187− ,('\417','o')
188− ,('\431','U')
189− ,('\432','u')
190− ,('\461','A')
191− ,('\462','a')
192− ,('\463','I')
193− ,('\464','i')
194− ,('\465','O')
195− ,('\466','o')
196− ,('\467','U')
197− ,('\468','u')
198− ,('\486','G')
199− ,('\487','g')
200− ,('\488','K')
201− ,('\489','k')
202− ,('\490','O')
203− ,('\491','o')
204− ,('\496','j')
205− ,('\500','G')
206− ,('\501','g')
207− ,('\504','N')
208− ,('\505','n')
209− ,('\512','A')
210− ,('\513','a')
211− ,('\514','A')
212− ,('\515','a')
213− ,('\516','E')
214− ,('\517','e')
215− ,('\518','E')
216− ,('\519','e')
217− ,('\520','I')
218− ,('\521','i')
219− ,('\522','I')
220− ,('\523','i')
221− ,('\524','O')
222− ,('\525','o')
223− ,('\526','O')
224− ,('\527','o')
225− ,('\528','R')
226− ,('\529','r')
227− ,('\530','R')
228− ,('\531','r')
229− ,('\532','U')
230− ,('\533','u')
231− ,('\534','U')
232− ,('\535','u')
233− ,('\536','S')
234− ,('\537','s')
235− ,('\538','T')
236− ,('\539','t')
237− ,('\542','H')
238− ,('\543','h')
239− ,('\550','A')
240− ,('\551','a')
241− ,('\552','E')
242− ,('\553','e')
243− ,('\558','O')
244− ,('\559','o')
245− ,('\562','Y')
246− ,('\563','y')
247− ,('\894',';')
248− ,('\7680','A')
249− ,('\7681','a')
250− ,('\7682','B')
251− ,('\7683','b')
252− ,('\7684','B')
253− ,('\7685','b')
254− ,('\7686','B')
255− ,('\7687','b')
256− ,('\7690','D')
257− ,('\7691','d')
258− ,('\7692','D')
259− ,('\7693','d')
260− ,('\7694','D')
261− ,('\7695','d')
262− ,('\7696','D')
263− ,('\7697','d')
264− ,('\7698','D')
265− ,('\7699','d')
266− ,('\7704','E')
267− ,('\7705','e')
268− ,('\7706','E')
269− ,('\7707','e')
270− ,('\7710','F')
271− ,('\7711','f')
272− ,('\7712','G')
273− ,('\7713','g')
274− ,('\7714','H')
275− ,('\7715','h')
276− ,('\7716','H')
277− ,('\7717','h')
278− ,('\7718','H')
279− ,('\7719','h')
280− ,('\7720','H')
281− ,('\7721','h')
282− ,('\7722','H')
283− ,('\7723','h')
284− ,('\7724','I')
285− ,('\7725','i')
286− ,('\7728','K')
287− ,('\7729','k')
288− ,('\7730','K')
289− ,('\7731','k')
290− ,('\7732','K')
291− ,('\7733','k')
292− ,('\7734','L')
293− ,('\7735','l')
294− ,('\7738','L')
295− ,('\7739','l')
296− ,('\7740','L')
297− ,('\7741','l')
298− ,('\7742','M')
299− ,('\7743','m')
300− ,('\7744','M')
301− ,('\7745','m')
302− ,('\7746','M')
303− ,('\7747','m')
304− ,('\7748','N')
305− ,('\7749','n')
306− ,('\7750','N')
307− ,('\7751','n')
308− ,('\7752','N')
309− ,('\7753','n')
310− ,('\7754','N')
311− ,('\7755','n')
312− ,('\7764','P')
313− ,('\7765','p')
314− ,('\7766','P')
315− ,('\7767','p')
316− ,('\7768','R')
317− ,('\7769','r')
318− ,('\7770','R')
319− ,('\7771','r')
320− ,('\7774','R')
321− ,('\7775','r')
322− ,('\7776','S')
323− ,('\7777','s')
324− ,('\7778','S')
325− ,('\7779','s')
326− ,('\7786','T')
327− ,('\7787','t')
328− ,('\7788','T')
329− ,('\7789','t')
330− ,('\7790','T')
331− ,('\7791','t')
332− ,('\7792','T')
333− ,('\7793','t')
334− ,('\7794','U')
335− ,('\7795','u')
336− ,('\7796','U')
337− ,('\7797','u')
338− ,('\7798','U')
339− ,('\7799','u')
340− ,('\7804','V')
341− ,('\7805','v')
342− ,('\7806','V')
343− ,('\7807','v')
344− ,('\7808','W')
345− ,('\7809','w')
346− ,('\7810','W')
347− ,('\7811','w')
348− ,('\7812','W')
349− ,('\7813','w')
350− ,('\7814','W')
351− ,('\7815','w')
352− ,('\7816','W')
353− ,('\7817','w')
354− ,('\7818','X')
355− ,('\7819','x')
356− ,('\7820','X')
357− ,('\7821','x')
358− ,('\7822','Y')
359− ,('\7823','y')
360− ,('\7824','Z')
361− ,('\7825','z')
362− ,('\7826','Z')
363− ,('\7827','z')
364− ,('\7828','Z')
365− ,('\7829','z')
366− ,('\7830','h')
367− ,('\7831','t')
368− ,('\7832','w')
369− ,('\7833','y')
370− ,('\7840','A')
371− ,('\7841','a')
372− ,('\7842','A')
373− ,('\7843','a')
374− ,('\7864','E')
375− ,('\7865','e')
376− ,('\7866','E')
377− ,('\7867','e')
378− ,('\7868','E')
379− ,('\7869','e')
380− ,('\7880','I')
381− ,('\7881','i')
382− ,('\7882','I')
383− ,('\7883','i')
384− ,('\7884','O')
385− ,('\7885','o')
386− ,('\7886','O')
387− ,('\7887','o')
388− ,('\7908','U')
389− ,('\7909','u')
390− ,('\7910','U')
391− ,('\7911','u')
392− ,('\7922','Y')
393− ,('\7923','y')
394− ,('\7924','Y')
395− ,('\7925','y')
396− ,('\7926','Y')
397− ,('\7927','y')
398− ,('\7928','Y')
399− ,('\7929','y')
400− ,('\8175','`')
401− ,('\8490','K')
402− ,('\8800','=')
403− ,('\8814','<')
404− ,('\8815','>')
405− ]
src/Text/Pandoc/BCP47.hsdeleted−112
@@ -1,112 +0,0 @@
1−{-# LANGUAGE OverloadedStrings #-}
2−{- |
3− Module : Text.Pandoc.BCP47
4− Copyright : Copyright (C) 2017–2020 John MacFarlane
5− License : GNU GPL, version 2 or above
6−
7− Maintainer : John MacFarlane <jgm@berkeley.edu>
8− Stability : alpha
9− Portability : portable
10−
11−Functions for parsing and rendering BCP47 language identifiers.
12−-}
13−module Text.Pandoc.BCP47 (
14− getLang
15− , parseBCP47
16− , Lang(..)
17− , renderLang
18− )
19−where
20−import Control.Monad (guard)
21−import Data.Char (isAlphaNum, isAscii, isLetter, isLower, isUpper)
22−import Text.Pandoc.Definition
23−import Text.Pandoc.Options
24−import Text.DocTemplates (FromContext(..))
25−import qualified Data.Text as T
26−import qualified Text.Parsec as P
27−
28−-- | Represents BCP 47 language/country code.
29−data Lang = Lang{ langLanguage :: T.Text
30− , langScript :: T.Text
31− , langRegion :: T.Text
32− , langVariants :: [T.Text] }
33− deriving (Eq, Ord, Show)
34−
35−-- | Render a Lang as BCP 47.
36−renderLang :: Lang -> T.Text
37−renderLang lang = T.intercalate "-" (langLanguage lang : filter (not . T.null)
38− ([langScript lang, langRegion lang] ++ langVariants lang))
39−
40−-- | Get the contents of the `lang` metadata field or variable.
41−getLang :: WriterOptions -> Meta -> Maybe T.Text
42−getLang opts meta =
43− case lookupContext "lang" (writerVariables opts) of
44− Just s -> Just s
45− _ ->
46− case lookupMeta "lang" meta of
47− Just (MetaBlocks [Para [Str s]]) -> Just s
48− Just (MetaBlocks [Plain [Str s]]) -> Just s
49− Just (MetaInlines [Str s]) -> Just s
50− Just (MetaString s) -> Just s
51− _ -> Nothing
52−
53−-- | Parse a BCP 47 string as a Lang. Currently we parse
54−-- extensions and private-use fields as "variants," even
55−-- though officially they aren't.
56−parseBCP47 :: T.Text -> Either T.Text Lang
57−parseBCP47 lang =
58− case P.parse bcp47 "lang" lang of
59− Right r -> Right r
60− Left e -> Left $ T.pack $ show e
61− where bcp47 = do
62− language <- pLanguage
63− script <- P.option "" pScript
64− region <- P.option "" pRegion
65− variants <- P.many (pVariant P.<|> pExtension P.<|> pPrivateUse)
66− P.eof
67− return Lang{ langLanguage = language
68− , langScript = script
69− , langRegion = region
70− , langVariants = variants }
71− asciiLetter = P.satisfy (\c -> isAscii c && isLetter c)
72− pLanguage = do
73− cs <- P.many1 asciiLetter
74− let lcs = length cs
75− guard $ lcs == 2 || lcs == 3
76− return $ T.toLower $ T.pack cs
77− pScript = P.try $ do
78− P.char '-'
79− x <- P.satisfy (\c -> isAscii c && isLetter c && isUpper c)
80− xs <- P.count 3
81− (P.satisfy (\c -> isAscii c && isLetter c && isLower c))
82− return $ T.toLower $ T.pack (x:xs)
83− pRegion = P.try $ do
84− P.char '-'
85− cs <- P.many1 asciiLetter
86− let lcs = length cs
87− guard $ lcs == 2 || lcs == 3
88− return $ T.toUpper $ T.pack cs
89− pVariant = P.try $ do
90− P.char '-'
91− ds <- P.option "" (P.count 1 P.digit)
92− cs <- P.many1 asciiLetter
93− let var = ds ++ cs
94− lv = length var
95− guard $ if null ds
96− then lv >= 5 && lv <= 8
97− else lv == 4
98− return $ T.toLower $ T.pack var
99− pExtension = P.try $ do
100− P.char '-'
101− cs <- P.many1 $ P.satisfy (\c -> isAscii c && isAlphaNum c)
102− let lcs = length cs
103− guard $ lcs >= 2 && lcs <= 8
104− return $ T.toLower $ T.pack cs
105− pPrivateUse = P.try $ do
106− P.char '-'
107− P.char 'x'
108− P.char '-'
109− cs <- P.many1 $ P.satisfy (\c -> isAscii c && isAlphaNum c)
110− guard $ not (null cs) && length cs <= 8
111− let var = "x-" ++ cs
112− return $ T.toLower $ T.pack var
src/Text/Pandoc/CSS.hs+24−25
@@ -1,6 +1,6 @@
1{- |
1{- |
2Module : Text.Pandoc.CSS
2Module : Text.Pandoc.CSS
3−Copyright : © 2006-2020 John MacFarlane <jgm@berkeley.edu>,
3+Copyright : © 2006-2021 John MacFarlane <jgm@berkeley.edu>,
4 2015-2016 Mauro Bieg,
4 2015-2016 Mauro Bieg,
5 2015 Ophir Lifshitz <hangfromthefloor@gmail.com>
5 2015 Ophir Lifshitz <hangfromthefloor@gmail.com>
6License : GNU GPL, version 2 or above
6License : GNU GPL, version 2 or above
@@ -11,47 +11,46 @@ Portability : portable
11
11
12Tools for working with CSS.
12Tools for working with CSS.
13-}
13-}
14−module Text.Pandoc.CSS ( foldOrElse
14+module Text.Pandoc.CSS
15+ ( cssAttributes
15− , pickStyleAttrProps
16+ , pickStyleAttrProps
16− , pickStylesToKVs
17+ , pickStylesToKVs
17− )
18+ )
18where
19where
19
20
20−import qualified Data.Text as T
21+import Data.Maybe (mapMaybe, listToMaybe)
22+import Data.Text (Text, pack)
21import Text.Pandoc.Shared (trim)
23import Text.Pandoc.Shared (trim)
22import Text.Parsec
24import Text.Parsec
23import Text.Parsec.Text
25import Text.Parsec.Text
24
26
25−ruleParser :: Parser (T.Text, T.Text)
27+ruleParser :: Parser (Text, Text)
26ruleParser = do
28ruleParser = do
27 p <- many1 (noneOf ":") <* char ':'
29 p <- many1 (noneOf ":") <* char ':'
28 v <- many1 (noneOf ":;") <* optional (char ';') <* spaces
30 v <- many1 (noneOf ":;") <* optional (char ';') <* spaces
29− return (trim $ T.pack p, trim $ T.pack v)
31+ return (trim $ pack p, trim $ pack v)
30
32
31−styleAttrParser :: Parser [(T.Text, T.Text)]
33+styleAttrParser :: Parser [(Text, Text)]
32styleAttrParser = many1 ruleParser
34styleAttrParser = many1 ruleParser
33
35
34−orElse :: Eq a => a -> a -> a -> a
36+-- | Parses a style string, returning the CSS attributes.
35−orElse v x y = if v == x then y else x
37+-- Returns an empty list on failure.
36−
38+cssAttributes :: Text -> [(Text, Text)]
37−foldOrElse :: Eq a => a -> [a] -> a
39+cssAttributes styleString =
38−foldOrElse v xs = foldr (orElse v) v xs
40+ -- Use Data.Either.fromRight once GHC 8.0 is no longer supported
39−
41+ case parse styleAttrParser "" styleString of
40−eitherToMaybe :: Either a b -> Maybe b
42+ Left _ -> []
41−eitherToMaybe (Right x) = Just x
43+ Right x -> x
42−eitherToMaybe _ = Nothing
43
44
44-- | takes a list of keys/properties and a CSS string and
45-- | takes a list of keys/properties and a CSS string and
45-- returns the corresponding key-value-pairs.
46-- returns the corresponding key-value-pairs.
46−pickStylesToKVs :: [T.Text] -> T.Text -> [(T.Text, T.Text)]
47+pickStylesToKVs :: [Text] -> Text -> [(Text, Text)]
47pickStylesToKVs props styleAttr =
48pickStylesToKVs props styleAttr =
48− case parse styleAttrParser "" styleAttr of
49− Left _ -> []
50− Right styles -> filter (\s -> fst s `elem` props) styles
49+ filter (\s -> fst s `elem` props) $ cssAttributes styleAttr
51
50
52-- | takes a list of key/property synonyms and a CSS string and maybe
51-- | takes a list of key/property synonyms and a CSS string and maybe
53-- returns the value of the first match (in order of the supplied list)
52-- returns the value of the first match (in order of the supplied list)
54−pickStyleAttrProps :: [T.Text] -> T.Text -> Maybe T.Text
53+pickStyleAttrProps :: [Text] -> Text -> Maybe Text
55pickStyleAttrProps lookupProps styleAttr = do
54pickStyleAttrProps lookupProps styleAttr = do
56− styles <- eitherToMaybe $ parse styleAttrParser "" styleAttr
55+ styles <- either (const Nothing) Just $ parse styleAttrParser "" styleAttr
57− foldOrElse Nothing $ map (`lookup` styles) lookupProps
56+ listToMaybe $ mapMaybe (`lookup` styles) lookupProps
src/Text/Pandoc/CSV.hs+2−3
@@ -1,6 +1,6 @@
1{- |
1{- |
2 Module : Text.Pandoc.CSV
2 Module : Text.Pandoc.CSV
3− Copyright : Copyright (C) 2017–2020 John MacFarlane <jgm@berkeley.edu>
3+ Copyright : Copyright (C) 2017-2021 John MacFarlane <jgm@berkeley.edu>
4 License : GNU GPL, version 2 or above
4 License : GNU GPL, version 2 or above
5 Maintainer : John MacFarlane <jgm@berkeley.edu>
5 Maintainer : John MacFarlane <jgm@berkeley.edu>
6 Stability : alpha
6 Stability : alpha
@@ -68,8 +68,7 @@ escaped opts = try $
68
68
69pCSVUnquotedCell :: CSVOptions -> Parser Text
69pCSVUnquotedCell :: CSVOptions -> Parser Text
70pCSVUnquotedCell opts = T.pack <$>
70pCSVUnquotedCell opts = T.pack <$>
71− many (satisfy (\c -> c /= csvDelim opts && c /= '\r' && c /= '\n'
71+ many (satisfy (\c -> c /= csvDelim opts && c /= '\r' && c /= '\n'))
72− && c /= csvQuote opts))
73
72
74pCSVDelim :: CSVOptions -> Parser ()
73pCSVDelim :: CSVOptions -> Parser ()
75pCSVDelim opts = do
74pCSVDelim opts = do
src/Text/Pandoc/Citeproc.hsnew file+661
@@ -0,0 +1,661 @@
1+{-# LANGUAGE ScopedTypeVariables #-}
2+{-# LANGUAGE FlexibleContexts #-}
3+{-# LANGUAGE StrictData #-}
4+{-# LANGUAGE MultiParamTypeClasses #-}
5+{-# LANGUAGE FlexibleInstances #-}
6+{-# LANGUAGE OverloadedStrings #-}
7+module Text.Pandoc.Citeproc
8+ ( processCitations,
9+ getReferences,
10+ getStyle
11+ )
12+where
13+
14+import Citeproc
15+import Citeproc.Pandoc ()
16+import Text.Pandoc.Citeproc.Locator (parseLocator)
17+import Text.Pandoc.Citeproc.CslJson (cslJsonToReferences)
18+import Text.Pandoc.Citeproc.BibTeX (readBibtexString, Variant(..))
19+import Text.Pandoc.Citeproc.MetaValue (metaValueToReference, metaValueToText)
20+import Text.Pandoc.Readers.Markdown (yamlToRefs)
21+import Text.Pandoc.Builder (Inlines, Many(..), deleteMeta, setMeta)
22+import qualified Text.Pandoc.Builder as B
23+import Text.Pandoc.Definition as Pandoc
24+import Text.Pandoc.Class (PandocMonad(..), getResourcePath, getUserDataDir,
25+ fetchItem, readDataFile, report, setResourcePath)
26+import Text.Pandoc.Error (PandocError(..))
27+import Text.Pandoc.Extensions (pandocExtensions)
28+import Text.Pandoc.Logging (LogMessage(..))
29+import Text.Pandoc.Options (ReaderOptions(..))
30+import Text.Pandoc.Shared (stringify, ordNub, tshow)
31+import qualified Text.Pandoc.UTF8 as UTF8
32+import Text.Pandoc.Walk (query, walk, walkM)
33+import Control.Applicative ((<|>))
34+import Control.Monad.Except (catchError, throwError)
35+import Control.Monad.State (State, evalState, get, put, runState)
36+import Data.Aeson (eitherDecode)
37+import Data.ByteString (ByteString)
38+import qualified Data.ByteString.Lazy as L
39+import Data.Char (isPunctuation, isUpper)
40+import Data.Default (Default(def))
41+import qualified Data.Foldable as Foldable
42+import qualified Data.Map as M
43+import Data.Maybe (mapMaybe, fromMaybe)
44+import Data.Ord ()
45+import qualified Data.Sequence as Seq
46+import qualified Data.Set as Set
47+import Data.Text (Text)
48+import qualified Data.Text as T
49+import System.FilePath (takeExtension)
50+import Safe (lastMay, initSafe)
51+
52+
53+processCitations :: PandocMonad m => Pandoc -> m Pandoc
54+processCitations (Pandoc meta bs) = do
55+ style <- getStyle (Pandoc meta bs)
56+
57+ mblang <- getLang meta
58+ let locale = Citeproc.mergeLocales mblang style
59+
60+ refs <- getReferences (Just locale) (Pandoc meta bs)
61+
62+ let otherIdsMap = foldr (\ref m ->
63+ case T.words . extractText <$>
64+ M.lookup "other-ids"
65+ (referenceVariables ref) of
66+ Nothing -> m
67+ Just ids -> foldr
68+ (\id' ->
69+ M.insert id' (referenceId ref)) m ids)
70+ M.empty refs
71+ let meta' = deleteMeta "nocite" meta
72+ let citations = getCitations locale otherIdsMap $ Pandoc meta' bs
73+
74+
75+ let linkCites = maybe False truish $ lookupMeta "link-citations" meta
76+ let opts = defaultCiteprocOptions{ linkCitations = linkCites }
77+ let result = Citeproc.citeproc opts style mblang refs citations
78+ mapM_ (report . CiteprocWarning) (resultWarnings result)
79+ let sopts = styleOptions style
80+ let classes = "references" : -- TODO remove this or keep for compatibility?
81+ "csl-bib-body" :
82+ ["hanging-indent" | styleHangingIndent sopts]
83+ let refkvs = (case styleEntrySpacing sopts of
84+ Just es | es > 0 -> (("entry-spacing",T.pack $ show es):)
85+ _ -> id) .
86+ (case styleLineSpacing sopts of
87+ Just ls | ls > 1 -> (("line-spacing",T.pack $ show ls):)
88+ _ -> id) $ []
89+ let bibs = mconcat $ map (\(ident, out) ->
90+ B.divWith ("ref-" <> ident,["csl-entry"],[]) . B.para .
91+ walk (convertQuotes locale) .
92+ insertSpace $ out)
93+ (resultBibliography result)
94+ let moveNotes = styleIsNoteStyle sopts &&
95+ maybe True truish (lookupMeta "notes-after-punctuation" meta)
96+ let cits = map (walk (convertQuotes locale)) $
97+ resultCitations result
98+
99+ let metanocites = lookupMeta "nocite" meta
100+ let Pandoc meta'' bs' =
101+ maybe id (setMeta "nocite") metanocites .
102+ walk (mvPunct moveNotes locale) .
103+ (if styleIsNoteStyle sopts
104+ then walk addNote . walk deNote
105+ else id) .
106+ evalState (walkM insertResolvedCitations $ Pandoc meta' bs)
107+ $ cits
108+ return $ Pandoc meta''
109+ $ insertRefs refkvs classes meta''
110+ (walk fixLinks $ B.toList bibs) bs'
111+
112+-- | Retrieve the CSL style specified by the csl or citation-style
113+-- metadata field in a pandoc document, or the default CSL style
114+-- if none is specified. Retrieve the parent style
115+-- if the style is a dependent style. Add abbreviations defined
116+-- in an abbreviation file if one has been specified.
117+getStyle :: PandocMonad m => Pandoc -> m (Style Inlines)
118+getStyle (Pandoc meta _) = do
119+ let cslfile = (lookupMeta "csl" meta <|> lookupMeta "citation-style" meta)
120+ >>= metaValueToText
121+
122+ let getFile defaultExtension fp = do
123+ oldRp <- getResourcePath
124+ mbUdd <- getUserDataDir
125+ setResourcePath $ oldRp ++ maybe []
126+ (\u -> [u <> "/csl",
127+ u <> "/csl/dependent"]) mbUdd
128+ let fp' = if T.any (=='.') fp || "data:" `T.isPrefixOf` fp
129+ then fp
130+ else fp <> defaultExtension
131+ (result, _) <- fetchItem fp'
132+ setResourcePath oldRp
133+ return result
134+
135+ let getCslDefault = readDataFile "default.csl"
136+
137+ cslContents <- UTF8.toText <$> maybe getCslDefault (getFile ".csl") cslfile
138+
139+ let abbrevFile = lookupMeta "citation-abbreviations" meta >>= metaValueToText
140+
141+ mbAbbrevs <- case abbrevFile of
142+ Nothing -> return Nothing
143+ Just fp -> do
144+ rawAbbr <- getFile ".json" fp
145+ case eitherDecode (L.fromStrict rawAbbr) of
146+ Left err -> throwError $ PandocCiteprocError $
147+ CiteprocParseError $
148+ "Could not parse abbreviations file " <> fp
149+ <> "\n" <> T.pack err
150+ Right abbr -> return $ Just abbr
151+
152+ let getParentStyle url = do
153+ -- first, try to retrieve the style locally, then use HTTP.
154+ let basename = T.takeWhileEnd (/='/') url
155+ UTF8.toText <$>
156+ catchError (getFile ".csl" basename) (\_ -> fst <$> fetchItem url)
157+
158+ styleRes <- Citeproc.parseStyle getParentStyle cslContents
159+ case styleRes of
160+ Left err -> throwError $ PandocAppError $ prettyCiteprocError err
161+ Right style -> return style{ styleAbbreviations = mbAbbrevs }
162+
163+
164+-- Retrieve citeproc lang based on metadata.
165+getLang :: PandocMonad m => Meta -> m (Maybe Lang)
166+getLang meta = maybe (return Nothing) bcp47LangToIETF
167+ ((lookupMeta "lang" meta <|> lookupMeta "locale" meta) >>=
168+ metaValueToText)
169+
170+-- | Get references defined inline in the metadata and via an external
171+-- bibliography. Only references that are actually cited in the document
172+-- (either with a genuine citation or with `nocite`) are returned.
173+-- URL variables are converted to links.
174+getReferences :: PandocMonad m
175+ => Maybe Locale -> Pandoc -> m [Reference Inlines]
176+getReferences mblocale (Pandoc meta bs) = do
177+ locale <- case mblocale of
178+ Just l -> return l
179+ Nothing -> do
180+ mblang <- getLang meta
181+ case mblang of
182+ Just lang -> return $ either mempty id $ getLocale lang
183+ Nothing -> return mempty
184+
185+ let getCiteId (Cite cs _) = Set.fromList $ map B.citationId cs
186+ getCiteId _ = mempty
187+ let metanocites = lookupMeta "nocite" meta
188+ let nocites = maybe mempty (query getCiteId) metanocites
189+ let citeIds = query getCiteId (Pandoc meta bs)
190+ let idpred = if "*" `Set.member` nocites
191+ then const True
192+ else (`Set.member` citeIds)
193+ let inlineRefs = case lookupMeta "references" meta of
194+ Just (MetaList rs) ->
195+ filter (idpred . unItemId . referenceId)
196+ $ mapMaybe metaValueToReference rs
197+ _ -> []
198+ externalRefs <- case lookupMeta "bibliography" meta of
199+ Just (MetaList xs) ->
200+ mconcat <$>
201+ mapM (getRefsFromBib locale idpred)
202+ (mapMaybe metaValueToText xs)
203+ Just x ->
204+ case metaValueToText x of
205+ Just fp -> getRefsFromBib locale idpred fp
206+ Nothing -> return []
207+ Nothing -> return []
208+ return $ map (linkifyVariables . legacyDateRanges)
209+ (externalRefs ++ inlineRefs)
210+ -- note that inlineRefs can override externalRefs
211+
212+
213+
214+-- If we have a span.csl-left-margin followed by span.csl-right-inline,
215+-- we insert a space. This ensures that they will be separated by a space,
216+-- even in formats that don't have special handling for the display spans.
217+insertSpace :: Inlines -> Inlines
218+insertSpace ils =
219+ case Seq.viewl (unMany ils) of
220+ (Span ("",["csl-left-margin"],[]) xs) Seq.:< rest ->
221+ case Seq.lookup 0 rest of
222+ Just (Span ("",["csl-right-inline"],[]) _) ->
223+ Many $
224+ Span ("",["csl-left-margin"],[]) (xs ++ case lastMay xs of
225+ Just Space -> []
226+ _ -> [Space])
227+ Seq.<| rest
228+ _ -> ils
229+ _ -> ils
230+
231+getRefsFromBib :: PandocMonad m
232+ => Locale -> (Text -> Bool) -> Text -> m [Reference Inlines]
233+getRefsFromBib locale idpred fp = do
234+ (raw, _) <- fetchItem fp
235+ case formatFromExtension (T.unpack fp) of
236+ Just f -> getRefs locale f idpred (Just fp) raw
237+ Nothing -> throwError $ PandocAppError $
238+ "Could not determine bibliography format for " <> fp
239+
240+getRefs :: PandocMonad m
241+ => Locale
242+ -> BibFormat
243+ -> (Text -> Bool)
244+ -> Maybe Text
245+ -> ByteString
246+ -> m [Reference Inlines]
247+getRefs locale format idpred mbfp raw = do
248+ let err' = throwError .
249+ PandocBibliographyError (fromMaybe mempty mbfp)
250+ case format of
251+ Format_bibtex ->
252+ either (err' . tshow) return .
253+ readBibtexString Bibtex locale idpred . UTF8.toText $ raw
254+ Format_biblatex ->
255+ either (err' . tshow) return .
256+ readBibtexString Biblatex locale idpred . UTF8.toText $ raw
257+ Format_json ->
258+ either (err' . T.pack)
259+ (return . filter (idpred . unItemId . referenceId)) .
260+ cslJsonToReferences $ raw
261+ Format_yaml -> do
262+ rs <- yamlToRefs idpred
263+ def{ readerExtensions = pandocExtensions }
264+ (T.unpack <$> mbfp)
265+ (L.fromStrict raw)
266+ return $ mapMaybe metaValueToReference rs
267+
268+-- localized quotes
269+convertQuotes :: Locale -> Inline -> Inline
270+convertQuotes locale (Quoted qt ils) =
271+ case (M.lookup openterm terms, M.lookup closeterm terms) of
272+ (Just ((_,oq):_), Just ((_,cq):_)) ->
273+ Span ("",[],[]) (Str oq : ils ++ [Str cq])
274+ _ -> Quoted qt ils
275+ where
276+ terms = localeTerms locale
277+ openterm = case qt of
278+ DoubleQuote -> "open-quote"
279+ SingleQuote -> "open-inner-quote"
280+ closeterm = case qt of
281+ DoubleQuote -> "close-quote"
282+ SingleQuote -> "close-inner-quote"
283+convertQuotes _ x = x
284+
285+-- assumes we walk in same order as query
286+insertResolvedCitations :: Inline -> State [Inlines] Inline
287+insertResolvedCitations (Cite cs ils) = do
288+ resolved <- get
289+ case resolved of
290+ [] -> return (Cite cs ils)
291+ (x:xs) -> do
292+ put xs
293+ return $ Cite cs (walk fixLinks $ B.toList x)
294+insertResolvedCitations x = return x
295+
296+getCitations :: Locale
297+ -> M.Map Text ItemId
298+ -> Pandoc
299+ -> [Citeproc.Citation Inlines]
300+getCitations locale otherIdsMap = Foldable.toList . query getCitation
301+ where
302+ getCitation (Cite cs _fallback) = Seq.singleton $
303+ Citeproc.Citation { Citeproc.citationId = Nothing
304+ , Citeproc.citationNoteNumber =
305+ case cs of
306+ [] -> Nothing
307+ (Pandoc.Citation{ Pandoc.citationNoteNum = n }:
308+ _) | n > 0 -> Just n
309+ | otherwise -> Nothing
310+ , Citeproc.citationItems =
311+ fromPandocCitations locale otherIdsMap cs
312+ }
313+ getCitation _ = mempty
314+
315+fromPandocCitations :: Locale
316+ -> M.Map Text ItemId
317+ -> [Pandoc.Citation]
318+ -> [CitationItem Inlines]
319+fromPandocCitations locale otherIdsMap = concatMap go
320+ where
321+ go c =
322+ let (loclab, suffix) = parseLocator locale (citationSuffix c)
323+ (mblab, mbloc) = case loclab of
324+ Just (loc, lab) -> (Just loc, Just lab)
325+ Nothing -> (Nothing, Nothing)
326+ cit = CitationItem
327+ { citationItemId = fromMaybe
328+ (ItemId $ Pandoc.citationId c)
329+ (M.lookup (Pandoc.citationId c) otherIdsMap)
330+ , citationItemLabel = mblab
331+ , citationItemLocator = mbloc
332+ , citationItemType = NormalCite
333+ , citationItemPrefix = case citationPrefix c of
334+ [] -> Nothing
335+ ils -> Just $ B.fromList ils <>
336+ B.space
337+ , citationItemSuffix = case suffix of
338+ [] -> Nothing
339+ ils -> Just $ B.fromList ils
340+ }
341+ in if Pandoc.citationId c == "*"
342+ then []
343+ else
344+ case citationMode c of
345+ AuthorInText -> [ cit{ citationItemType = AuthorOnly
346+ , citationItemSuffix = Nothing }
347+ , cit{ citationItemType =
348+ Citeproc.SuppressAuthor
349+ , citationItemPrefix = Nothing } ]
350+ NormalCitation -> [ cit ]
351+ Pandoc.SuppressAuthor
352+ -> [ cit{ citationItemType =
353+ Citeproc.SuppressAuthor } ]
354+
355+
356+
357+data BibFormat =
358+ Format_biblatex
359+ | Format_bibtex
360+ | Format_json
361+ | Format_yaml
362+ deriving (Show, Eq, Ord)
363+
364+formatFromExtension :: FilePath -> Maybe BibFormat
365+formatFromExtension fp = case dropWhile (== '.') $ takeExtension fp of
366+ "biblatex" -> Just Format_biblatex
367+ "bibtex" -> Just Format_bibtex
368+ "bib" -> Just Format_biblatex
369+ "json" -> Just Format_json
370+ "yaml" -> Just Format_yaml
371+ _ -> Nothing
372+
373+
374+isNote :: Inline -> Bool
375+isNote (Cite _ [Note _]) = True
376+ -- the following allows citation styles that are "in-text" but use superscript
377+ -- references to be treated as if they are "notes" for the purposes of moving
378+ -- the citations after trailing punctuation (see <https://github.com/jgm/pandoc-citeproc/issues/382>):
379+isNote (Cite _ [Superscript _]) = True
380+isNote _ = False
381+
382+isSpacy :: Inline -> Bool
383+isSpacy Space = True
384+isSpacy SoftBreak = True
385+isSpacy _ = False
386+
387+movePunctInsideQuotes :: Locale -> [Inline] -> [Inline]
388+movePunctInsideQuotes locale
389+ | localePunctuationInQuote locale == Just True
390+ = B.toList . movePunctuationInsideQuotes . B.fromList
391+ | otherwise
392+ = id
393+
394+mvPunct :: Bool -> Locale -> [Inline] -> [Inline]
395+mvPunct moveNotes locale (x : xs)
396+ | isSpacy x = x : mvPunct moveNotes locale xs
397+-- 'x [^1],' -> 'x,[^1]'
398+mvPunct moveNotes locale (q : s : x : ys)
399+ | isSpacy s
400+ , isNote x
401+ = let spunct = T.takeWhile isPunctuation $ stringify ys
402+ in if moveNotes
403+ then if T.null spunct
404+ then q : x : mvPunct moveNotes locale ys
405+ else movePunctInsideQuotes locale
406+ [q , Str spunct , x] ++ mvPunct moveNotes locale
407+ (B.toList
408+ (dropTextWhile isPunctuation (B.fromList ys)))
409+ else q : x : mvPunct moveNotes locale ys
410+-- 'x[^1],' -> 'x,[^1]'
411+mvPunct moveNotes locale (Cite cs ils : ys)
412+ | not (null ils)
413+ , isNote (last ils)
414+ , startWithPunct ys
415+ , moveNotes
416+ = let s = stringify ys
417+ spunct = T.takeWhile isPunctuation s
418+ in Cite cs (movePunctInsideQuotes locale $
419+ init ils
420+ ++ [Str spunct | not (endWithPunct False (init ils))]
421+ ++ [last ils]) :
422+ mvPunct moveNotes locale
423+ (B.toList (dropTextWhile isPunctuation (B.fromList ys)))
424+mvPunct moveNotes locale (s : x : ys) | isSpacy s, isNote x =
425+ x : mvPunct moveNotes locale ys
426+mvPunct moveNotes locale (s : x@(Cite _ (Superscript _ : _)) : ys)
427+ | isSpacy s = x : mvPunct moveNotes locale ys
428+mvPunct moveNotes locale (Cite cs ils : Str "." : ys)
429+ | "." `T.isSuffixOf` (stringify ils)
430+ = Cite cs ils : mvPunct moveNotes locale ys
431+mvPunct moveNotes locale (x:xs) = x : mvPunct moveNotes locale xs
432+mvPunct _ _ [] = []
433+
434+-- move https://doi.org etc. prefix inside link text (#6723):
435+fixLinks :: [Inline] -> [Inline]
436+fixLinks (Str t : Link attr [Str u1] (u2,tit) : xs)
437+ | u2 == t <> u1
438+ = Link attr [Str (t <> u1)] (u2,tit) : fixLinks xs
439+fixLinks (x:xs) = x : fixLinks xs
440+fixLinks [] = []
441+
442+
443+endWithPunct :: Bool -> [Inline] -> Bool
444+endWithPunct _ [] = False
445+endWithPunct onlyFinal xs@(_:_) =
446+ case reverse (T.unpack $ stringify xs) of
447+ [] -> True
448+ -- covers .), .", etc.:
449+ (d:c:_) | isPunctuation d
450+ && not onlyFinal
451+ && isEndPunct c -> True
452+ (c:_) | isEndPunct c -> True
453+ | otherwise -> False
454+ where isEndPunct c = c `elem` (".,;:!?" :: String)
455+
456+
457+
458+startWithPunct :: [Inline] -> Bool
459+startWithPunct ils =
460+ case T.uncons (stringify ils) of
461+ Just (c,_) -> c `elem` (".,;:!?" :: [Char])
462+ Nothing -> False
463+
464+truish :: MetaValue -> Bool
465+truish (MetaBool t) = t
466+truish (MetaString s) = isYesValue (T.toLower s)
467+truish (MetaInlines ils) = isYesValue (T.toLower (stringify ils))
468+truish (MetaBlocks [Plain ils]) = isYesValue (T.toLower (stringify ils))
469+truish _ = False
470+
471+isYesValue :: Text -> Bool
472+isYesValue "t" = True
473+isYesValue "true" = True
474+isYesValue "yes" = True
475+isYesValue _ = False
476+
477+-- if document contains a Div with id="refs", insert
478+-- references as its contents. Otherwise, insert references
479+-- at the end of the document in a Div with id="refs"
480+insertRefs :: [(Text,Text)] -> [Text] -> Meta -> [Block] -> [Block] -> [Block]
481+insertRefs _ _ _ [] bs = bs
482+insertRefs refkvs refclasses meta refs bs =
483+ if isRefRemove meta
484+ then bs
485+ else case runState (walkM go bs) False of
486+ (bs', True) -> bs'
487+ (_, False)
488+ -> case refTitle meta of
489+ Nothing ->
490+ case reverse bs of
491+ Header lev (id',classes,kvs) ys : xs ->
492+ reverse xs ++
493+ [Header lev (id',addUnNumbered classes,kvs) ys,
494+ Div ("refs",refclasses,refkvs) refs]
495+ _ -> bs ++ [refDiv]
496+ Just ils -> bs ++
497+ [Header 1 ("bibliography", ["unnumbered"], []) ils,
498+ refDiv]
499+ where
500+ refDiv = Div ("refs", refclasses, refkvs) refs
501+ addUnNumbered cs = "unnumbered" : [c | c <- cs, c /= "unnumbered"]
502+ go :: Block -> State Bool Block
503+ go (Div ("refs",cs,kvs) xs) = do
504+ put True
505+ -- refHeader isn't used if you have an explicit references div
506+ let cs' = ordNub $ cs ++ refclasses
507+ let kvs' = ordNub $ kvs ++ refkvs
508+ return $ Div ("refs",cs',kvs') (xs ++ refs)
509+ go x = return x
510+
511+refTitle :: Meta -> Maybe [Inline]
512+refTitle meta =
513+ case lookupMeta "reference-section-title" meta of
514+ Just (MetaString s) -> Just [Str s]
515+ Just (MetaInlines ils) -> Just ils
516+ Just (MetaBlocks [Plain ils]) -> Just ils
517+ Just (MetaBlocks [Para ils]) -> Just ils
518+ _ -> Nothing
519+
520+isRefRemove :: Meta -> Bool
521+isRefRemove meta =
522+ maybe False truish $ lookupMeta "suppress-bibliography" meta
523+
524+legacyDateRanges :: Reference Inlines -> Reference Inlines
525+legacyDateRanges ref =
526+ ref{ referenceVariables = M.map go $ referenceVariables ref }
527+ where
528+ go (DateVal d)
529+ | null (dateParts d)
530+ , Just lit <- dateLiteral d
531+ = case T.splitOn "_" lit of
532+ [x,y] -> case Citeproc.rawDateEDTF (x <> "/" <> y) of
533+ Just d' -> DateVal d'
534+ Nothing -> DateVal d
535+ _ -> DateVal d
536+ go x = x
537+
538+linkifyVariables :: Reference Inlines -> Reference Inlines
539+linkifyVariables ref =
540+ ref{ referenceVariables = M.mapWithKey go $ referenceVariables ref }
541+ where
542+ go "URL" x = tolink "https://" x
543+ go "DOI" x = tolink "https://doi.org/" (fixShortDOI x)
544+ go "ISBN" x = tolink "https://worldcat.org/isbn/" x
545+ go "PMID" x = tolink "https://www.ncbi.nlm.nih.gov/pubmed/" x
546+ go "PMCID" x = tolink "https://www.ncbi.nlm.nih.gov/pmc/articles/" x
547+ go _ x = x
548+ fixShortDOI x = let x' = extractText x
549+ in if "10/" `T.isPrefixOf` x'
550+ then TextVal $ T.drop 3 x'
551+ -- see https://shortdoi.org
552+ else TextVal x'
553+ tolink pref x = let x' = extractText x
554+ x'' = if "://" `T.isInfixOf` x'
555+ then x'
556+ else pref <> x'
557+ in if T.null x'
558+ then x
559+ else FancyVal (B.link x'' "" (B.str x'))
560+
561+extractText :: Val Inlines -> Text
562+extractText (TextVal x) = x
563+extractText (FancyVal x) = toText x
564+extractText (NumVal n) = T.pack (show n)
565+extractText _ = mempty
566+
567+-- Here we take the Spans with class csl-note that are left
568+-- after deNote has removed nested ones, and convert them
569+-- into real notes.
570+addNote :: Inline -> Inline
571+addNote (Span ("",["csl-note"],[]) ils) =
572+ Note [Para $
573+ B.toList . addTextCase Nothing CapitalizeFirst . B.fromList $ ils]
574+addNote x = x
575+
576+-- Here we handle citation notes that occur inside footnotes
577+-- or other citation notes, in a note style. We don't want
578+-- notes inside notes, so we convert these to parenthesized
579+-- or comma-separated citations.
580+deNote :: Inline -> Inline
581+deNote (Note bs) =
582+ case bs of
583+ [Para (cit@(Cite (c:_) _) : ils)]
584+ | citationMode c /= AuthorInText ->
585+ -- if citation is first in note, no need to parenthesize.
586+ Note [Para (walk removeNotes $ cit : walk addParens ils)]
587+ _ -> Note (walk removeNotes . walk addParens $ bs)
588+
589+ where
590+ addParens [] = []
591+ addParens (Cite (c:cs) ils : zs)
592+ | citationMode c == AuthorInText
593+ = Cite (c:cs) (concatMap (noteAfterComma (needsPeriod zs)) ils) :
594+ addParens zs
595+ | otherwise
596+ = Cite (c:cs) (concatMap noteInParens ils) : addParens zs
597+ addParens (x:xs) = x : addParens xs
598+
599+ removeNotes (Span ("",["csl-note"],[]) ils) = Span ("",[],[]) ils
600+ removeNotes x = x
601+
602+ needsPeriod [] = True
603+ needsPeriod (Str t:_) = case T.uncons t of
604+ Nothing -> False
605+ Just (c,_) -> isUpper c
606+ needsPeriod (Space:zs) = needsPeriod zs
607+ needsPeriod _ = False
608+
609+ noteInParens (Span ("",["csl-note"],[]) ils)
610+ = Space : Str "(" :
611+ removeFinalPeriod ils ++ [Str ")"]
612+ noteInParens x = [x]
613+
614+ noteAfterComma needsPer (Span ("",["csl-note"],[]) ils)
615+ | not (null ils)
616+ = Str "," : Space :
617+ if needsPer
618+ then ils
619+ else removeFinalPeriod ils
620+ noteAfterComma _ x = [x]
621+
622+deNote x = x
623+
624+-- Note: we can't use dropTextWhileEnd indiscriminately,
625+-- because this would remove the final period on abbreviations like Ibid.
626+-- But it turns out that when the note citation ends with Ibid.
627+-- (or Ed. etc.), the last inline will be Str "" as a result of
628+-- the punctuation-fixing mechanism that removes the double '.'.
629+removeFinalPeriod :: [Inline] -> [Inline]
630+removeFinalPeriod ils =
631+ case lastMay ils of
632+ Just (Span attr ils')
633+ -> initSafe ils ++ [Span attr (removeFinalPeriod ils')]
634+ Just (Emph ils')
635+ -> initSafe ils ++ [Emph (removeFinalPeriod ils')]
636+ Just (Strong ils')
637+ -> initSafe ils ++ [Strong (removeFinalPeriod ils')]
638+ Just (SmallCaps ils')
639+ -> initSafe ils ++ [SmallCaps (removeFinalPeriod ils')]
640+ Just (Str t)
641+ | T.takeEnd 1 t == "." -> initSafe ils ++ [Str (T.dropEnd 1 t)]
642+ | isRightQuote (T.takeEnd 1 t)
643+ -> removeFinalPeriod
644+ (initSafe ils ++ [Str tInit | not (T.null tInit)]) ++ [Str tEnd]
645+ where
646+ tEnd = T.takeEnd 1 t
647+ tInit = T.dropEnd 1 t
648+ _ -> ils
649+ where
650+ isRightQuote "\8221" = True
651+ isRightQuote "\8217" = True
652+ isRightQuote "\187" = True
653+ isRightQuote _ = False
654+
655+bcp47LangToIETF :: PandocMonad m => Text -> m (Maybe Lang)
656+bcp47LangToIETF bcplang =
657+ case parseLang bcplang of
658+ Left _ -> do
659+ report $ InvalidLang bcplang
660+ return Nothing
661+ Right lang -> return $ Just lang
src/Text/Pandoc/Citeproc/BibTeX.hsnew file+1476

This diff is too big to show here.

src/Text/Pandoc/Citeproc/CslJson.hsnew file+37

This diff is too big to show here.

src/Text/Pandoc/Citeproc/Data.hsnew file+32

This diff is too big to show here.

src/Text/Pandoc/Citeproc/Locator.hsnew file+295

This diff is too big to show here.

src/Text/Pandoc/Citeproc/MetaValue.hsnew file+255

This diff is too big to show here.

src/Text/Pandoc/Citeproc/Util.hsnew file+70

This diff is too big to show here.

src/Text/Pandoc/Class/CommonState.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Class/IO.hs+24−24

This diff is too big to show here.

src/Text/Pandoc/Class/PandocMonad.hs+47−40

This diff is too big to show here.

src/Text/Pandoc/Data.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Error.hs+111−53

This diff is too big to show here.

src/Text/Pandoc/Extensions.hs+37−8

This diff is too big to show here.

src/Text/Pandoc/Filter.hs+18−7

This diff is too big to show here.

src/Text/Pandoc/Filter/JSON.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Filter/Lua.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Filter/Path.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Highlighting.hs+6−6

This diff is too big to show here.

src/Text/Pandoc/Image.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/ImageSize.hs+61−341

This diff is too big to show here.

src/Text/Pandoc/Logging.hs+86−55

This diff is too big to show here.

src/Text/Pandoc/Lua.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Lua/ErrorConversion.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Lua/Filter.hs+7−4

This diff is too big to show here.

src/Text/Pandoc/Lua/Global.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Lua/Init.hs+16−5

This diff is too big to show here.

src/Text/Pandoc/Lua/Marshaling.hs+2−2

This diff is too big to show here.

src/Text/Pandoc/Lua/Marshaling/AST.hs+80−82

This diff is too big to show here.

src/Text/Pandoc/Lua/Marshaling/AnyValue.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Lua/Marshaling/CommonState.hs+2−2

This diff is too big to show here.

src/Text/Pandoc/Lua/Marshaling/Context.hs+3−2

This diff is too big to show here.

src/Text/Pandoc/Lua/Marshaling/List.hs+2−2

This diff is too big to show here.

src/Text/Pandoc/Lua/Marshaling/MediaBag.hs+3−3

This diff is too big to show here.

src/Text/Pandoc/Lua/Marshaling/PandocError.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Lua/Marshaling/ReaderOptions.hs+2−2

This diff is too big to show here.

src/Text/Pandoc/Lua/Marshaling/SimpleTable.hsnew file+59

This diff is too big to show here.

src/Text/Pandoc/Lua/Marshaling/Version.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Lua/Module/MediaBag.hs+18−17

This diff is too big to show here.

src/Text/Pandoc/Lua/Module/Pandoc.hs+29−23

This diff is too big to show here.

src/Text/Pandoc/Lua/Module/System.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Lua/Module/Types.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Lua/Module/Utils.hs+45−6

This diff is too big to show here.

src/Text/Pandoc/Lua/Packages.hs+10−27

This diff is too big to show here.

src/Text/Pandoc/Lua/PandocLua.hs+20−13

This diff is too big to show here.

src/Text/Pandoc/Lua/Util.hs+3−3

This diff is too big to show here.

src/Text/Pandoc/Lua/Walk.hs+2−2

This diff is too big to show here.

src/Text/Pandoc/MIME.hs+26−3

This diff is too big to show here.

src/Text/Pandoc/MediaBag.hs+46−15

This diff is too big to show here.

src/Text/Pandoc/Options.hs+22−19

This diff is too big to show here.

src/Text/Pandoc/PDF.hs+38−17

This diff is too big to show here.

src/Text/Pandoc/Parsing.hs+418−266

This diff is too big to show here.

src/Text/Pandoc/Process.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Readers.hs+61−46

This diff is too big to show here.

src/Text/Pandoc/Readers/BibTeX.hsnew file+77

This diff is too big to show here.

src/Text/Pandoc/Readers/CSV.hs+9−9

This diff is too big to show here.

src/Text/Pandoc/Readers/CommonMark.hs+81−28

This diff is too big to show here.

src/Text/Pandoc/Readers/Creole.hs+6−7

This diff is too big to show here.

src/Text/Pandoc/Readers/CslJson.hsnew file+54

This diff is too big to show here.

src/Text/Pandoc/Readers/DocBook.hs+144−109

This diff is too big to show here.

src/Text/Pandoc/Readers/Docx.hs+71−51

This diff is too big to show here.

src/Text/Pandoc/Readers/Docx/Combine.hs+7−7

This diff is too big to show here.

src/Text/Pandoc/Readers/Docx/Parse.hs+218−124

This diff is too big to show here.

src/Text/Pandoc/Readers/Docx/Parse/Styles.hs+32−25

This diff is too big to show here.

src/Text/Pandoc/Readers/Docx/Util.hs+28−26

This diff is too big to show here.

src/Text/Pandoc/Readers/DokuWiki.hs+10−9

This diff is too big to show here.

src/Text/Pandoc/Readers/EPUB.hs+46−39

This diff is too big to show here.

src/Text/Pandoc/Readers/FB2.hs+57−51

This diff is too big to show here.

src/Text/Pandoc/Readers/HTML.hs+264−561

This diff is too big to show here.

src/Text/Pandoc/Readers/HTML/Parsing.hsnew file+225

This diff is too big to show here.

src/Text/Pandoc/Readers/HTML/Table.hsnew file+283

This diff is too big to show here.

src/Text/Pandoc/Readers/HTML/TagCategories.hsnew file+78

This diff is too big to show here.

src/Text/Pandoc/Readers/HTML/Types.hsnew file+97

This diff is too big to show here.

src/Text/Pandoc/Readers/Haddock.hs+11−7

This diff is too big to show here.

src/Text/Pandoc/Readers/Ipynb.hs+6−4

This diff is too big to show here.

src/Text/Pandoc/Readers/JATS.hs+49−63

This diff is too big to show here.

src/Text/Pandoc/Readers/Jira.hs+14−10

This diff is too big to show here.

src/Text/Pandoc/Readers/LaTeX.hs+274−1434

This diff is too big to show here.

src/Text/Pandoc/Readers/LaTeX/Citation.hsnew file+210

This diff is too big to show here.

src/Text/Pandoc/Readers/LaTeX/Inline.hsnew file+397

This diff is too big to show here.

src/Text/Pandoc/Readers/LaTeX/Lang.hs+200−121

This diff is too big to show here.

src/Text/Pandoc/Readers/LaTeX/Macro.hsnew file+184

This diff is too big to show here.

src/Text/Pandoc/Readers/LaTeX/Math.hsnew file+221

This diff is too big to show here.

src/Text/Pandoc/Readers/LaTeX/Parsing.hs+214−56

This diff is too big to show here.

src/Text/Pandoc/Readers/LaTeX/SIunitx.hs+153−70

This diff is too big to show here.

src/Text/Pandoc/Readers/LaTeX/Table.hsnew file+378

This diff is too big to show here.

src/Text/Pandoc/Readers/LaTeX/Types.hs+15−2

This diff is too big to show here.

src/Text/Pandoc/Readers/Man.hs+38−17

This diff is too big to show here.

src/Text/Pandoc/Readers/Markdown.hs+385−261

This diff is too big to show here.

src/Text/Pandoc/Readers/MediaWiki.hs+21−14

This diff is too big to show here.

src/Text/Pandoc/Readers/Metadata.hs+115−34

This diff is too big to show here.

src/Text/Pandoc/Readers/Muse.hs+10−9

This diff is too big to show here.

src/Text/Pandoc/Readers/Native.hs+8−6

This diff is too big to show here.

src/Text/Pandoc/Readers/OPML.hs+22−36

This diff is too big to show here.

src/Text/Pandoc/Readers/Odt.hs+28−25

This diff is too big to show here.

src/Text/Pandoc/Readers/Odt/Arrows/State.hs+2−2

This diff is too big to show here.

src/Text/Pandoc/Readers/Odt/ContentReader.hs+22−15

This diff is too big to show here.

src/Text/Pandoc/Readers/Odt/Generic/Namespaces.hs+2−1

This diff is too big to show here.

src/Text/Pandoc/Readers/Odt/Generic/Utils.hs+10−26

This diff is too big to show here.

src/Text/Pandoc/Readers/Odt/Generic/XMLConverter.hs+13−14

This diff is too big to show here.

src/Text/Pandoc/Readers/Odt/Namespaces.hs+6−5

This diff is too big to show here.

src/Text/Pandoc/Readers/Odt/StyleReader.hs+21−17

This diff is too big to show here.

src/Text/Pandoc/Readers/Org.hs+5−8

This diff is too big to show here.

src/Text/Pandoc/Readers/Org/BlockStarts.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Readers/Org/Blocks.hs+73−35

This diff is too big to show here.

src/Text/Pandoc/Readers/Org/DocumentTree.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Readers/Org/ExportSettings.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Readers/Org/Inlines.hs+13−13

This diff is too big to show here.

src/Text/Pandoc/Readers/Org/Meta.hs+13−5

This diff is too big to show here.

src/Text/Pandoc/Readers/Org/ParserState.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Readers/Org/Parsing.hs+6−6

This diff is too big to show here.

src/Text/Pandoc/Readers/Org/Shared.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Readers/RST.hs+91−117

This diff is too big to show here.

src/Text/Pandoc/Readers/Roff.hs+16−18

This diff is too big to show here.

src/Text/Pandoc/Readers/TWiki.hs+7−27

This diff is too big to show here.

src/Text/Pandoc/Readers/Textile.hs+96−90

This diff is too big to show here.

src/Text/Pandoc/Readers/TikiWiki.hs+6−6

This diff is too big to show here.

src/Text/Pandoc/Readers/Txt2Tags.hs+49−23

This diff is too big to show here.

src/Text/Pandoc/Readers/Vimwiki.hs+12−7

This diff is too big to show here.

src/Text/Pandoc/RoffChar.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/SelfContained.hs+16−12

This diff is too big to show here.

src/Text/Pandoc/Shared.hs+52−101

This diff is too big to show here.

src/Text/Pandoc/Slides.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Sources.hsnew file+195

This diff is too big to show here.

src/Text/Pandoc/Templates.hs+6−1

This diff is too big to show here.

src/Text/Pandoc/Translations.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/UTF8.hs+21−24

This diff is too big to show here.

src/Text/Pandoc/UUID.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Writers.hs+12−4

This diff is too big to show here.

src/Text/Pandoc/Writers/AnnotatedTable.hs+23

This diff is too big to show here.

src/Text/Pandoc/Writers/AsciiDoc.hs+43−12

This diff is too big to show here.

src/Text/Pandoc/Writers/BibTeX.hsnew file+61

This diff is too big to show here.

src/Text/Pandoc/Writers/CommonMark.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Writers/ConTeXt.hs+45−39

This diff is too big to show here.

src/Text/Pandoc/Writers/CslJson.hsnew file+91

This diff is too big to show here.

src/Text/Pandoc/Writers/Custom.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Writers/Docbook.hs+114−33

This diff is too big to show here.

src/Text/Pandoc/Writers/Docx.hs+262−401

This diff is too big to show here.

src/Text/Pandoc/Writers/Docx/StyleMap.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Writers/Docx/Table.hsnew file+227

This diff is too big to show here.

src/Text/Pandoc/Writers/Docx/Types.hsnew file+185

This diff is too big to show here.

src/Text/Pandoc/Writers/DokuWiki.hs+29−16

This diff is too big to show here.

src/Text/Pandoc/Writers/EPUB.hs+269−212

This diff is too big to show here.

src/Text/Pandoc/Writers/FB2.hs+62−78

This diff is too big to show here.

src/Text/Pandoc/Writers/GridTable.hsnew file+157

This diff is too big to show here.

src/Text/Pandoc/Writers/HTML.hs+184−67

This diff is too big to show here.

src/Text/Pandoc/Writers/Haddock.hs+13−2

This diff is too big to show here.

src/Text/Pandoc/Writers/ICML.hs+6−1

This diff is too big to show here.

src/Text/Pandoc/Writers/Ipynb.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Writers/JATS.hs+113−120

This diff is too big to show here.

src/Text/Pandoc/Writers/JATS/References.hsnew file+164

This diff is too big to show here.

src/Text/Pandoc/Writers/JATS/Table.hsnew file+268

This diff is too big to show here.

src/Text/Pandoc/Writers/JATS/Types.hsnew file+57

This diff is too big to show here.

src/Text/Pandoc/Writers/Jira.hs+43−18

This diff is too big to show here.

src/Text/Pandoc/Writers/LaTeX.hs+111−805

This diff is too big to show here.

src/Text/Pandoc/Writers/LaTeX/Caption.hsnew file+47

This diff is too big to show here.

src/Text/Pandoc/Writers/LaTeX/Citation.hsnew file+181

This diff is too big to show here.

src/Text/Pandoc/Writers/LaTeX/Lang.hsnew file+192

This diff is too big to show here.

src/Text/Pandoc/Writers/LaTeX/Notes.hsnew file+34

This diff is too big to show here.

src/Text/Pandoc/Writers/LaTeX/Table.hsnew file+307

This diff is too big to show here.

src/Text/Pandoc/Writers/LaTeX/Types.hsnew file+83

This diff is too big to show here.

src/Text/Pandoc/Writers/LaTeX/Util.hsnew file+275

This diff is too big to show here.

src/Text/Pandoc/Writers/Man.hs+3−3

This diff is too big to show here.

src/Text/Pandoc/Writers/Markdown.hs+104−663

This diff is too big to show here.

src/Text/Pandoc/Writers/Markdown/Inline.hsnew file+616

This diff is too big to show here.

src/Text/Pandoc/Writers/Markdown/Types.hsnew file+81

This diff is too big to show here.

src/Text/Pandoc/Writers/MediaWiki.hs+10−3

This diff is too big to show here.

src/Text/Pandoc/Writers/Ms.hs+87−15

This diff is too big to show here.

src/Text/Pandoc/Writers/Muse.hs+6−3

This diff is too big to show here.

src/Text/Pandoc/Writers/Native.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Writers/ODT.hs+28−22

This diff is too big to show here.

src/Text/Pandoc/Writers/OOXML.hs+22−22

This diff is too big to show here.

src/Text/Pandoc/Writers/OPML.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Writers/OpenDocument.hs+268−114

This diff is too big to show here.

src/Text/Pandoc/Writers/Org.hs+66−42

This diff is too big to show here.

src/Text/Pandoc/Writers/Powerpoint.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Writers/Powerpoint/Output.hs+172−148

This diff is too big to show here.

src/Text/Pandoc/Writers/Powerpoint/Presentation.hs+2−3

This diff is too big to show here.

src/Text/Pandoc/Writers/RST.hs+38−22

This diff is too big to show here.

src/Text/Pandoc/Writers/RTF.hs+17−11

This diff is too big to show here.

src/Text/Pandoc/Writers/Roff.hs+2−2

This diff is too big to show here.

src/Text/Pandoc/Writers/Shared.hs+20−6

This diff is too big to show here.

src/Text/Pandoc/Writers/TEI.hs+5−4

This diff is too big to show here.

src/Text/Pandoc/Writers/Texinfo.hs+23−16

This diff is too big to show here.

src/Text/Pandoc/Writers/Textile.hs+1−1

This diff is too big to show here.

src/Text/Pandoc/Writers/ZimWiki.hs+5−3

This diff is too big to show here.

src/Text/Pandoc/XML.hs+42−20

This diff is too big to show here.

src/Text/Pandoc/XML/Light.hsnew file+89

This diff is too big to show here.

src/Text/Pandoc/XML/Light/Output.hsnew file+234

This diff is too big to show here.

src/Text/Pandoc/XML/Light/Proc.hsnew file+139

This diff is too big to show here.

src/Text/Pandoc/XML/Light/Types.hsnew file+193

This diff is too big to show here.

stack.yaml+11−28

This diff is too big to show here.

test/Tests/Command.hs+74−47

This diff is too big to show here.

test/Tests/Helpers.hs+25−36

This diff is too big to show here.

test/Tests/Lua.hs+2−4

This diff is too big to show here.

test/Tests/Lua/Module.hs+3−1

This diff is too big to show here.

test/Tests/Old.hs+18−30

This diff is too big to show here.

test/Tests/Readers/Creole.hs+1−3

This diff is too big to show here.

test/Tests/Readers/Docx.hs+29−7

This diff is too big to show here.

test/Tests/Readers/DokuWiki.hs−2

This diff is too big to show here.

test/Tests/Readers/EPUB.hs+2−4

This diff is too big to show here.

test/Tests/Readers/FB2.hs−2

This diff is too big to show here.

test/Tests/Readers/HTML.hs+24−19

This diff is too big to show here.

test/Tests/Readers/JATS.hs+1−2

This diff is too big to show here.

test/Tests/Readers/Jira.hs+22−2

This diff is too big to show here.

test/Tests/Readers/LaTeX.hs+2−21

This diff is too big to show here.

test/Tests/Readers/Man.hs+1−2

This diff is too big to show here.

test/Tests/Readers/Markdown.hs+8−10

This diff is too big to show here.

test/Tests/Readers/Muse.hs−2

This diff is too big to show here.

test/Tests/Readers/Odt.hs+2−3

This diff is too big to show here.

test/Tests/Readers/Org.hs+1−1

This diff is too big to show here.

test/Tests/Readers/Org/Block.hs+22−24

This diff is too big to show here.

test/Tests/Readers/Org/Block/CodeBlock.hs+36−38

This diff is too big to show here.

test/Tests/Readers/Org/Block/Figure.hs+9−11

This diff is too big to show here.

test/Tests/Readers/Org/Block/Header.hs+4−6

This diff is too big to show here.

test/Tests/Readers/Org/Block/List.hs+14−3

This diff is too big to show here.

test/Tests/Readers/Org/Block/Table.hs+3−5

This diff is too big to show here.

test/Tests/Readers/Org/Directive.hs+1−3

This diff is too big to show here.

test/Tests/Readers/Org/Inline.hs+5−7

This diff is too big to show here.

test/Tests/Readers/Org/Inline/Citation.hs+41−3

This diff is too big to show here.

test/Tests/Readers/Org/Inline/Note.hs+1−3

This diff is too big to show here.

test/Tests/Readers/Org/Inline/Smart.hs+1−3

This diff is too big to show here.

test/Tests/Readers/Org/Meta.hs+44−30

This diff is too big to show here.

test/Tests/Readers/Org/Shared.hs+1−3

This diff is too big to show here.

test/Tests/Readers/RST.hs+1−3

This diff is too big to show here.

test/Tests/Readers/Txt2Tags.hs+1−3

This diff is too big to show here.

test/Tests/Shared.hs+1−3

This diff is too big to show here.

test/Tests/Writers/AnnotatedTable.hs−1

This diff is too big to show here.

test/Tests/Writers/AsciiDoc.hs−2

This diff is too big to show here.

test/Tests/Writers/ConTeXt.hs+122−115

This diff is too big to show here.

test/Tests/Writers/Docbook.hs+103−2

This diff is too big to show here.

test/Tests/Writers/Docx.hs+25−2

This diff is too big to show here.

test/Tests/Writers/FB2.hs−2

This diff is too big to show here.

test/Tests/Writers/HTML.hs+57−54

This diff is too big to show here.

test/Tests/Writers/JATS.hs+135−93

This diff is too big to show here.

test/Tests/Writers/Jira.hs+60−1

This diff is too big to show here.

test/Tests/Writers/LaTeX.hs−2

This diff is too big to show here.

test/Tests/Writers/Markdown.hs+3−3

This diff is too big to show here.

test/Tests/Writers/Ms.hs−2

This diff is too big to show here.

test/Tests/Writers/Muse.hs−1

This diff is too big to show here.

test/Tests/Writers/Native.hs−2

This diff is too big to show here.

test/Tests/Writers/OOXML.hs+5−4

This diff is too big to show here.

test/Tests/Writers/Org.hs+46−13

This diff is too big to show here.

test/Tests/Writers/Plain.hs−2

This diff is too big to show here.

test/Tests/Writers/Powerpoint.hs−2

This diff is too big to show here.

test/Tests/Writers/RST.hs−2

This diff is too big to show here.

test/Tests/Writers/TEI.hs−2

This diff is too big to show here.

test/command/1279.md+1−1

This diff is too big to show here.

test/command/1608.md+1−1

This diff is too big to show here.

test/command/1881.md+13−13

This diff is too big to show here.

test/command/2103.mdnew file+8

This diff is too big to show here.

test/command/2378.md+3−3

This diff is too big to show here.

test/command/2874.md+2−2

This diff is too big to show here.

test/command/3516.md+1−5

This diff is too big to show here.

test/command/3674.md+1−1

This diff is too big to show here.

test/command/3706.md+8−8

This diff is too big to show here.

test/command/3736.md+3−6

This diff is too big to show here.

test/command/3752.mdnew file+60

This diff is too big to show here.

test/command/3792.md+1−1

This diff is too big to show here.

test/command/3824.md+1

This diff is too big to show here.

test/command/4038.md+1−1

This diff is too big to show here.

test/command/4063.mdnew file+29

This diff is too big to show here.

test/command/4164.md+5−9

This diff is too big to show here.

test/command/4186.md+8−8

This diff is too big to show here.

test/command/4420.md−11

This diff is too big to show here.

test/command/4442.md+1−1

This diff is too big to show here.

test/command/4465.mdnew file+15

This diff is too big to show here.

test/command/4742.md+2−2

This diff is too big to show here.

test/command/5099.md+1−1

This diff is too big to show here.

test/command/5121.md+1−2

This diff is too big to show here.

test/command/5178.md+10−10

This diff is too big to show here.

test/command/5304.md+1−1

This diff is too big to show here.

test/command/5321.md+2−2

This diff is too big to show here.

test/command/5367.md+9−10

This diff is too big to show here.

test/command/5519.md+1−1

This diff is too big to show here.

test/command/5541-localLink.md+1−1

This diff is too big to show here.

test/command/5541-nesting.md+2−1

This diff is too big to show here.

test/command/5541-urlLink.md+1−1

This diff is too big to show here.

test/command/5686.md+1−1

This diff is too big to show here.

test/command/5708.md+1−5

This diff is too big to show here.

test/command/5849-prefix.md+5−6

This diff is too big to show here.

test/command/5986.md+3−2

This diff is too big to show here.

test/command/6026.mdnew file+19

This diff is too big to show here.

test/command/6324.mdnew file+17

This diff is too big to show here.

test/command/6388.mdnew file+16

This diff is too big to show here.

test/command/6541.mdnew file+27

This diff is too big to show here.

test/command/6620.md+3

This diff is too big to show here.

test/command/6658.mdnew file+75

This diff is too big to show here.

test/command/6675.md+1−1

This diff is too big to show here.

test/command/6699.mdnew file+13

This diff is too big to show here.

test/command/6709.mdnew file+11

This diff is too big to show here.

test/command/6719.mdnew file+18

This diff is too big to show here.

test/command/6723.mdnew file+32

This diff is too big to show here.

test/command/6739.mdnew file+21

This diff is too big to show here.

test/command/6740.mdnew file+7

This diff is too big to show here.

test/command/6741.mdnew file+145

This diff is too big to show here.

test/command/6752.mdnew file+36

This diff is too big to show here.

test/command/6755.mdnew file+11

This diff is too big to show here.

test/command/6765.mdnew file+31

This diff is too big to show here.

test/command/6768.mdnew file+21

This diff is too big to show here.

test/command/6774.mdnew file+63

This diff is too big to show here.

test/command/6783.mdnew file+26

This diff is too big to show here.

test/command/6791.mdnew file+32

This diff is too big to show here.

test/command/6792.mdnew file+66

This diff is too big to show here.

test/command/6796.mdnew file+16

This diff is too big to show here.

test/command/6802.mdnew file+9

This diff is too big to show here.

test/command/6836.mdnew file+17

This diff is too big to show here.

test/command/6837.mdnew file+29

This diff is too big to show here.

test/command/6844.mdnew file+27

This diff is too big to show here.

test/command/6855.mdnew file+12

This diff is too big to show here.

test/command/6858.mdnew file+52

This diff is too big to show here.

test/command/6869.mdnew file+6

This diff is too big to show here.

test/command/6873.mdnew file+7

This diff is too big to show here.

test/command/6890.mdnew file+36

This diff is too big to show here.

test/command/6925.mdnew file+34

This diff is too big to show here.

test/command/6948.mdnew file+31

This diff is too big to show here.

test/command/6951.mdnew file+18

This diff is too big to show here.

test/command/6958.mdnew file+10

This diff is too big to show here.

test/command/6993.mdnew file+21

This diff is too big to show here.

test/command/7003.mdnew file+37

This diff is too big to show here.

test/command/7006.mdnew file+20

This diff is too big to show here.

test/command/7009.mdnew file+8

This diff is too big to show here.

test/command/7016.mdnew file+48

This diff is too big to show here.

test/command/7041.mdnew file+23

This diff is too big to show here.

test/command/7042.mdnew file+146

This diff is too big to show here.

test/command/7058.mdnew file+6

This diff is too big to show here.

test/command/7064.mdnew file+32

This diff is too big to show here.

test/command/7067.mdnew file+90

This diff is too big to show here.

test/command/7080.mdnew file+8

This diff is too big to show here.

test/command/7092.mdnew file+8

This diff is too big to show here.

test/command/7099.mdnew file+18

This diff is too big to show here.

test/command/7112.mdnew file+15

This diff is too big to show here.

test/command/7129.mdnew file+27

This diff is too big to show here.

test/command/7132.mdnew file+10

This diff is too big to show here.

test/command/7134.mdnew file+16

This diff is too big to show here.

test/command/7145.mdnew file+12

This diff is too big to show here.

test/command/7155.mdnew file+15

This diff is too big to show here.

test/command/7173.mdnew file+137

This diff is too big to show here.

test/command/7208.mdnew file+6

This diff is too big to show here.

test/command/7214.mdnew file+28

This diff is too big to show here.

test/command/7216.mdnew file+19

This diff is too big to show here.

test/command/7266.mdnew file+10

This diff is too big to show here.

test/command/7272.mdnew file+27

This diff is too big to show here.

test/command/7278.mdnew file+38

This diff is too big to show here.

test/command/7282.mdnew file+7

This diff is too big to show here.

test/command/7288.mdnew file+40

This diff is too big to show here.

test/command/7299.mdnew file+23

This diff is too big to show here.

test/command/7321.mdnew file+24

This diff is too big to show here.

test/command/7323.mdnew file+29

This diff is too big to show here.

test/command/7324.mdnew file+25

This diff is too big to show here.

test/command/7339.mdnew file+11

This diff is too big to show here.

test/command/7340.mdnew file+6

This diff is too big to show here.

test/command/7376.mdnew file+16

This diff is too big to show here.

test/command/7394.mdnew file+85

This diff is too big to show here.

test/command/7397.mdnew file+14

This diff is too big to show here.

test/command/7400.mdnew file+9

This diff is too big to show here.

test/command/7416.mdnew file+19

This diff is too big to show here.

test/command/advanced-optical-materials.cslnew file+155

This diff is too big to show here.

test/command/annales.cslnew file+334

This diff is too big to show here.

test/command/apa.cslnew file+474

This diff is too big to show here.

test/command/archeologie-medievale.cslnew file+291

This diff is too big to show here.

test/command/averroes.bibnew file+95

This diff is too big to show here.

test/command/biblatex-266.mdnew file+34

This diff is too big to show here.

test/command/biblatex-aksin.mdnew file+78

This diff is too big to show here.

test/command/biblatex-almendro.mdnew file+71

This diff is too big to show here.

test/command/biblatex-angenendt.mdnew file+66

This diff is too big to show here.

test/command/biblatex-aristotle-anima.mdnew file+62

This diff is too big to show here.

test/command/biblatex-aristotle-physics.mdnew file+63

This diff is too big to show here.

test/command/biblatex-aristotle-poetics.mdnew file+65

This diff is too big to show here.

test/command/biblatex-aristotle-rhetoric.mdnew file+80

This diff is too big to show here.

test/command/biblatex-article.mdnew file+128

This diff is too big to show here.

test/command/biblatex-augustine.mdnew file+56

This diff is too big to show here.

test/command/biblatex-averroes-bland.mdnew file+85

This diff is too big to show here.

test/command/biblatex-averroes-hannes.mdnew file+84

This diff is too big to show here.

test/command/biblatex-averroes-hercz.mdnew file+85

This diff is too big to show here.

test/command/biblatex-baez-article.mdnew file+76

This diff is too big to show here.

test/command/biblatex-baez-online.mdnew file+69

This diff is too big to show here.

test/command/biblatex-basic.mdnew file+71

This diff is too big to show here.

test/command/biblatex-bertram.mdnew file+66

This diff is too big to show here.

test/command/biblatex-bibstring-resolution.mdnew file+20

This diff is too big to show here.

test/command/biblatex-book-averroes.mdnew file+129

This diff is too big to show here.

test/command/biblatex-book-coleridge.mdnew file+59

This diff is too big to show here.

test/command/biblatex-book-title-maintitle-series.mdnew file+39

This diff is too big to show here.

test/command/biblatex-book-vazques-de-parga.mdnew file+48

This diff is too big to show here.

test/command/biblatex-brandt.mdnew file+88

This diff is too big to show here.

test/command/biblatex-britannica.mdnew file+85

This diff is too big to show here.

test/command/biblatex-chiu.mdnew file+77

This diff is too big to show here.

test/command/biblatex-cicero.mdnew file+82

This diff is too big to show here.

test/command/biblatex-cms.mdnew file+81

This diff is too big to show here.

test/command/biblatex-coleridge.mdnew file+86

This diff is too big to show here.

test/command/biblatex-companion.mdnew file+70

This diff is too big to show here.

test/command/biblatex-cotton.mdnew file+69

This diff is too big to show here.

test/command/biblatex-crossref-inbook-mvbook.mdnew file+58

This diff is too big to show here.

test/command/biblatex-crossref-nested.mdnew file+100

This diff is too big to show here.

test/command/biblatex-ctan.mdnew file+73

This diff is too big to show here.

test/command/biblatex-dates.mdnew file+162

This diff is too big to show here.

test/command/biblatex-doody.mdnew file+101

This diff is too big to show here.

test/command/biblatex-edtf-date.mdnew file+72

This diff is too big to show here.

test/command/biblatex-escapedquotes.mdnew file+51

This diff is too big to show here.

test/command/biblatex-formatting.mdnew file+23

This diff is too big to show here.

test/command/biblatex-gaonkar-in.mdnew file+62

This diff is too big to show here.

test/command/biblatex-gaonkar.mdnew file+59

This diff is too big to show here.

test/command/biblatex-geer.mdnew file+70

This diff is too big to show here.

test/command/biblatex-gerhardt.mdnew file+64

This diff is too big to show here.

test/command/biblatex-gillies.mdnew file+69

This diff is too big to show here.

test/command/biblatex-glashow.mdnew file+51

This diff is too big to show here.

test/command/biblatex-gonzalez.mdnew file+62

This diff is too big to show here.

test/command/biblatex-hammond.mdnew file+63

This diff is too big to show here.

test/command/biblatex-herrmann.mdnew file+70

This diff is too big to show here.

test/command/biblatex-hyman.mdnew file+79

This diff is too big to show here.

test/command/biblatex-iliad.mdnew file+68

This diff is too big to show here.

test/command/biblatex-inbook-title-booktitle-maintitle-series-2.mdnew file+48

This diff is too big to show here.

test/command/biblatex-inbook-title-booktitle-maintitle-series.mdnew file+44

This diff is too big to show here.

test/command/biblatex-inbook.mdnew file+147

This diff is too big to show here.

test/command/biblatex-incollection-2.mdnew file+98

This diff is too big to show here.

test/command/biblatex-incollection.mdnew file+130

This diff is too big to show here.

test/command/biblatex-inproceedings.mdnew file+88

This diff is too big to show here.

test/command/biblatex-issue288.mdnew file+35

This diff is too big to show here.

test/command/biblatex-itzhaki.mdnew file+82

This diff is too big to show here.

test/command/biblatex-jaffe.mdnew file+82

This diff is too big to show here.

test/command/biblatex-jcg.mdnew file+54

This diff is too big to show here.

test/command/biblatex-kant-kpv.mdnew file+90

This diff is too big to show here.

test/command/biblatex-kant-ku.mdnew file+82

This diff is too big to show here.

test/command/biblatex-kastenholz.mdnew file+126

This diff is too big to show here.

test/command/biblatex-knuth-ct-a.mdnew file+78

This diff is too big to show here.

test/command/biblatex-knuth-ct-b.mdnew file+70

This diff is too big to show here.

test/command/biblatex-knuth-ct-c.mdnew file+69

This diff is too big to show here.

test/command/biblatex-knuth-ct-d.mdnew file+71

This diff is too big to show here.

test/command/biblatex-knuth-ct-e.mdnew file+66

This diff is too big to show here.

test/command/biblatex-knuth-ct-related.mdnew file+72

This diff is too big to show here.

test/command/biblatex-knuth-ct.mdnew file+66

This diff is too big to show here.

test/command/biblatex-kowalik.mdnew file+68

This diff is too big to show here.

test/command/biblatex-kullback-related.mdnew file+62

This diff is too big to show here.

test/command/biblatex-kullback-reprint.mdnew file+71

This diff is too big to show here.

test/command/biblatex-kullback.mdnew file+52

This diff is too big to show here.

test/command/biblatex-laufenberg.mdnew file+109

This diff is too big to show here.

test/command/biblatex-loh.mdnew file+65

This diff is too big to show here.

test/command/biblatex-malinowski.mdnew file+67

This diff is too big to show here.

test/command/biblatex-manual.mdnew file+51

This diff is too big to show here.

test/command/biblatex-markey.mdnew file+65

This diff is too big to show here.

test/command/biblatex-maron.mdnew file+70

This diff is too big to show here.

test/command/biblatex-massa.mdnew file+56

This diff is too big to show here.

test/command/biblatex-moore-related.mdnew file+66

This diff is too big to show here.

test/command/biblatex-moore.mdnew file+56

This diff is too big to show here.

test/command/biblatex-moraux.mdnew file+94

This diff is too big to show here.

test/command/biblatex-murray.mdnew file+105

This diff is too big to show here.

test/command/biblatex-nietzsche-historie.mdnew file+100

This diff is too big to show here.

test/command/biblatex-nietzsche-ksa.mdnew file+89

This diff is too big to show here.

test/command/biblatex-nietzsche-ksa1.mdnew file+95

This diff is too big to show here.

test/command/biblatex-online.mdnew file+64

This diff is too big to show here.

test/command/biblatex-options-url-false-doi-false.mdnew file+57

This diff is too big to show here.

test/command/biblatex-padhye.mdnew file+117

This diff is too big to show here.

test/command/biblatex-patent.mdnew file+158

This diff is too big to show here.

test/command/biblatex-periodical.mdnew file+31

This diff is too big to show here.

test/command/biblatex-piccato.mdnew file+59

This diff is too big to show here.

test/command/biblatex-pines.mdnew file+77

This diff is too big to show here.

test/command/biblatex-quotes.mdnew file+44

This diff is too big to show here.

test/command/biblatex-reese.mdnew file+71

This diff is too big to show here.

test/command/biblatex-report.mdnew file+119

This diff is too big to show here.

test/command/biblatex-salam.mdnew file+69

This diff is too big to show here.

test/command/biblatex-sarfraz.mdnew file+65

This diff is too big to show here.

test/command/biblatex-shore.mdnew file+66

This diff is too big to show here.

test/command/biblatex-sigfridsson.mdnew file+106

This diff is too big to show here.

test/command/biblatex-sorace.mdnew file+65

This diff is too big to show here.

test/command/biblatex-spiegelberg.mdnew file+74

This diff is too big to show here.

test/command/biblatex-springer.mdnew file+58

This diff is too big to show here.

test/command/biblatex-strings.mdnew file+46

This diff is too big to show here.

test/command/biblatex-test-case-conversion.mdnew file+73

This diff is too big to show here.

test/command/biblatex-textnormal.mdnew file+17

This diff is too big to show here.

test/command/biblatex-thesis.mdnew file+68

This diff is too big to show here.

test/command/biblatex-title-and-shorttitle.mdnew file+76

This diff is too big to show here.

test/command/biblatex-vangennep-related.mdnew file+69

This diff is too big to show here.

test/command/biblatex-vangennep-trans.mdnew file+69

This diff is too big to show here.

test/command/biblatex-vangennep.mdnew file+61

This diff is too big to show here.

test/command/biblatex-vazques-de-parga-mvbook.mdnew file+75

This diff is too big to show here.

test/command/biblatex-vazques-de-parga.mdnew file+74

This diff is too big to show here.

test/command/biblatex-video.mdnew file+19

This diff is too big to show here.

test/command/biblatex-vizedom-related.mdnew file+68

This diff is too big to show here.

test/command/biblatex-wassenberg.mdnew file+83

This diff is too big to show here.

test/command/biblatex-weinberg.mdnew file+52

This diff is too big to show here.

test/command/biblatex-westfahl-frontier.mdnew file+60

This diff is too big to show here.

test/command/biblatex-westfahl-space.mdnew file+106

This diff is too big to show here.

test/command/biblatex-wilde.mdnew file+65

This diff is too big to show here.

test/command/biblatex-worman.mdnew file+60

This diff is too big to show here.

test/command/biblatex-yoon.mdnew file+67

This diff is too big to show here.

test/command/biblio.bibnew file+26

This diff is too big to show here.

test/command/bibtex-basic.mdnew file+71

This diff is too big to show here.

test/command/bioethics.cslnew file+226

This diff is too big to show here.

test/command/chap1/spider.pngnew file

Binary file not shown.

test/command/chap1/text.mdnew file+17

This diff is too big to show here.

test/command/chap2/spider.pngnew file

Binary file not shown.

test/command/chap2/text.mdnew file+5

This diff is too big to show here.

test/command/chicago-annotated-bibliography.cslnew file+1207

This diff is too big to show here.

test/command/chicago-author-date-with-original-date-and-status.cslnew file+575

This diff is too big to show here.

test/command/chicago-fullnote-bibliography.cslnew file+1430

This diff is too big to show here.

test/command/chicago-note-bibliography.cslnew file+1005

This diff is too big to show here.

test/command/chinese-gb7714-2005-numeric.cslnew file+213

This diff is too big to show here.

test/command/cite-in-inline-note.md+1−1

This diff is too big to show here.

test/command/citeproc-17.mdnew file+17

This diff is too big to show here.

test/command/citeproc-20.mdnew file+25

This diff is too big to show here.

test/command/citeproc-7a.mdnew file+42

This diff is too big to show here.

test/command/citeproc-7b.mdnew file+36

This diff is too big to show here.

test/command/citeproc-author-in-text-suffix.mdnew file+6

This diff is too big to show here.

test/command/custom-attributes.htmldeleted−16

This diff is too big to show here.

test/command/defaults-inheritance-1.mdnew file+6

This diff is too big to show here.

test/command/defaults-inheritance-2.mdnew file+5

This diff is too big to show here.

test/command/defaults-inheritance-3.mdnew file+6

This diff is too big to show here.

test/command/defaults3.yamlnew file+4

This diff is too big to show here.

test/command/defaults4.yamlnew file+3

This diff is too big to show here.

test/command/defaults5.yamlnew file+2

This diff is too big to show here.

test/command/defaults6.yamlnew file+2

This diff is too big to show here.

test/command/defaults7.yamlnew file+2

This diff is too big to show here.

test/command/defaults8.yamlnew file+2

This diff is too big to show here.

test/command/defaults9.yamlnew file+1

This diff is too big to show here.

test/command/din-1505-2.cslnew file+406

This diff is too big to show here.

test/command/docbook-bibliography.mdnew file+20

This diff is too big to show here.

test/command/duplicate_attributes.mdnew file+7

This diff is too big to show here.

test/command/empty-inline-code.txtdeleted−6

This diff is too big to show here.

test/command/harvard-university-of-kent.cslnew file+253

This diff is too big to show here.

test/command/ieee.cslnew file+339

This diff is too big to show here.

test/command/issue160.cslnew file+28

This diff is too big to show here.

test/command/issue437.cslnew file+26

This diff is too big to show here.

test/command/issue58.cslnew file+553

This diff is too big to show here.

data/jats.csl → test/command/jats.cslrenamed+12−7

This diff is too big to show here.

test/command/latex-center.mdnew file+13

This diff is too big to show here.

test/command/le-tapuscrit-note.cslnew file+496

This diff is too big to show here.

test/command/locators.cslnew file+68

This diff is too big to show here.

test/command/mmd-metadata.mdnew file+20

This diff is too big to show here.

test/command/modern-humanities-research-association.cslnew file+445

This diff is too big to show here.

test/command/nested-table-to-asciidoc-6942.mdnew file+82

This diff is too big to show here.

test/command/newif.mdnew file+55

This diff is too big to show here.

test/command/oscola.cslnew file+680

This diff is too big to show here.

test/command/pandoc-citeproc-118.mdnew file+28

This diff is too big to show here.

test/command/pandoc-citeproc-119.mdnew file+38

This diff is too big to show here.

test/command/pandoc-citeproc-13.mdnew file+29

This diff is too big to show here.

test/command/pandoc-citeproc-136.mdnew file+23

This diff is too big to show here.

test/command/pandoc-citeproc-14.mdnew file+77

This diff is too big to show here.

test/command/pandoc-citeproc-152.mdnew file+63

This diff is too big to show here.

test/command/pandoc-citeproc-160.mdnew file+44

This diff is too big to show here.

test/command/pandoc-citeproc-175.mdnew file+43

This diff is too big to show here.

test/command/pandoc-citeproc-197.mdnew file+31

This diff is too big to show here.

test/command/pandoc-citeproc-213.mdnew file+33

This diff is too big to show here.

test/command/pandoc-citeproc-25.mdnew file+30

This diff is too big to show here.

test/command/pandoc-citeproc-250.mdnew file+21

This diff is too big to show here.

test/command/pandoc-citeproc-27.mdnew file+38

This diff is too big to show here.

test/command/pandoc-citeproc-292.mdnew file+43

This diff is too big to show here.

test/command/pandoc-citeproc-301.mdnew file+25

This diff is too big to show here.

test/command/pandoc-citeproc-307.mdnew file+31

This diff is too big to show here.

test/command/pandoc-citeproc-31.mdnew file+48

This diff is too big to show here.

test/command/pandoc-citeproc-312.mdnew file+171

This diff is too big to show here.

test/command/pandoc-citeproc-320.mdnew file+254

This diff is too big to show here.

test/command/pandoc-citeproc-320a.mdnew file+87

This diff is too big to show here.

test/command/pandoc-citeproc-322.mdnew file+35

This diff is too big to show here.

test/command/pandoc-citeproc-325.mdnew file+30

This diff is too big to show here.

test/command/pandoc-citeproc-327.mdnew file+51

This diff is too big to show here.

test/command/pandoc-citeproc-338.mdnew file+35

This diff is too big to show here.

test/command/pandoc-citeproc-351.mdnew file+27

This diff is too big to show here.

test/command/pandoc-citeproc-356.mdnew file+20

This diff is too big to show here.

test/command/pandoc-citeproc-360.mdnew file+35

This diff is too big to show here.

test/command/pandoc-citeproc-361.mdnew file+80

This diff is too big to show here.

test/command/pandoc-citeproc-365.mdnew file+39

This diff is too big to show here.

test/command/pandoc-citeproc-371.mdnew file+40

This diff is too big to show here.

test/command/pandoc-citeproc-38.mdnew file+29

This diff is too big to show here.

test/command/pandoc-citeproc-386.mdnew file+35

This diff is too big to show here.

test/command/pandoc-citeproc-392.mdnew file+29

This diff is too big to show here.

test/command/pandoc-citeproc-399.mdnew file+45

This diff is too big to show here.

test/command/pandoc-citeproc-401.mdnew file+59

This diff is too big to show here.

test/command/pandoc-citeproc-408.mdnew file+39

This diff is too big to show here.

test/command/pandoc-citeproc-416.mdnew file+60

This diff is too big to show here.

test/command/pandoc-citeproc-437.mdnew file+23

This diff is too big to show here.

test/command/pandoc-citeproc-47.mdnew file+112

This diff is too big to show here.

test/command/pandoc-citeproc-51.mdnew file+45

This diff is too big to show here.

test/command/pandoc-citeproc-53.mdnew file+56

This diff is too big to show here.

test/command/pandoc-citeproc-57.mdnew file+37

This diff is too big to show here.

test/command/pandoc-citeproc-58.mdnew file+32

This diff is too big to show here.

test/command/pandoc-citeproc-61.mdnew file+77

This diff is too big to show here.

test/command/pandoc-citeproc-64.mdnew file+24

This diff is too big to show here.

test/command/pandoc-citeproc-65.mdnew file+38

This diff is too big to show here.

test/command/pandoc-citeproc-68.mdnew file+56

This diff is too big to show here.

test/command/pandoc-citeproc-7.mdnew file+31

This diff is too big to show here.

test/command/pandoc-citeproc-70.mdnew file+73

This diff is too big to show here.

test/command/pandoc-citeproc-75.mdnew file+67

This diff is too big to show here.

test/command/pandoc-citeproc-76.mdnew file+64

This diff is too big to show here.

test/command/pandoc-citeproc-77.mdnew file+67

This diff is too big to show here.

test/command/pandoc-citeproc-82.mdnew file+39

This diff is too big to show here.

test/command/pandoc-citeproc-87.mdnew file+156

This diff is too big to show here.

test/command/pandoc-citeproc-chicago-author-date.mdnew file+109

This diff is too big to show here.

test/command/pandoc-citeproc-chicago-fullnote-bibliography.mdnew file+134

This diff is too big to show here.

test/command/pandoc-citeproc-ieee.mdnew file+113

This diff is too big to show here.

test/command/pandoc-citeproc-locators-delimited.mdnew file+127

This diff is too big to show here.

test/command/pandoc-citeproc-locators-integrated.mdnew file+159

This diff is too big to show here.

test/command/pandoc-citeproc-move-period-inside-quote.mdnew file+52

This diff is too big to show here.

test/command/pandoc-citeproc-no-author.mdnew file+73

This diff is too big to show here.

test/command/pandoc-citeproc-number-of-volumes.mdnew file+29

This diff is too big to show here.

test/command/pandoc-citeproc-page-range.mdnew file+32

This diff is too big to show here.

test/command/sage-harvard.cslnew file+202

This diff is too big to show here.

test/command/science.cslnew file+245

This diff is too big to show here.

test/command/style399.cslnew file+12

This diff is too big to show here.

test/command/svg.md+17−15

This diff is too big to show here.

test/command/table-with-cell-align.mdnew file+82

This diff is too big to show here.

test/command/table-with-column-span.md+157

This diff is too big to show here.

test/command/toc.md+11−20

This diff is too big to show here.

test/command/unicode-collation.mdnew file+130

This diff is too big to show here.

test/command/vancouver.cslnew file+351

This diff is too big to show here.

test/command/yaml-metadata-blocks.md+3−3

This diff is too big to show here.

test/command/zeitschrift-fur-kunstgeschichte.cslnew file+346

This diff is too big to show here.

test/docbook-reader.docbook+9−2

This diff is too big to show here.

test/docx/0_level_headers.native+2−2

This diff is too big to show here.

test/docx/golden/block_quotes.docx

Binary file not shown.

test/docx/golden/codeblock.docx

Binary file not shown.

test/docx/golden/comments.docx

Binary file not shown.

test/docx/golden/custom_style_no_reference.docx

Binary file not shown.

test/docx/golden/custom_style_preserve.docx

Binary file not shown.

test/docx/golden/custom_style_reference.docx

Binary file not shown.

test/docx/golden/definition_list.docx

Binary file not shown.

test/docx/golden/document-properties-short-desc.docx

Binary file not shown.

test/docx/golden/document-properties.docx

Binary file not shown.

test/docx/golden/headers.docx

Binary file not shown.

test/docx/golden/image.docx

Binary file not shown.

test/docx/golden/inline_code.docx

Binary file not shown.

test/docx/golden/inline_formatting.docx

Binary file not shown.

test/docx/golden/inline_images.docx

Binary file not shown.

test/docx/golden/link_in_notes.docx

Binary file not shown.

test/docx/golden/links.docx

Binary file not shown.

test/docx/golden/lists.docx

Binary file not shown.

test/docx/golden/lists_continuing.docx

Binary file not shown.

test/docx/golden/lists_multiple_initial.docxnew file

Binary file not shown.

test/docx/golden/lists_restarting.docx

Binary file not shown.

test/docx/golden/nested_anchors_in_header.docx

Binary file not shown.

test/docx/golden/notes.docx

Binary file not shown.

test/docx/golden/raw-blocks.docxnew file

Binary file not shown.

test/docx/golden/raw-bookmarks.docxnew file

Binary file not shown.

test/docx/golden/table_one_row.docx

Binary file not shown.

test/docx/golden/table_with_list_cell.docx

Binary file not shown.

test/docx/golden/tables-default-widths.docxnew file

Binary file not shown.

test/docx/golden/tables.docx

Binary file not shown.

test/docx/golden/track_changes_deletion.docx

Binary file not shown.

test/docx/golden/track_changes_insertion.docx

Binary file not shown.

test/docx/golden/track_changes_move.docx

Binary file not shown.

test/docx/golden/track_changes_scrubbed_metadata.docxnew file

Binary file not shown.

test/docx/golden/unicode.docx

Binary file not shown.

test/docx/golden/verbatim_subsuper.docx

Binary file not shown.

test/docx/image_vml_as_object.docxnew file

Binary file not shown.

test/docx/image_vml_as_object.nativenew file+2

This diff is too big to show here.

test/docx/lists_multiple_initial.nativenew file+8

This diff is too big to show here.

test/docx/raw-blocks.nativenew file+6

This diff is too big to show here.

test/docx/raw-bookmarks.nativenew file+3

This diff is too big to show here.

test/docx/sdt_elements.native+9−10

This diff is too big to show here.

test/docx/table_captions_no_field.docxnew file

Binary file not shown.

test/docx/table_captions_no_field.nativenew file+34

This diff is too big to show here.

test/docx/table_captions_with_field.docxnew file

Binary file not shown.

test/docx/table_captions_with_field.nativenew file+54

This diff is too big to show here.

test/docx/table_header_rowspan.docxnew file

Binary file not shown.

test/docx/table_header_rowspan.nativenew file+189

This diff is too big to show here.

test/docx/table_one_header_row.docxnew file

Binary file not shown.

test/docx/table_one_header_row.nativenew file+18

This diff is too big to show here.

test/docx/table_one_row.docx

Binary file not shown.

test/docx/table_one_row.native+4−4

This diff is too big to show here.

test/docx/table_variable_width.native+12−17

This diff is too big to show here.

test/docx/table_with_list_cell.native+3−3

This diff is too big to show here.

test/docx/tables-default-widths.nativenew file+92

This diff is too big to show here.

test/docx/tables.native+9−9

This diff is too big to show here.

test/docx/track_changes_scrubbed_metadata.docxnew file

Binary file not shown.

test/docx/track_changes_scrubbed_metadata.nativenew file+9

This diff is too big to show here.

test/epub/features.epub

Binary file not shown.

test/epub/features.native+3−3

This diff is too big to show here.

test/epub/wasteland.epub

Binary file not shown.

test/epub/wasteland.native+4−4

This diff is too big to show here.

test/fb2/images.fb2+1−1

This diff is too big to show here.

test/fb2/test.jpg

Binary file not shown.

test/grofftest.shdeleted−26

This diff is too big to show here.

test/html-reader.html+76

This diff is too big to show here.

test/html-reader.native+148−37

This diff is too big to show here.

test/jats-reader.native+1−1

This diff is too big to show here.

test/jats-reader.xml+1

This diff is too big to show here.

test/jira-reader.native+1−1

This diff is too big to show here.

test/latex-reader.native+26−13

This diff is too big to show here.

test/lhs-test.html+45−19

This diff is too big to show here.

test/lhs-test.html+lhs+45−19

This diff is too big to show here.

test/lhs-test.latex+4−4

This diff is too big to show here.

test/lhs-test.latex+lhs+4−4

This diff is too big to show here.

test/lua/module/pandoc-path.luanew file+44

This diff is too big to show here.

test/lua/module/pandoc-utils.lua+66

This diff is too big to show here.

test/markdown-citations.native+14−14

This diff is too big to show here.

test/markdown-reader-more.native+6−34

This diff is too big to show here.

test/odt/native/tab.nativenew file+1

This diff is too big to show here.

test/odt/odt/tab.odtnew file

Binary file not shown.

test/org-select-tags.org+2−2

This diff is too big to show here.

test/pipe-tables.native+2−10

This diff is too big to show here.

test/pptx/code-custom.pptx

Binary file not shown.

test/pptx/code-custom_templated.pptx

Binary file not shown.

test/pptx/code.pptx

Binary file not shown.

test/pptx/code_templated.pptx

Binary file not shown.

test/pptx/document-properties-short-desc.pptx

Binary file not shown.

test/pptx/document-properties-short-desc_templated.pptx

Binary file not shown.

test/pptx/document-properties.pptx

Binary file not shown.

test/pptx/document-properties_templated.pptx

Binary file not shown.

test/pptx/endnotes.pptx

Binary file not shown.

test/pptx/endnotes_templated.pptx

Binary file not shown.

test/pptx/endnotes_toc.pptx

Binary file not shown.

test/pptx/endnotes_toc_templated.pptx

Binary file not shown.

test/pptx/images.pptx

Binary file not shown.

test/pptx/images_templated.pptx

Binary file not shown.

test/pptx/inline_formatting.pptx

Binary file not shown.

test/pptx/inline_formatting_templated.pptx

Binary file not shown.

test/pptx/lists.pptx

Binary file not shown.

test/pptx/lists_templated.pptx

Binary file not shown.

test/pptx/raw_ooxml.native+1−1

This diff is too big to show here.

test/pptx/raw_ooxml.pptx

Binary file not shown.

test/pptx/raw_ooxml_templated.pptx

Binary file not shown.

test/pptx/reference_depth.pptx

Binary file not shown.

test/pptx/remove_empty_slides.pptx

Binary file not shown.

test/pptx/remove_empty_slides_templated.pptx

Binary file not shown.

test/pptx/slide_breaks.pptx

Binary file not shown.

test/pptx/slide_breaks_slide_level_1.pptx

Binary file not shown.

test/pptx/slide_breaks_slide_level_1_templated.pptx

Binary file not shown.

test/pptx/slide_breaks_templated.pptx

Binary file not shown.

test/pptx/slide_breaks_toc.pptx

Binary file not shown.

test/pptx/slide_breaks_toc_templated.pptx

Binary file not shown.

test/pptx/speaker_notes.pptx

Binary file not shown.

test/pptx/speaker_notes_after_metadata.pptx

Binary file not shown.

test/pptx/speaker_notes_after_metadata_templated.pptx

Binary file not shown.

test/pptx/speaker_notes_afterheader.pptx

Binary file not shown.

test/pptx/speaker_notes_afterheader_templated.pptx

Binary file not shown.

test/pptx/speaker_notes_afterseps.pptx

Binary file not shown.

test/pptx/speaker_notes_afterseps_templated.pptx

Binary file not shown.

test/pptx/speaker_notes_templated.pptx

Binary file not shown.

test/pptx/start_numbering_at.pptx

Binary file not shown.

test/pptx/start_numbering_at_templated.pptx

Binary file not shown.

test/pptx/tables.pptx

Binary file not shown.

test/pptx/tables_templated.pptx

Binary file not shown.

test/pptx/two_column.pptx

Binary file not shown.

test/pptx/two_column_templated.pptx

Binary file not shown.

test/rst-reader.native+3−21

This diff is too big to show here.

test/s5-fancy.html+1−1

This diff is too big to show here.

test/tables-rstsubset.native+1−9

This diff is too big to show here.

test/tables.jats_archiving+156−156

This diff is too big to show here.

test/tables.jats_articleauthoring+156−156

This diff is too big to show here.

test/tables.jats_publishing+156−156

This diff is too big to show here.

test/tables.latex+65−101

This diff is too big to show here.

test/tables.ms+44

This diff is too big to show here.

test/tables.org+3−3

This diff is too big to show here.

test/tables/nordics.html4+6−6

This diff is too big to show here.

test/tables/nordics.html5+6−6

This diff is too big to show here.

test/tables/nordics.jats_archivingnew file+58

This diff is too big to show here.

test/tables/nordics.latexnew file+42

This diff is too big to show here.

test/tables/nordics.native+60−33

This diff is too big to show here.

test/tables/planets.html4+1−1

This diff is too big to show here.

test/tables/planets.html5+1−1

This diff is too big to show here.

test/tables/planets.jats_archivingnew file+128

This diff is too big to show here.

test/tables/planets.latexnew file+30

This diff is too big to show here.

test/tables/planets.native+215−112

This diff is too big to show here.

test/tables/students.jats_archivingnew file+56

This diff is too big to show here.

test/tables/students.latexnew file+31

This diff is too big to show here.

test/tables/students.native+49−32

This diff is too big to show here.

test/test-pandoc.hs+18−8

This diff is too big to show here.

test/textile-reader.native+1−1

This diff is too big to show here.

test/textile-reader.textile+1−1

This diff is too big to show here.

test/txt2tags.native+1−1

This diff is too big to show here.

test/txt2tags.t2t+1−1

This diff is too big to show here.

test/writer.context+45−43

This diff is too big to show here.

test/writer.custom+2−2

This diff is too big to show here.

test/writer.dokuwiki+11

This diff is too big to show here.

test/writer.html4+44−19

This diff is too big to show here.

test/writer.html5+44−19

This diff is too big to show here.

test/writer.icml+2

This diff is too big to show here.

test/writer.jats_archiving+12−8

This diff is too big to show here.

test/writer.jats_articleauthoring+1−1

This diff is too big to show here.

test/writer.jats_publishing+12−8

This diff is too big to show here.

test/writer.jira+23−35

This diff is too big to show here.

test/writer.latex+4−4

This diff is too big to show here.

test/writer.markdown+28−55

This diff is too big to show here.

test/writer.ms+1−1

This diff is too big to show here.

test/writer.opml+1−1

This diff is too big to show here.

test/writer.org+91−91

This diff is too big to show here.

test/writer.zimwiki+3−3

This diff is too big to show here.

test/writers-lang-and-dir.context+7−5

This diff is too big to show here.

test/writers-lang-and-dir.latex+11−8

This diff is too big to show here.

tools/build-arm.shnew file+110

This diff is too big to show here.

tools/changelog-helper.sh+11−4

This diff is too big to show here.

tools/parseTimings.plnew file+33

This diff is too big to show here.

trypandoc/index.html+1−1

This diff is too big to show here.

trypandoc/trypandoc.hs+3−8

This diff is too big to show here.

windows/Makefile+1−1

This diff is too big to show here.

windows/pandoc.wxs+2−4

This diff is too big to show here.