diff options
Diffstat (limited to '')
5 files changed, 12 insertions, 12 deletions
diff --git a/licentia/source/program/licentia/document.lux b/licentia/source/program/licentia/document.lux index 3d5f41dc3..12703675a 100644 --- a/licentia/source/program/licentia/document.lux +++ b/licentia/source/program/licentia/document.lux @@ -28,7 +28,7 @@ (|>> (list#each ..sentence) (text.interposed text.new_line))) -(template [<name> <word>] +(with_template [<name> <word>] [(def: .public <name> (-> (List Text) Text) ... https://en.wikipedia.org/wiki/Serial_comma diff --git a/licentia/source/program/licentia/license/addendum.lux b/licentia/source/program/licentia/license/addendum.lux index a30e271e7..82affbcda 100644 --- a/licentia/source/program/licentia/license/addendum.lux +++ b/licentia/source/program/licentia/license/addendum.lux @@ -17,7 +17,7 @@ (def: .public (output value) (-> Addendum Text) - (`` (format (~~ (template [<title> <condition> <content>] + (`` (format (~~ (with_template [<title> <condition> <content>] [(if <condition> ($.block ($.section [#$.title <title> #$.content <content>])) diff --git a/licentia/source/program/licentia/license/definition.lux b/licentia/source/program/licentia/license/definition.lux index bd748adce..975a906d5 100644 --- a/licentia/source/program/licentia/license/definition.lux +++ b/licentia/source/program/licentia/license/definition.lux @@ -45,7 +45,7 @@ (def: covered_work_description "work of authorship") -(template [<name> <term> <meaning>] +(with_template [<name> <term> <meaning>] [(def: .public <name> Definition [#term <term> diff --git a/licentia/source/program/licentia/license/term.lux b/licentia/source/program/licentia/license/term.lux index 87f94860a..55aee7bae 100644 --- a/licentia/source/program/licentia/license/term.lux +++ b/licentia/source/program/licentia/license/term.lux @@ -4,7 +4,7 @@ ["[0]" // ["[1][0]" definition]]) -(template [<term> <definition>] +(with_template [<term> <definition>] [(def: .public <term> Text (the //definition.#term <definition>))] diff --git a/licentia/source/program/licentia/output.lux b/licentia/source/program/licentia/output.lux index 43599e39b..58747368c 100644 --- a/licentia/source/program/licentia/output.lux +++ b/licentia/source/program/licentia/output.lux @@ -47,7 +47,7 @@ (def: .public (grant termination) (-> Termination Text) - (`` (format (~~ (template [<title> <content>] + (`` (format (~~ (with_template [<title> <content>] [($.block ($.section [#$.title <title> #$.content <content>]))] @@ -69,7 +69,7 @@ (def: .public limitation Text - (`` (format (~~ (template [<title> <content>] + (`` (format (~~ (with_template [<title> <content>] [($.block ($.section [#$.title <title> #$.content <content>]))] @@ -84,7 +84,7 @@ (def: .public assurance Text - (`` (format (~~ (template [<title> <content>] + (`` (format (~~ (with_template [<title> <content>] [($.block ($.section [#$.title <title> #$.content <content>]))] @@ -96,7 +96,7 @@ (def: .public (liability value) (-> Liability Text) - (`` (format (~~ (template [<title> <condition> <content>] + (`` (format (~~ (with_template [<title> <condition> <content>] [(if <condition> ($.block ($.section [#$.title <title> #$.content <content>])) @@ -124,7 +124,7 @@ (def: .public (distribution distribution) (-> Distribution Text) - (`` (format (~~ (template [<title> <condition> <content>] + (`` (format (~~ (with_template [<title> <condition> <content>] [(if <condition> ($.block ($.section [#$.title <title> #$.content <content>])) @@ -145,7 +145,7 @@ (def: .public (commercial value) (-> Commercial Text) - (`` (format (~~ (template [<title> <condition> <content>] + (`` (format (~~ (with_template [<title> <condition> <content>] [(if <condition> ($.block ($.section [#$.title <title> #$.content <content>])) @@ -172,7 +172,7 @@ {.#None} [false ""])] - (`` (format (~~ (template [<condition> <title> <content>] + (`` (format (~~ (with_template [<condition> <title> <content>] [(if <condition> ($.block ($.section [#$.title <title> #$.content <content>])) @@ -214,7 +214,7 @@ (def: .public (miscellaneous identified?) (-> Bit Text) - (`` (format (~~ (template [<title> <condition> <content>] + (`` (format (~~ (with_template [<title> <condition> <content>] [(if <condition> ($.block ($.section [#$.title <title> #$.content <content>])) |