John MacFarlane
a27dad6f68
+ Add command line options `--table-caption-position` and `--figure-caption-position`. These allow the user to specify whether to put captions above or below tables and figures, respectively. The following output formats are supported: HTML (and related such as EPUB), LaTeX (and Beamer), Docx, ODT/OpenDocument, Typst. + Text.Pandoc.Options: add `CaptionPosition` and new `WriterOptions` fields `writerFigureCaptionPosition` and `writerTableCaptionPosition` [API change]. + Text.Pandoc.Opt: add `Opt` fields `optFigureCaptionPosition` and `optTableCaptionPosition` [API change]. + Docx writer: make table/figure rendering sensitive to caption position settings. + OpenDocument writer: make table/figure rendering sensitive to caption position settings. + Typst writer/template: implement figure caption positions by triggering a show rule in the default template, which determines caption positions for figures and tables globally. + LaTeX writer: make table/figure rendering sensitive to caption position settings. Closes #5116. + HTML writer/template: make `<figcaption>` placement sensitive to caption position settings. For tables, `<caption>` must be the first element, and positioning is determined by CSS, for here we set a variable which the default template is sensitive to.
121 lines
2.0 KiB
Plaintext
121 lines
2.0 KiB
Plaintext
$definitions.typst()$
|
|
|
|
#show terms: it => {
|
|
it.children
|
|
.map(child => [
|
|
#strong[#child.term]
|
|
#block(inset: (left: 1.5em, top: -0.4em))[#child.description]
|
|
])
|
|
.join()
|
|
}
|
|
|
|
#set table(
|
|
inset: 6pt,
|
|
stroke: none
|
|
)
|
|
|
|
#show figure.where(
|
|
kind: table
|
|
): set figure.caption(position: $if(table-caption-position)$$table-caption-position$$else$top$endif$)
|
|
|
|
#show figure.where(
|
|
kind: image
|
|
): set figure.caption(position: $if(figure-caption-position)$$figure-caption-position$$else$bottom$endif$)
|
|
|
|
$if(template)$
|
|
#import "$template$": conf
|
|
$else$
|
|
$template.typst()$
|
|
$endif$
|
|
|
|
$for(header-includes)$
|
|
$header-includes$
|
|
|
|
$endfor$
|
|
#show: doc => conf(
|
|
$if(title)$
|
|
title: [$title$],
|
|
$endif$
|
|
$if(subtitle)$
|
|
subtitle: [$subtitle$],
|
|
$endif$
|
|
$if(author)$
|
|
authors: (
|
|
$for(author)$
|
|
$if(author.name)$
|
|
( name: [$author.name$],
|
|
affiliation: [$author.affiliation$],
|
|
email: [$author.email$] ),
|
|
$else$
|
|
( name: [$author$],
|
|
affiliation: "",
|
|
email: "" ),
|
|
$endif$
|
|
$endfor$
|
|
),
|
|
$endif$
|
|
$if(keywords)$
|
|
keywords: ($for(keywords)$$keyword$$sep$,$endfor$),
|
|
$endif$
|
|
$if(date)$
|
|
date: [$date$],
|
|
$endif$
|
|
$if(lang)$
|
|
lang: "$lang$",
|
|
$endif$
|
|
$if(region)$
|
|
region: "$region$",
|
|
$endif$
|
|
$if(abstract)$
|
|
abstract: [$abstract$],
|
|
$endif$
|
|
$if(margin)$
|
|
margin: ($for(margin/pairs)$$margin.key$: $margin.value$,$endfor$),
|
|
$endif$
|
|
$if(papersize)$
|
|
paper: "$papersize$",
|
|
$endif$
|
|
$if(mainfont)$
|
|
font: ("$mainfont$",),
|
|
$endif$
|
|
$if(fontsize)$
|
|
fontsize: $fontsize$,
|
|
$endif$
|
|
$if(section-numbering)$
|
|
sectionnumbering: "$section-numbering$",
|
|
$endif$
|
|
cols: $if(columns)$$columns$$else$1$endif$,
|
|
doc,
|
|
)
|
|
|
|
$for(include-before)$
|
|
$include-before$
|
|
|
|
$endfor$
|
|
$if(toc)$
|
|
#outline(
|
|
title: auto,
|
|
depth: $toc-depth$
|
|
);
|
|
$endif$
|
|
|
|
$body$
|
|
|
|
$if(citations)$
|
|
$if(csl)$
|
|
|
|
#set bibliography(style: "$csl$")
|
|
$elseif(bibliographystyle)$
|
|
|
|
#set bibliography(style: "$bibliographystyle$")
|
|
$endif$
|
|
$if(bibliography)$
|
|
|
|
#bibliography($for(bibliography)$"$bibliography$"$sep$,$endfor$)
|
|
$endif$
|
|
$endif$
|
|
$for(include-after)$
|
|
|
|
$include-after$
|
|
$endfor$
|