improve iterate parameter

This commit is contained in:
cajun
2024-10-07 17:35:01 -05:00
parent 67ee280c32
commit 5ab2a404ed
4 changed files with 21 additions and 7 deletions

View File

@@ -42,6 +42,8 @@ init script:
corners_default := { "diagonal" }
font_size := { if styling.font_size == "" then 26 else to_number_lax(styling.font_size) or else 26 }
swap_font := { true }
swap_fonts_name_src := { styling.name_font }
@@ -68,7 +70,7 @@ init script:
swap_fonts_body_default :=
[
name: {"MPlantin"},
size: {if styling.font_size == "" then 26 else to_number_lax(styling.font_size) or else 26},
size: {font_size()},
color: {"black"},
vertical: {0},
italic: {"MPlantin-Italic"}

View File

@@ -45,6 +45,8 @@ init script:
corners_default := { "diagonal" }
font_size := { if styling.font_size == "" then 26 else to_number_lax(styling.font_size) or else 26 }
swap_font := { true }
swap_fonts_name_src := { styling.name_font }
@@ -71,7 +73,7 @@ init script:
swap_fonts_body_default :=
[
name: {"MPlantin"},
size: {if styling.font_size == "" then 26 else to_number_lax(styling.font_size) or else 26},
size: {font_size()},
color: {"black"},
vertical: {0},
italic: {"MPlantin-Italic"}

View File

@@ -153,11 +153,15 @@ keyword parameter type:
match: mills?
keyword parameter type:
name: iterate
match: [., ](t?w?i?c?e?|t?h?r?e?e?|f?o?u?r?|f?i?v?e?|s?i?x?|s?e?v?e?n?|X?)?( ?t?i?m?e?s?)?
match: [., ](o?n?c?e?|o?n?e?|t?w?i?c?e?|t?w?o?|t?h?r?e?e?|f?o?u?r?|f?i?v?e?|s?i?x?|s?e?v?e?n?|X?)?( ?t?i?m?e?s?)?
refer script:
name: as words
description: Use the iteration word (twice, three times, etc)
script: \{iterate_fix({input})\}
name: as words, use "" for blank
description: Use the iteration word (twice, three, etc)
script: \{iterate_string({input})\}
refer script:
name: as words, use "one" for blank
description: Use the iteration word (twice, three, etc)
script: \{iterate_string({input}, empty:"one")\}
refer script:
name: as number
description: Use the iteration word (twice, three times, etc)

View File

@@ -1068,7 +1068,13 @@ iterate_fix := remove_tags
+replace@(match: "^\\.", replace:"")
+replace@(match: "^,", replace:"")
+replace@(match: "^[ ]", replace:"")
+replace@(match:" times", replace:"")
+replace@(match:" ti?m?e?s?$", replace:"")
iterate_string := {
str := iterate_fix(input)
if str == ""
then empty_lead + empty + empty_follow
else non_empty_lead + str + non_empty_follow
}@(non_empty_lead:" ", non_empty_follow:"", empty_lead:"", empty_follow:"", empty:"")
digital_map := [
"zero": 0,
"one": 1,