Merge pull request #1211 from AmpersandTarski/development

Release of September 13
AmpersandTarski · Sep 10, 2021 · f4084e7 · f4084e7
2 parents 02faaad + d3aea48
commit f4084e7
Show file tree

Hide file tree

Showing 77 changed files with 622 additions and 389 deletions.
diff --git a/.ampersand b/.ampersand
@@ -1,2 +1,2 @@
-AmpersandData/FormalAmpersand/AST.adl
+AmpersandData/FormalAmpersand/FormalAmpersand.adl
 AmpersandData/PrototypeContext/PrototypeContext.adl
diff --git a/AmpersandData/FormalAmpersand/.ampersand b/AmpersandData/FormalAmpersand/.ampersand
@@ -1 +1 @@
-AST.adl
+FormalAmpersand.adl
diff --git a/AmpersandData/FormalAmpersand/AST.adl b/AmpersandData/FormalAmpersand/AST.adl
@@ -1,19 +1,3 @@
 CONTEXT Ampersand IN ENGLISH
---! It is allowed to change texts and/or the order of texts IF AND ONLY IF this is also done in the corresponding Haskell files !--
-INCLUDE "Concepts.adl"
--- INCLUDE "Conjuncts.adl"
-INCLUDE "Contexts.adl"
-INCLUDE "Documentation.adl"
-INCLUDE "Generics.adl"
-INCLUDE "Interfaces.adl"
---INCLUDE "MinimalAST.xlsx" -- Contains minimal population. Anything discarded from it must violate an invariant
-INCLUDE "Relations.adl"
-INCLUDE "Rules.adl"
--- INCLUDE "Tables.adl"
-INCLUDE "Terms.adl"
---INCLUDE "Views.adl"
-
-
-ENDCONTEXT
 
 
diff --git a/AmpersandData/FormalAmpersand/AST.docadl b/AmpersandData/FormalAmpersand/AST.docadl
@@ -1,7 +1,7 @@
 CONTEXT RAP IN ENGLISH LATEX
 {- This file contains the documentation of RAP in LaTeX format.
    Each concept of the RAP metamodel has its own section, where sections are separated by comments -}
-INCLUDE "AST.adl"
+INCLUDE "FormalAmpersand.adl"
 INCLUDE "Atoms.docadl"
 --INCLUDE "Terms.docadl"
 INCLUDE "Rules.docadl"

diff --git a/AmpersandData/FormalAmpersand/Concepts.adl b/AmpersandData/FormalAmpersand/Concepts.adl
@@ -1,4 +1,4 @@
-CONTEXT AST IN ENGLISH 
+CONTEXT FormalAmpersand IN ENGLISH 
 
 PATTERN Concepts
     RELATION name[Concept*ConceptName] [UNI,SUR]

diff --git a/AmpersandData/FormalAmpersand/Concepts.docadl b/AmpersandData/FormalAmpersand/Concepts.docadl
@@ -1,4 +1,4 @@
-CONTEXT AST IN ENGLISH 
+CONTEXT FormalAmpersand IN ENGLISH 
 
 PATTERN Concepts
     VIEW Concept: Concept(name)

diff --git a/AmpersandData/FormalAmpersand/Contexts.adl b/AmpersandData/FormalAmpersand/Contexts.adl
@@ -45,15 +45,15 @@ PATTERN Context
     MEANING "If a concept declaration is used in a context, that concept exists in that context. This is registered in the system."
     RELATION ctxds[Relation*Context] [UNI] -- comes from ctxds, which is defined in A_Context. This contains all relations declared inside a context but outside the patterns it contains.
     MEANING "Any relation declared anywhere in a context outside the scope of a pattern is registered in the system."
-    RELATION context[Relation*Context] [UNI] -- comes from relsDefdIn, which is defined in FSpec. This contains all relations declared inside a context including the patterns it contains.
+    RELATION relsDefdIn[Relation*Context] [UNI] -- comes from relsDefdIn, which is defined in FSpec. This contains all relations declared inside a context including the patterns it contains.
     MEANING "Any relation declared anywhere in a context is registered in the system."
     RELATION ctxrs[Rule*Context] [UNI]  -- This contains all rules declared inside a context but outside the patterns it contains.
     MEANING "If a rule is declared in a context outside any pattern, that rule exists in that context. This is registered in the system."
     RELATION udefrules[Rule*Context] [UNI]      -- ^ all rules the user has declared within this context including the patterns it contains,
-                                                --   which are not multiplicity- and not identity rules. See ViewPoint.hs
-    RELATION multrules[Rule*Context] [UNI]      -- ^ all multiplicityrules the user has declared within this context including the patterns it contains.
+                                                --   which are not property- and not identity rules. See ViewPoint.hs
+    RELATION proprules[Rule*Context] [UNI]      -- ^ all property rules the user has declared within this context including the patterns it contains.
     RELATION identityRules[Rule*Context] [UNI]  -- ^ all identity rules the user has declared within this context. This contains all rules declared inside a context including the patterns it contains.
-    -- Use allRules[Rule*Context] to get all rules declared inside a context, including all rules declared inside the patterns in that context. A rule can be either user defined, a multiplicity rule, or identity rule
+    -- Use allRules[Rule*Context] to get all rules declared inside a context, including all rules declared inside the patterns in that context. A rule can be either user defined, a property rule, or identity rule
 
     MEANING "If a rule is declared anywhere in a context, that rule exists in that context. This is registered in the system."
     RELATION context[Pattern*Context] [UNI]     -- comes from patterns, which is defined in FSpec. This contains all patterns declared inside a context.
@@ -71,9 +71,9 @@ PATTERN Context
     {+Ampersand allows its users to declare relations in a context, outside the scope of a pattern.
     +}
     ROLE ExecEngine MAINTAINS "relation declared outside pattern"
-    RULE "relation declared outside pattern" : ctxds[Relation*Context] |- context[Relation*Context]
+    RULE "relation declared outside pattern" : ctxds[Relation*Context] |- relsDefdIn[Relation*Context]
     MEANING "A relation declared in a context outside the scope of a pattern is registered in the system."
-    VIOLATION (TXT "{EX} InsPair;context;Relation;", SRC I, TXT ";Context;", TGT I)
+    VIOLATION (TXT "{EX} InsPair;relsDefdIn;Relation;", SRC I, TXT ";Context;", TGT I)
 
     PURPOSE RULE "pat defined in means used in"
     {+Patterns can be defined inside a context. This means that all declarations in that pattern are used in that context.
@@ -112,25 +112,20 @@ PATTERN Validity
     MEANING "Every concept in the signature of relations is valid in every context that uses the pattern in which that relation is declared.."
     VIOLATION ( TXT "{EX} InsPair;context;Concept;", TGT I, TXT ";Context;", SRC I )
 
-    RELATION valid[Relation*Context]
+    RELATION valid[Relation*Context]    -- TODO: this relation is called 'relsDefdIn' in FormalAmpersand.
     MEANING "A relation/context pair in the relation `valid[Relation*Context]` means that this relation exists with the context."
     PURPOSE RULE validRelations MARKDOWN
     {+In order to compute validity of relations within a context,
     three categories of relations are taken into account:
-     - the relation defined in the context
-     - all relation defined in patterns within the context
-     - all relation defined in patterns used by the context
+     - the relations defined in the context
+     - all relations defined in patterns within the context
+     - all relations defined in patterns used by the context
     +}
     ROLE ExecEngine MAINTAINS validRelations
-    RULE validRelations : declaredIn[Relation*Pattern];(context\/uses~) \/ ctxds |- valid[Relation*Context]
+    RULE validRelations : declaredIn;(context\/uses~) \/ ctxds |- valid[Relation*Context]
     MEANING "Every relation defined in one of the patterns inside a context, or in the context itself, or in one of the contexts used by this context, is valid throughout that context."
     VIOLATION (TXT "{EX} InsPair;valid;Relation;", SRC I, TXT ";Context;", TGT I)
 
-    ROLE User MAINTAINS AllValidRelations
-    RULE AllValidRelations : valid[Relation*Context] |- declaredIn[Relation*Pattern];(context\/uses~) \/ ctxds
-    MEANING "TODO: MEANING ONTBREEKT"
-    VIOLATION (TXT "Relation ", SRC name, TXT " is not valid in context ", TGT I)
-
     RELATION valid[Rule*Context]
     MEANING "A rule/context pair in the relation `valid[Rule*Context]` means that this rule exists with the context."
     PURPOSE RULE validRules MARKDOWN
@@ -163,10 +158,10 @@ PATTERN Patterns
       VIOLATION ( TXT "{EX} DelAtom;PatternName;", SRC I )
 
 
-    RELATION allRules[Rule*Context] []          -- ^ all rules in the context, i.e. all user defined rules, multiplicity rules, and identity rules.
+    RELATION allRules[Rule*Context] []          -- ^ all rules in the context, i.e. all user defined rules, property rules, and identity rules.
     RELATION udefrules[Rule*Pattern] []         -- ^ all rules the user has declared within this pattern including the patterns it contains,
-                                                --   which are not multiplicity- and not identity rules. See ViewPoint.hs
-    RELATION multrules[Rule*Pattern] []         -- ^ all multiplicityrules the user has declared within a pattern.
+                                                --   which are not property- and not identity rules. See ViewPoint.hs
+    RELATION proprules[Rule*Pattern] []         -- ^ all property rules the user has declared within a pattern.
     RELATION identityRules[Rule*Pattern] []     -- ^ all identity rules the user has declared within this pattern. This contains all rules declared inside a pattern including the patterns it contains.
     RELATION patRules[Pattern*Rule]        -- This contains all rules declared inside a pattern. This contains all rules declared inside a pattern including the patterns it contains.
     MEANING "The user-defined rules in a pattern."
@@ -179,12 +174,12 @@ PATTERN Patterns
     VIOLATION ( TXT "{EX} DelAtom;Rule;", SRC I )
 
     ROLE ExecEngine MAINTAINS "Remove relation atom"
-    RULE "Remove relation atom" : I[Relation] - (declaredIn;I[Pattern];declaredIn~\/context;I[Context];context~) |- -V
+    RULE "Remove relation atom" : I[Relation] - relsDefdIn;I[Context];relsDefdIn~ |- -V
     MEANING "A relation without declaration will be removed."
     VIOLATION ( TXT "{EX} DelAtom;Relation;", SRC I )
 
     ROLE User MAINTAINS "self-sustained rules"
-    RULE "self-sustained rules" : usedIn;formalTerm~;patRules~ |- declaredIn[Relation*Pattern]
+    RULE "self-sustained rules" : usedIn;formalTerm~;patRules~ |- declaredIn
     MEANING "A relation that is used in a rule, which is declared in a pattern, must be declared in that same pattern."
 
 ENDPATTERN

diff --git a/AmpersandData/FormalAmpersand/Contexts.docadl b/AmpersandData/FormalAmpersand/Contexts.docadl
@@ -18,7 +18,7 @@ CONTEXT RAP IN ENGLISH
 
     PURPOSE RULE "Remove relation atom"
     {+Because every relation must be declared somewhere, the relation must be removed when its declaration ceases to exist.
-    A relation can be declared by multiple patterns, so as long as one of these declarations exist, the relation remains extant.
+    A relation can be declared by multiple patterns, so as long as one of these declarations exist, the relation remains in existence.
     +}
 
     PURPOSE RULE "self-sustained rules"

diff --git a/AmpersandData/FormalAmpersand/FormalAmpersand.adl b/AmpersandData/FormalAmpersand/FormalAmpersand.adl
@@ -1,9 +1,17 @@
-CONTEXT RAP3 IN ENGLISH LATEX
+CONTEXT FormalAmpersand IN ENGLISH LATEX
+--! It is allowed to change texts and/or the order of texts IF AND ONLY IF this is also done in the corresponding Haskell files !--
+INCLUDE "Concepts.adl"
+-- INCLUDE "Conjuncts.adl"
+INCLUDE "Contexts.adl"
+INCLUDE "Documentation.adl"
+INCLUDE "Generics.adl"
+INCLUDE "Interfaces.adl"
+--INCLUDE "MinimalAST.xlsx" -- Contains minimal population. Anything discarded from it must violate an invariant
+INCLUDE "Relations.adl"
+INCLUDE "Rules.adl"
+-- INCLUDE "Tables.adl"
+INCLUDE "Terms.adl"
+--INCLUDE "Views.adl"
 
-INCLUDE "AST.adl" 
-{-
-PURPOSE CONTEXT FormalAmpersand
-{+Formal Ampersand is the specification of Ampersand in Ampersand. It's main purpose is to act as a reference to the language. 
-+}
 
-ENDCONTEXT
+ENDCONTEXT
diff --git a/AmpersandData/FormalAmpersand/Relations.adl b/AmpersandData/FormalAmpersand/Relations.adl
@@ -1,10 +1,10 @@
-CONTEXT AST IN ENGLISH LATEX
+CONTEXT FormalAmpersand IN ENGLISH LATEX
 -- The comments for this script can be found in Rules.doc
 
 PATTERN Relations
-RELATION context[Relation*Context]
+RELATION relsDefdIn[Relation*Context]
 --VIEW Relation: Relation( name , TXT "::", sign[Relation*Signature];src;name[Concept*ConceptName] ,TXT " * ", sign[Relation*Signature];tgt[Signature*Concept];name[Concept*ConceptName] )
-IDENT Relation: Relation( name, sign[Relation*Signature];src, sign[Relation*Signature];tgt[Signature*Concept] , context[Relation*Context])
+IDENT Relation: Relation( name, sign[Relation*Signature];src, sign[Relation*Signature];tgt[Signature*Concept] , relsDefdIn[Relation*Context])
 RULE "eq relation": name[Relation*RelationName];name[Relation*RelationName]~ 
                  /\ sign[Relation*Signature];src[Signature*Concept];(sign[Relation*Signature];src[Signature*Concept])~ 
                  /\ sign[Relation*Signature];tgt[Signature*Concept];(sign[Relation*Signature];tgt[Signature*Concept])~ 

diff --git a/AmpersandData/FormalAmpersand/Rules.adl b/AmpersandData/FormalAmpersand/Rules.adl
@@ -1,4 +1,4 @@
-CONTEXT AST IN ENGLISH LATEX
+CONTEXT FormalAmpersand IN ENGLISH LATEX
 -- The documentation of this script can be found in Rules.docadl
 -- This file has been aligned with ShowMeatgrinder on 2017-07-21 by SJ.
 

diff --git a/AmpersandData/FormalAmpersand/Rules.docadl b/AmpersandData/FormalAmpersand/Rules.docadl
@@ -1,4 +1,4 @@
-CONTEXT AST IN ENGLISH LATEX
+CONTEXT FormalAmpersand IN ENGLISH LATEX
 INCLUDE "Rules.adl"
 
 PURPOSE PATTERN Rules

diff --git a/AmpersandData/FormalAmpersand/Terms.adl b/AmpersandData/FormalAmpersand/Terms.adl
@@ -1,4 +1,4 @@
-CONTEXT AST IN ENGLISH LATEX
+CONTEXT FormalAmpersand IN ENGLISH LATEX
 -- The comments for this script can be found in Atoms.doc
 INCLUDE "Concepts.adl"
 INCLUDE "Relations.adl"

diff --git a/AmpersandData/FormalAmpersand/Terms.docadl b/AmpersandData/FormalAmpersand/Terms.docadl
@@ -1,4 +1,4 @@
-CONTEXT AST IN ENGLISH LATEX
+CONTEXT FormalAmpersand IN ENGLISH LATEX
 -- The comments for this script can be found in Terms.docadl
 INCLUDE "Terms.adl"
 

diff --git a/AmpersandData/Repo Interfaces/AST.ifc b/AmpersandData/Repo Interfaces/AST.ifc
@@ -1,4 +1,4 @@
-CONTEXT "AST Interface" IN ENGLISH
+CONTEXT "FormalAmpersand Interface" IN ENGLISH
 
 --INTERFACE Contexts FOR Ampersand : "_SESSION";V[SESSION*Context]
 --BOX <TABLE sortable hideEmptyTable>
@@ -41,7 +41,7 @@ BOX <TABS>
              )  INTERFACE IsaTree 
   , "Concepts defined inside patterns" : context[Pattern*Context]~;concepts[Pattern*Concept]
   , "Concepts defined outside patterns" : context[Concept*Context]~
-  , "Relations" : declaredIn[Relation*Context]~  LINKTO INTERFACE "Relation"
+  , "Relations" : relsDefdIn[Relation*Context]~  LINKTO INTERFACE "Relation"
   , "Roles" : allRoles[Context*Role]
 --  , "allConjuncts" : allConjuncts[Context*Conjunct]
   , "Rules" : context[Rule*Context]~ INTERFACE "Rule"
@@ -144,7 +144,7 @@ BOX [ "context" : context[IsE*Context]
     ]
 
 INTERFACE Relation FOR Ampersand : I[Relation]
-BOX [ "declared in context" : declaredIn[Relation*Context]
+BOX [ "declared in context" : relsDefdIn[Relation*Context]
     , "decMean" : decMean[Relation*Meaning]
     , "decprL" : decprL[Relation*String]
     , "decprM" : decprM[Relation*String]

diff --git a/AmpersandData/Repo Interfaces/Atoms.ifc b/AmpersandData/Repo Interfaces/Atoms.ifc
@@ -1,4 +1,4 @@
-CONTEXT AST IN ENGLISH 
+CONTEXT FormalAmpersand IN ENGLISH 
 INCLUDE "Concepts.adl"
 INCLUDE "Atoms.adl"
 --INCLUDE "Atoms.xlsx"

diff --git a/AmpersandData/Repo Interfaces/Contexts.ifc b/AmpersandData/Repo Interfaces/Contexts.ifc
@@ -8,7 +8,7 @@ BOX <TABS>
       BOX<TABLE sortable>
            [ context        : I
            , "valid rules"  : valid[Rule*Context]~
-           , relations      : declaredIn[Relation*Context]~
+           , relations      : relsDefdIn[Relation*Context]~
            ]
     ]
 
@@ -35,11 +35,11 @@ BOX <TABS>
                 ( -(genspc[Isa*Concept]~;genspc[Isa*Concept]))) 
          -- INTERFACE IsaTree 
   , "Concepts" : context[Concept*Context]~
-  , "Relations" : declaredIn[Relation*Context]~  -- LINKTO INTERFACE "Relation"
+  , "Relations" : relsDefdIn[Relation*Context]~  -- LINKTO INTERFACE "Relation"
        BOX<TABLE sortable>
            [ relation   : I
-           , "declared in pattern" : declaredIn[Relation*Pattern]
-           , "declared in context" : declaredIn[Relation*Context]
+           , "declared in pattern" : declaredIn
+           , "declared in context" : relsDefdIn
            ]
   , "Roles" : allRoles[Context*Role]
 --  , "allConjuncts" : allConjuncts[Context*Conjunct]

diff --git a/AmpersandData/Repo Interfaces/DomainAnalysis.ifc b/AmpersandData/Repo Interfaces/DomainAnalysis.ifc
@@ -1,4 +1,4 @@
-CONTEXT AST IN ENGLISH 
+CONTEXT FormalAmpersand IN ENGLISH 
 INCLUDE "DomainAnalysis.adl"
 INCLUDE "Terms.adl"
 INCLUDE "Braga.xslx"

diff --git a/AmpersandData/Repo Interfaces/Expressions.ifc b/AmpersandData/Repo Interfaces/Expressions.ifc
@@ -1,4 +1,4 @@
-CONTEXT AST IN ENGLISH 
+CONTEXT FormalAmpersand IN ENGLISH 
 INCLUDE "Terms.adl"
 INCLUDE "Views.adl"
 INCLUDE "Atoms.adl"

diff --git a/AmpersandData/Repo Interfaces/Rules.ifc b/AmpersandData/Repo Interfaces/Rules.ifc
@@ -1,4 +1,4 @@
-CONTEXT AST IN ENGLISH 
+CONTEXT FormalAmpersand IN ENGLISH 
 INCLUDE "Concepts.adl"
 --INCLUDE "Atoms.xlsx"
 

diff --git a/AmpersandData/Repo Interfaces/Tables.ifc b/AmpersandData/Repo Interfaces/Tables.ifc
@@ -1,4 +1,4 @@
-CONTEXT AST IN ENGLISH
+CONTEXT FormalAmpersand IN ENGLISH
 INCLUDE "Tables.adl"
 INCLUDE "Tables.xlsx"
 

diff --git a/AmpersandData/Repo Interfaces/TypeChecking.ifc b/AmpersandData/Repo Interfaces/TypeChecking.ifc
@@ -1,4 +1,4 @@
-CONTEXT AST IN ENGLISH 
+CONTEXT FormalAmpersand IN ENGLISH 
 INCLUDE "TypeChecking.adl"
 INCLUDE "Views.adl"
 INCLUDE "Terms.xlsx"

diff --git a/AmpersandData/Semantics/Atoms.adl b/AmpersandData/Semantics/Atoms.adl
@@ -1,4 +1,4 @@
-CONTEXT AST IN ENGLISH 
+CONTEXT FormalAmpersand IN ENGLISH 
 INCLUDE "Concepts.adl"
 
 PATTERN Pairs

diff --git a/AmpersandData/Semantics/Atoms.docadl b/AmpersandData/Semantics/Atoms.docadl
@@ -1,4 +1,4 @@
-CONTEXT AST IN ENGLISH LATEX
+CONTEXT FormalAmpersand IN ENGLISH LATEX
 INCLUDE "Atoms.adl"
 
 -- RJ: Ik maak duidelijk onderscheid tussen een 'representation' (bijv. een foto van een tomaat) 

diff --git a/AmpersandData/Semantics/AtomsAsShouldBe.adl b/AmpersandData/Semantics/AtomsAsShouldBe.adl
@@ -1,4 +1,4 @@
-CONTEXT AST IN ENGLISH 
+CONTEXT FormalAmpersand IN ENGLISH 
 INCLUDE "Concepts.adl"
 INCLUDE "Atoms.xlsx"
 

diff --git a/AmpersandData/Semantics/AtomsWithRepr.adl b/AmpersandData/Semantics/AtomsWithRepr.adl
@@ -1,4 +1,4 @@
-CONTEXT AST IN ENGLISH 
+CONTEXT FormalAmpersand IN ENGLISH 
 INCLUDE "Atoms.xlsx"
 
 INTERFACE Overview : "_SESSION"[SESSION]

diff --git a/AmpersandData/Semantics/DomainAnalysis.adl b/AmpersandData/Semantics/DomainAnalysis.adl
@@ -1,4 +1,4 @@
-CONTEXT AST IN ENGLISH LATEX
+CONTEXT FormalAmpersand IN ENGLISH LATEX
 -- The comments for this script can be found in DomainAnalysis.docadl
 INCLUDE "Atoms.adl"
 

diff --git a/AmpersandData/Semantics/FSpec.adl b/AmpersandData/Semantics/FSpec.adl
@@ -1,5 +1,5 @@
 CONTEXT RAP IN ENGLISH
-INCLUDE "AST.adl"
+INCLUDE "FormalAmpersand.adl"
 
 PATTERN Image
 imageurl :: Image*URL

diff --git a/AmpersandData/Semantics/Tables.adl b/AmpersandData/Semantics/Tables.adl
@@ -1,4 +1,4 @@
-CONTEXT AST IN ENGLISH
+CONTEXT FormalAmpersand IN ENGLISH
 INCLUDE "Concepts.adl"
 --INCLUDE "Tables.xlsx"
 

diff --git a/AmpersandData/Semantics/Tables.docadl b/AmpersandData/Semantics/Tables.docadl
@@ -1,4 +1,4 @@
-CONTEXT AST IN ENGLISH LATEX
+CONTEXT FormalAmpersand IN ENGLISH LATEX
 INCLUDE "Tables.adl"
 
 PURPOSE PATTERN Persistence
@@ -202,7 +202,7 @@ Relations that are neither univalent nor injective are administered separately i
 +}
 
 PURPOSE RELATION prop[Relation*Property]
-{+Multiplicity properties of relations have consequences for the way Ampersand generates database tables.
+{+Properties UNI and INJ have consequences for the way Ampersand generates database tables.
 For this reason, Ampersand keeps these properties in the system.
 +}
 RELATION prop[Relation*Property]

diff --git a/AmpersandData/Semantics/TypeChecking.adl b/AmpersandData/Semantics/TypeChecking.adl
@@ -1,4 +1,4 @@
-CONTEXT AST IN ENGLISH LATEX
+CONTEXT FormalAmpersand IN ENGLISH LATEX
 -- The comments for this script can be found in Atoms.doc
 INCLUDE "Atoms.adl"
 INCLUDE "DomainAnalysis.adl"

diff --git a/AmpersandData/Semantics/TypeChecking.docadl b/AmpersandData/Semantics/TypeChecking.docadl
@@ -1,4 +1,4 @@
-CONTEXT AST IN ENGLISH LATEX
+CONTEXT FormalAmpersand IN ENGLISH LATEX
 -- The comments for this script can be found in Terms.docadl
 INCLUDE "Terms.adl"
 

diff --git a/AmpersandData/Semantics/Views.adl b/AmpersandData/Semantics/Views.adl
@@ -1,4 +1,4 @@
-CONTEXT AST IN ENGLISH
+CONTEXT FormalAmpersand IN ENGLISH
 INCLUDE "Concepts.adl"
 
 PATTERN Views

diff --git a/AmpersandData/Semantics/Views.docadl b/AmpersandData/Semantics/Views.docadl
@@ -1,4 +1,4 @@
-CONTEXT AST IN ENGLISH
+CONTEXT FormalAmpersand IN ENGLISH
 INCLUDE "Atoms.docadl"
 INCLUDE "Views.adl"
 

diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -1,5 +1,11 @@
 # Release notes of Ampersand
 
+## v4.4.0 ( 10 September August 2021)
+
+* PR #1201 changes to Transformers.hs for the new RAP release.
+* [Issue #1171](https://github.com/AmpersandTarski/Ampersand/issues/1171) Duplicate labels in VIEW will now result in error, not warning. 
+* [Issue #1204](https://github.com/AmpersandTarski/Ampersand/issues/1204) Introduction of ENFORCE statement.
+
 ## v4.3.0 ( 13 August 2021)
 
 * [Issue #1194](https://github.com/AmpersandTarski/Ampersand/issues/1194) Ampersand will output the options in debug mode.