Skip to content

Commit 5c1f954

Browse files
committed
fix old parameters for pandoc2 in pandoc3
1 parent 7621d03 commit 5c1f954

File tree

2 files changed

+18
-10
lines changed

2 files changed

+18
-10
lines changed

fulltext-markdown.sh

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,14 @@
99
# Author: Piero Grandesso
1010
# https://github.com/piero-g/markdown-workflow
1111
#
12+
# Todo:
13+
# rework as a complete loop
14+
# add media-extract
15+
# add several fixes via sed, like:
16+
# - remove mark `\[([^\]]*)\]\{\.mark\}`
17+
# - fix `\...` and `\"`
18+
#
19+
1220

1321
#####
1422
# 0. events log and other checks
@@ -109,7 +117,7 @@ printf '%b\n' "[$(date +"%Y-%m-%d %H:%M:%S")] Starting conversion of manuscripts
109117
if [ "${manuscript}" != "${manuscript%.${EXT1}}" ]; then
110118
printf '%b\n' "[$(date +"%Y-%m-%d %H:%M:%S")] ${manuscript}: trying to convert it in Markdown..." >> "$workingDir/$eventslog"
111119
# actual conversion with Pandoc
112-
if pandoc --wrap=none --atx-headers -o "$tempdir/${manuscript%.${EXT1}}.md" "$manuscript" ; then
120+
if pandoc --wrap=none --markdown-headings=atx -o "$tempdir/${manuscript%.${EXT1}}.md" "$manuscript" ; then
113121
printf '%b\n' "[$(date +"%Y-%m-%d %H:%M:%S")] ... ${manuscript} was converted!" >> "$workingDir/$eventslog"
114122
# archive the processed manuscript
115123
mv "$manuscript" "$workingDir/archive/original-version/${manuscript%.${EXT1}}-$(date +"%Y-%m-%dT%H-%M-%S").${EXT1}"
@@ -122,7 +130,7 @@ printf '%b\n' "[$(date +"%Y-%m-%d %H:%M:%S")] Starting conversion of manuscripts
122130
elif [ "${manuscript}" != "${manuscript%.${EXT2}}" ]; then
123131
printf '%b\n' "[$(date +"%Y-%m-%d %H:%M:%S")] ${manuscript}: trying to convert it in Markdown..." >> "$workingDir/$eventslog"
124132
# actual conversion with Pandoc
125-
if pandoc --wrap=none --atx-headers -o "$tempdir/${manuscript%.${EXT2}}.md" "$manuscript" ; then
133+
if pandoc --wrap=none --markdown-headings=atx -o "$tempdir/${manuscript%.${EXT2}}.md" "$manuscript" ; then
126134
printf '%b\n' "[$(date +"%Y-%m-%d %H:%M:%S")] ... ${manuscript} was converted!" >> "$workingDir/$eventslog"
127135
# archive the processed manuscript
128136
mv "$manuscript" "$workingDir/archive/original-version/${manuscript%.${EXT2}}-$(date +"%Y-%m-%dT%H-%M-%S").${EXT2}"
@@ -135,7 +143,7 @@ printf '%b\n' "[$(date +"%Y-%m-%d %H:%M:%S")] Starting conversion of manuscripts
135143
elif [ "${manuscript}" != "${manuscript%.${EXT3}}" ]; then
136144
printf '%b\n' "[$(date +"%Y-%m-%d %H:%M:%S")] ${manuscript}: trying to convert it in Markdown..." >> "$workingDir/$eventslog"
137145
# actual conversion with Pandoc
138-
if pandoc --wrap=none --atx-headers -o "$tempdir/${manuscript%.${EXT3}}.md" "$manuscript" ; then
146+
if pandoc --wrap=none --markdown-headings=atx -o "$tempdir/${manuscript%.${EXT3}}.md" "$manuscript" ; then
139147
printf '%b\n' "[$(date +"%Y-%m-%d %H:%M:%S")] ... ${manuscript} was converted!" >> "$workingDir/$eventslog"
140148
# archive the processed manuscript
141149
mv "$manuscript" "$workingDir/archive/original-version/${manuscript%.${EXT3}}-$(date +"%Y-%m-%dT%H-%M-%S").${EXT3}"

markdown-galleys.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -141,25 +141,25 @@ mkdir -p "$workingDir/archive/layout-versions/$today"
141141

142142
# conversion functions
143143
converttohtml() {
144-
# HTML conversion with Pandoc --self-contained
145-
pandoc "$workingDir/z-lib/journal.yaml" "$workingDir/z-lib/issue.yaml" "${manuscript}" ${sectionNum} --toc --filter=pandoc-citeproc --email-obfuscation=references --section-divs --self-contained --template="$workingDir/z-lib/article.html5" --write=html5 --default-image-extension=.low.jpg -o "$workingDir/2-publication/${manuscript%.md}.html"
144+
# HTML conversion with Pandoc --embed-resources --standalone
145+
pandoc "$workingDir/z-lib/journal.yaml" "$workingDir/z-lib/issue.yaml" "${manuscript}" ${sectionNum} --toc --citeproc --email-obfuscation=references --section-divs --embed-resources --standalone --template="$workingDir/z-lib/article.html5" --write=html5 --default-image-extension=.low.jpg -o "$workingDir/2-publication/${manuscript%.md}.html"
146146
}
147147
converttopdf() {
148148
# PDF conversion with Pandoc # -N --toc
149-
pandoc "$workingDir/z-lib/journal.yaml" "$workingDir/z-lib/issue.yaml" "${manuscript}" ${sectionNum} --toc --filter=pandoc-citeproc --template="$workingDir/z-lib/article.latex" --pdf-engine=xelatex --default-image-extension=.jpg -s -o "$workingDir/2-publication/${manuscript%.md}.pdf"
149+
pandoc "$workingDir/z-lib/journal.yaml" "$workingDir/z-lib/issue.yaml" "${manuscript}" ${sectionNum} --toc --citeproc --template="$workingDir/z-lib/article.latex" --pdf-engine=xelatex --default-image-extension=.jpg -s -o "$workingDir/2-publication/${manuscript%.md}.pdf"
150150
# LaTeX
151-
pandoc "$workingDir/z-lib/journal.yaml" "$workingDir/z-lib/issue.yaml" "${manuscript}" ${sectionNum} --toc --filter=pandoc-citeproc --template="$workingDir/z-lib/article.latex" --pdf-engine=xelatex --default-image-extension=.jpg -s -o "$workingDir/2-publication/${manuscript%.md}.tex"
151+
pandoc "$workingDir/z-lib/journal.yaml" "$workingDir/z-lib/issue.yaml" "${manuscript}" ${sectionNum} --toc --citeproc --template="$workingDir/z-lib/article.latex" --pdf-engine=xelatex --default-image-extension=.jpg -s -o "$workingDir/2-publication/${manuscript%.md}.tex"
152152
}
153153
converttoxml() {
154154
# JATS XML
155-
pandoc "$workingDir/z-lib/journal.yaml" "$workingDir/z-lib/issue.yaml" "${manuscript}" ${sectionNum} --toc --filter=pandoc-citeproc --template="$workingDir/z-lib/article.jats" --write=jats --wrap=none --default-image-extension=.jpg -s -o "$workingDir/2-publication/${manuscript%.md}.jats.xml"
155+
pandoc "$workingDir/z-lib/journal.yaml" "$workingDir/z-lib/issue.yaml" "${manuscript}" ${sectionNum} --toc --citeproc --template="$workingDir/z-lib/article.jats" --write=jats --wrap=none --default-image-extension=.jpg -s -o "$workingDir/2-publication/${manuscript%.md}.jats.xml"
156156
# TEI XML
157-
#pandoc "$workingDir/z-lib/journal.yaml" "$workingDir/z-lib/issue.yaml" "${manuscript}" --toc ${sectionNum} --filter=pandoc-citeproc --template="$workingDir/z-lib/article.tei" --write=tei -s -o "$workingDir/2-publication/${manuscript%.md}.tei.xml"
157+
#pandoc "$workingDir/z-lib/journal.yaml" "$workingDir/z-lib/issue.yaml" "${manuscript}" --toc ${sectionNum} --citeproc --template="$workingDir/z-lib/article.tei" --write=tei -s -o "$workingDir/2-publication/${manuscript%.md}.tei.xml"
158158
}
159159
# this is just a test
160160
converttoword() {
161161
# DOCX format # --reference-doc="$workingDir/z-lib/article.docx"
162-
pandoc "$workingDir/z-lib/journal.yaml" "$workingDir/z-lib/issue.yaml" "${manuscript}" ${sectionNum} --toc --filter=pandoc-citeproc -w docx+styles -s -o "$workingDir/2-publication/${manuscript%.md}.docx"
162+
pandoc "$workingDir/z-lib/journal.yaml" "$workingDir/z-lib/issue.yaml" "${manuscript}" ${sectionNum} --toc --citeproc -w docx+styles -s -o "$workingDir/2-publication/${manuscript%.md}.docx"
163163
}
164164
# generic function that calls the specific conversions
165165
converttoformats() {

0 commit comments

Comments
 (0)