diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/pandoc.lua | 4 | ||||
| -rw-r--r-- | data/templates/default.latex | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/data/pandoc.lua b/data/pandoc.lua index 16387d27b..bce4e9326 100644 --- a/data/pandoc.lua +++ b/data/pandoc.lua @@ -135,7 +135,7 @@ end -- @section document --- A complete pandoc document --- @function Panoc +-- @function Pandoc -- @tparam {Block,...} blocks document content -- @tparam[opt] Meta meta document meta data function M.Pandoc(blocks, meta) @@ -772,7 +772,7 @@ M.UpperAlpha = "UpperAlpha" -- `--from` command line option. -- @tparam string markup the markup to be parsed -- @tparam[opt] string format format specification, defaults to "markdown". --- @return Doc pandoc document +-- @treturn Pandoc pandoc document -- @usage -- local org_markup = "/emphasis/" -- Input to be read -- local document = pandoc.read(org_markup, "org") diff --git a/data/templates/default.latex b/data/templates/default.latex index f64c74069..b26d5dc58 100644 --- a/data/templates/default.latex +++ b/data/templates/default.latex @@ -259,6 +259,15 @@ $else$ \fi $endif$ $endif$ + +% set default figure placement to htbp +\makeatletter +\def\fps@figure{htbp} +\makeatother + +$for(header-includes)$ +$header-includes$ +$endfor$ $if(lang)$ \ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex \usepackage[shorthands=off,$for(babel-otherlangs)$$babel-otherlangs$,$endfor$main=$babel-lang$]{babel} @@ -292,15 +301,6 @@ $if(dir)$ \fi $endif$ -% set default figure placement to htbp -\makeatletter -\def\fps@figure{htbp} -\makeatother - -$for(header-includes)$ -$header-includes$ -$endfor$ - $if(title)$ \title{$title$$if(thanks)$\thanks{$thanks$}$endif$} $endif$ |