De-taggification | part 2

12 files changed, 72 insertions, 72 deletions

diff --git a/stdlib/source/program/aedifex/artifact/extension.lux b/stdlib/source/program/aedifex/artifact/extension.lux
index 130dda74e..6b3a61367 100644
--- a/stdlib/source/program/aedifex/artifact/extension.lux
+++ b/stdlib/source/program/aedifex/artifact/extension.lux
@@ -1,12 +1,12 @@
 (.module:
   [library
-   [lux (#- type)
+   [lux {"-" [type]}
     [data
      ["." text
-      ["%" format (#+ format)]]]
+      ["%" format {"+" [format]}]]]
     [macro
      ["." template]]]]
-  ["." // #_
+  ["." // "_"
    ["#" type]])
 
 (type: .public Extension
diff --git a/stdlib/source/program/aedifex/artifact/snapshot.lux b/stdlib/source/program/aedifex/artifact/snapshot.lux
index 936419788..a83905f0b 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot.lux
@@ -1,19 +1,19 @@
 (.module:
   [library
-   [lux (#- Name Type)
+   [lux {"-" [Name Type]}
     [abstract
-     [equivalence (#+ Equivalence)]
-     [monad (#+ do)]]
+     [equivalence {"+" [Equivalence]}]
+     [monad {"+" [do]}]]
     [control
      ["<>" parser
-      ["<.>" xml (#+ Parser)]
+      ["<.>" xml {"+" [Parser]}]
       ["<.>" text]]]
     [data
      ["." sum]
      [format
-      ["." xml (#+ XML)]]]]]
-  ["." / #_
-   ["#." stamp (#+ Stamp)]])
+      ["." xml {"+" [XML]}]]]]]
+  ["." / "_"
+   ["#." stamp {"+" [Stamp]}]])
 
 (type: .public Snapshot
   (Variant
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/build.lux b/stdlib/source/program/aedifex/artifact/snapshot/build.lux
index 15d0c91dd..3afdf31b1 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/build.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/build.lux
@@ -1,18 +1,18 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [abstract
-     [equivalence (#+ Equivalence)]
-     [monad (#+ do)]]
+     [equivalence {"+" [Equivalence]}]
+     [monad {"+" [do]}]]
     [control
      ["<>" parser
-      ["<.>" xml (#+ Parser)]
+      ["<.>" xml {"+" [Parser]}]
       ["<.>" text]]]
     [data
      [text
       ["%" format]]
      [format
-      ["." xml (#+ XML)]]]
+      ["." xml {"+" [XML]}]]]
     [math
      [number
       ["." nat]]]]])
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux b/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux
index 91fcc3de5..8d57034ef 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux
@@ -1,20 +1,20 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [abstract
-     [equivalence (#+ Equivalence)]
-     [monad (#+ do)]]
+     [equivalence {"+" [Equivalence]}]
+     [monad {"+" [do]}]]
     [control
      ["<>" parser
-      ["<.>" xml (#+ Parser)]
+      ["<.>" xml {"+" [Parser]}]
       ["<.>" text]]]
     [data
      ["." product]
      [format
-      ["." xml (#+ XML)]]]]]
-  ["." // #_
-   ["#." time (#+ Time)]
-   ["#." build (#+ Build)]])
+      ["." xml {"+" [XML]}]]]]]
+  ["." // "_"
+   ["#." time {"+" [Time]}]
+   ["#." build {"+" [Build]}]])
 
 (type: .public Stamp
   (Record
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/time.lux b/stdlib/source/program/aedifex/artifact/snapshot/time.lux
index 703354eb8..ab62308b2 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/time.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/time.lux
@@ -1,22 +1,22 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [abstract
-     [equivalence (#+ Equivalence)]
-     [monad (#+ do)]]
+     [equivalence {"+" [Equivalence]}]
+     [monad {"+" [do]}]]
     [control
-     ["." exception (#+ exception:)]
+     ["." exception {"+" [exception:]}]
      ["<>" parser
       ["<.>" text]
-      ["<.>" xml (#+ Parser)]]]
+      ["<.>" xml {"+" [Parser]}]]]
     [data
      [text
       ["%" format]]
      [format
-      ["." xml (#+ XML)]]]
+      ["." xml {"+" [XML]}]]]
     [time
-     ["." instant (#+ Instant)]]]]
-  ["." /// #_
+     ["." instant {"+" [Instant]}]]]]
+  ["." /// "_"
    ["#." time
     ["#/." date]
     ["#/." time]]])
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/version.lux b/stdlib/source/program/aedifex/artifact/snapshot/version.lux
index 821d3d2c5..ff3017838 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/version.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/version.lux
@@ -1,21 +1,21 @@
 (.module:
   [library
-   [lux (#- Type)
+   [lux {"-" [Type]}
     [abstract
-     [equivalence (#+ Equivalence)]
-     [monad (#+ do)]]
+     [equivalence {"+" [Equivalence]}]
+     [monad {"+" [do]}]]
     [control
      ["<>" parser
-      ["<.>" xml (#+ Parser)]
+      ["<.>" xml {"+" [Parser]}]
       ["<.>" text]]]
     [data
      ["." product]
      ["." text]
      [format
-      ["." xml (#+ XML)]]]]]
-  ["." /// #_
-   ["#." type (#+ Type)]
-   ["#." time (#+ Time)]])
+      ["." xml {"+" [XML]}]]]]]
+  ["." /// "_"
+   ["#." type {"+" [Type]}]
+   ["#." time {"+" [Time]}]])
 
 (type: .public Version
   (Record
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux b/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux
index 9aacdf6de..eff775ab3 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux
@@ -1,13 +1,13 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [abstract
-     [equivalence (#+ Equivalence)]]
+     [equivalence {"+" [Equivalence]}]]
     [data
      ["." product]
      ["." text
       ["%" format]]]]]
-  ["." /// (#+ Snapshot)
+  ["." /// {"+" [Snapshot]}
    ["#." time]
    ["#." stamp]])
 
diff --git a/stdlib/source/program/aedifex/artifact/time.lux b/stdlib/source/program/aedifex/artifact/time.lux
index 4a0a20ea3..d46d204bc 100644
--- a/stdlib/source/program/aedifex/artifact/time.lux
+++ b/stdlib/source/program/aedifex/artifact/time.lux
@@ -1,21 +1,21 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     ["." time]
     [abstract
-     [equivalence (#+ Equivalence)]
-     [monad (#+ do)]]
+     [equivalence {"+" [Equivalence]}]
+     [monad {"+" [do]}]]
     [control
-     ["." try (#+ Try)]
+     ["." try {"+" [Try]}]
      ["<>" parser
-      ["<.>" text (#+ Parser)]]]
+      ["<.>" text {"+" [Parser]}]]]
     [data
      ["." product]
      [text
-      ["%" format (#+ Format)]]]
+      ["%" format {"+" [Format]}]]]
     [time
-     ["." instant (#+ Instant)]]]]
-  ["." / #_
+     ["." instant {"+" [Instant]}]]]]
+  ["." / "_"
    ["#." date]
    ["#." time]])
 
diff --git a/stdlib/source/program/aedifex/artifact/time/date.lux b/stdlib/source/program/aedifex/artifact/time/date.lux
index ca309e382..deb9cb8ed 100644
--- a/stdlib/source/program/aedifex/artifact/time/date.lux
+++ b/stdlib/source/program/aedifex/artifact/time/date.lux
@@ -1,14 +1,14 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [abstract
-     [monad (#+ do)]
-     [equivalence (#+ Equivalence)]]
+     [monad {"+" [do]}]
+     [equivalence {"+" [Equivalence]}]]
     [control
-     ["." try (#+ Try)]
-     ["." exception (#+ exception:)]
+     ["." try {"+" [Try]}]
+     ["." exception {"+" [exception:]}]
      ["<>" parser
-      ["<.>" text (#+ Parser)]]]
+      ["<.>" text {"+" [Parser]}]]]
     [data
      [text
       ["%" format]]]
diff --git a/stdlib/source/program/aedifex/artifact/time/time.lux b/stdlib/source/program/aedifex/artifact/time/time.lux
index 6fb329962..5fca26062 100644
--- a/stdlib/source/program/aedifex/artifact/time/time.lux
+++ b/stdlib/source/program/aedifex/artifact/time/time.lux
@@ -1,19 +1,19 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     ["." time]
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [control
      ["<>" parser
-      ["<.>" text (#+ Parser)]]]
+      ["<.>" text {"+" [Parser]}]]]
     [data
      [text
       ["%" format]]]
     [math
      [number
       ["n" nat]]]]]
-  ["." // #_
+  ["." // "_"
    ["#" date]])
 
 (type: .public Time
diff --git a/stdlib/source/program/aedifex/artifact/type.lux b/stdlib/source/program/aedifex/artifact/type.lux
index ae6f9b79b..659155f49 100644
--- a/stdlib/source/program/aedifex/artifact/type.lux
+++ b/stdlib/source/program/aedifex/artifact/type.lux
@@ -1,6 +1,6 @@
 (.module:
   [library
-   [lux (#- Type)]])
+   [lux {"-" [Type]}]])
 
 ... https://maven.apache.org/ref/3.6.3/maven-core/artifact-handlers.html
 (type: .public Type
diff --git a/stdlib/source/program/aedifex/artifact/versioning.lux b/stdlib/source/program/aedifex/artifact/versioning.lux
index 550ae86a3..d2d702236 100644
--- a/stdlib/source/program/aedifex/artifact/versioning.lux
+++ b/stdlib/source/program/aedifex/artifact/versioning.lux
@@ -1,33 +1,33 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [abstract
-     [equivalence (#+ Equivalence)]
-     [monad (#+ do)]]
+     [equivalence {"+" [Equivalence]}]
+     [monad {"+" [do]}]]
     [control
-     ["." exception (#+ exception:)]
+     ["." exception {"+" [exception:]}]
      ["<>" parser
-      ["<.>" xml (#+ Parser)]
+      ["<.>" xml {"+" [Parser]}]
       ["<.>" text]]]
     [data
      ["." product]
      ["." text
       ["%" format]]
      [format
-      ["." xml (#+ XML)]]
+      ["." xml {"+" [XML]}]]
      [collection
       ["." list ("#\." functor)]]]
     [math
      [number
       ["n" nat]]]
-    ["." time (#+ Time)
-     ["." date (#+ Date)]
+    ["." time {"+" [Time]}
+     ["." date {"+" [Date]}]
      ["." year]
      ["." month]]]]
-  ["." // #_
+  ["." // "_"
    ["#." time]
-   ["#." snapshot (#+ Snapshot)
-    ["#/." version (#+ Version)]]])
+   ["#." snapshot {"+" [Snapshot]}
+    ["#/." version {"+" [Version]}]]])
 
 (type: .public Versioning
   (Record