De-taggification | part 2

22 files changed, 98 insertions, 98 deletions

diff --git a/licentia/source/program/licentia.lux b/licentia/source/program/licentia.lux
index 04fd52191..a6e0820c3 100644
--- a/licentia/source/program/licentia.lux
+++ b/licentia/source/program/licentia.lux
@@ -13,17 +13,17 @@
 
 (.module:
   [library
-   [lux #*
-    [ffi (#+ import:)]
-    [program (#+ program:)]
+   [lux "*"
+    [ffi {"+" [import:]}]
+    [program {"+" [program:]}]
     ["." debug]
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [control
-     [remember (#+ to_do)]
-     ["." io (#+ IO) ("#\." monad)]
+     [remember {"+" [to_do]}]
+     ["." io {"+" [IO]} ("#\." monad)]
      ["." maybe]
-     ["." try (#+ Try)]
+     ["." try {"+" [Try]}]
      ["." parser
       ["<.>" cli]
       ["<.>" json]]
@@ -31,14 +31,14 @@
       ["!" capability]]]
     [data
      ["." text
-      ["%" format (#+ format)]
+      ["%" format {"+" [format]}]
       [encoding
        ["." utf8]]]
      [format
       ["." json]]]
     [world
      ["." file]]]]
-  ["." / #_
+  ["." / "_"
    ["#." input]
    ["#." output]])
 
diff --git a/licentia/source/program/licentia/document.lux b/licentia/source/program/licentia/document.lux
index 07a4e2b83..0746e3cbc 100644
--- a/licentia/source/program/licentia/document.lux
+++ b/licentia/source/program/licentia/document.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux (#- or and)
+   [lux {"-" [or and]}
     [data
      ["." text
-      ["%" format (#+ format)]]
+      ["%" format {"+" [format]}]]
      [collection
       ["." list ("#\." functor)]]]]])
 
diff --git a/licentia/source/program/licentia/input.lux b/licentia/source/program/licentia/input.lux
index f6a438e7f..7f2796026 100644
--- a/licentia/source/program/licentia/input.lux
+++ b/licentia/source/program/licentia/input.lux
@@ -1,32 +1,32 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [control
-     ["." exception (#+ exception:)]
+     ["." exception {"+" [exception:]}]
      ["<>" parser
-      ["<.>" json (#+ Parser)]]]
+      ["<.>" json {"+" [Parser]}]]]
     [data
      [text
-      ["%" format (#+ format)]]]
+      ["%" format {"+" [format]}]]]
     [math
      [number
       ["n" nat]
       ["i" int]
       ["f" frac]]]]]
-  ["." // #_
-   ["#" license (#+ Identification
-                    Termination
-                    Liability
-                    Distribution
-                    Commercial
-                    Extension
-                    Entity Black_List
-                    URL Attribution
-                    Addendum
-                    License)
-    ["." time (#+ Period)]
+  ["." // "_"
+   ["#" license {"+" [Identification
+                      Termination
+                      Liability
+                      Distribution
+                      Commercial
+                      Extension
+                      Entity Black_List
+                      URL Attribution
+                      Addendum
+                      License]}
+    ["." time {"+" [Period]}]
     ["." copyright]]])
 
 (def: identification
diff --git a/licentia/source/program/licentia/license.lux b/licentia/source/program/licentia/license.lux
index 052ad1f05..c810e865d 100644
--- a/licentia/source/program/licentia/license.lux
+++ b/licentia/source/program/licentia/license.lux
@@ -1,8 +1,8 @@
 (.module:
   [library
-   [lux #*]]
-  ["." / #_
-   [time (#+ Days Months Period)]
+   [lux "*"]]
+  ["." / "_"
+   [time {"+" [Days Months Period]}]
    ["#." copyright]])
 
 (type: .public Identification
diff --git a/licentia/source/program/licentia/license/addendum.lux b/licentia/source/program/licentia/license/addendum.lux
index 1fffda746..825e91968 100644
--- a/licentia/source/program/licentia/license/addendum.lux
+++ b/licentia/source/program/licentia/license/addendum.lux
@@ -1,10 +1,10 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [data
      [text
-      ["%" format (#+ format)]]]]]
-  ["." // (#+ Addendum)
+      ["%" format {"+" [format]}]]]]]
+  ["." // {"+" [Addendum]}
    [//
     ["$" document]]])
 
diff --git a/licentia/source/program/licentia/license/assurance.lux b/licentia/source/program/licentia/license/assurance.lux
index ca1f697d6..64e865e14 100644
--- a/licentia/source/program/licentia/license/assurance.lux
+++ b/licentia/source/program/licentia/license/assurance.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [data
      ["." text
-      ["%" format (#+ format)]]]]]
+      ["%" format {"+" [format]}]]]]]
   [//
    ["_" term]
    [//
diff --git a/licentia/source/program/licentia/license/black_list.lux b/licentia/source/program/licentia/license/black_list.lux
index fbedb62cd..96dd85d85 100644
--- a/licentia/source/program/licentia/license/black_list.lux
+++ b/licentia/source/program/licentia/license/black_list.lux
@@ -1,14 +1,14 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [control
      ["." maybe ("#\." functor)]]
     [data
      ["." text
-      ["%" format (#+ format)]]
+      ["%" format {"+" [format]}]]
      [collection
       ["." list ("#\." functor)]]]]]
-  ["." // (#+ Entity Black_List)
+  ["." // {"+" [Entity Black_List]}
    ["_" term]
    [//
     ["$" document]]])
diff --git a/licentia/source/program/licentia/license/commercial.lux b/licentia/source/program/licentia/license/commercial.lux
index 6af68b860..5a9ea86d3 100644
--- a/licentia/source/program/licentia/license/commercial.lux
+++ b/licentia/source/program/licentia/license/commercial.lux
@@ -1,10 +1,10 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [data
      ["." text
-      ["%" format (#+ format)]]]]]
-  ["." // (#+ Commercial)
+      ["%" format {"+" [format]}]]]]]
+  ["." // {"+" [Commercial]}
    ["_" term]
    [//
     ["$" document]]])
diff --git a/licentia/source/program/licentia/license/copyright.lux b/licentia/source/program/licentia/license/copyright.lux
index 3d48653b6..a2cdc6fe5 100644
--- a/licentia/source/program/licentia/license/copyright.lux
+++ b/licentia/source/program/licentia/license/copyright.lux
@@ -1,8 +1,8 @@
 (.module:
   [library
-   [lux #*]]
+   [lux "*"]]
   [//
-   [time (#+ Year Period)]])
+   [time {"+" [Year Period]}]])
 
 (type: .public Holder
   (Record
diff --git a/licentia/source/program/licentia/license/definition.lux b/licentia/source/program/licentia/license/definition.lux
index 0765a488f..921c67675 100644
--- a/licentia/source/program/licentia/license/definition.lux
+++ b/licentia/source/program/licentia/license/definition.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux (#- Definition)
+   [lux {"-" [Definition]}
     [data
      ["." text
-      ["%" format (#+ format)]]]]]
+      ["%" format {"+" [format]}]]]]]
   [///
    ["$" document]])
 
diff --git a/licentia/source/program/licentia/license/distribution.lux b/licentia/source/program/licentia/license/distribution.lux
index e5185598f..22a783d79 100644
--- a/licentia/source/program/licentia/license/distribution.lux
+++ b/licentia/source/program/licentia/license/distribution.lux
@@ -1,12 +1,12 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [data
      ["." text
-      ["%" format (#+ format)]]
+      ["%" format {"+" [format]}]]
      [collection
       ["." list ("#\." monoid)]]]]]
-  ["." // (#+ Distribution)
+  ["." // {"+" [Distribution]}
    ["_" term]
    [//
     ["$" document]]])
diff --git a/licentia/source/program/licentia/license/extension.lux b/licentia/source/program/licentia/license/extension.lux
index 38c93fb13..2cf225b88 100644
--- a/licentia/source/program/licentia/license/extension.lux
+++ b/licentia/source/program/licentia/license/extension.lux
@@ -1,13 +1,13 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [data
      ["." text
-      ["%" format (#+ format)]]]]]
-  ["." // (#+ Extension)
+      ["%" format {"+" [format]}]]]]]
+  ["." // {"+" [Extension]}
    ["_" term]
    ["." grant]
-   [time (#+ Months Period)]
+   [time {"+" [Months Period]}]
    [//
     ["$" document]]])
 
diff --git a/licentia/source/program/licentia/license/grant.lux b/licentia/source/program/licentia/license/grant.lux
index bae1478c7..a0ad84474 100644
--- a/licentia/source/program/licentia/license/grant.lux
+++ b/licentia/source/program/licentia/license/grant.lux
@@ -1,11 +1,11 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [data
      ["." text
-      ["%" format (#+ format)]]]]]
+      ["%" format {"+" [format]}]]]]]
   [//
-   [time (#+ Days)]
+   [time {"+" [Days]}]
    ["_" term]
    ["." definition]
    [//
diff --git a/licentia/source/program/licentia/license/liability.lux b/licentia/source/program/licentia/license/liability.lux
index b56e51a50..aac47b4e9 100644
--- a/licentia/source/program/licentia/license/liability.lux
+++ b/licentia/source/program/licentia/license/liability.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [data
      ["." text
-      ["%" format (#+ format)]]]]]
+      ["%" format {"+" [format]}]]]]]
   [//
    ["_" term]
    [//
diff --git a/licentia/source/program/licentia/license/limitation.lux b/licentia/source/program/licentia/license/limitation.lux
index aebaa0faa..3da275235 100644
--- a/licentia/source/program/licentia/license/limitation.lux
+++ b/licentia/source/program/licentia/license/limitation.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [data
      ["." text
-      ["%" format (#+ format)]]]]]
+      ["%" format {"+" [format]}]]]]]
   [//
    ["_" term]
    [//
diff --git a/licentia/source/program/licentia/license/miscellaneous.lux b/licentia/source/program/licentia/license/miscellaneous.lux
index 35cddfa5a..bda4bade6 100644
--- a/licentia/source/program/licentia/license/miscellaneous.lux
+++ b/licentia/source/program/licentia/license/miscellaneous.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [data
      ["." text
-      ["%" format (#+ format)]]]]]
+      ["%" format {"+" [format]}]]]]]
   [//
    ["_" term]
    [//
diff --git a/licentia/source/program/licentia/license/notice.lux b/licentia/source/program/licentia/license/notice.lux
index c6f27e183..7ade12fc8 100644
--- a/licentia/source/program/licentia/license/notice.lux
+++ b/licentia/source/program/licentia/license/notice.lux
@@ -1,15 +1,15 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [data
      ["." text
-      ["%" format (#+ format)]]
+      ["%" format {"+" [format]}]]
      [collection
       ["." list ("#\." functor)]]]
     [math
      [number
       ["n" nat]]]]]
-  ["." // #_
+  ["." // "_"
    ["#." time]
    ["#." copyright]
    ["_" term]
diff --git a/licentia/source/program/licentia/license/submission.lux b/licentia/source/program/licentia/license/submission.lux
index d83d54d80..4b74d0df8 100644
--- a/licentia/source/program/licentia/license/submission.lux
+++ b/licentia/source/program/licentia/license/submission.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [data
      ["." text
-      ["%" format (#+ format)]]]]]
+      ["%" format {"+" [format]}]]]]]
   [//
    ["_" term]
    [//
diff --git a/licentia/source/program/licentia/license/term.lux b/licentia/source/program/licentia/license/term.lux
index 9b210fb2b..2d4df6ce7 100644
--- a/licentia/source/program/licentia/license/term.lux
+++ b/licentia/source/program/licentia/license/term.lux
@@ -1,7 +1,7 @@
 (.module:
   [library
-   [lux (#- Definition)]]
-  ["." // #_
+   [lux {"-" [Definition]}]]
+  ["." // "_"
    ["#." definition]])
 
 (template [<term> <definition>]
diff --git a/licentia/source/program/licentia/license/time.lux b/licentia/source/program/licentia/license/time.lux
index e19f7ef16..8da867dba 100644
--- a/licentia/source/program/licentia/license/time.lux
+++ b/licentia/source/program/licentia/license/time.lux
@@ -1,6 +1,6 @@
 (.module:
   [library
-   [lux #*]])
+   [lux "*"]])
 
 (type: .public Days
   Nat)
diff --git a/licentia/source/program/licentia/output.lux b/licentia/source/program/licentia/output.lux
index 03380ece9..8b69b0f8d 100644
--- a/licentia/source/program/licentia/output.lux
+++ b/licentia/source/program/licentia/output.lux
@@ -1,26 +1,26 @@
 (.module:
   [library
-   [lux (#- Definition)
+   [lux {"-" [Definition]}
     [control
      ["." maybe ("#\." functor)]]
     [data
      ["." bit]
      ["." text
-      ["%" format (#+ format)]]
+      ["%" format {"+" [format]}]]
      [collection
       ["." list ("#\." functor monoid)]]]]]
   [//
-   ["." license (#+ Identification
-                    Termination
-                    Liability
-                    Distribution
-                    Commercial
-                    Extension
-                    Entity Black_List
-                    URL Attribution
-                    License)
+   ["." license {"+" [Identification
+                      Termination
+                      Liability
+                      Distribution
+                      Commercial
+                      Extension
+                      Entity Black_List
+                      URL Attribution
+                      License]}
     ["." copyright]
-    ["." definition (#+ Definition)]
+    ["." definition {"+" [Definition]}]
     ["." grant]
     ["." limitation]
     ["." assurance]
diff --git a/licentia/source/test/licentia.lux b/licentia/source/test/licentia.lux
index 7238b6c71..e3204e598 100644
--- a/licentia/source/test/licentia.lux
+++ b/licentia/source/test/licentia.lux
@@ -1,10 +1,10 @@
 (.module:
   [library
-   [lux #*
-    [program (#+ program:)]
-    ["_" test (#+ Test)]
+   [lux "*"
+    [program {"+" [program:]}]
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [control
      ["." io]
      ["." maybe ("#\." functor)]]
@@ -14,22 +14,22 @@
      [collection
       ["." list ("#\." functor)]]]
     [math
-     ["." random (#+ Random)]
+     ["." random {"+" [Random]}]
      [number
       ["n" nat ("#\." interval)]]]]]
   [\\program
    ["." output]
-   ["." license (#+ Identification
-                    Termination
-                    Liability
-                    Distribution
-                    Commercial
-                    Extension
-                    Entity Black_List
-                    URL Attribution
-                    Addendum
-                    License)
-    ["." time (#+ Period)]
+   ["." license {"+" [Identification
+                      Termination
+                      Liability
+                      Distribution
+                      Commercial
+                      Extension
+                      Entity Black_List
+                      URL Attribution
+                      Addendum
+                      License]}
+    ["." time {"+" [Period]}]
     ["." copyright]
     ["." notice]
     ["." definition]