Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
pandoc
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
templates
pandoc
Commits
06953664
Unverified
Commit
06953664
authored
5 years ago
by
ck85nori
Browse files
Options
Downloads
Patches
Plain Diff
fixes pandoc version dependent engine option name
parent
fea5d39b
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Makefile
+11
-3
11 additions, 3 deletions
Makefile
with
11 additions
and
3 deletions
Makefile
+
11
−
3
View file @
06953664
...
@@ -12,12 +12,20 @@ TITLE = title
...
@@ -12,12 +12,20 @@ TITLE = title
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
PANDOC
=
pandoc
PANDOC
=
pandoc
PANDOC_MAJOR_VERSION
:=
\
$(
shell pandoc
-v
|
awk
-F
"[ .]"
'NR==1 { print $$2
}
'
)
PANDOCFLAGS
=
\
ifeq
($(shell test $(PANDOC_MAJOR_VERSION) -lt 2; echo $$?), 0)
PANDOC_PDF_ENGINE_OPT_NAME
=
latex-engine
else
PANDOC_PDF_ENGINE_OPT_NAME
=
pdf-engine
endif
PANDOC_PDF_OPTIONS
=
\
--fail-if-warnings
\
--fail-if-warnings
\
--standalone
\
--standalone
\
--filter
pandoc-citeproc
\
--filter
pandoc-citeproc
\
--
pdf-engine
=
xelatex
\
--
$(
PANDOC_PDF_ENGINE_OPT_NAME
)
=
xelatex
\
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
# sources
# sources
...
@@ -43,7 +51,7 @@ $(SUBDIRS):
...
@@ -43,7 +51,7 @@ $(SUBDIRS):
subdirs
:
$(SUBDIRS)
subdirs
:
$(SUBDIRS)
$(TITLE).pdf
:
$(SUBDIRS) metadata.yml $(SOURCES_CSV) $(SOURCES_MD)
$(TITLE).pdf
:
$(SUBDIRS) metadata.yml $(SOURCES_CSV) $(SOURCES_MD)
$(
PANDOC
)
$(
PANDOC
FLAG
S
)
-o
$@
metadata.yml
$(
SOURCES_MD
)
$(
PANDOC
)
$(
PANDOC
_PDF_OPTION
S
)
-o
$@
metadata.yml
$(
SOURCES_MD
)
check
:
spellcheck
check
:
spellcheck
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment