aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--MANUAL.txt15
-rw-r--r--data/templates/default.typst24
-rw-r--r--data/templates/template.typst100
-rw-r--r--test/writer.typst101
4 files changed, 75 insertions, 165 deletions
diff --git a/MANUAL.txt b/MANUAL.txt
index 50a64c34f..c7ffdbd6f 100644
--- a/MANUAL.txt
+++ b/MANUAL.txt
@@ -2730,7 +2730,7 @@ Currently the following pipes are predefined:
documents
`abstract-title`
-: title of abstract, currently used only in HTML, EPUB, docx, and Typst.
+: title of abstract, currently used only in HTML, EPUB, and docx.
This will be set automatically to a localized value,
depending on `lang`, but can be manually overridden.
@@ -3403,19 +3403,6 @@ The `--css` option also affects the output.
`columns`
: Number of columns for body text.
-`thanks`
-: contents of acknowledgments footnote after document title
-
-`mathfont`, `codefont`
-: Name of system font to use for math and code, respectively.
-
-`linestretch`
-: adjusts line spacing, e.g. `1.25`, `1.5`
-
-`linkcolor`, `filecolor`, `citecolor`
-: color for external links, internal links, and citation links,
- respectively: expects a hexadecimal color code
-
### Variables for ms
`fontfamily`
diff --git a/data/templates/default.typst b/data/templates/default.typst
index 4c75fd0f4..c361aa951 100644
--- a/data/templates/default.typst
+++ b/data/templates/default.typst
@@ -71,15 +71,9 @@ $endif$
$if(region)$
region: "$region$",
$endif$
-$if(abstract-title)$
- abstract-title: [$abstract-title$],
-$endif$
$if(abstract)$
abstract: [$abstract$],
$endif$
-$if(thanks)$
- thanks: [$thanks$],
-$endif$
$if(margin)$
margin: ($for(margin/pairs)$$margin.key$: $margin.value$,$endfor$),
$endif$
@@ -92,28 +86,10 @@ $endif$
$if(fontsize)$
fontsize: $fontsize$,
$endif$
-$if(mathfont)$
- mathfont: ($for(mathfont)$"$mathfont$",$endfor$),
-$endif$
-$if(codefont)$
- codefont: ($for(codefont)$"$codefont$",$endfor$),
-$endif$
-$if(linestretch)$
- linestretch: $linestretch$,
-$endif$
$if(section-numbering)$
sectionnumbering: "$section-numbering$",
$endif$
pagenumbering: $if(page-numbering)$"$page-numbering$"$else$none$endif$,
-$if(linkcolor)$
- linkcolor: [$linkcolor$],
-$endif$
-$if(citecolor)$
- citecolor: [$citecolor$],
-$endif$
-$if(filecolor)$
- filecolor: [$filecolor$],
-$endif$
cols: $if(columns)$$columns$$else$1$endif$,
doc,
)
diff --git a/data/templates/template.typst b/data/templates/template.typst
index 1afaa35fc..24b1320fb 100644
--- a/data/templates/template.typst
+++ b/data/templates/template.typst
@@ -15,9 +15,7 @@
authors: (),
keywords: (),
date: none,
- abstract-title: none,
abstract: none,
- thanks: none,
cols: 1,
margin: (x: 1.25in, y: 1.25in),
paper: "us-letter",
@@ -25,90 +23,66 @@
region: "US",
font: (),
fontsize: 11pt,
- mathfont: none,
- codefont: none,
- linestretch: 1,
sectionnumbering: none,
- linkcolor: none,
- citecolor: none,
- filecolor: none,
pagenumbering: "1",
doc,
) = {
set document(
title: title,
- author: authors.map(author => content-to-string(author.name)).join(", ", last: " & "),
+ author: authors.map(author => content-to-string(author.name)),
keywords: keywords,
)
set page(
paper: paper,
margin: margin,
numbering: pagenumbering,
- )
-
- set par(
- justify: true,
- leading: linestretch * 0.65em
- )
+ columns: cols,
+ )
+ set par(justify: true)
set text(lang: lang,
region: region,
font: font,
size: fontsize)
-
- show math.equation: set text(font: mathfont) if mathfont != none
- show raw: set text(font: codefont) if codefont != none
-
set heading(numbering: sectionnumbering)
- show link: set text(fill: rgb(content-to-string(linkcolor))) if linkcolor != none
- show ref: set text(fill: rgb(content-to-string(citecolor))) if citecolor != none
- show link: this => {
- if filecolor != none and type(this.dest) == label {
- text(this, fill: rgb(content-to-string(filecolor)))
- }
+ place(top, float: true, scope: "parent", clearance: 4mm)[
+ #if title != none {
+ align(center)[#block(inset: 2em)[
+ #text(weight: "bold", size: 1.5em)[#title]
+ #(if subtitle != none {
+ parbreak()
+ text(weight: "bold", size: 1.25em)[#subtitle]
+ })
+ ]]
}
- block(below: 4mm)[
- #if title != none {
- align(center)[#block(inset: 2em)[
- #text(weight: "bold", size: 1.5em)[#title #if thanks != none {
- footnote(thanks, numbering: "*")
- counter(footnote).update(n => n - 1)
- }]
- #(
- if subtitle != none {
- parbreak()
- text(weight: "bold", size: 1.25em)[#subtitle]
- }
- )
- ]]
- }
-
- #if authors != none and authors != [] {
- let count = authors.len()
- let ncols = calc.min(count, 3)
- grid(
- columns: (1fr,) * ncols,
- row-gutter: 1.5em,
- ..authors.map(author => align(center)[
- #author.name \
- #author.affiliation \
- #author.email
- ])
+ #if authors != none and authors != [] {
+ let count = authors.len()
+ let ncols = calc.min(count, 3)
+ grid(
+ columns: (1fr,) * ncols,
+ row-gutter: 1.5em,
+ ..authors.map(author =>
+ align(center)[
+ #author.name \
+ #author.affiliation \
+ #author.email
+ ]
)
- }
+ )
+ }
- #if date != none {
- align(center)[#block(inset: 1em)[
- #date
- ]]
- }
+ #if date != none {
+ align(center)[#block(inset: 1em)[
+ #date
+ ]]
+ }
- #if abstract != none {
- block(inset: 2em)[
- #text(weight: "semibold")[#abstract-title] #h(1em) #abstract
- ]
- }
+ #if abstract != none {
+ block(inset: 2em)[
+ #text(weight: "semibold")[$if(abstract-title)$${abstract-title}$else$Abstract$endif$] #h(1em) #abstract
+ ]
+ }
]
doc
diff --git a/test/writer.typst b/test/writer.typst
index 5521680c7..5ff3051d4 100644
--- a/test/writer.typst
+++ b/test/writer.typst
@@ -39,9 +39,7 @@
authors: (),
keywords: (),
date: none,
- abstract-title: none,
abstract: none,
- thanks: none,
cols: 1,
margin: (x: 1.25in, y: 1.25in),
paper: "us-letter",
@@ -49,90 +47,66 @@
region: "US",
font: (),
fontsize: 11pt,
- mathfont: none,
- codefont: none,
- linestretch: 1,
sectionnumbering: none,
- linkcolor: none,
- citecolor: none,
- filecolor: none,
pagenumbering: "1",
doc,
) = {
set document(
title: title,
- author: authors.map(author => content-to-string(author.name)).join(", ", last: " & "),
+ author: authors.map(author => content-to-string(author.name)),
keywords: keywords,
)
set page(
paper: paper,
margin: margin,
numbering: pagenumbering,
- )
-
- set par(
- justify: true,
- leading: linestretch * 0.65em
- )
+ columns: cols,
+ )
+ set par(justify: true)
set text(lang: lang,
region: region,
font: font,
size: fontsize)
-
- show math.equation: set text(font: mathfont) if mathfont != none
- show raw: set text(font: codefont) if codefont != none
-
set heading(numbering: sectionnumbering)
- show link: set text(fill: rgb(content-to-string(linkcolor))) if linkcolor != none
- show ref: set text(fill: rgb(content-to-string(citecolor))) if citecolor != none
- show link: this => {
- if filecolor != none and type(this.dest) == label {
- text(this, fill: rgb(content-to-string(filecolor)))
- }
+ place(top, float: true, scope: "parent", clearance: 4mm)[
+ #if title != none {
+ align(center)[#block(inset: 2em)[
+ #text(weight: "bold", size: 1.5em)[#title]
+ #(if subtitle != none {
+ parbreak()
+ text(weight: "bold", size: 1.25em)[#subtitle]
+ })
+ ]]
}
- block(below: 4mm)[
- #if title != none {
- align(center)[#block(inset: 2em)[
- #text(weight: "bold", size: 1.5em)[#title #if thanks != none {
- footnote(thanks, numbering: "*")
- counter(footnote).update(n => n - 1)
- }]
- #(
- if subtitle != none {
- parbreak()
- text(weight: "bold", size: 1.25em)[#subtitle]
- }
- )
- ]]
- }
-
- #if authors != none and authors != [] {
- let count = authors.len()
- let ncols = calc.min(count, 3)
- grid(
- columns: (1fr,) * ncols,
- row-gutter: 1.5em,
- ..authors.map(author => align(center)[
- #author.name \
- #author.affiliation \
- #author.email
- ])
+ #if authors != none and authors != [] {
+ let count = authors.len()
+ let ncols = calc.min(count, 3)
+ grid(
+ columns: (1fr,) * ncols,
+ row-gutter: 1.5em,
+ ..authors.map(author =>
+ align(center)[
+ #author.name \
+ #author.affiliation \
+ #author.email
+ ]
)
- }
+ )
+ }
- #if date != none {
- align(center)[#block(inset: 1em)[
- #date
- ]]
- }
+ #if date != none {
+ align(center)[#block(inset: 1em)[
+ #date
+ ]]
+ }
- #if abstract != none {
- block(inset: 2em)[
- #text(weight: "semibold")[#abstract-title] #h(1em) #abstract
- ]
- }
+ #if abstract != none {
+ block(inset: 2em)[
+ #text(weight: "semibold")[Abstract] #h(1em) #abstract
+ ]
+ }
]
doc
@@ -148,7 +122,6 @@
email: "" ),
),
date: [July 17, 2006],
- abstract-title: [Abstract],
pagenumbering: "1",
cols: 1,
doc,
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-26 22:31:32 +0000