这是indexloc提供的服务，不要输入任何密码
Skip to content

Variably-sized thousands grouping #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 3, 2025
Merged

Variably-sized thousands grouping #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 59 additions & 9 deletions oxifmt.typ
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#let _float-type = type(5.5)
#let _str-type = type("")
#let _label-type = type(<hello>)
#let _arr-type = type(())

#let _minus-sign = "\u{2212}"
#let using-080 = type(type(5)) != _str-type
Expand Down Expand Up @@ -32,6 +33,39 @@
}
}

// Splits an array into dynamic chunk sizes.
// 'chunks' is an array e.g. (1, 2, 3) indicating
// the sizes of each chunk. The last size is repeated if there
// are more elements than the chunks combined can cover.
//
// For example, if arr = ("a", "b", "c", "d", "e", "f", "g", "h", "i") and
// chunks = (2, 3), this will return
// (("a", "b"), ("c", "d", "e"), ("f", "g", "h"), ("i",))
#let _arr-dyn-chunks(arr, chunks) = {
let i = 0
let res = ()
let chunk-i = 0
if chunks == () {
return ()
}

for element in arr {
if i == 0 {
res.push(())
i = chunks.at(chunk-i)
if i <= 0 {
assert(false, message: "String formatter error: internal error: received chunk of invalid size")
}
if chunk-i + 1 != chunks.len() {
chunk-i += 1
}
}
res.last().push(element)
i -= 1
}
res
}

#let _float-is-nan = if using-0110 {
float.is-nan
} else {
Expand Down Expand Up @@ -345,7 +379,12 @@ parameter := argument '$'
}
let (integral, ..fractional) = string-replacement.split(".")
if fmt-thousands-separator != "" and not is-nan and not is-inf {
integral = _arr-chunks(integral.codepoints().rev(), fmt-thousands-count)
let digit-groups = if type(fmt-thousands-count) == _arr-type {
_arr-dyn-chunks(integral.codepoints().rev(), fmt-thousands-count)
} else {
_arr-chunks(integral.codepoints().rev(), fmt-thousands-count)
}
integral = digit-groups
.join(fmt-thousands-separator.codepoints().rev())
.rev()
.join()
Expand Down Expand Up @@ -537,7 +576,12 @@ parameter := argument '$'

// Format with thousands AFTER zeroes, but BEFORE applying textual prefixes
if fmt-thousands-separator != "" and not is-nan and not is-inf {
integral = _arr-chunks(integral.codepoints().rev(), fmt-thousands-count)
let digit-groups = if type(fmt-thousands-count) == _arr-type {
_arr-dyn-chunks(integral.codepoints().rev(), fmt-thousands-count)
} else {
_arr-chunks(integral.codepoints().rev(), fmt-thousands-count)
}
integral = digit-groups
.join(fmt-thousands-separator.codepoints().rev())
.rev()
.join()
Expand Down Expand Up @@ -606,17 +650,23 @@ parameter := argument '$'
)
}

if type(fmt-thousands-count) != _int-type {
if type(fmt-thousands-count) == _arr-type {
assert(
false,
message: "String formatter error: 'fmt-thousands-count' must be an integer, got '" + str(type(fmt-thousands-count)) + "' instead."
fmt-thousands-count.all(c => type(c) == _int-type and c > 0),
message: "String formatter error: 'fmt-thousands-count' must be a positive integer or array of positive integers, got an array with at least one element that isn't a positive integer."
)
}

if fmt-thousands-count <= 0 {
assert(fmt-thousands-count != (), message: "String formatter error: 'fmt-thousands-count' must not be an empty array, but an array of positive integers.")
} else if type(fmt-thousands-count) == _int-type {
if fmt-thousands-count <= 0 {
assert(
false,
message: "String formatter error: 'fmt-thousands-count' must be a positive integer, got " + str(fmt-thousands-count) + " instead."
)
}
} else {
assert(
false,
message: "String formatter error: 'fmt-thousands-count' must be a positive integer, got " + str(fmt-thousands-count) + " instead."
message: "String formatter error: 'fmt-thousands-count' must be a positive integer or array of positive integers, got '" + str(type(fmt-thousands-count)) + "' instead."
)
}

Expand Down
24 changes: 21 additions & 3 deletions tests/strfmt-tests.typ
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,27 @@
assert.eq(strfmt("{:#b}", 255, fmt-thousands-count: 1, fmt-thousands-separator: "_"), "0b1_1_1_1_1_1_1_1")
assert.eq(strfmt("{:#x}", -16 * 16 * 16 * 16 * 15, fmt-thousands-count: 2, fmt-thousands-separator: "_"), "-0xf_00_00")
assert.eq(strfmt("{:o}", -16 * 16 * 16 * 16 * 15, fmt-thousands-count: 4, fmt-thousands-separator: "_"), "-360_0000")
assert.eq(strfmt("{:05}", float("nan"), fmt-thousands-count: 2, fmt-thousands-separator: "_"), "00NaN")
assert.eq(strfmt("{:05}", float("inf"), fmt-thousands-count: 2, fmt-thousands-separator: "_"), "00inf")
assert.eq(strfmt("{:05}", -float("inf"), fmt-thousands-count: 2, fmt-thousands-separator: "_"), "-0inf")
assert.eq(strfmt("{:08}", float("nan"), fmt-thousands-count: 2, fmt-thousands-separator: "_"), "00000NaN")
assert.eq(strfmt("{:08}", float("inf"), fmt-thousands-count: 2, fmt-thousands-separator: "_"), "00000inf")
assert.eq(strfmt("{:08}", -float("inf"), fmt-thousands-count: 2, fmt-thousands-separator: "_"), "-0000inf")

// Issue #21: variable group sizes
assert.eq(strfmt("{}", 10, fmt-thousands-count: (3, 2), fmt-thousands-separator: "_"), "10")
assert.eq(strfmt("{}", 1000000, fmt-thousands-count: (3, 2), fmt-thousands-separator: ","), "10,00,000")
assert.eq(strfmt("{}", 1000000, fmt-thousands-count: (3, 2, 2, 2, 2, 2, 2, 2), fmt-thousands-separator: ","), "10,00,000")
assert.eq(strfmt("{}", 10000000000, fmt-thousands-count: (3, 2), fmt-thousands-separator: ","), "10,00,00,00,000")
assert.eq(strfmt("{}", 10000000000, fmt-thousands-count: (1, 2, 3), fmt-thousands-separator: ","), "10,000,000,00,0")
assert.eq(strfmt("{}", 10000000.3231, fmt-thousands-count: (1, 2, 3), fmt-thousands-separator: "_"), "10_000_00_0.3231")
assert.eq(strfmt("{}", float("nan"), fmt-thousands-count: (1, 2, 3), fmt-thousands-separator: "_"), "NaN")
assert.eq(strfmt("{}", float("inf"), fmt-thousands-count: (1, 2, 3), fmt-thousands-separator: "_"), "inf")
assert.eq(strfmt("{}", -float("inf"), fmt-thousands-count: (1, 2, 3), fmt-thousands-separator: "_"), "-inf")
assert.eq(strfmt("{:014}", -23003, fmt-thousands-count: (4, 4, 2), fmt-thousands-separator: "|"), "-0|00|00|0002|3003")
assert.eq(strfmt("{:#b}", 255, fmt-thousands-count: (1, 2, 1, 2, 1), fmt-thousands-separator: "_"), "0b1_1_11_1_11_1")
assert.eq(strfmt("{:#x}", -16 * 16 * 16 * 16 * 15, fmt-thousands-count: (3, 2), fmt-thousands-separator: "_"), "-0xf0_000")
assert.eq(strfmt("{:o}", -16 * 16 * 16 * 16 * 15, fmt-thousands-count: (4, 2, 1), fmt-thousands-separator: "_"), "-3_60_0000")
assert.eq(strfmt("{:08}", float("nan"), fmt-thousands-count: (2, 3), fmt-thousands-separator: "_"), "00000NaN")
assert.eq(strfmt("{:08}", float("inf"), fmt-thousands-count: (2, 3), fmt-thousands-separator: "_"), "00000inf")
assert.eq(strfmt("{:08}", -float("inf"), fmt-thousands-count: (2, 3), fmt-thousands-separator: "_"), "-0000inf")
}
// Issue #11: Decimals
#if using-0120 {
Expand Down