diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index 19246bfad..98b99f385 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -1,6 +1,9 @@
 # Release notes of Ampersand
 
-## Unreleased changes
+## v5.0.1 (5 february 2024)
+- Some adaptions to w.r.t. the namespaces, in the generated funcional specification.
+
+## v5.0.0 (4 february 2024)
 
 - [Issue #1307](https://github.com/AmpersandTarski/Ampersand/issues/1307) First phase of introducing namespaces in Ampersand.
 - [Issue #1315](https://github.com/AmpersandTarski/Ampersand/issues/1315) Documentation update: landing pages for target audience, governance info for the Ampersand project added.
diff --git a/ampersand.cabal b/ampersand.cabal
index 7b5030cb4..c11512ad6 100644
--- a/ampersand.cabal
+++ b/ampersand.cabal
@@ -5,7 +5,7 @@ cabal-version: 2.0
 -- see: https://github.com/sol/hpack
 
 name:           ampersand
-version:        5.0.0
+version:        5.0.1
 synopsis:       Toolsuite for automated design of enterprise information systems.
 description:    You can define your business processes by means of rules, written in Relation Algebra.
 category:       Database Design
diff --git a/docs/Examples.md b/docs/Examples.md
index 5816a4c5c..3336e9c8f 100644
--- a/docs/Examples.md
+++ b/docs/Examples.md
@@ -1,5 +1,5 @@
 ---
-title: Examples
+title: examples
 id: examples
 description: Examples of Ampersand programs and fragments
 ---
@@ -9,6 +9,27 @@ description: Examples of Ampersand programs and fragments
 This page is a collection of examples, meant for learning and explaining the language Ampersand.
 TODO: refactor this documentation to match the latest syntax.
 
+## Example: Multiple files
+This example illustrates how an Ampersand specification can consist of multiple files.
+
+In this example, we have two files. File `foo.adl` contains the following text:
+```Ampersand
+CONTEXT MultifileDemo
+INCLUDE "bar.adl"
+RELATION r[A*B]
+RULE r |- s
+ENDCONTEXT
+```
+and file `bar.adl` contains:
+```Ampersand
+CONTEXT MultifileDemo
+INCLUDE "bar.adl"
+RELATION s[A*B]
+ENDCONTEXT
+```
+Without the `INCLUDE` statement, file `foo.adl` does not compile because relation `s` is undefined.
+The `INCLUDE` statement causes all definitions of `bar.adl` to be included in the context of `foo.adl`, so this example compiles without errors.
+
 ## Example: Client {#interfaces-example-client}
 
 This example illustrates the structure of [interfaces in Ampersand](reference-material/syntax-of-ampersand#the-interface-statement)
diff --git a/docs/guides/onboarding.md b/docs/guides/onboarding.md
index 2196a728d..48363697e 100644
--- a/docs/guides/onboarding.md
+++ b/docs/guides/onboarding.md
@@ -20,6 +20,8 @@ Request membership to
 - [AmpersandTarski](https://github.com/orgs/AmpersandTarski/people) organization and
 - [Ordina A-team](https://github.com/orgs/AmpersandTarski/teams/ordina-a-team/members).
 
+Above links only work for members of AmpersandTarski
+
 :::tip
 Make sure when you contact Han about this that you provide him with your Github account name (or URL to your GitHub profile page).
 :::
diff --git a/docs/landingpage/2-student.md b/docs/landingpage/2-student.md
index e3b95fc6b..8f07ad32a 100644
--- a/docs/landingpage/2-student.md
+++ b/docs/landingpage/2-student.md
@@ -12,4 +12,5 @@ You can learn about the language Ampersand, and learn how to make a prototype of
 - Do the [tutorial](../tutorial-rap4), to get an idea of an Ampersand application
 - Learn about the [syntax of Ampersand](../reference-material/syntax-of-ampersand), to write correct Ampersand code.
 - Learn about [relation algebra](https://en.wikipedia.org/wiki/Relational_algebra) on Wikipedia, to understand more about this fascinating field of mathematics.
+- Find [examples](../examples) of Ampersand specifications, to get started making your own.
 - Find [exercises](../exercises.md) that help you improve your skills in specifying information systems.
diff --git a/docs/landingpage/3-ampersand-user.md b/docs/landingpage/3-ampersand-user.md
index f7aa2ff6d..df7305887 100644
--- a/docs/landingpage/3-ampersand-user.md
+++ b/docs/landingpage/3-ampersand-user.md
@@ -11,6 +11,7 @@ This page will help you build a working prototype of your information system and
 ## Get started
 
 - Do the [tutorial](../tutorial-rap4), to get an idea of an Ampersand application
+- Find [examples](../examples) of Ampersand specifications, to get started making your own.
 - Understand the [architecture of an Ampersand application](../reference-material/architecture-of-an-ampersand-application), so you can build, deploy, and maintain your Ampersand application better.
 - Learn about the [syntax of Ampersand](../reference-material/syntax-of-ampersand), to write correct Ampersand code.
 - Learn about [relation algebra](https://en.wikipedia.org/wiki/Relational_algebra) on Wikipedia, to understand more about this fascinating field of mathematics.
diff --git a/docs/reference-material/interfaces.md b/docs/reference-material/interfaces.md
index c7c40ca4b..6ad9b93ef 100644
--- a/docs/reference-material/interfaces.md
+++ b/docs/reference-material/interfaces.md
@@ -276,5 +276,5 @@ When running an application in your browser, you are watching one user interface
 
 The next sections contain two examples:
 
-- a [client interface](../Examples.md#interfaces-example-client) to allow clients of a web shop to change their name and address and show them status information of their orders;
-- a [login interface](../Examples.md#interfaces-example-login) to demonstrate how to get different interface structures under varying conditions.
+- a [client interface](../examples#interfaces-example-client) to allow clients of a web shop to change their name and address and show them status information of their orders;
+- a [login interface](../examples#interfaces-example-login) to demonstrate how to get different interface structures under varying conditions.
diff --git a/docs/reference-material/syntax-of-ampersand.md b/docs/reference-material/syntax-of-ampersand.md
index 911765c30..6c1c3bd2a 100644
--- a/docs/reference-material/syntax-of-ampersand.md
+++ b/docs/reference-material/syntax-of-ampersand.md
@@ -795,7 +795,7 @@ Interfaces are meant to expose functionality and data from a [context](#the-cont
 
 #### Description
 
-An interface is a component of an information system that exposes functionality and data from a [context](#the-context-statement), to let users or information systems interact by creating, reading, updating, and deleting data. The first [example](../Examples.md#example-interface-structure) introduces a simple interface informally. Another [example](../Examples.md#interface-introductory-example) introduces the main features of an interface with nested interfaces.
+An interface is a component of an information system that exposes functionality and data from a [context](#the-context-statement), to let users or information systems interact by creating, reading, updating, and deleting data. The first [example](../examples#example-interface-structure) introduces a simple interface informally. Another [example](../examples#interface-introductory-example) introduces the main features of an interface with nested interfaces.
 
 A _interface_ is a component of an information system. During the time that this interface can actually be used, we say it is _deployed_. We also call this the _lifetime_ of a interface. A typical instance of a interface is a user interface based on HTML-CSS that runs in a browser. But an application program interface \(API\) that serves other computers with web services is a perfectly valid instance as well.
 
@@ -859,8 +859,8 @@ When running an application in your browser, you are watching one user interface
 
 Further examples:
 
-- a [client interface](../Examples.md#interfaces-example-client) to allow clients of a web shop to change their name and address and show them status information of their orders;
-- a [login interface](../Examples.md#interfaces-example-login) to demonstrate how to get different interface structures under varying conditions.
+- a [client interface](../examples#interfaces-example-client) to allow clients of a web shop to change their name and address and show them status information of their orders;
+- a [login interface](../examples#interfaces-example-login) to demonstrate how to get different interface structures under varying conditions.
 
 ### CRUD annotations
 
@@ -1498,7 +1498,7 @@ RULE <label> <term> <meaning>* <message>* <violation>?
 The [RULE syntax](#the-rule-statement) is the same as for ordinary rules.
 However, the violations are specified differently.
 We will define the specifics by examples.
-Most of the examples are taken from the demo script [Project Administration Example](https://github.com/AmpersandTarski/ampersand-models/tree/master/Examples/ProjectAdministration). You can compile and run this script, and reproduce several of the examples that follow.
+Most of the examples are taken from the demo script [Project Administration Example](https://github.com/AmpersandTarski/ampersand-models/tree/master/examples/ProjectAdministration). You can compile and run this script, and reproduce several of the examples that follow.
 
 #### Example \(`InsPair` and `DelPair`\)
 
diff --git a/docs/the-tools-we-use/ampersand-language-support.md b/docs/the-tools-we-use/ampersand-language-support.md
index becb7da67..1a80b675b 100644
--- a/docs/the-tools-we-use/ampersand-language-support.md
+++ b/docs/the-tools-we-use/ampersand-language-support.md
@@ -1,22 +1,65 @@
 ---
-description: This page describes tooling and workflow in relation to our VSCode extention
+description: This page describes tooling and workflow in relation to our VSCode extension
 ---
 
-# Ampersand language support
+# Ampersand dev tools
 
-As we start fiddling around with getting a first version of VSCode extention, it turns out all kind of tooling needs to be in place. The vision of the extention is that it will eventually give ampersand modellers a rich integrated development environment, including syntax colouring, prettyprint, syntax supported editing, script execution etc etc. 
+Ampersand has various tools that help development of ampersand models.
 
-At first, I had a look at [language-haskell](https://github.com/JustusAdam/language-haskell). They have some IDE support in place, so it seems a reasonable first start. I don't like to invent the wheel myself.
+## Ampersand language support
+
+There is a VSCode extension named Ampersand language support (ampersandtarski.language-ampersand), which adds support for creating ampersand models.
+
+### Settings
+
+The extension has the following settings.
+
+#### Main script name
+
+When using one of the generate commands, this file is used as an entrypoint for the ampersand compiler. This file needs to located inside the project folder.
+
+**Default**: main.adl
+
+#### Project folder name
+
+When using one of the generate commands, this is the folder that is used to pass on to the ampersand compiler.
+
+**Default**: project
+
+### Commands
+
+Listed below are the commands made available by this extension. For these commands to work you also need to have ampersand in PATH.
 
+#### Ampersand Version
 
+Will show you which version of ampersand you have.
+
+#### Ampersand Daemon
+
+Starts the ampersand daemon. This tool will check the files listed in `.ampersand` for syntax errors.
+
+#### Ampersand Generate Functional Specifications
+
+This will take the project folder and create a word document with the functional specification of the model.
+
+#### Ampersand Generate Atlas
+
+As of this writing, this will generate a json file which describes the relations within the model.
+
+#### Ampersand Generate Protoype
+
+This command generates a Kubernetes manifest file containing a deployment and service. It will then try to apply this file and port-forward the service. To apply the file, a running Kubernetes cluster and kubectl are required. Once port-forwarded, the prototype is available at localhost:8000.
+
+As we start fiddling around with getting a first version of VSCode extension, it turns out all kind of tooling needs to be in place. The vision of the extension is that it will eventually give ampersand modellers a rich integrated development environment, including syntax colouring, prettyprint, syntax supported editing, script execution etc etc.
+
+At first, I had a look at [language-haskell](https://github.com/JustusAdam/language-haskell). They have some IDE support in place, so it seems a reasonable first start. I don't like to invent the wheel myself.
 
 ### [npm](https://docs.npmjs.com/)
 
-There is a lot of javascript going on, so we need a package manager for it. 
+There is a lot of javascript going on, so we need a package manager for it.
 
 ### Releasing of this vs-code extension
 
 We have a release pipeline in place using travis-ci. See the travis.yml file in the root directory. Documentation of extentions can be found [here](https://code.visualstudio.com/api/working-with-extensions/publishing-extension).
 
 The personal access token in use has an expiry date on it. An email is sent to the owner of that token \(currently Han\), in advance of the expiry. It can be renewed or the expire date [can be extended](https://dev.azure.com/hanjoostenhan/_usersSettings/tokens). 
-
diff --git a/docs/tutorial/interfaces.md b/docs/tutorial/interfaces.md
index 71f3a82da..76481c838 100644
--- a/docs/tutorial/interfaces.md
+++ b/docs/tutorial/interfaces.md
@@ -119,7 +119,7 @@ TODO
 
 ## Assignment
 
-Compile and run the script [Project Administration Example](https://github.com/AmpersandTarski/ampersand-models/tree/master/Examples/ProjectAdministration). Start by reproducing everything that is shown above. It is quite likely that you will be trying out your own ideas before you get to the end... Have fun!
+Compile and run the script [Project Administration Example](https://github.com/AmpersandTarski/ampersand-models/tree/master/examples/ProjectAdministration). Start by reproducing everything that is shown above. It is quite likely that you will be trying out your own ideas before you get to the end... Have fun!
 
 ## What have you learned?
 
diff --git a/package.yaml b/package.yaml
index 0863d5c8f..65bbe85fc 100644
--- a/package.yaml
+++ b/package.yaml
@@ -1,5 +1,5 @@
 name: ampersand
-version: 5.0.0
+version: 5.0.1
 author: Stef Joosten
 maintainer: stef.joosten@ou.nl
 synopsis: Toolsuite for automated design of enterprise information systems.
diff --git a/src/Ampersand/ADL1/P2A_Converters.hs b/src/Ampersand/ADL1/P2A_Converters.hs
index 266515c56..255e4694b 100644
--- a/src/Ampersand/ADL1/P2A_Converters.hs
+++ b/src/Ampersand/ADL1/P2A_Converters.hs
@@ -941,16 +941,16 @@ pCtx2aCtx
 
       pPat2aPat :: ContextInfo -> P_Pattern -> Guarded Pattern
       pPat2aPat ci ppat =
-        f <$> traverse (pRul2aRul ci (Just $ name ppat)) (pt_rls ppat)
-          <*> traverse (pIdentity2aIdentity ci (Just $ name ppat)) (pt_ids ppat)
+        f <$> traverse (pRul2aRul ci (Just $ label ppat)) (pt_rls ppat)
+          <*> traverse (pIdentity2aIdentity ci (Just $ label ppat)) (pt_ids ppat)
           <*> traverse (pPop2aPop ci) (pt_pop ppat)
           <*> traverse (pViewDef2aViewDef ci) (pt_vds ppat)
           <*> traverse (pPurp2aPurp ci) (pt_xps ppat)
-          <*> traverse (pDecl2aDecl (representationOf ci) cptMap (Just $ name ppat) deflangCtxt deffrmtCtxt) (pt_dcs ppat)
+          <*> traverse (pDecl2aDecl (representationOf ci) cptMap (Just $ label ppat) deflangCtxt deffrmtCtxt) (pt_dcs ppat)
           <*> traverse (pure . pConcDef2aConcDef (defaultLang ci) (defaultFormat ci)) (pt_cds ppat)
           <*> traverse (pure . pRoleRule2aRoleRule) (pt_RRuls ppat)
           <*> traverse pure (pt_Reprs ppat)
-          <*> traverse (pEnforce2aEnforce ci (Just $ name ppat)) (pt_enfs ppat)
+          <*> traverse (pEnforce2aEnforce ci (Just $ label ppat)) (pt_enfs ppat)
         where
           f rules' keys' pops' views' xpls relations conceptdefs roleRules representations enforces' =
             A_Pat
@@ -972,13 +972,13 @@ pCtx2aCtx
               }
       pRul2aRul ::
         ContextInfo ->
-        Maybe Name -> -- name of pattern the rule is defined in (if any)
+        Maybe Text -> -- name of pattern the rule is defined in (if any), just for documentation purposes.
         P_Rule TermPrim ->
         Guarded Rule
       pRul2aRul ci mPat = typeCheckRul ci mPat . disambiguate (conceptMap ci) (termPrimDisAmb (conceptMap ci) (declDisambMap ci))
       typeCheckRul ::
         ContextInfo ->
-        Maybe Name -> -- name of pattern the rule is defined in (if any)
+        Maybe Text -> -- name of pattern the rule is defined in (if any), just for documentation purposes.
         P_Rule (TermPrim, DisambPrim) ->
         Guarded Rule
       typeCheckRul
@@ -1010,13 +1010,13 @@ pCtx2aCtx
                 }
       pEnforce2aEnforce ::
         ContextInfo ->
-        Maybe Name -> -- name of pattern the rule is defined in (if any)
+        Maybe Text -> -- name of pattern the enforcement rule is defined in (if any), just for documentation purposes.
         P_Enforce TermPrim ->
         Guarded AEnforce
       pEnforce2aEnforce ci mPat = typeCheckEnforce ci mPat . disambiguate (conceptMap ci) (termPrimDisAmb (conceptMap ci) (declDisambMap ci))
       typeCheckEnforce ::
         ContextInfo ->
-        Maybe Name -> -- name of pattern the enforce is defined in (if any)
+        Maybe Text -> -- name of pattern the enforcement rule is defined in (if any), just for documentation purposes.
         P_Enforce (TermPrim, DisambPrim) ->
         Guarded AEnforce
       typeCheckEnforce
@@ -1095,7 +1095,7 @@ pCtx2aCtx
                     lbl' = "Compute " <> tshow rel <> " using " <> command
       pIdentity2aIdentity ::
         ContextInfo ->
-        Maybe Name -> -- name of pattern the rule is defined in (if any)
+        Maybe Text -> -- name of pattern the rule is defined in (if any), just for documentation purposes.
         P_IdentDef ->
         Guarded IdentityRule
       pIdentity2aIdentity ci mPat pidt =
@@ -1340,12 +1340,12 @@ pAtomValue2aAtomValue typ cpt pav =
 pDecl2aDecl ::
   (A_Concept -> TType) ->
   ConceptMap ->
-  Maybe Name -> -- name of pattern the rule is defined in (if any)
+  Maybe Text -> -- label of pattern the rule is defined in (if any), just for documentation purposes
   Lang -> -- The default language
   PandocFormat -> -- The default pandocFormat
   P_Relation ->
   Guarded Relation
-pDecl2aDecl typ cptMap maybePatName defLanguage defFormat pd =
+pDecl2aDecl typ cptMap maybePatLabel defLanguage defFormat pd =
   do
     checkEndoProps
     --propLists <- mapM pProp2aProps . Set.toList $ dec_prps pd
@@ -1361,7 +1361,7 @@ pDecl2aDecl typ cptMap maybePatName defLanguage defFormat pd =
           decMean = map (pMean2aMean defLanguage defFormat) (dec_Mean pd),
           decfpos = origin pd,
           decusr = True,
-          decpat = maybePatName,
+          decpat = maybePatLabel,
           dechash = hash (dec_nm pd) `hashWithSalt` decSign
         }
   where
diff --git a/src/Ampersand/Basics/Name.hs b/src/Ampersand/Basics/Name.hs
index f452f1d18..42f974116 100644
--- a/src/Ampersand/Basics/Name.hs
+++ b/src/Ampersand/Basics/Name.hs
@@ -228,7 +228,7 @@ class Named a => Labeled a where
     Just (Label lbl) -> lbl
 
 instance Show Label where
-  show (Label x) = "LABEL " <> T.unpack x
+  show (Label x) = T.unpack x
 
 prependToPlainName :: Text -> Name -> Name
 prependToPlainName
diff --git a/src/Ampersand/Core/AbstractSyntaxTree.hs b/src/Ampersand/Core/AbstractSyntaxTree.hs
index 40e293d98..0372ba366 100644
--- a/src/Ampersand/Core/AbstractSyntaxTree.hs
+++ b/src/Ampersand/Core/AbstractSyntaxTree.hs
@@ -161,7 +161,7 @@ data A_Context = ACtx
     -- | used for Pandoc authors (and possibly other things)
     ctxmetas :: ![MetaData],
     ctxInfo :: !ContextInfo,
-    -- | All user defined enforce statements in this context, but outside patterns.
+    -- | All user defined enforcement rules in this context, but outside patterns.
     ctxEnforces :: ![AEnforce]
   }
   deriving (Typeable)
@@ -239,8 +239,8 @@ data AEnforce = AEnforce
     enfRel :: !Relation,
     enfOp :: !EnforceOperator,
     enfExpr :: !Expression,
-    -- | If the Enforce is defined in the context of a pattern, the name of that pattern.
-    enfPatName :: !(Maybe Name),
+    -- | If the enforcement rule is defined in the context of a pattern, the name of that pattern.
+    enfPatName :: !(Maybe Text),
     enfRules :: ![Rule]
   }
   deriving (Eq)
@@ -334,8 +334,8 @@ data Rule = Rule
     rrmsg :: ![Markup],
     -- | Custom presentation for violations, currently only in a single language
     rrviol :: !(Maybe (PairView Expression)),
-    -- | If the rule is defined in the context of a pattern, the name of that pattern.
-    rrpat :: !(Maybe Name),
+    -- | If the rule is defined in the context of a pattern, the label of that pattern for documentation purposes.
+    rrpat :: !(Maybe Text),
     -- | Where does this rule come from?
     rrkind :: !RuleKind
   }
@@ -470,8 +470,8 @@ data Relation = Relation
     decfpos :: !Origin,
     -- | if true, this relation is declared by an author in the Ampersand script; otherwise it was generated by Ampersand.
     decusr :: !Bool,
-    -- | If the relation is declared inside a pattern, the name of that pattern.
-    decpat :: !(Maybe Name),
+    -- | If the relation is declared inside a pattern, the label of that pattern, just for documentation purposes.
+    decpat :: !(Maybe Text),
     dechash :: !Int
   }
   deriving (Typeable, Data)
@@ -525,8 +525,8 @@ data IdentityRule = Id
     idlabel :: !(Maybe Label),
     -- | this term describes the instances of this object, related to their context
     idCpt :: !A_Concept,
-    -- | if defined within a pattern, then the name of that pattern.
-    idPat :: !(Maybe Name),
+    -- | if defined within a pattern, then the label of that pattern.
+    idPat :: !(Maybe Text),
     -- | the constituent attributes (i.e. name/term pairs) of this identity.
     identityAts :: NE.NonEmpty IdentitySegment
   }
diff --git a/src/Ampersand/FSpec/FSpec.hs b/src/Ampersand/FSpec/FSpec.hs
index a4486930b..a4e496d05 100644
--- a/src/Ampersand/FSpec/FSpec.hs
+++ b/src/Ampersand/FSpec/FSpec.hs
@@ -62,6 +62,7 @@ import Text.Pandoc.Builder (Blocks)
 data FSpec = FSpec
   { -- | The name of the specification, taken from the Ampersand script
     fsName :: !Name,
+    fsLabel :: !(Maybe Label),
     -- | the original context. (for showA)
     originalContext :: !(Maybe A_Context),
     -- | The origin of the FSpec. An FSpec can be a merge of a file including other files c.q. a list of Origin.
@@ -250,6 +251,9 @@ instance ConceptStructure FSpec where
 instance Named FSpec where
   name = fsName
 
+instance Labeled FSpec where
+  mLabel = fsLabel
+
 data Quad = Quad
   { qDcl :: Relation, -- The relation that, when affected, triggers a restore action.
     qRule :: Rule, -- The rule from which qConjuncts is derived.
@@ -508,6 +512,7 @@ emptyFSpec nm =
   FSpec
     { fsName = nm,
       -- The name of the specification, taken from the Ampersand script
+      fsLabel = Nothing,
       originalContext = fatal "Don't ask for the original context in the empty FSpec.",
       -- the original context. (for showA)
       fspos = [],
diff --git a/src/Ampersand/FSpec/ToFSpec/ADL2FSpec.hs b/src/Ampersand/FSpec/ToFSpec/ADL2FSpec.hs
index 97d1c1eb6..23572d80c 100644
--- a/src/Ampersand/FSpec/ToFSpec/ADL2FSpec.hs
+++ b/src/Ampersand/FSpec/ToFSpec/ADL2FSpec.hs
@@ -23,7 +23,7 @@ import qualified RIO.Set as Set
 import qualified RIO.Text as T
 
 {- The FSpec-datastructure should contain all "difficult" computations. This data structure is used by all sorts of rendering-engines,
-such as the code generator, the functional-specification generator, and future extentions. -}
+such as the code generator, the functional-specification generator, and future extensions. -}
 makeFSpec ::
   (HasFSpecGenOpts env) =>
   env ->
@@ -32,6 +32,7 @@ makeFSpec ::
 makeFSpec env context =
   FSpec
     { fsName = name context,
+      fsLabel = ctxlbl context,
       originalContext = Just context,
       fspos = ctxpos context,
       plugInfos = allplugs,
diff --git a/src/Ampersand/Graphic/Graphics.hs b/src/Ampersand/Graphic/Graphics.hs
index 65dbd958d..eca197b23 100644
--- a/src/Ampersand/Graphic/Graphics.hs
+++ b/src/Ampersand/Graphic/Graphics.hs
@@ -324,13 +324,13 @@ class ReferableFromPandoc a where
 
 instance ReferableFromPandoc Picture where
   imagePathRelativeToDirOutput env p =
-    "images" </> filename <.> extention
+    "images" </> filename <.> extension
     where
       filename = pictureFileName . pType $ p
-      extention =
+      extension =
         case view fspecFormatL env of
           Fpdf -> "png" -- When Pandoc makes a PDF file, Ampersand delivers the pictures in .png format. .pdf-pictures don't seem to work.
-          Fdocx -> "png" -- When Pandoc makes a .docx file, Ampersand delivers the pictures in .pdf format. The .svg format for scalable rendering does not work in MS-word.
+          Fdocx -> "png" -- When Pandoc makes a .docx file, Ampersand delivers the pictures in .pdf format. The .svg format for scalable rendering does not work in Pandoc.
           Fhtml -> "png"
           _ -> "dot"
 
diff --git a/src/Ampersand/Output/ToPandoc/ChapterConceptualAnalysis.hs b/src/Ampersand/Output/ToPandoc/ChapterConceptualAnalysis.hs
index 1a26bcd31..86ecd8240 100644
--- a/src/Ampersand/Output/ToPandoc/ChapterConceptualAnalysis.hs
+++ b/src/Ampersand/Output/ToPandoc/ChapterConceptualAnalysis.hs
@@ -84,11 +84,11 @@ chpConceptualAnalysis env lev fSpec =
           <> ( case (outputLang', patOfTheme themeContent) of
                  (Dutch, Just pat) ->
                    -- announce the conceptual diagram
-                   para (hyperLinkTo (pictOfPat pat) <> "Conceptueel diagram van " <> (singleQuoted . str . fullName) pat <> ".")
+                   para (hyperLinkTo (pictOfPat pat) <> "Conceptueel diagram van " <> (singleQuoted . str . label) pat <> ".")
                      -- draw the conceptual diagram
                      <> (xDefBlck env fSpec . pictOfPat) pat
                  (English, Just pat) ->
-                   para (hyperLinkTo (pictOfPat pat) <> "Conceptual diagram of " <> (singleQuoted . str . fullName) pat <> ".")
+                   para (hyperLinkTo (pictOfPat pat) <> "Conceptual diagram of " <> (singleQuoted . str . label) pat <> ".")
                      <> (xDefBlck env fSpec . pictOfPat) pat
                  (_, Nothing) -> mempty
              )
@@ -207,8 +207,8 @@ chpConceptualAnalysis env lev fSpec =
           case rrkind r of
             Identity c ->
               (para . l)
-                ( NL ("Een identiteit op \"" <> fullName c <> "\" is gedefinieerd, zij het zonder PURPOSE."),
-                  EN ("An identity rule for \"" <> fullName c <> "\" is defined, albeit without a purpose.")
+                ( NL ("Een identiteit op \"" <> label c <> "\" is gedefinieerd, zij het zonder PURPOSE."),
+                  EN ("An identity rule for \"" <> label c <> "\" is defined, albeit without a purpose.")
                 )
             _ -> fatal "The result of idRulesOfTheme themeContent has produced a RuleCont whose rrkind is not Identity c."
         caRemainingRelations :: Blocks
@@ -219,7 +219,7 @@ chpConceptualAnalysis env lev fSpec =
                 (plain . l) (NL "Betekenis", EN "Meaning")
               ]
               ( [ [ (plain . text)
-                      ( fullName rel <> " "
+                      ( label rel <> " "
                           <> if null cls
                             then tshow (sign rel)
                             else localize outputLang' (NL " (Attribuut van ", EN " (Attribute of ") <> (T.concat . map fullName) cls <> ")"
@@ -338,7 +338,7 @@ chpConceptualAnalysis env lev fSpec =
                         ( L.intersperse
                             (str ", ")
                             [ hyperLinkTo (XRefConceptualAnalysisRelation d)
-                                <> text (" (" <> fullName d <> ")")
+                                <> text (" (" <> label d <> ")")
                               | d <- toList $ bindedRelationsIn r
                             ]
                         )
diff --git a/src/Ampersand/Output/ToPandoc/ChapterDataAnalysis.hs b/src/Ampersand/Output/ToPandoc/ChapterDataAnalysis.hs
index d5397292b..3edbd5fae 100644
--- a/src/Ampersand/Output/ToPandoc/ChapterDataAnalysis.hs
+++ b/src/Ampersand/Output/ToPandoc/ChapterDataAnalysis.hs
@@ -146,7 +146,7 @@ chpDataAnalysis env fSpec = (theBlocks, [])
           (plain . text . l) (NL "Aantal", EN "Count"),
           (plain . text . l) (NL "Vullingsgraad", EN "Filling degree")
         ]
-        [ [ (plain . text . fullName) c,
+        [ [ (plain . text . label) c,
             meaningOf c
               <> (mconcat . map (amPandoc . explMarkup) . purposesOf fSpec outputLang') c,
             (plain . text . tshow . Set.size . atomsInCptIncludingSmaller fSpec) c,
@@ -179,7 +179,7 @@ chpDataAnalysis env fSpec = (theBlocks, [])
             (plain . text . l) (NL "Voorbeelden", EN "Examples"),
             (plain . text . l) (NL "Aantal", EN "Count")
           ]
-          [ [ (plain . text . fullName) c
+          [ [ (plain . text . label) c
             ] -- max 20 voorbeelden van atomen van concept c
               ++ (map (plain . text . showA) . take 20 . Set.toList . atomsInCptIncludingSmaller fSpec) c
               ++ [ (plain . text . tshow . Set.size . atomsInCptIncludingSmaller fSpec) c
@@ -222,7 +222,7 @@ chpDataAnalysis env fSpec = (theBlocks, [])
             (plain . text . l) (NL "#uniek", EN "#unique")
           ]
           ( [ [ (plain . text . text1ToText . sqlColumNameToText1 . attSQLColName) attr,
-                (plain . text) ((fullName . target . attExpr) attr <> "(" <> tshow nTgtConcept <> ")"), -- use "tshow.attType" for the technical type.
+                (plain . text) ((label . target . attExpr) attr <> "(" <> tshow nTgtConcept <> ")"), -- use "tshow.attType" for the technical type.
                 (plain . text) (percent (Set.size pairs) n),
                 (plain . text . tshow . Set.size . Set.map apRight) pairs
               ]
@@ -232,7 +232,7 @@ chpDataAnalysis env fSpec = (theBlocks, [])
                 pairs <- [(pairsInExpr fSpec . attExpr) (attr :: SqlAttribute)]
             ]
               <> [ [ (plain . text . text1ToText . sqlColumNameToText1 . attSQLColName) attr,
-                     (plain . text) ((fullName . target . attExpr) attr <> "(" <> tshow nTgtConcept <> ")"), -- use "tshow.attType" for the technical type.
+                     (plain . text) ((label . target . attExpr) attr <> "(" <> tshow nTgtConcept <> ")"), -- use "tshow.attType" for the technical type.
                      (plain . text) (percent (Set.size pairs) n),
                      (plain . text . tshow . Set.size . Set.map apRight) pairs
                      -- , (plain . text . tshow) nTgtConcept
@@ -259,10 +259,10 @@ chpDataAnalysis env fSpec = (theBlocks, [])
                          (plain . text . l) (NL "Target", EN "Target"),
                          (plain . text . l) (NL "uniek", EN "unique")
                        ]
-                       [ [ (plain . text) ((fullName . source) rel <> "(" <> tshow nSrcConcept <> ")"), -- use "tshow.attType" for the technical type.
+                       [ [ (plain . text) ((label . source) rel <> "(" <> tshow nSrcConcept <> ")"), -- use "tshow.attType" for the technical type.
                            (plain . text) (percent (Set.size (Set.map apLeft pairs)) nSrcConcept),
-                           (plain . text) (fullName rel <> "(" <> tshow (Set.size pairs) <> ")"),
-                           (plain . text) ((fullName . target) rel <> "(" <> tshow nTgtConcept <> ")"), -- use "tshow.attType" for the technical type.
+                           (plain . text) ((label) rel <> "(" <> tshow (Set.size pairs) <> ")"),
+                           (plain . text) ((label . target) rel <> "(" <> tshow nTgtConcept <> ")"), -- use "tshow.attType" for the technical type.
                            (plain . text) (percent (Set.size (Set.map apRight pairs)) nTgtConcept)
                          ]
                          | Just rel <- map assmdcl asscs,
@@ -308,11 +308,11 @@ chpDataAnalysis env fSpec = (theBlocks, [])
         <> mconcat
           [ simpleTable
               [plainText "Concept", plainText "C", plainText "R", plainText "U", plainText "D"]
-              [ [ (plainText . fullName) cncpt,
-                  mconcat . map (plainText . fullName) $ ifcsC,
-                  mconcat . map (plainText . fullName) $ ifcsR,
-                  mconcat . map (plainText . fullName) $ ifcsU,
-                  mconcat . map (plainText . fullName) $ ifcsD
+              [ [ (plainText . label) cncpt,
+                  mconcat . map (plainText . label) $ ifcsC,
+                  mconcat . map (plainText . label) $ ifcsR,
+                  mconcat . map (plainText . label) $ ifcsU,
+                  mconcat . map (plainText . label) $ ifcsD
                 ]
                 | (cncpt, (ifcsC, ifcsR, ifcsU, ifcsD)) <- crudObjsPerConcept (crudInfo fSpec)
               ]
@@ -401,7 +401,7 @@ chpDataAnalysis env fSpec = (theBlocks, [])
                             Dutch -> "Dit attribuut verwijst naar een rij in de tabel "
                             English -> "This attribute is a foreign key to "
                         )
-                          <> (text . fullName) c
+                          <> (text . label) c
                       PlainAttr ->
                         ( case outputLang' of
                             Dutch -> "Dit attribuut implementeert "
@@ -474,7 +474,7 @@ chpDataAnalysis env fSpec = (theBlocks, [])
         docRule :: LocalizedStr -> Rule -> Blocks
         docRule heading rule =
           mconcat
-            [ plain $ strong (text (l heading <> ": ") <> (emph . text . fullName) rule),
+            [ plain $ strong (text (l heading <> ": ") <> (emph . text . label) rule),
               mconcat . map (amPandoc . explMarkup) . purposesOf fSpec outputLang' $ rule,
               printMeaning outputLang' rule,
               para (showMath rule),
@@ -506,12 +506,12 @@ primExpr2pandocMath lang e =
       case lang of
         Dutch -> text "de relatie "
         English -> text "the relation "
-        <> math ((fullName . source) d <> " \\rightarrow {" <> fullName d <> "} " <> (fullName . target) d)
+        <> math ((label . source) d <> " \\rightarrow {" <> label d <> "} " <> (label . target) d)
     (EFlp (EDcD d)) ->
       case lang of
         Dutch -> text "de relatie "
         English -> text "the relation "
-        <> math ((fullName . source) d <> " \\leftarrow  {" <> fullName d <> "} " <> (fullName . target) d)
+        <> math ((label . source) d <> " \\leftarrow  {" <> label d <> "} " <> (label . target) d)
     (EIsc (r1, _)) ->
       let srcTable = case r1 of
             EDcI c -> c
@@ -519,15 +519,15 @@ primExpr2pandocMath lang e =
        in case lang of
             Dutch -> text "de identiteitsrelatie van "
             English -> text "the identityrelation of "
-            <> math (fullName srcTable)
+            <> math (label $ srcTable)
     (EDcI c) ->
       case lang of
         Dutch -> text "de identiteitsrelatie van "
         English -> text "the identityrelation of "
-        <> math (fullName c)
+        <> math (label $ c)
     (EEps c _) ->
       case lang of
         Dutch -> text "de identiteitsrelatie van "
         English -> text "the identityrelation of "
-        <> math (fullName c)
+        <> math (label $ c)
     _ -> fatal ("Have a look at the generated Haskell to see what is going on..\n" <> tshow e)
diff --git a/src/Ampersand/Output/ToPandoc/ChapterDiagnosis.hs b/src/Ampersand/Output/ToPandoc/ChapterDiagnosis.hs
index 36d02e055..29544aa76 100644
--- a/src/Ampersand/Output/ToPandoc/ChapterDiagnosis.hs
+++ b/src/Ampersand/Output/ToPandoc/ChapterDiagnosis.hs
@@ -7,6 +7,7 @@ import Ampersand.Output.ToPandoc.SharedAmongChapters
 import qualified RIO.List as L
 import qualified RIO.Set as Set
 import qualified RIO.Text as T
+import System.FilePath
 
 chpDiagnosis ::
   (HasDirOutput env, HasDocumentOpts env) =>
@@ -112,14 +113,17 @@ chpDiagnosis env fSpec
                   map (plain . str . fullName . fst) (fRoles fSpec)
                 )
                 -- Content rows:
-                [ (plain . str . fullName) rul :
+                [ (plain . str . label) rul :
                     [f rol rul | (rol, _) <- fRoles fSpec]
                   | rul <- sigs
                 ]
       where
         ruls = Set.filter (isSignal fSpec) . vrules $ fSpec
         f :: Role -> Rule -> Blocks
-        f _ _ = mempty
+        f rol rul =
+          if (rol, rul) `elem` fRoleRuls fSpec
+            then (plain . str) "✓"
+            else mempty
 
     missingConceptDefs :: Blocks
     missingConceptDefs =
@@ -138,7 +142,7 @@ chpDiagnosis env fSpec
                 ( NL "Het oogmerk (purpose) van concept ",
                   EN "The concept "
                 )
-                <> (singleQuoted . str . fullName) c
+                <> (singleQuoted . str . label) c
                 <> (str . l)
                   ( NL " is niet gedocumenteerd.",
                     EN " remains without a purpose."
@@ -150,7 +154,7 @@ chpDiagnosis env fSpec
                 ( NL "Het oogmerk (purpose) van de concepten: ",
                   EN "Concepts "
                 )
-                <> commaPandocAnd outputLang' (map (str . fullName) xs)
+                <> commaPandocAnd outputLang' (map (str . label) xs)
                 <> (str . l)
                   ( NL " is niet gedocumenteerd.",
                     EN " remain without a purpose."
@@ -158,9 +162,9 @@ chpDiagnosis env fSpec
             )
       where
         missing =
-          [ c | c <- ccs, null (purposesOf fSpec outputLang' c)
-          ]
-            <> [c | c <- ccs, null (concDefs fSpec c)]
+          L.nub $
+            [c | c <- ccs, null (purposesOf fSpec outputLang' c)]
+              <> [c | c <- ccs, null (concDefs fSpec c)]
         ccs = toList . concs . vrels $ fSpec
 
     unusedConceptDefs :: Blocks
@@ -362,7 +366,7 @@ chpDiagnosis env fSpec
                                ( NL " geeft een conceptueel diagram met alle relaties die gedeclareerd zijn in ",
                                  EN " shows a conceptual diagram with all relations declared in "
                                )
-                             <> (singleQuoted . str . fullName) pat
+                             <> (singleQuoted . str . label) pat
                              <> "."
                          )
                          <> xDefBlck env fSpec pict
@@ -444,12 +448,22 @@ chpDiagnosis env fSpec
       where
         formalizations rls =
           bulletList
-            [ para ((emph . str . fullName) r <> " (" <> (str . tshow . origin) r <> ")")
+            [ para ((emph . str . label) r <> " (" <> (str . tShowOrigin) r <> ")")
                 <> (para . showMath . formalExpression) r
                 <> (para . showPredLogic outputLang' . formalExpression) r
               | r <- rls
             ]
 
+    tShowOrigin :: (Traced x) => x -> Text
+    tShowOrigin = tshow . stripDirectory . origin
+      where
+        stripDirectory :: Origin -> Origin
+        stripDirectory (FileLoc pos' x) = FileLoc (f pos') x
+        stripDirectory fileLoc = fileLoc
+        -- data FilePos = FilePos FilePath Line Column deriving (Eq, Ord, Generic, Typeable, Data)
+        f :: FilePos -> FilePos
+        f (FilePos pth line col) = FilePos (takeFileName pth) line col
+
     ruleRelationRefTable :: Blocks
     ruleRelationRefTable =
       (para . str . l)
@@ -488,7 +502,7 @@ chpDiagnosis env fSpec
           Relations -> --The user-defined relations of the pattern / fSpec
           Rules -> -- The user-defined rules of the pattern / fSpec
           [Blocks]
-        mkTableRowPat p = mkTableRow (fullName $ p) (relsDefdIn p) (udefrules p)
+        mkTableRowPat p = mkTableRow (label p) (relsDefdIn p) (udefrules p)
         mkTableRow nm rels ruls =
           map
             (plain . str)
@@ -528,10 +542,10 @@ chpDiagnosis env fSpec
                      ]
               )
               -- Rows:
-              [ [(plain . str . fullName) rol]
-                  <> [(plain . str . maybe "--" fullName . rrpat) rul | multProcs]
-                  <> [ (plain . str . fullName) rul,
-                       (plain . str . maybe "--" fullName . rrpat) rul
+              [ [(plain . str . label) rol]
+                  <> [(plain . str . fromMaybe "--" . rrpat) rul | multProcs]
+                  <> [ (plain . str . label) rul,
+                       (plain . str . fromMaybe "--" . rrpat) rul
                      ]
                 | (rol, rul) <- fRoleRuls fSpec
               ]
@@ -577,8 +591,8 @@ chpDiagnosis env fSpec
               -- Rows:
               [ map
                   (plain . str)
-                  [ fullName r,
-                    (tshow . origin) r,
+                  [ label r,
+                    tShowOrigin r,
                     (tshow . length) ps
                   ]
                 | (r, ps) <- popwork
@@ -588,10 +602,9 @@ chpDiagnosis env fSpec
               mconcat
                 [ para
                     ( str (l (NL "Afspraak ", EN "Agreement "))
-                        <> hyperLinkTo (XRefSharedLangRule r)
-                        <> " ( "
+                        -- Pandoc does not yield hyperlinks in Word files, so we cannot do:
+                        -- <> hyperLinkTo (XRefSharedLangRule r) <> " ( " <> quoterule r <> " )"
                         <> quoterule r
-                        <> " )"
                         <> (str . l) (NL " luidt: ", EN " says: ")
                     )
                     <> printMeaning outputLang' r
@@ -625,19 +638,19 @@ chpDiagnosis env fSpec
         --         else expls
         --         where expls = [Plain (block<>[Space]) | Means l econt<-rrxpl r, l==Just outputLang' || l==Nothing, Para block<-econt]
         quoterule :: Rule -> Inlines
-        quoterule = singleQuoted . str . fullName
+        quoterule = singleQuoted . str . label
         oneviol :: Rule -> AAtomPair -> Inlines
         oneviol r p =
           if isEndo (formalExpression r) && apLeft p == apRight p
             then
               singleQuoted
-                ( (str . fullName . source . formalExpression) r
+                ( (str . label . source . formalExpression) r
                     <> (str . showValADL . apLeft) p
                 )
             else
-              "(" <> (str . fullName . source . formalExpression) r <> (str . showValADL . apLeft) p
+              "(" <> (str . label . source . formalExpression) r <> (str . showValADL . apLeft) p
                 <> ", "
-                <> (str . fullName . target . formalExpression) r
+                <> (str . label . target . formalExpression) r
                 <> (str . showValADL . apRight) p
                 <> ")"
         popwork :: [(Rule, AAtomPairs)]
@@ -676,7 +689,7 @@ chpDiagnosis env fSpec
         showViolatedRule (r, ps) =
           (para . emph)
             ( (str . l) (NL "Regel ", EN "Rule ")
-                <> (str . fullName) r
+                <> (str . label) r
             )
             <> para
               ( ( if isSignal fSpec r
@@ -692,7 +705,7 @@ chpDiagnosis env fSpec
                       <> (commaPandocOr outputLang' . map (str . fullName) . rolesOf $ r)
                   else
                     (str . l) (NL "Overtredingen van invariant ", EN "Violations of invariant ")
-                      <> (str . fullName) r
+                      <> (str . label) r
               )
               -- Alignment:
               (replicate 1 (AlignLeft, 1))
@@ -731,7 +744,7 @@ chpDiagnosis env fSpec
             -- Alignment:
             [(AlignLeft, 1.0)]
             -- Header:
-            [(plain . str . fullName . source . formalExpression) r]
+            [(plain . str . label . source . formalExpression) r]
             -- Data rows:
             [ [(plain . str . showValADL . apLeft) p]
               | p <- take 10 . toList $ ps --max 10 rows
@@ -742,7 +755,7 @@ chpDiagnosis env fSpec
             -- Alignment:
             (replicate 2 (AlignLeft, 1 / 2))
             -- Header:
-            [(plain . str . fullName . source . formalExpression) r, (plain . str . fullName . target . formalExpression) r]
+            [(plain . str . label . source . formalExpression) r, (plain . str . label . target . formalExpression) r]
             -- Data rows:
             [ [(plain . str . showValADL . apLeft) p, (plain . str . showValADL . apRight) p]
               | p <- take 10 . toList $ ps --max 10 rows
diff --git a/src/Ampersand/Output/ToPandoc/ChapterIntroduction.hs b/src/Ampersand/Output/ToPandoc/ChapterIntroduction.hs
index 9b6e87179..23eed85a6 100644
--- a/src/Ampersand/Output/ToPandoc/ChapterIntroduction.hs
+++ b/src/Ampersand/Output/ToPandoc/ChapterIntroduction.hs
@@ -29,7 +29,7 @@ chpIntroduction env now fSpec =
                 <> (singleQuoted . text . fullName) fSpec
                 <> text ". "
                 <> text "Het definieert de database en de business-services van "
-                <> (text . fullName) fSpec
+                <> text (label fSpec)
                 <> text " door middel van bedrijfsregels"
                 <> (note . para . text) "Het ontwerpen met bedrijfsregels is een kenmerk van de Ampersand aanpak, die gebruikt is bij het samenstellen van dit document. "
                 <> text ". "
@@ -71,7 +71,7 @@ chpIntroduction env now fSpec =
                            <> text "De gegevensanalyse in "
                            <> hyperLinkTo DataAnalysis
                            <> text " beschrijft de gegevensverzamelingen waarop "
-                           <> (singleQuoted . text . fullName) fSpec
+                           <> (text . label) fSpec
                            <> text " wordt gebouwd. "
                            <> text "Elk volgend hoofdstuk definieert één business service. "
                            <> text "Hierdoor kunnen bouwers zich concentreren op één service tegelijk. "
@@ -92,7 +92,7 @@ chpIntroduction env now fSpec =
                 <> (singleQuoted . text . fullName) fSpec
                 <> text ". "
                 <> text "It defines the database and the business services of "
-                <> (text . fullName) fSpec
+                <> (text . label) fSpec
                 <> text " by means of business rules"
                 <> (note . para . text) "Rule based design characterizes the Ampersand approach, which has been used to produce this document. "
                 <> text ". "
@@ -133,7 +133,7 @@ chpIntroduction env now fSpec =
                            <> text "The data analysis in "
                            <> hyperLinkTo DataAnalysis
                            <> text " describes the data sets upon which "
-                           <> (singleQuoted . text . fullName) fSpec
+                           <> (singleQuoted . text . label) fSpec
                            <> text " is built. "
                            <> text "Each subsequent chapter defines one business service. "
                            <> text "This allows builders to focus on a single service at a time. "
@@ -141,7 +141,7 @@ chpIntroduction env now fSpec =
                        <> para
                          ( text "Together, these services fulfill all commitments. "
                              <> text "By disclosing all functionality exclusively through these services, "
-                             <> (singleQuoted . text . fullName) fSpec
+                             <> (singleQuoted . text . label) fSpec
                              <> text " ensures compliance to all rules agreed upon."
                          )
                    else mempty
diff --git a/src/Ampersand/Output/ToPandoc/ChapterNatLangReqs.hs b/src/Ampersand/Output/ToPandoc/ChapterNatLangReqs.hs
index 922b7619a..632480da8 100644
--- a/src/Ampersand/Output/ToPandoc/ChapterNatLangReqs.hs
+++ b/src/Ampersand/Output/ToPandoc/ChapterNatLangReqs.hs
@@ -218,8 +218,7 @@ chpNatLangReqs env lev fSpec =
           [ ( str (l (NL "Afspraak ", EN "Agreement "))
                 <> (text . tshow . theNr $ nRul)
                 <> ": "
-                <> xDefInln env fSpec (XRefSharedLangRule rul)
-                <> ".",
+                <> xDefInln env fSpec (XRefSharedLangRule rul),
               case (cRulMeanings . theLoad) nRul of
                 [] ->
                   [ plain $
diff --git a/src/Ampersand/Output/ToPandoc/SharedAmongChapters.hs b/src/Ampersand/Output/ToPandoc/SharedAmongChapters.hs
index d902c272e..64d72da81 100644
--- a/src/Ampersand/Output/ToPandoc/SharedAmongChapters.hs
+++ b/src/Ampersand/Output/ToPandoc/SharedAmongChapters.hs
@@ -85,7 +85,7 @@ class Typeable a => Xreferenceable a where
   xDefInln :: (HasOutputLanguage env) => env -> FSpec -> a -> Inlines
   xDefInln _ _ a = fatal ("A " <> tshow (typeOf a) <> " cannot be labeled in an <Inlines>.") --you should use xDefBlck instead.
 
-  -- ^ function that defines the target Inlines of something that can e referenced.
+  -- ^ function that defines the target Inlines of something that can be referenced.
 
   hyperLinkTo :: a -> Inlines
   -- ^ function that returns a link to something that can be referenced.
@@ -123,7 +123,7 @@ hyperTarget :: (HasOutputLanguage env) => env -> FSpec -> CustomSection -> Eithe
 hyperTarget env fSpec a =
   case a of
     XRefConceptualAnalysisPattern {} -> Left . hdr $ (text . l) (NL "Thema: ", EN "Theme: ") <> (singleQuoted . str . tshow . mkId . refStuff $ a)
-    XRefSharedLangTheme (Just pat) -> (Left . hdr . text . fullName) pat
+    XRefSharedLangTheme (Just pat) -> (Left . hdr . text . label) pat
     XRefSharedLangTheme Nothing -> (Left . hdr . text . l) (NL "Overig", EN "Remaining")
     XRefSharedLangRelation d -> Right $ spanWith (xSafeLabel a, [], []) (str . tshow $ d)
     --   Left $ divWith (xSafeLabel a,[],[])
@@ -132,7 +132,7 @@ hyperTarget env fSpec a =
     --                         ("", ["adl"],[("caption",tshow d)])
     --                         ( "Deze RELATIE moet nog verder worden uitgewerkt in de Haskell code")
     --                  )
-    XRefSharedLangRule r -> Right $ spanWith (xSafeLabel a, [], []) (str . fullName $ r)
+    XRefSharedLangRule r -> (Right . spanWith (xSafeLabel a, [], []) . str . label) r
     --   Left $ divWith (xSafeLabel a,[],[])
     --                  (   (para . text $ tshow r)
     --                  --  <>codeBlockWith
@@ -722,10 +722,7 @@ legacyTable caption' cellspecs headers rows =
         toColSpec :: (Alignment, Double) -> ColSpec
         toColSpec (a, d) = (a, ColWidth d)
     tHead :: TableHead
-    tHead = TableHead nullAttr (zipWith toRow (map fst cellspecs) headers)
-      where
-        toRow :: Alignment -> Blocks -> Row
-        toRow a bs = Row nullAttr (map (toCell a . singleton) $ toList bs)
+    tHead = (TableHead nullAttr . toList . singleton . Row nullAttr . map (toCell AlignDefault)) headers
     toCell :: Alignment -> Blocks -> Cell
     toCell a b = Cell nullAttr a (RowSpan 1) (ColSpan 1) (toList b)
     tBodies :: [TableBody]
diff --git a/src/Ampersand/Prototype/ProtoUtil.hs b/src/Ampersand/Prototype/ProtoUtil.hs
index 264280b7e..891defaf5 100644
--- a/src/Ampersand/Prototype/ProtoUtil.hs
+++ b/src/Ampersand/Prototype/ProtoUtil.hs
@@ -192,7 +192,7 @@ writeFile filePath content = do
 
 -- Copy entire directory tree from srcBase/ to tgtBase/, overwriting existing files, but not emptying existing directories.
 -- NOTE: tgtBase specifies the copied directory target, not its parent
--- NOTE: directories with extention .proto are excluded. This would compromise regression tests,
+-- NOTE: directories with extension .proto are excluded. This would compromise regression tests,
 --       where '.proto' is the default output directory (if not specified)
 copyDirRecursively ::
   (HasLogFunc env) =>
@@ -230,7 +230,7 @@ copyDirRecursively srcBase tgtBase
             else
               if takeExtension srcPath == defaultDirPrototype
                 then do
-                  logDebug $ "Skipping " <> display (T.pack srcPath) <> " because its extention is excluded by design" --This is because of regression tests. (See what happend at https://travis-ci.org/AmpersandTarski/Ampersand/jobs/621565925 )
+                  logDebug $ "Skipping " <> display (T.pack srcPath) <> " because its extension is excluded by design" --This is because of regression tests. (See what happend at https://travis-ci.org/AmpersandTarski/Ampersand/jobs/621565925 )
                 else do
                   logDebug $ " Copying dir... " <> display (T.pack srcPath)
                   logDebug $ "      to dir... " <> display (T.pack tgtPath)
diff --git a/testing/Travis/testcases/Misc/Arbeidsduur.adl b/testing/Travis/testcases/Misc/Arbeidsduur.adl
index 348200f7c..f0c3a85e9 100644
--- a/testing/Travis/testcases/Misc/Arbeidsduur.adl
+++ b/testing/Travis/testcases/Misc/Arbeidsduur.adl
@@ -1,4 +1,4 @@
-CONTEXT Arbeidsduur IN DUTCH LATEX
+CONTEXT Arbeidsduur IN DUTCH MARKDOWN
 META "authors" "Stef Joosten, Rieks Joosten"
 PURPOSE CONTEXT Arbeidsduur
 {+De Wet aanpassing arbeidsduur (http://wetten.overheid.nl/BWBR0011173, 19 februari 2000) regelt het recht van werknemers om te vragen om aanpassing van de arbeidsduur. Op deze wet is een Ampersand analyse gedaan, om inzicht te krijgen in de wijze van modelleren aan de hand van een klein voorbeeld. Daar waar in deze tekst wordt gerefereerd naar een wetsartikel, zonder de naam van de wet erbij te noemen, wordt de Wet aanpassing arbeidsduur bedoeld.+}
@@ -249,7 +249,13 @@ ENDPATTERN
 --[Proces: geautomatiseerde procesondersteuning]-----------
 PATTERN GeautomatiseerdeProcesondersteuning LABEL "Geautomatiseerde procesondersteuning"
 PURPOSE PATTERN GeautomatiseerdeProcesondersteuning
-{+Menselijke procesuitvoerders moeten zoveel mogelijk worden ontlast van handelingen die ook geautomatiseerd kunnen worden uitgevoerd. Geautomatiseerde procesondersteuning zorgt ervoor dat informatie die reeds aanwezig is dan wel afleidbaar is uit bestaande informatie, daar waar nodig automatisch wordt ingevuld. Ook zorgt het ervoor dat handelingen automatisch uitgevoerd worden voor zover dit afleidbaar is. Dit hoofdstuk documenteert de afspraken op basis waarvan automatische handelingen worden uitgevoerd.+}
+{+
+Menselijke procesuitvoerders moeten zoveel mogelijk worden ontlast van handelingen die ook geautomatiseerd kunnen worden uitgevoerd.
+Geautomatiseerde procesondersteuning zorgt ervoor dat informatie die reeds aanwezig is dan wel afleidbaar is uit bestaande informatie,
+daar waar nodig automatisch wordt ingevuld.
+Ook zorgt het ervoor dat handelingen automatisch uitgevoerd worden voor zover dit afleidbaar is.
+Dit hoofdstuk documenteert de afspraken op basis waarvan automatische handelingen worden uitgevoerd.
++}
 
 nieuwVerzoek :: Arbeidsrelatie * Verzoek [UNI]
 ROLE ExecEngine MAINTAINS EersteVerzoekVerwerken
@@ -333,9 +339,9 @@ PURPOSE RULE BerekenTermijnVanEenJaar
 ROLE ExecEngine MAINTAINS BerekenTermijnVanEenJaar
 RULE BerekenTermijnVanEenJaar LABEL "Berekenen van de termijn van een jaar conform artikel 2 lid 1":
        inDienst~;arbeidsrelatie~;tot;ingang |- minstensEenJaarTrigger
-VIOLATION (TXT "{EX} InsPair;minstensEenJaarTrigger;Datum;", SRC I, TXT ";Datum;", TGT I
-          ,TXT "{EX} DatumDelta;minstensEenJaar;Datum;", SRC I, TXT ";1 Year;", TGT I
+VIOLATION (TXT "{EX} DatumDelta;minstensEenJaar;Datum;", SRC I, TXT ";1 Year;", TGT I
           )
+ENFORCE minstensEenJaarTrigger >: inDienst~;arbeidsrelatie~;tot;ingang
 
 PURPOSE RELATION minstensTweeJaar REF "Artikel 2 lid 3"
 {+Omdat de wet de voorwaarde stelt dat de werknemer die tot aanpassing van zijn arbeidsduur verzoekt, tenminste 2 jaar na een voorafgaand besluit wacht met het indienen van een nieuw verzoek, willen we dat automatisch kunnen uitrekenen. Daarom voeren we een relatie ``minstensTweeJaar'' in.+}
@@ -418,7 +424,8 @@ BOX[ "Arbeidsrelaties" : V[ONE*Arbeidsrelatie]
 ----------------------------------------------- -}
  ]
 
-INTERFACE NieuweArbeidsrelatie FOR Werkgever : I[Arbeidsrelatie]
+INTERFACE NieuweArbeidsrelatie LABEL "NieuweArbeidsrelatie"
+    FOR Werkgever : I[Arbeidsrelatie]
 BOX[ "Werkgever" : werkgever
    , "Werknemer" : werknemer
    , "Arbeidsduur" : arbeidsduur
@@ -435,7 +442,8 @@ BOX[ "Arbeidsrelatie" : I
       ]
    ]
 
-INTERFACE ArbeidsrelatieWerknemer FOR Werknemer : I[Arbeidsrelatie]
+INTERFACE ArbeidsrelatieWerknemer LABEL "ArbeidsrelatieWerknemer"
+    FOR Werknemer : I[Arbeidsrelatie]
 BOX[ "Arbeidsrelatie" : I
    BOX[ "Werkgever" : werkgever
       , "Werknemer" : werknemer
@@ -457,7 +465,8 @@ BOX[ "Arbeidsrelatie" : I
       ]
    ]
 
-INTERFACE GewijzigdeBeslissingNemen FOR Werkgever : I[Verzoek]
+INTERFACE GewijzigdeBeslissingNemen LABEL "GewijzigdeBeslissingNemen"
+    FOR Werkgever : I[Verzoek]
 BOX[ "Verzoek" : I
     BOX[ "indiener" : arbeidsrelatie;werknemer
        , "werkgever" : arbeidsrelatie;werkgever
@@ -542,7 +551,8 @@ BOX[ "tot" : tot
    , "uitersteBeslisdatum" : uitersteBeslisdatum
    ]
 
-INTERFACE BeslissingKlein FOR Werknemer, Werkgever : I[Beslissing]
+INTERFACE BeslissingKlein LABEL "BeslissingKlein"
+    FOR Werknemer, Werkgever : I[Beslissing]
 BOX[ "op" : op
    , "aanp" : aanp
    , "door" : door
@@ -693,26 +703,3 @@ POPULATION medegedeeldAan      CONTAINS [ ("Beslissing b342", "Willem Alexander"
 
 -----------------------------------------------------------------------
 ENDCONTEXT
-
-{-
-[{EE} restored 'Bereken een maand voordien']
-Rule 'Bereken een maand voordien' is broken:
-SetPeriod;eenMaandVoordien;Datum;1-1-2015;-1 Month
-SetPeriod: InsPair(eenMaandVoordien,Datum,1-1-2015,Datum,01-12-2014)
-  Update eenMaandVoordien(Datum*Datum) with (1-1-2015,01-12-2014)
-
-{EE} restored 'Uiterste beslisdatum vaststellen (geautomatiseerd)']
-Rule 'Uiterste beslisdatum vaststellen (geautomatiseerd)' is broken: Van elk verzoek wordt de uiterste belisdatum automatisch vastgesteld.
-InsPair;uitersteBeslisdatum;Verzoek;Verzoek1399448850678000;Datum;01-12-2014
-  Update uitersteBeslisdatum(Verzoek*Datum) with (Verzoek1399448850678000,01-12-2014)
-
-[{EE} restored 'Berekenen van de jaar-termijn conform artikel 2 lid 1']
-Rule 'Berekenen van de jaar-termijn conform artikel 2 lid 1' is broken:
-[[START]]
-InsPair;minstensEenJaarTrigger;Datum;1-2-2013;Datum;1-1-2015
-  INSERT minstensEenJaarTrigger(Datum*Datum) with (1-2-2013,1-1-2015)
-DatumDelta;minstensEenJaar;Datum;1-2-2013;1 Year;1-1-2015
-DatumDelta: InsPair(minstensEenJaar,Datum,1-2-2013,Datum,1-1-2015)
-  INSERT minstensEenJaar(Datum*Datum) with (1-2-2013,1-1-2015)
-[[DONE]]
--}
\ No newline at end of file