No more #export magic syntax.

20 files changed, 94 insertions, 94 deletions

diff --git a/licentia/source/program/licentia/document.lux b/licentia/source/program/licentia/document.lux
index 31f05a818..f09b8f5f5 100644
--- a/licentia/source/program/licentia/document.lux
+++ b/licentia/source/program/licentia/document.lux
@@ -7,29 +7,29 @@
      [collection
       ["." list ("#\." functor)]]]]])
 
-(def: #export (quote text)
+(def: .public (quote text)
   (-> Text Text)
   (format text.double_quote text text.double_quote))
 
-(def: #export (block content)
+(def: .public (block content)
   (-> Text Text)
   (format content text.new_line text.new_line))
 
-(def: #export (plural singular)
+(def: .public (plural singular)
   (-> Text Text)
   (format singular "(s)"))
 
-(def: #export (sentence content)
+(def: .public (sentence content)
   (-> Text Text)
   (format content "."))
 
-(def: #export paragraph
+(def: .public paragraph
   (-> (List Text) Text)
   (|>> (list\map ..sentence)
        (text.join_with text.new_line)))
 
 (template [<name> <word>]
-  [(def: #export <name>
+  [(def: .public <name>
      (-> (List Text) Text)
      ## https://en.wikipedia.org/wiki/Serial_comma
      (text.join_with (format ", " <word> " ")))]
@@ -39,11 +39,11 @@
   [and/or "and/or"]
   )
 
-(type: #export Section
+(type: .public Section
   {#title Text
    #content Text})
 
-(def: #export (section value)
+(def: .public (section value)
   (-> Section Text)
   (format (..block (get@ #title value))
           (get@ #content value)))
diff --git a/licentia/source/program/licentia/input.lux b/licentia/source/program/licentia/input.lux
index 06c73fef2..5482daba4 100644
--- a/licentia/source/program/licentia/input.lux
+++ b/licentia/source/program/licentia/input.lux
@@ -36,11 +36,11 @@
         (<json>.field "name" <json>.string)
         (<json>.field "version" <json>.string))))
 
-(exception: #export (cannot_use_fractional_amount {amount Frac})
+(exception: .public (cannot_use_fractional_amount {amount Frac})
   (exception.report
    ["Amount" (%.frac amount)]))
 
-(exception: #export (cannot_use_negative_amount {amount Int})
+(exception: .public (cannot_use_negative_amount {amount Int})
   (exception.report
    ["Amount" (%.int amount)]))
 
@@ -56,7 +56,7 @@
                   (i.> +0 amountI))]
     (wrap (.nat amountI))))
 
-(exception: #export (invalid_period {period (Period Nat)})
+(exception: .public (invalid_period {period (Period Nat)})
   (exception.report
    ["Start" (%.nat (get@ #time.start period))]
    ["End" (%.nat (get@ #time.end period))]))
@@ -150,7 +150,7 @@
         (<json>.field "commons clause?" <json>.boolean)
         )))
 
-(def: #export license
+(def: .public license
   (Parser License)
   (<json>.object
     ($_ <>.and
diff --git a/licentia/source/program/licentia/license.lux b/licentia/source/program/licentia/license.lux
index 811b983e0..9060915a3 100644
--- a/licentia/source/program/licentia/license.lux
+++ b/licentia/source/program/licentia/license.lux
@@ -5,52 +5,52 @@
    [time (#+ Days Months Period)]
    ["#." copyright]])
 
-(type: #export Identification
+(type: .public Identification
   {#name Text
    #version Text})
 
-(type: #export Termination
+(type: .public Termination
   {#patent_retaliation? Bit
    #termination_period Days
    #grace_period Days})
 
-(type: #export Liability
+(type: .public Liability
   {#can_accept? Bit
    #disclaim_high_risk? Bit})
 
-(type: #export Distribution
+(type: .public Distribution
   {#can_re_license? Bit
    #can_multi_license? Bit})
 
-(type: #export Commercial
+(type: .public Commercial
   {#can_sell? Bit
    #require_contributor_credit? Bit
    #allow_contributor_endorsement? Bit})
 
-(type: #export Extension
+(type: .public Extension
   {#same_license? Bit
    #must_be_distinguishable? Bit
    #notification_period (Maybe (Period Months))
    #must_describe_modifications? Bit})
 
-(type: #export Entity Text)
+(type: .public Entity Text)
 
-(type: #export Black_List
+(type: .public Black_List
   {#justification (Maybe Text)
    #entities (List Entity)})
 
-(type: #export URL Text)
+(type: .public URL Text)
 
-(type: #export Attribution
+(type: .public Attribution
   {#copyright_notice Text
    #phrase (Maybe Text)
    #url URL
    #image (Maybe URL)})
 
-(type: #export Addendum
+(type: .public Addendum
   {#commons_clause? Bit})
 
-(type: #export License
+(type: .public License
   {#copyright_holders (List /copyright.Holder)
    #identification (Maybe Identification)
    #termination Termination
diff --git a/licentia/source/program/licentia/license/addendum.lux b/licentia/source/program/licentia/license/addendum.lux
index dd13cfeb7..5cde5a412 100644
--- a/licentia/source/program/licentia/license/addendum.lux
+++ b/licentia/source/program/licentia/license/addendum.lux
@@ -9,13 +9,13 @@
     ["$" document]]])
 
 ## https://commonsclause.com/
-(def: #export commons_clause
+(def: .public commons_clause
   Text
   (format ($.block "The Software is provided to you by the Licensor under the License, as defined below, subject to the following condition.")
           ($.block "Without limiting other conditions in the License, the grant of rights under the License will not include, and the License does not grant to you, the right to Sell the Software.")
           ($.block "For purposes of the foregoing, “Sell” means practicing any or all of the rights granted to you under the License to provide to third parties, for a fee or other consideration (including without limitation fees for hosting or consulting/ support services related to the Software), a product or service whose value derives, entirely or substantially, from the functionality of the Software. Any license notice or attribution required by the License must also include this Commons Clause License Condition notice.")))
 
-(def: #export (output value)
+(def: .public (output value)
   (-> Addendum Text)
   (`` (format (~~ (template [<title> <condition> <content>]
                     [(if <condition>
diff --git a/licentia/source/program/licentia/license/assurance.lux b/licentia/source/program/licentia/license/assurance.lux
index a60de7a91..ca1f697d6 100644
--- a/licentia/source/program/licentia/license/assurance.lux
+++ b/licentia/source/program/licentia/license/assurance.lux
@@ -9,14 +9,14 @@
    [//
     ["$" document]]])
 
-(def: #export representation
+(def: .public representation
   ($.sentence (format "Each " _.contributor
                       " represents that the " _.contributor
                       " believes its " ($.plural _.contribution)
                       " are its original creation(s) or it has sufficient rights to grant the rights to its " ($.plural _.contribution)
                       " conveyed by " _.license)))
 
-(def: #export fair_use
+(def: .public fair_use
   (let [copyright_doctrines (: (List Text)
                                (list "fair use"
                                      "fair dealing"
diff --git a/licentia/source/program/licentia/license/black_list.lux b/licentia/source/program/licentia/license/black_list.lux
index 0a5b62580..99f85029e 100644
--- a/licentia/source/program/licentia/license/black_list.lux
+++ b/licentia/source/program/licentia/license/black_list.lux
@@ -12,11 +12,11 @@
    [//
     ["$" document]]])
 
-(def: #export entity
+(def: .public entity
   (-> Entity Text)
   %.text)
 
-(def: #export (black_list black_list)
+(def: .public (black_list black_list)
   (-> Black_List Text)
   (let [scope (format "The rights granted under " _.license)
         effect "shall not be granted to the following entities, or any subsidiary thereof"
diff --git a/licentia/source/program/licentia/license/commercial.lux b/licentia/source/program/licentia/license/commercial.lux
index 03f3757e1..6af68b860 100644
--- a/licentia/source/program/licentia/license/commercial.lux
+++ b/licentia/source/program/licentia/license/commercial.lux
@@ -9,7 +9,7 @@
    [//
     ["$" document]]])
 
-(def: #export cannot_sell
+(def: .public cannot_sell
   (let [preamble (format "Without limiting other conditions in " _.license)
         direct_condition (format "the grant of rights under " _.license
                                  " will not include, and does not grant to " _.recipient
@@ -19,11 +19,11 @@
                         ", " direct_condition
                         ", " derivative_condition))))
 
-(def: #export require_contributor_attribution
+(def: .public require_contributor_attribution
   ($.sentence (format "All advertising materials mentioning features or use of " _.licensed_work
                       " must include an acknowledgement of the authorship of every " _.contributor)))
 
-(def: #export disallow_contributor_endorsement
+(def: .public disallow_contributor_endorsement
   (let [subject (format "The name of no " _.contributor)
         capability "endorse or promote products"
         source (format "any " _.extension)
diff --git a/licentia/source/program/licentia/license/copyright.lux b/licentia/source/program/licentia/license/copyright.lux
index ab9b262d6..7c2d838c1 100644
--- a/licentia/source/program/licentia/license/copyright.lux
+++ b/licentia/source/program/licentia/license/copyright.lux
@@ -4,6 +4,6 @@
   [//
    [time (#+ Year Period)]])
 
-(type: #export Holder
+(type: .public Holder
   {#name Text
    #period (Period Year)})
diff --git a/licentia/source/program/licentia/license/definition.lux b/licentia/source/program/licentia/license/definition.lux
index 0c930c847..0335a9b30 100644
--- a/licentia/source/program/licentia/license/definition.lux
+++ b/licentia/source/program/licentia/license/definition.lux
@@ -7,14 +7,14 @@
   [///
    ["$" document]])
 
-(type: #export Definition
+(type: .public Definition
   {#term Text
    #meaning Text})
 
 (def: not_a_contribution_notice
   (format text.double_quote "Not a Contribution" text.double_quote))
 
-(def: #export patent_rights
+(def: .public patent_rights
   (List Text)
   (list "make"
         "have made"
@@ -45,7 +45,7 @@
   "work of authorship")
 
 (template [<name> <term> <meaning>]
-  [(def: #export <name>
+  [(def: .public <name>
      Definition
      {#term <term>
       #meaning <meaning>})]
@@ -214,7 +214,7 @@
    ($.paragraph (list "a mechanism generally accepted in the software development community for the electronic transfer of data, such as download from an FTP server or web site, where such mechanism is publicly accessible"))]
   )
 
-(def: #export all
+(def: .public all
   (List Definition)
   (list license
         licensable
diff --git a/licentia/source/program/licentia/license/distribution.lux b/licentia/source/program/licentia/license/distribution.lux
index 82450ac0a..ca5e37f1c 100644
--- a/licentia/source/program/licentia/license/distribution.lux
+++ b/licentia/source/program/licentia/license/distribution.lux
@@ -24,7 +24,7 @@
           (notices "limitation of liability")
           (notices "other"))))
 
-(def: #export source_code_form
+(def: .public source_code_form
   (let [on_license_propagation (let [coverage (format "All distribution of " _.licensed_work " in " _.source_code_form)
                                      with_contributions (format "including any " ($.plural _.contribution)
                                                                 " that " _.recipient
@@ -62,7 +62,7 @@
                        on_notice_retention
                        on_additional_notices))))
 
-(def: #export object_form
+(def: .public object_form
   (let [on_responsibility (let [condition (format "If " _.recipient
                                                   " distributes " _.licensed_work
                                                   " in " _.object_form)
@@ -79,7 +79,7 @@
     ($.paragraph (list on_responsibility
                        on_licensing))))
 
-(def: #export allow_re_licensing
+(def: .public allow_re_licensing
   (let [can_license (format _.recipient
                             " may create and distribute an " _.extension
                             " under terms " _.recipient
@@ -89,7 +89,7 @@
                             " for the " _.licensed_work)]
     (format can_license ", " "provided that " requirement)))
 
-(def: #export allow_multi_licensing
+(def: .public allow_multi_licensing
   (let [condition (format "the " _.extension " is a combination of " _.licensed_work " with a work governed by one or more " ($.plural _.secondary_license))
         permission (let [relicensing (format _.license
                                              " permits " _.recipient
@@ -102,7 +102,7 @@
                      (format relicensing ", " distribution))]
     (format "If " condition ", " permission)))
 
-(def: #export (extension distribution)
+(def: .public (extension distribution)
   (-> Distribution Text)
   ($.paragraph ($_ list\compose
                    (if (get@ #//.can_re_license? distribution)
diff --git a/licentia/source/program/licentia/license/extension.lux b/licentia/source/program/licentia/license/extension.lux
index 7ded0d0ca..38c93fb13 100644
--- a/licentia/source/program/licentia/license/extension.lux
+++ b/licentia/source/program/licentia/license/extension.lux
@@ -11,7 +11,7 @@
    [//
     ["$" document]]])
 
-(def: #export sharing_requirement
+(def: .public sharing_requirement
   (List Text)
   (let [on_extension (let [constraint (let [because "In consideration of, and as an express condition to, "
                                             source (format "the licenses granted to " _.recipient
@@ -51,7 +51,7 @@
           on_license_propagation
           on_license_protection)))
 
-(def: #export license_conflict_resolution
+(def: .public license_conflict_resolution
   (List Text)
   (let [on_other_licenses (let [circumstance (format "Where any portion of an " _.extension
                                                      " created by " _.recipient)
@@ -71,7 +71,7 @@
           on_licensor_judgement
           on_licensor_discretion)))
 
-(def: #export distinctness_requirement
+(def: .public distinctness_requirement
   ($.paragraph (list (format "Any " _.extension
                              " " _.recipient
                              " does make and " _.deploy
@@ -86,7 +86,7 @@
         "weblogs"
         "other sites"))
 
-(def: #export (notification_requirement [start end])
+(def: .public (notification_requirement [start end])
   (-> (Period Months) Text)
   (let [on_availability (format _.recipient
                                 " must notify the software community of the availability of the " _.source_code_form
@@ -129,7 +129,7 @@
                        on_changes
                        on_accesibility))))
 
-(def: #export description_requirement
+(def: .public description_requirement
   Text
   (let [on_duty (let [basic (format _.recipient
                                     " must cause any " _.modification
diff --git a/licentia/source/program/licentia/license/grant.lux b/licentia/source/program/licentia/license/grant.lux
index 92995f0b4..bae1478c7 100644
--- a/licentia/source/program/licentia/license/grant.lux
+++ b/licentia/source/program/licentia/license/grant.lux
@@ -16,7 +16,7 @@
           ", each " _.contributor
           " hereby grants to " _.recipient))
 
-(def: #export grant_characteristics
+(def: .public grant_characteristics
   (List Text)
   (list "perpetual"
         "world-wide"
@@ -25,7 +25,7 @@
         "royalty-free"
         "irrevocable"))
 
-(def: #export copyright_grant_rights
+(def: .public copyright_grant_rights
   (List Text)
   (list "use"
         "reproduce"
@@ -36,7 +36,7 @@
         "sublicense"
         "distribute"))
 
-(def: #export copyright
+(def: .public copyright
   ($.sentence (format grant_header " a " ($.and ..grant_characteristics)
                       " copyright license to " ($.or ..copyright_grant_rights)
                       " " _.licensed_work
@@ -44,7 +44,7 @@
                       " in a " _.source_code_form
                       " or an " _.object_form)))
 
-(def: #export (patent retaliation?)
+(def: .public (patent retaliation?)
   (-> Bit Text)
   (let [grant (format grant_header " a " ($.and ..grant_characteristics)
                       " patent license to " ($.or definition.patent_rights) " "
@@ -66,7 +66,7 @@
                           (list retaliation_clause)
                           (list))))))
 
-(def: #export date
+(def: .public date
   ($.sentence (format "The licenses granted in " _.license
                       " with respect to any " _.contribution
                       " become effective for each " _.contribution
@@ -75,7 +75,7 @@
 
 (def: restoration_scope "an ongoing basis")
 
-(def: #export (grant_restoration_clause termination_period)
+(def: .public (grant_restoration_clause termination_period)
   (-> Days Text)
   (let [restoration_condition (format _.recipient " becomes compliant")
         restored_grants (format "the rights granted under " _.license
@@ -91,7 +91,7 @@
             ", unless and until " invalidation_condition
             ", and on " ..restoration_scope ", if " complaint_period_condition)))
 
-(def: #export (grace_period_clause grace_period)
+(def: .public (grace_period_clause grace_period)
   (-> Days Text)
   (let [the_grants (format "grants to " _.recipient " from a particular " _.contributor)
         automatic_restoration_conditions (let [notification (format "such " _.contributor
@@ -110,7 +110,7 @@
             " are reinstated on " ..restoration_scope
             " if " automatic_restoration_conditions)))
 
-(def: #export (termination termination_period grace_period)
+(def: .public (termination termination_period grace_period)
   (-> Days Days Text)
   (let [on_violation_of_terms (let [what (format "The rights granted under " _.license)
                                     when (format _.recipient " fails to comply with any of its terms")]
@@ -119,7 +119,7 @@
                        (..grant_restoration_clause termination_period)
                        (..grace_period_clause grace_period)))))
 
-(def: #export no_retroactive_termination
+(def: .public no_retroactive_termination
   (let [situation "In the event of termination"
         coverage "all end user license agreements"
         exclusions "(excluding licenses to distributors and resellers)"
diff --git a/licentia/source/program/licentia/license/liability.lux b/licentia/source/program/licentia/license/liability.lux
index d6208b3e4..b56e51a50 100644
--- a/licentia/source/program/licentia/license/liability.lux
+++ b/licentia/source/program/licentia/license/liability.lux
@@ -28,7 +28,7 @@
         "repair"
         "correction"))
 
-(def: #export warranty
+(def: .public warranty
   (let [on_basics (let [applicability_escape "Unless required by applicable law or agreed to in writing"
                         work_provisioning (format _.licensor
                                                   " provides " _.licensed_work
@@ -76,7 +76,7 @@
         "computer failure or malfunction"
         "any and all other commercial damages or losses"))
 
-(def: #export limitation
+(def: .public limitation
   (let [on_limit (let [exclusion "Under no circumstances and under no legal theory"
                        examples "whether tort (including negligence), contract, or otherwise"
                        applicable_law_exception "unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing"
@@ -92,7 +92,7 @@
                        on_death_exception
                        on_jurisdictions))))
 
-(def: #export litigation
+(def: .public litigation
   (let [on_jurisdiction (format "Any litigation relating to " _.license " may be brought only in the courts of a jurisdiction where the defendant maintains its principal place of business")
         on_laws "Such litigation shall be governed by laws of that jurisdiction, without reference to its conflict-of-law provisions"
         on_claims "Nothing in this section shall prevent a party’s ability to bring cross-claims or counter-claims"]
@@ -108,7 +108,7 @@
         "other liability obligations"
         (format "rights consistent with " _.license)))
 
-(def: #export can_accept
+(def: .public can_accept
   (let [on_acceptance_of_liability (let [condition (format "While redistributing " _.licensed_work " or " ($.plural _.extension) " thereof")
                                          right (format _.recipient " may choose to offer, and charge a fee for, acceptance of " ($.and/or ..liability_obligations))]
                                      (format condition ", " right))
@@ -130,7 +130,7 @@
     ($.paragraph (list on_acceptance_of_liability
                        on_responsibility))))
 
-(def: #export disclaim_high_risk
+(def: .public disclaim_high_risk
   (let [on_work (let [intentions (: (List Text)
                                     (list "designed"
                                           "manufactured"
diff --git a/licentia/source/program/licentia/license/limitation.lux b/licentia/source/program/licentia/license/limitation.lux
index daec0f569..aebaa0faa 100644
--- a/licentia/source/program/licentia/license/limitation.lux
+++ b/licentia/source/program/licentia/license/limitation.lux
@@ -9,7 +9,7 @@
    [//
     ["$" document]]])
 
-(def: #export acceptance
+(def: .public acceptance
   (let [abilities (: (List Text)
                      (list "use"
                            "copy"
@@ -47,7 +47,7 @@
                        prohibition_due_to_non_agreement
                        prohibition_due_to_impossibility))))
 
-(def: #export grant
+(def: .public grant
   ($.paragraph (list (format "The licenses granted in this document are the only rights granted under " _.license)
                      (format "No additional rights or licenses will be implied from the distribution or licensing of " _.licensed_work
                              " under " _.license)
@@ -63,13 +63,13 @@
         "product names"
         "logos"))
 
-(def: #export trademark
+(def: .public trademark
   ($.paragraph (list (format _.license " does not grant any permission to use the " ($.or ..identifiers)
                              " of any " _.contributor
                              "; except as required for reasonable and customary use in describing the origin of "
                              _.licensed_work))))
 
-(def: #export secondary_licenses
+(def: .public secondary_licenses
   ($.paragraph (list (format "No " _.contributor
                              " makes additional grants as a result of a choice by " _.recipient
                              " to distribute " _.licensed_work
diff --git a/licentia/source/program/licentia/license/miscellaneous.lux b/licentia/source/program/licentia/license/miscellaneous.lux
index 321482860..35cddfa5a 100644
--- a/licentia/source/program/licentia/license/miscellaneous.lux
+++ b/licentia/source/program/licentia/license/miscellaneous.lux
@@ -9,10 +9,10 @@
    [//
     ["$" document]]])
 
-(def: #export entire_agreement
+(def: .public entire_agreement
   ($.paragraph (list (format _.license " constitutes the entire agreement between the parties with respect to the subject matter hereof"))))
 
-(def: #export relationship_of_parties
+(def: .public relationship_of_parties
   (let [legal_associations (: (List Text)
                               (list "an agency"
                                     "a partnership"
@@ -31,7 +31,7 @@
                            " will not represent to the contrary, whether " ($.or forms_of_representation))]
     ($.paragraph (list (format disclaimer " " scope ", and " constraint)))))
 
-(def: #export independent_development
+(def: .public independent_development
   (let [actions (: (List Text)
                    (list "acquire"
                          "license"
@@ -54,7 +54,7 @@
                                " that " _.recipient
                                " may " ($.or actions))))))
 
-(def: #export not_waiver
+(def: .public not_waiver
   (let [culprits (format _.licensor " or any " _.contributor)
         duty (format "enforce any provision of " _.license)
         effect "a waiver of future enforcement of that or any other provision"]
@@ -62,14 +62,14 @@
                                " to " duty
                                " will not be deemed " effect)))))
 
-(def: #export severability
+(def: .public severability
   (let [on_reformation (format "If any provision of " _.license " is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable")
         on_contributor_protection (format "Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not be used to construe " _.license
                                           " against a " _.contributor)]
     ($.paragraph (list on_reformation
                        on_contributor_protection))))
 
-(def: #export export_restrictions
+(def: .public export_restrictions
   (let [limiter "applicable laws and regulations"
         limited (: (List Text)
                    (list "downloading"
@@ -87,7 +87,7 @@
     ($.paragraph (list on_circumstances
                        on_acceptance_of_responsibility))))
 
-(def: #export new_versions
+(def: .public new_versions
   (let [on_publishing (let [when ", from time to time,"
                             what (format "revised versions of " _.license)]
                         (format _.licensor " may publish" when " " what))
diff --git a/licentia/source/program/licentia/license/notice.lux b/licentia/source/program/licentia/license/notice.lux
index b6422205f..cbac11e8b 100644
--- a/licentia/source/program/licentia/license/notice.lux
+++ b/licentia/source/program/licentia/license/notice.lux
@@ -16,10 +16,10 @@
    [//
     ["$" document]]])
 
-(def: #export end_of_license
+(def: .public end_of_license
   ($.sentence "END OF TERMS AND CONDITIONS"))
 
-(def: #export (copyright_holder holder)
+(def: .public (copyright_holder holder)
   (-> //copyright.Holder Text)
   (let [(^slots [#//time.start #//time.end]) (get@ #//copyright.period holder)
         single_year? (n.= start end)
@@ -28,7 +28,7 @@
                          (format (%.nat start) "-" (%.nat end)))]
     (format "Copyright (C) " period_section " " (get@ #//copyright.name holder))))
 
-(def: #export copyright
+(def: .public copyright
   (-> (List //copyright.Holder) Text)
   (|>> (list\map ..copyright_holder)
        (text.join_with text.new_line)))
diff --git a/licentia/source/program/licentia/license/submission.lux b/licentia/source/program/licentia/license/submission.lux
index 01dfad08f..d83d54d80 100644
--- a/licentia/source/program/licentia/license/submission.lux
+++ b/licentia/source/program/licentia/license/submission.lux
@@ -9,7 +9,7 @@
    [//
     ["$" document]]])
 
-(def: #export contribution
+(def: .public contribution
   (let [on-submissions (let [exception (format "Unless " _.recipient " explicitly states otherwise")
                              general-case (format "any intentional " _.submission " of a " _.contribution
                                                   " for inclusion in " _.licensed_work
diff --git a/licentia/source/program/licentia/license/term.lux b/licentia/source/program/licentia/license/term.lux
index 49fd42569..c66afc56c 100644
--- a/licentia/source/program/licentia/license/term.lux
+++ b/licentia/source/program/licentia/license/term.lux
@@ -5,7 +5,7 @@
    ["#." definition]])
 
 (template [<term> <definition>]
-  [(def: #export <term>
+  [(def: .public <term>
      Text
      (get@ #//definition.term <definition>))]
 
diff --git a/licentia/source/program/licentia/license/time.lux b/licentia/source/program/licentia/license/time.lux
index 32be12aa8..de6d613b7 100644
--- a/licentia/source/program/licentia/license/time.lux
+++ b/licentia/source/program/licentia/license/time.lux
@@ -2,15 +2,15 @@
   [library
    [lux #*]])
 
-(type: #export Days
+(type: .public Days
   Nat)
 
-(type: #export Months
+(type: .public Months
   Nat)
 
-(type: #export Year
+(type: .public Year
   Nat)
 
-(type: #export (Period a)
+(type: .public (Period a)
   {#start a
    #end a})
diff --git a/licentia/source/program/licentia/output.lux b/licentia/source/program/licentia/output.lux
index 3519a88ce..63a70e521 100644
--- a/licentia/source/program/licentia/output.lux
+++ b/licentia/source/program/licentia/output.lux
@@ -35,16 +35,16 @@
     ["." addendum]]
    ["$" document]])
 
-(def: #export (definition value)
+(def: .public (definition value)
   (-> Definition Text)
   (format ($.quote (get@ #definition.term value)) ": " (get@ #definition.meaning value)))
 
-(def: #export (identification value)
+(def: .public (identification value)
   (-> Identification Text)
   (format (get@ #license.name value) text.new_line
           (get@ #license.version value)))
 
-(def: #export (grant termination)
+(def: .public (grant termination)
   (-> Termination Text)
   (`` (format (~~ (template [<title> <content>]
                     [($.block ($.section {#$.title <title>
@@ -66,7 +66,7 @@
                     ["No Retroactive Effect of Termination"
                      grant.no_retroactive_termination])))))
 
-(def: #export limitation
+(def: .public limitation
   Text
   (`` (format (~~ (template [<title> <content>]
                     [($.block ($.section {#$.title <title>
@@ -81,7 +81,7 @@
                     [(format "Limitations on " ($.plural _.secondary_license))
                      limitation.secondary_licenses])))))
 
-(def: #export assurance
+(def: .public assurance
   Text
   (`` (format (~~ (template [<title> <content>]
                     [($.block ($.section {#$.title <title>
@@ -93,7 +93,7 @@
                     ["Fair Use"
                      assurance.fair_use])))))
 
-(def: #export (liability value)
+(def: .public (liability value)
   (-> Liability Text)
   (`` (format (~~ (template [<title> <condition> <content>]
                     [(if <condition>
@@ -121,7 +121,7 @@
                      (get@ #license.disclaim_high_risk? value)
                      liability.disclaim_high_risk])))))
 
-(def: #export (distribution distribution)
+(def: .public (distribution distribution)
   (-> Distribution Text)
   (`` (format (~~ (template [<title> <condition> <content>]
                     [(if <condition>
@@ -142,7 +142,7 @@
                          (get@ #license.can_multi_license? distribution))
                      (distribution.extension distribution)])))))
 
-(def: #export (commercial value)
+(def: .public (commercial value)
   (-> Commercial Text)
   (`` (format (~~ (template [<title> <condition> <content>]
                     [(if <condition>
@@ -163,7 +163,7 @@
                      commercial.disallow_contributor_endorsement]
                     )))))
 
-(def: #export (extension value)
+(def: .public (extension value)
   (-> Extension Text)
   (let [[show? document] (case (get@ #license.notification_period value)
                            (#.Some period)
@@ -190,7 +190,7 @@
                       [(get@ #license.must_describe_modifications? value) (format "Description of " ($.plural _.modification))
                        extension.description_requirement]))))))
 
-(def: #export (attribution value)
+(def: .public (attribution value)
   (-> Attribution Text)
   (let [copyright_notice (format "Attribution Copyright Notice: " (get@ #license.copyright_notice value))
         phrase (case (get@ #license.phrase value)
@@ -211,7 +211,7 @@
             url
             image)))
 
-(def: #export (miscellaneous identified?)
+(def: .public (miscellaneous identified?)
   (-> Bit Text)
   (`` (format (~~ (template [<title> <condition> <content>]
                     [(if <condition>
@@ -250,7 +250,7 @@
 
 (def: black_list_spacing (format text.new_line text.new_line))
 
-(def: #export (license value)
+(def: .public (license value)
   (-> License Text)
   (let [identification (|> value
                            (get@ #license.identification)