diff options
| author | Eduardo Julian | 2021-08-16 01:12:01 -0400 |
|---|---|---|
| committer | Eduardo Julian | 2021-08-16 01:12:01 -0400 |
| commit | 3289b9dcf9d5d1c1e5c380e3185065c8fd32535f (patch) | |
| tree | fc2f67581dd7b1d72c20217a95e031187a375bc5 /licentia | |
| parent | 6fd22846f21b8b70b7867e989109d14a366c0a3e (diff) | |
Made extension-definition macros specify their bindings the same way as syntax:.
Diffstat (limited to 'licentia')
4 files changed, 6 insertions, 6 deletions
diff --git a/licentia/source/program/licentia/document.lux b/licentia/source/program/licentia/document.lux index 94348f030..c7806ab6a 100644 --- a/licentia/source/program/licentia/document.lux +++ b/licentia/source/program/licentia/document.lux @@ -26,13 +26,13 @@ (def: .public paragraph (-> (List Text) Text) (|>> (list\map ..sentence) - (text.join_with text.new_line))) + (text.interposed text.new_line))) (template [<name> <word>] [(def: .public <name> (-> (List Text) Text) ... https://en.wikipedia.org/wiki/Serial_comma - (text.join_with (format ", " <word> " ")))] + (text.interposed (format ", " <word> " ")))] [or "or"] [and "and"] diff --git a/licentia/source/program/licentia/license/black_list.lux b/licentia/source/program/licentia/license/black_list.lux index 96fafb6c7..577f53242 100644 --- a/licentia/source/program/licentia/license/black_list.lux +++ b/licentia/source/program/licentia/license/black_list.lux @@ -28,6 +28,6 @@ entities (|> black_list (get@ #//.entities) (list\map ..entity) - (text.join_with text.new_line))] + (text.interposed text.new_line))] (format scope " " effect justification ":" text.new_line entities))) diff --git a/licentia/source/program/licentia/license/notice.lux b/licentia/source/program/licentia/license/notice.lux index cbac11e8b..87308f87b 100644 --- a/licentia/source/program/licentia/license/notice.lux +++ b/licentia/source/program/licentia/license/notice.lux @@ -31,4 +31,4 @@ (def: .public copyright (-> (List //copyright.Holder) Text) (|>> (list\map ..copyright_holder) - (text.join_with text.new_line))) + (text.interposed text.new_line))) diff --git a/licentia/source/program/licentia/output.lux b/licentia/source/program/licentia/output.lux index 9b753b4c6..bef7014b3 100644 --- a/licentia/source/program/licentia/output.lux +++ b/licentia/source/program/licentia/output.lux @@ -274,12 +274,12 @@ ($.block ($.section {#$.title (format "Denial of " _.license) #$.content (|> black_lists (list\map black_list.black_list) - (text.join_with ..black_list_spacing))}))) + (text.interposed ..black_list_spacing))}))) ($.section {#$.title "Definitions" #$.content (|> definition.all (list\map (|>> ..definition $.block)) - (text.join_with ""))}) + (text.interposed ""))}) ($.block ($.section {#$.title (format "Acceptance of " _.license) #$.content limitation.acceptance})) |