mirror of
https://github.com/typst/typst
synced 2025-05-15 01:25:28 +08:00
Add roman numeral and footnote formatting
This commit is contained in:
parent
e32e9faa53
commit
e6a0447f9d
@ -143,6 +143,8 @@ pub fn new() -> Scope {
|
|||||||
std.def_func("rgb", rgb);
|
std.def_func("rgb", rgb);
|
||||||
std.def_func("lower", lower);
|
std.def_func("lower", lower);
|
||||||
std.def_func("upper", upper);
|
std.def_func("upper", upper);
|
||||||
|
std.def_func("roman", roman);
|
||||||
|
std.def_func("symbol", symbol);
|
||||||
std.def_func("len", len);
|
std.def_func("len", len);
|
||||||
std.def_func("sorted", sorted);
|
std.def_func("sorted", sorted);
|
||||||
|
|
||||||
|
@ -6,6 +6,31 @@ use std::str::FromStr;
|
|||||||
use super::prelude::*;
|
use super::prelude::*;
|
||||||
use crate::eval::Array;
|
use crate::eval::Array;
|
||||||
|
|
||||||
|
static ROMAN_PAIRS: &'static [(&'static str, u32)] = &[
|
||||||
|
("M̅", 1000000),
|
||||||
|
("D̅", 500000),
|
||||||
|
("C̅", 100000),
|
||||||
|
("L̅", 50000),
|
||||||
|
("X̅", 10000),
|
||||||
|
("V̅", 5000),
|
||||||
|
("I̅V̅", 4000),
|
||||||
|
("M", 1000),
|
||||||
|
("CM", 900),
|
||||||
|
("D", 500),
|
||||||
|
("CD", 400),
|
||||||
|
("C", 100),
|
||||||
|
("XC", 90),
|
||||||
|
("L", 50),
|
||||||
|
("XL", 40),
|
||||||
|
("X", 10),
|
||||||
|
("IX", 9),
|
||||||
|
("V", 5),
|
||||||
|
("IV", 4),
|
||||||
|
("I", 1),
|
||||||
|
];
|
||||||
|
|
||||||
|
static SYMBOLS: &'static [char] = &['*', '†', '‡', '§', '‖', '¶'];
|
||||||
|
|
||||||
/// Ensure that a condition is fulfilled.
|
/// Ensure that a condition is fulfilled.
|
||||||
pub fn assert(_: &mut EvalContext, args: &mut Args) -> TypResult<Value> {
|
pub fn assert(_: &mut EvalContext, args: &mut Args) -> TypResult<Value> {
|
||||||
let Spanned { v, span } = args.expect::<Spanned<bool>>("condition")?;
|
let Spanned { v, span } = args.expect::<Spanned<bool>>("condition")?;
|
||||||
@ -201,6 +226,54 @@ pub fn upper(_: &mut EvalContext, args: &mut Args) -> TypResult<Value> {
|
|||||||
Ok(args.expect::<EcoString>("string")?.to_uppercase().into())
|
Ok(args.expect::<EcoString>("string")?.to_uppercase().into())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Converts an integer into a roman numeral.
|
||||||
|
///
|
||||||
|
/// Works for integer between 0 and 3,999,999 inclusive, returns None otherwise.
|
||||||
|
/// Adapted from Yann Villessuzanne's roman.rs under the Unlicense, at
|
||||||
|
/// https://github.com/linfir/roman.rs/
|
||||||
|
pub fn roman(_: &mut EvalContext, args: &mut Args) -> TypResult<Value> {
|
||||||
|
let source: Spanned<i64> = args.expect("integer")?;
|
||||||
|
let mut n = source.v as u32;
|
||||||
|
|
||||||
|
match n {
|
||||||
|
0 => return Ok("N".into()),
|
||||||
|
i if i > 3_999_999 => {
|
||||||
|
bail!(
|
||||||
|
source.span,
|
||||||
|
"cannot convert integers greater than 3,999,999 to roman numerals"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut roman = String::new();
|
||||||
|
for &(name, value) in ROMAN_PAIRS.iter() {
|
||||||
|
while n >= value {
|
||||||
|
n -= value;
|
||||||
|
roman.push_str(name);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(roman.into())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Convert a number into a roman numeral.
|
||||||
|
pub fn symbol(_: &mut EvalContext, args: &mut Args) -> TypResult<Value> {
|
||||||
|
let source: Spanned<i64> = args.expect("integer")?;
|
||||||
|
let n: usize = match source.v.try_into() {
|
||||||
|
Ok(n) => n,
|
||||||
|
Err(_) if source.v < 0 => bail!(source.span, "number must not be negative"),
|
||||||
|
Err(_) => bail!(source.span, "number too large"),
|
||||||
|
};
|
||||||
|
|
||||||
|
let symbol = SYMBOLS[n % SYMBOLS.len()];
|
||||||
|
let amount = (n / SYMBOLS.len()) + 1;
|
||||||
|
|
||||||
|
let symbols: String = std::iter::repeat(symbol).take(amount).collect();
|
||||||
|
|
||||||
|
Ok(symbols.into())
|
||||||
|
}
|
||||||
|
|
||||||
/// The length of a string, an array or a dictionary.
|
/// The length of a string, an array or a dictionary.
|
||||||
pub fn len(_: &mut EvalContext, args: &mut Args) -> TypResult<Value> {
|
pub fn len(_: &mut EvalContext, args: &mut Args) -> TypResult<Value> {
|
||||||
let Spanned { v, span } = args.expect("collection")?;
|
let Spanned { v, span } = args.expect("collection")?;
|
||||||
|
BIN
tests/ref/utility/strings.png
Normal file
BIN
tests/ref/utility/strings.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 10 KiB |
23
tests/typ/utility/strings.typ
Normal file
23
tests/typ/utility/strings.typ
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
// Test string functions.
|
||||||
|
|
||||||
|
---
|
||||||
|
// Test the `upper`, `lower`, and number formatting functions.
|
||||||
|
#upper("Abc 8 def")
|
||||||
|
|
||||||
|
#lower("SCREAMING MUST BE SILENCED in " + roman(1672) + " years")
|
||||||
|
|
||||||
|
#for i in range(9) {
|
||||||
|
symbol(i)
|
||||||
|
[ and ]
|
||||||
|
roman(i)
|
||||||
|
[ for #i]
|
||||||
|
parbreak()
|
||||||
|
}
|
||||||
|
|
||||||
|
---
|
||||||
|
// Error: 8-15 cannot convert integers greater than 3,999,999 to roman numerals
|
||||||
|
#roman(8000000)
|
||||||
|
|
||||||
|
---
|
||||||
|
// Error: 9-11 number must not be negative
|
||||||
|
#symbol(-1)
|
Loading…
x
Reference in New Issue
Block a user