From a8eef09363b9b9d8153713e92a41855dc82938f9 Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Tue, 18 Jun 2024 16:04:40 +0100
Subject: [PATCH 1/5] feat: update lems scripts to include version and commit
 information

---
 scripts/lems/asttemplates.py  |   3 +-
 scripts/lems/requirements.txt |   3 +
 scripts/lems/xml2md.py        | 227 ++++++++++++++++++++++++----------
 3 files changed, 164 insertions(+), 69 deletions(-)
 create mode 100644 scripts/lems/requirements.txt

diff --git a/scripts/lems/asttemplates.py b/scripts/lems/asttemplates.py
index 7f975f10..4e1b28c1 100644
--- a/scripts/lems/asttemplates.py
+++ b/scripts/lems/asttemplates.py
@@ -25,7 +25,8 @@
     ---
     {%- endif %}
 
-    Generated on {{ todays_date }}.
+    Schema against which LEMS based on these should be valid: [LEMS_v{{ lems_version }}.xsd](https://github.com/LEMS/LEMS/tree/{{ lems_branch }}/Schemas/LEMS/LEMS_v{{ lems_version }}.xsd).
+    Generated on {{ lems_date }} from [this](https://github.com/LEMS/LEMS/commit/{{ lems_commit }}) commit.
     Please file any issues or questions at the [issue tracker here](https://github.com/LEMS/LEMS/issues).
 
     ---
diff --git a/scripts/lems/requirements.txt b/scripts/lems/requirements.txt
new file mode 100644
index 00000000..c83e1209
--- /dev/null
+++ b/scripts/lems/requirements.txt
@@ -0,0 +1,3 @@
+lxml
+xmltodict
+jinja2
diff --git a/scripts/lems/xml2md.py b/scripts/lems/xml2md.py
index 664eaa84..2ca1feac 100644
--- a/scripts/lems/xml2md.py
+++ b/scripts/lems/xml2md.py
@@ -7,6 +7,11 @@
 Copyright 2023 NeuroML contributors
 """
 
+import tempfile
+import subprocess
+import re
+import lxml
+import lxml.etree as ET
 import xmltodict
 from datetime import date
 import asttemplates
@@ -28,83 +33,169 @@
     "components": ["Defining Components", ""]
 }
 
-todays_date = date.today().strftime("%d/%m/%y")
+lems_branch = "master"
+lems_version = "0.7.6"
+GitHubRepo = "https://github.com/LEMS/LEMS.git"
+lems_date = date.today().strftime("%d/%m/%y")
+lems_commit = ""
+
 parsed_data = {}
 
 srcfile = "sourceannotations.xml"
-destdir = "../../source/Userdocs/LEMS_elements/"
-
-# populate our page info
-with open(srcfile, 'r') as ast_doc:
-    elementtypes = xmltodict.parse(ast_doc.read())['ElementTypes']['ElementType']
-    for et in elementtypes:
-        try:
-            parsed_data[et['@section']].append(et)
-        except KeyError:
-            parsed_data[et['@section']] = []
-            parsed_data[et['@section']].append(et)
-
-# add Include
-parsed_data['root'].append(
-    OrderedDict(
-        {
-            '@name': 'Include',
-            'Info': 'Include LEMS files in other LEMS files. Files are included where the Include declaration occurs.  The enclosing Lems block is stripped off and the rest of the content included as is',
-            'Property': OrderedDict(
-                {
-                    '@name': 'file',
-                    '@type': 'String',
-                    '#text': 'the name or relative path of a file to be included'
-                }
-            )
-        }
-    )
-)
-
-print(parsed_data)
-
-# render templates
-for pg, pginfo in sections_pages.items():
-    outputfile = "{}/{}.md".format(destdir, pginfo[0].replace(" ", ""))
-    with open(outputfile, 'w') as ast_doc:
-        print(
-            asttemplates.page_header.render(section_data=pginfo, todays_date=todays_date),
-            file=ast_doc)
-        for et in parsed_data[pg]:
-            print(f"Rendering {et['@name']}")
-            print(
-                asttemplates.elementtype.render(et=et),
-                file=ast_doc)
-            if 'Property' in et or 'ListProperty' in et:
-                print("""`````{tab-set}""", end="", file=ast_doc)
 
+comp_type_schema = {}
+
+def get_schema_doc(schemafile):
+    """Get schemas for everything
+
+    :param schemafile: path to the XSD schema file
+    """
+    print(ET.__file__)
+    parser = lxml.etree.XMLParser(remove_comments=True,
+                                  remove_blank_text=True, ns_clean=True)
+    try:
+        tree = ET.parse(schemafile, parser=parser)
+        root = tree.getroot()
+    except ET.XMLSyntaxError as e:
+        print(f"Could not parse file {schemafile}: {e}")
+    namespaces = root.nsmap
+
+    # currently unused
+    for simple_type in root.findall("xs:simpleType", namespaces=namespaces):
+        simple_type_str = ET.tostring(simple_type, pretty_print=True,
+                                      encoding="unicode",
+                                      xml_declaration=False)
+
+        # needs to be lowerCamelCase to match XML core types
+        type_name = simple_type.attrib['name'].lower().replace("nml2quantity_", "")
+        comp_type_schema[type_name] = re.sub(r"Type.*name=",r"Type name=", simple_type_str)
+
+    for complex_type in root.findall("xs:complexType", namespaces=namespaces):
+        for node in complex_type:
+            if "annotation" in str(node.tag) or "documentation" in str(node.tag):
+                complex_type.remove(node)
+
+        complex_type_str = ET.tostring(complex_type, pretty_print=True,
+                                       encoding="unicode",
+                                       xml_declaration=False)
+        # needs to be lowerCamelCase to match XML core types
+        type_name = complex_type.attrib['name'].lower()
+        comp_type_schema[type_name] = re.sub(r"Type.*name=",r"Type name=", complex_type_str)
+
+
+def main(srcdir, destdir):
+    """TODO: Docstring for main.
+
+    :param arg1: TODO
+    :returns: TODO
+
+    """
+    # If not defined or empty, download a new copy to a temporary directory
+    if not srcdir or src == "":
+        print("No src directory specified. Cloning NeuroML2 repo")
+        tempdir = tempfile.TemporaryDirectory()
+        tmpsrcdir = tempdir.name
+        print("Temporariy directory: {}".format(tmpsrcdir))
+        clone_command = ["git", "clone", "--depth", "1", "--branch", lems_branch, GitHubRepo, tmpsrcdir]
+        subprocess.run(clone_command)
+    else:
+        tmpsrcdir = srcdir
+
+    # TODO: add LEMS examples
+    #  exampledirs = [tmpsrcdir + "/examples/", tmpsrcdir + "/LEMSexamples/"]
+    exampledirs = [tmpsrcdir + "/examples/"]
+    xsdsrc = tmpsrcdir + f"/Schemas/LEMS/LEMS_v{lems_version}.xsd"
+
+    # Get current commit
+    commit_command = ["git", "log", "-1", "--pretty=format:%H"]
+    output = subprocess.run(commit_command, capture_output=True,
+                            cwd=tmpsrcdir, text=True)
+    lems_commit = output.stdout
+
+    # start
+    get_schema_doc(xsdsrc)
+
+    # populate our page info
+    with open(srcfile, 'r') as ast_doc:
+        elementtypes = xmltodict.parse(ast_doc.read())['ElementTypes']['ElementType']
+        for et in elementtypes:
             try:
-                if type(et['Property']) == list:
-                    props=et['Property']
-                else:
-                    props=[et['Property']]
-                print(f" - {len(props)} properties: {props}")
-                print(
-                    asttemplates.prop.render(props=props),
-                    file=ast_doc)
+                parsed_data[et['@section']].append(et)
             except KeyError:
-                pass
+                parsed_data[et['@section']] = []
+                parsed_data[et['@section']].append(et)
+
+    # add Include
+    parsed_data['root'].append(
+        OrderedDict(
+            {
+                '@name': 'Include',
+                'Info': 'Include LEMS files in other LEMS files. Files are included where the Include declaration occurs.  The enclosing Lems block is stripped off and the rest of the content included as is',
+                'Property': OrderedDict(
+                    {
+                        '@name': 'file',
+                        '@type': 'String',
+                        '#text': 'the name or relative path of a file to be included'
+                    }
+                )
+            }
+        )
+    )
 
-            try:
-                if type(et['ListProperty']) == list:
-                    lprops=et['ListProperty']
-                else:
-                    lprops=[et['ListProperty']]
-                print(f" - {len(lprops)} properties: {lprops}")
+    print(parsed_data)
+
+    # render templates
+    for pg, pginfo in sections_pages.items():
+        outputfile = "{}/{}.md".format(destdir, pginfo[0].replace(" ", ""))
+        with open(outputfile, 'w') as ast_doc:
+            print(
+                asttemplates.page_header.render(section_data=pginfo,
+                                                lems_date=lems_date,
+                                                lems_commit=lems_commit,
+                                                lems_version=lems_version,
+                                                lems_branch=lems_branch),
+                file=ast_doc)
+            for et in parsed_data[pg]:
+                print(f"Rendering {et['@name']}")
                 print(
-                    asttemplates.listprop.render(lprops=lprops),
+                    asttemplates.elementtype.render(et=et),
                     file=ast_doc)
-            except KeyError:
-                pass
-
-            # process them, close tab-set
-            if 'Property' in et or 'ListProperty' in et:
-                print("""`````""", end="", file=ast_doc)
+                if 'Property' in et or 'ListProperty' in et:
+                    print("""`````{tab-set}""", end="", file=ast_doc)
+
+                try:
+                    if isinstance(et['Property'], list):
+                        props=et['Property']
+                    else:
+                        props=[et['Property']]
+                    print(f" - {len(props)} properties: {props}")
+                    print(
+                        asttemplates.prop.render(props=props),
+                        file=ast_doc)
+                except KeyError:
+                    pass
+
+                try:
+                    if isinstance(et['ListProperty'], list):
+                        lprops=et['ListProperty']
+                    else:
+                        lprops=[et['ListProperty']]
+                    print(f" - {len(lprops)} properties: {lprops}")
+                    print(
+                        asttemplates.listprop.render(lprops=lprops),
+                        file=ast_doc)
+                except KeyError:
+                    pass
+
+                # process them, close tab-set
+                if 'Property' in et or 'ListProperty' in et:
+                    print("""`````""", end="", file=ast_doc)
 
 
 # print(parsed_data)
+
+if __name__ == "__main__":
+    # src = "/home/asinha/Documents/02_Code/00_mine/NeuroML/software/NeuroML2/"
+    src = None
+    destdir = "../../source/Userdocs/LEMS_elements/"
+    main(src, destdir)

From bc40e6cf080a3aab573dcdaef07b450e7fa9ad4a Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Tue, 18 Jun 2024 16:32:34 +0100
Subject: [PATCH 2/5] feat(lems-schema): add schema to lems elements

---
 scripts/lems/asttemplates.py | 10 ++++++++++
 scripts/lems/xml2md.py       | 33 ++++++++++++++++++++++++++-------
 2 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/scripts/lems/asttemplates.py b/scripts/lems/asttemplates.py
index 4e1b28c1..dba19517 100644
--- a/scripts/lems/asttemplates.py
+++ b/scripts/lems/asttemplates.py
@@ -79,3 +79,13 @@
     """
 
 ))
+
+schema_quote = env.from_string(textwrap.dedent(
+    """
+    ````{tab-item} Schema
+    ```{code-block} xml
+    {{ schemadoc }}
+    ```
+    ````
+    """
+))
diff --git a/scripts/lems/xml2md.py b/scripts/lems/xml2md.py
index 2ca1feac..f3fafe7f 100644
--- a/scripts/lems/xml2md.py
+++ b/scripts/lems/xml2md.py
@@ -7,6 +7,7 @@
 Copyright 2023 NeuroML contributors
 """
 
+import logging
 import tempfile
 import subprocess
 import re
@@ -18,6 +19,10 @@
 from collections import OrderedDict
 
 
+logger = logging.getLogger(__name__)
+logging.basicConfig(level=logging.DEBUG)
+
+
 # pages to which different sections should belong
 # key is the name in the annotated source, list entries are [heading,
 # description]
@@ -84,7 +89,7 @@ def get_schema_doc(schemafile):
 
 
 def main(srcdir, destdir):
-    """TODO: Docstring for main.
+    """Main runner function.
 
     :param arg1: TODO
     :returns: TODO
@@ -112,9 +117,6 @@ def main(srcdir, destdir):
                             cwd=tmpsrcdir, text=True)
     lems_commit = output.stdout
 
-    # start
-    get_schema_doc(xsdsrc)
-
     # populate our page info
     with open(srcfile, 'r') as ast_doc:
         elementtypes = xmltodict.parse(ast_doc.read())['ElementTypes']['ElementType']
@@ -142,7 +144,10 @@ def main(srcdir, destdir):
         )
     )
 
-    print(parsed_data)
+    logger.debug(parsed_data)
+
+    # start
+    get_schema_doc(xsdsrc)
 
     # render templates
     for pg, pginfo in sections_pages.items():
@@ -160,7 +165,18 @@ def main(srcdir, destdir):
                 print(
                     asttemplates.elementtype.render(et=et),
                     file=ast_doc)
-                if 'Property' in et or 'ListProperty' in et:
+
+                # if the component has schema documentation, add that, otherwise
+                comp_type_schemadoc = None
+                # skip
+                try:
+                    comp_type_schemadoc = comp_type_schema[et['@name'].lower()]
+                    logger.debug(f"Schema doc for {et['@name']}")
+                    logger.debug(comp_type_schemadoc)
+                except KeyError:
+                    logger.warning(f"No schema doc found for {et['@name']}")
+
+                if 'Property' in et or 'ListProperty' in et or comp_type_schemadoc is not None:
                     print("""`````{tab-set}""", end="", file=ast_doc)
 
                 try:
@@ -187,8 +203,11 @@ def main(srcdir, destdir):
                 except KeyError:
                     pass
 
+                if comp_type_schemadoc is not None:
+                    print(asttemplates.schema_quote.render(schemadoc=comp_type_schemadoc), file=ast_doc)
+
                 # process them, close tab-set
-                if 'Property' in et or 'ListProperty' in et:
+                if 'Property' in et or 'ListProperty' in et or comp_type_schemadoc is not None:
                     print("""`````""", end="", file=ast_doc)
 
 

From 3e5badc54fe2497af3a7ea0b1161547bbdc4c4f3 Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Tue, 18 Jun 2024 16:55:12 +0100
Subject: [PATCH 3/5] feat(lems-schema): include examples

---
 scripts/lems/asttemplates.py |  14 +++++
 scripts/lems/xml2md.py       | 100 +++++++++++++++++++++++++++++++----
 2 files changed, 104 insertions(+), 10 deletions(-)

diff --git a/scripts/lems/asttemplates.py b/scripts/lems/asttemplates.py
index dba19517..46923f70 100644
--- a/scripts/lems/asttemplates.py
+++ b/scripts/lems/asttemplates.py
@@ -89,3 +89,17 @@
     ````
     """
 ))
+
+examples = env.from_string(textwrap.dedent(
+    """
+    {% if lemsexamples|length > 0 %}
+    ````{tab-item} {{ title }}: XML
+    {% for e in lemsexamples -%}
+    ```{code-block} xml
+    {{ e|trim }}
+    ```
+    {% endfor -%}
+    ````
+    {%- endif -%}
+    """
+))
diff --git a/scripts/lems/xml2md.py b/scripts/lems/xml2md.py
index f3fafe7f..ccef143b 100644
--- a/scripts/lems/xml2md.py
+++ b/scripts/lems/xml2md.py
@@ -7,6 +7,7 @@
 Copyright 2023 NeuroML contributors
 """
 
+import os
 import logging
 import tempfile
 import subprocess
@@ -48,7 +49,75 @@
 
 srcfile = "sourceannotations.xml"
 
-comp_type_schema = {}
+lems_element_schema = {}
+lems_element_examples = {}
+
+
+def get_lems_examples(srcdirs, examples_max=5):
+    """Get examples for component types
+
+    :param srcdirs: directores where examples are
+    :type srcdir: list(str)
+    :param examples_max: maximum number of examples to store
+    :type examples_max: int
+    :returns: TODO
+    """
+    for pg, pginfo in sections_pages.items():
+        for et in parsed_data[pg]:
+            lems_element_examples[et['@name']] = []
+
+    for srcdir in srcdirs:
+        example_files = os.listdir(srcdir)
+        for f in sorted(example_files):
+            if ".nml" in f or ".xml" in f:
+                srcfile = srcdir + "/" + f
+                print("Processing example file: {}".format(srcfile))
+                fh = open(srcfile, 'r')
+
+                # Replace xmlns bits, we can't do it using lxml
+                # So we need to read the file, do some regular expression
+                # substitutions, and then start the XML bits
+                data = fh.read()
+                data = re.sub('xmlns=".*"', '', data)
+                data = re.sub('xmlns:xsi=".*"', '', data)
+                data = re.sub('xsi:schemaLocation=".*"', '', data)
+                # Remove comment lines
+                data = re.sub('<!--.*-->', '', data)
+                # Strip empty lines
+                data = os.linesep.join([s for s in data.splitlines() if s])
+
+                try:
+                    root = ET.fromstring(bytes(data, 'utf-8'))
+                except ET.XMLSyntaxError as e:
+                    print(f"Could not parse file {srcfile}: {e}")
+                    continue
+                namespaces = root.nsmap
+
+                for lems_element in lems_element_examples.keys():
+                    #  print("looking for lems_element {}".format(lems_element))
+                    # To find recursively, we have to use the XPath system:
+                    # https://stackoverflow.com/a/2723968/375067
+                    # Gotta use namespaces:
+                    # https://stackoverflow.com/a/28700661/375067
+                    examples = root.findall(".//" + lems_element, namespaces=namespaces)
+                    """
+                    if len(examples) == 0:
+                        print("Found no XML examples for {}".format(lems_element))
+                    """
+                    # Sort by length so that we take the 5 longest examples
+                    # Also sort so that the order remains the same when using
+                    # different Python versions etc.
+                    examples.sort(key=len, reverse=True)
+                    # Let's only keep the first 5 examples
+                    for example in examples:
+                        if len(lems_element_examples[lems_element]) < examples_max:
+                            lems_element_examples[lems_element].append(
+                                ET.tostring(example, pretty_print=True,
+                                            encoding="unicode", with_comments="False"
+                                            )
+                            )
+    #  print(lems_element_examples)
+
 
 def get_schema_doc(schemafile):
     """Get schemas for everything
@@ -73,7 +142,7 @@ def get_schema_doc(schemafile):
 
         # needs to be lowerCamelCase to match XML core types
         type_name = simple_type.attrib['name'].lower().replace("nml2quantity_", "")
-        comp_type_schema[type_name] = re.sub(r"Type.*name=",r"Type name=", simple_type_str)
+        lems_element_schema[type_name] = re.sub(r"Type.*name=",r"Type name=", simple_type_str)
 
     for complex_type in root.findall("xs:complexType", namespaces=namespaces):
         for node in complex_type:
@@ -85,7 +154,7 @@ def get_schema_doc(schemafile):
                                        xml_declaration=False)
         # needs to be lowerCamelCase to match XML core types
         type_name = complex_type.attrib['name'].lower()
-        comp_type_schema[type_name] = re.sub(r"Type.*name=",r"Type name=", complex_type_str)
+        lems_element_schema[type_name] = re.sub(r"Type.*name=",r"Type name=", complex_type_str)
 
 
 def main(srcdir, destdir):
@@ -149,6 +218,12 @@ def main(srcdir, destdir):
     # start
     get_schema_doc(xsdsrc)
 
+    # examples
+    get_lems_examples(exampledirs)
+
+    logger.debug("EXAMPLES")
+    logger.debug(lems_element_examples)
+
     # render templates
     for pg, pginfo in sections_pages.items():
         outputfile = "{}/{}.md".format(destdir, pginfo[0].replace(" ", ""))
@@ -167,16 +242,16 @@ def main(srcdir, destdir):
                     file=ast_doc)
 
                 # if the component has schema documentation, add that, otherwise
-                comp_type_schemadoc = None
+                lems_element_schemadoc = None
                 # skip
                 try:
-                    comp_type_schemadoc = comp_type_schema[et['@name'].lower()]
+                    lems_element_schemadoc = lems_element_schema[et['@name'].lower()]
                     logger.debug(f"Schema doc for {et['@name']}")
-                    logger.debug(comp_type_schemadoc)
+                    logger.debug(lems_element_schemadoc)
                 except KeyError:
                     logger.warning(f"No schema doc found for {et['@name']}")
 
-                if 'Property' in et or 'ListProperty' in et or comp_type_schemadoc is not None:
+                if 'Property' in et or 'ListProperty' in et or lems_element_schemadoc is not None or len(lems_element_examples[et['@name']]) > 0:
                     print("""`````{tab-set}""", end="", file=ast_doc)
 
                 try:
@@ -203,11 +278,16 @@ def main(srcdir, destdir):
                 except KeyError:
                     pass
 
-                if comp_type_schemadoc is not None:
-                    print(asttemplates.schema_quote.render(schemadoc=comp_type_schemadoc), file=ast_doc)
+                if lems_element_schemadoc is not None:
+                    print(asttemplates.schema_quote.render(schemadoc=lems_element_schemadoc), file=ast_doc)
+
+                if len(lems_element_examples[et['@name']]) > 0:
+                    print(asttemplates.examples.render(
+                        title="Usage", lemsexamples=lems_element_examples[et['@name']]),
+                          file=ast_doc)
 
                 # process them, close tab-set
-                if 'Property' in et or 'ListProperty' in et or comp_type_schemadoc is not None:
+                if 'Property' in et or 'ListProperty' in et or lems_element_schemadoc is not None or len(lems_element_examples[et['@name']]) > 0:
                     print("""`````""", end="", file=ast_doc)
 
 

From b7f62a0769a7aae86ff0576e5344bd724b4b1d06 Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Tue, 18 Jun 2024 16:56:54 +0100
Subject: [PATCH 4/5] chore: tweak logging level

---
 scripts/lems/xml2md.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/lems/xml2md.py b/scripts/lems/xml2md.py
index ccef143b..b40f4a00 100644
--- a/scripts/lems/xml2md.py
+++ b/scripts/lems/xml2md.py
@@ -21,7 +21,7 @@
 
 
 logger = logging.getLogger(__name__)
-logging.basicConfig(level=logging.DEBUG)
+logging.basicConfig(level=logging.WARNING)
 
 
 # pages to which different sections should belong

From 301f06670717e4e3696875b2af5bce936acd7209 Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Tue, 18 Jun 2024 16:57:05 +0100
Subject: [PATCH 5/5] feat: regenerate lems docs with examples and schema

---
 .../LEMS_elements/DefiningComponents.md       |  34 +-
 .../LEMS_elements/Definingcomponenttypes.md   | 499 +++++++++++++++++-
 source/Userdocs/LEMS_elements/Dynamics.md     | 478 ++++++++++++++++-
 source/Userdocs/LEMS_elements/Geometry.md     |   3 +-
 .../Userdocs/LEMS_elements/Modelstructure.md  |  91 +++-
 source/Userdocs/LEMS_elements/Procedure.md    |   3 +-
 source/Userdocs/LEMS_elements/Simulation.md   | 154 +++++-
 source/Userdocs/LEMS_elements/Structure.md    | 236 ++++++++-
 .../LEMS_elements/Unitsanddimensions.md       |  73 ++-
 9 files changed, 1562 insertions(+), 9 deletions(-)

diff --git a/source/Userdocs/LEMS_elements/DefiningComponents.md b/source/Userdocs/LEMS_elements/DefiningComponents.md
index 817269cc..b7e6278d 100644
--- a/source/Userdocs/LEMS_elements/DefiningComponents.md
+++ b/source/Userdocs/LEMS_elements/DefiningComponents.md
@@ -4,7 +4,8 @@
 
 
 
-Generated on 22/08/23.
+Schema against which LEMS based on these should be valid: [LEMS_v0.7.6.xsd](https://github.com/LEMS/LEMS/tree/master/Schemas/LEMS/LEMS_v0.7.6.xsd).
+Generated on 18/06/24 from [this](https://github.com/LEMS/LEMS/commit/fd7b30eceb6735ac343745c8f6992bdde72b248b) commit.
 Please file any issues or questions at the [issue tracker here](https://github.com/LEMS/LEMS/issues).
 
 ---
@@ -41,6 +42,37 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 **abouts**$ {ref}`lemsschema:about_`
 **metas**$ {ref}`lemsschema:meta_`
 
+```
+````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="Component">
+  <xs:sequence>
+    <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax"/>
+  </xs:sequence>
+  <xs:anyAttribute processContents="skip"/>
+</xs:complexType>
+
+```
+````
+
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<Component id="ctb" type="iaf1" threshold="-30 mV" refractoryPeriod="2 ms" capacitance="1uF"/>
+```
+```{code-block} xml
+<Component id="celltype_c" type="iaf3" leakConductance="3 pS" refractoryPeriod="3 ms" threshold="45 mV" leakReversal="-50 mV" deltaV="5mV" capacitance="1uF"/>
+```
+```{code-block} xml
+<Component id="gen1" type="spikeGenerator" period="30ms"/>
+```
+```{code-block} xml
+<Component id="gen2" type="spikeGenerator2" period="32ms"/>
+```
+```{code-block} xml
+<Component id="iaf3cpt" type="iaf3" leakReversal="-50mV" deltaV="50mV" threshold="-30mV" leakConductance="50pS" refractoryPeriod="4ms" capacitance="1pF"/>
 ```
 ````
 `````
\ No newline at end of file
diff --git a/source/Userdocs/LEMS_elements/Definingcomponenttypes.md b/source/Userdocs/LEMS_elements/Definingcomponenttypes.md
index d4e54ae0..ea7fa654 100644
--- a/source/Userdocs/LEMS_elements/Definingcomponenttypes.md
+++ b/source/Userdocs/LEMS_elements/Definingcomponenttypes.md
@@ -4,7 +4,8 @@
 
 
 
-Generated on 22/08/23.
+Schema against which LEMS based on these should be valid: [LEMS_v0.7.6.xsd](https://github.com/LEMS/LEMS/tree/master/Schemas/LEMS/LEMS_v0.7.6.xsd).
+Generated on 18/06/24 from [this](https://github.com/LEMS/LEMS/commit/fd7b30eceb6735ac343745c8f6992bdde72b248b) commit.
 Please file any issues or questions at the [issue tracker here](https://github.com/LEMS/LEMS/issues).
 
 ---
@@ -65,6 +66,81 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 **abouts**$ {ref}`lemsschema:about_`
 **metas**$ {ref}`lemsschema:meta_`
 
+```
+````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="ComponentType">
+  <xs:sequence>
+    <xs:element name="Property" type="Property" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:element name="Parameter" type="Parameter" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:element name="DerivedParameter" type="DerivedParameter" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:element name="IndexParameter" type="IndexParameter" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:element name="Constant" type="Constant" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:element name="Child" type="Child" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:element name="Children" type="Children" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:element name="Fixed" type="Fixed" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:element name="Link" type="Link" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:element name="ComponentReference" type="ComponentReference" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:element name="Attachments" type="Attachments" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:element name="EventPort" type="EventPort" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:element name="Exposure" type="Exposure" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:element name="Requirement" type="Requirement" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:element name="ComponentRequirement" type="ComponentRequirement" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:element name="InstanceRequirement" type="InstanceRequirement" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:element name="Path" type="Path" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:element name="Text" type="Text" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:element name="Dynamics" type="Dynamics" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:element name="Structure" type="Structure" minOccurs="0" maxOccurs="1"/>
+    <xs:element name="Simulation" type="Simulation" minOccurs="0" maxOccurs="1"/>
+  </xs:sequence>
+  <xs:attribute name="name" type="xs:string" use="required"/>
+  <xs:attribute name="extends" type="xs:string" use="optional"/>
+  <xs:attribute name="description" type="xs:string" use="optional"/>
+</xs:complexType>
+
+```
+````
+
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<ComponentType name="Population">
+        <ComponentReference name="component" type="Component"/>
+        <Parameter name="size" dimension="none"/>
+        <Structure>
+            <MultiInstantiate number="size" component="component"/>
+        </Structure>
+    </ComponentType>
+```
+```{code-block} xml
+<ComponentType name="EventConnectivity">
+        <Link name="source" type="Population"/>
+        <Link name="target" type="Population"/>
+        <Child name="Connections" type="ConnectionPattern"/>
+    </ComponentType>
+```
+```{code-block} xml
+<ComponentType name="Network">
+        <Children name="populations" type="Population"/>
+        <Children name="connectivities" type="EventConnectivity"/>
+    </ComponentType>
+```
+```{code-block} xml
+<ComponentType name="AllAll" extends="ConnectionPattern">
+        <Structure>
+            <ForEach instances="../source" as="a">
+                <ForEach instances="../target" as="b">
+                    <EventConnection from="a" to="b"/>
+                </ForEach>
+            </ForEach>    
+        </Structure>
+       
+    </ComponentType>
+```
+```{code-block} xml
+<ComponentType name="ConnectionPattern"/>
 ```
 ````
 `````
@@ -84,6 +160,36 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 **dimension**$ String$ The dimension, or 'none'. This should be the name of an already defined dimension element
 **description**$ String$ An optional description of the parameter
 
+```
+````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="Parameter">
+  <xs:complexContent>
+    <xs:extension base="NamedDimensionalType"/>
+  </xs:complexContent>
+</xs:complexType>
+
+```
+````
+
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<Parameter name="size" dimension="none"/>
+```
+```{code-block} xml
+<Parameter name="xmin" dimension="none"/>
+```
+```{code-block} xml
+<Parameter name="xmax" dimension="none"/>
+```
+```{code-block} xml
+<Parameter name="ymin" dimension="none"/>
+```
+```{code-block} xml
+<Parameter name="ymax" dimension="none"/>
 ```
 ````
 `````
@@ -120,6 +226,18 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 **dimension**$ String$ 
 **defaultValue**$ String$ The defaultValue for the property must be a plain number (no units) giving the SI magnitude of the quantity.
 
+```
+````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="Property">
+  <xs:attribute name="name" type="xs:string" use="required"/>
+  <xs:attribute name="dimension" type="xs:string" use="optional" default="none"/>
+  <xs:attribute name="description" type="xs:string" use="optional"/>
+  <xs:attribute name="defaultValue" type="xs:double" use="optional"/>
+</xs:complexType>
+
 ```
 ````
 `````
@@ -141,6 +259,25 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 **select**$ String$ Path to the parameter that supplies the value. Exactly one of 'select' and 'value' is required.
 **value**$ String$ A string defining the value of the element
 
+```
+````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="DerivedParameter">
+  <xs:attribute name="name" type="xs:string" use="required"/>
+  <xs:attribute name="dimension" type="xs:string" use="optional" default="none"/>
+  <xs:attribute name="value" type="xs:string" use="required"/>
+  <xs:attribute name="description" type="xs:string" use="optional"/>
+</xs:complexType>
+
+```
+````
+
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<DerivedParameter name="erev" dimension="voltage" select="//MembranePotential[species=channel/species]/reversal"/>
 ```
 ````
 `````
@@ -159,6 +296,36 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 **parameter**$ String$ 
 **value**$ String$ 
 
+```
+````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="Fixed">
+  <xs:attribute name="parameter" type="xs:string" use="required"/>
+  <xs:attribute name="value" type="PhysicalQuantity" use="required"/>
+  <xs:attribute name="description" type="xs:string" use="optional"/>
+</xs:complexType>
+
+```
+````
+
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<Fixed parameter="threshold" value="-45mV"/>
+```
+```{code-block} xml
+<Fixed parameter="relativeConductance" value="0"/>
+```
+```{code-block} xml
+<Fixed parameter="relativeConductance" value="1"/>
+```
+```{code-block} xml
+<Fixed parameter="relativeConductance" value="0"/>
+```
+```{code-block} xml
+<Fixed parameter="relativeConductance" value="1"/>
 ```
 ````
 `````
@@ -178,6 +345,36 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 **dimension**$ String$ The dimension, or 'none'. This should be the name of an already defined dimension element
 **description**$ String$ An optional description of the requirement
 
+```
+````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="Requirement">
+  <xs:complexContent>
+    <xs:extension base="NamedDimensionalType"/>
+  </xs:complexContent>
+</xs:complexType>
+
+```
+````
+
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<Requirement name="v" dimension="voltage"/>
+```
+```{code-block} xml
+<Requirement name="v" dimension="voltage"/>
+```
+```{code-block} xml
+<Requirement name="v" dimension="voltage"/>
+```
+```{code-block} xml
+<Requirement name="v" dimension="voltage"/>
+```
+```{code-block} xml
+<Requirement name="v" dimension="voltage"/>
 ```
 ````
 `````
@@ -195,6 +392,15 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 
 **name**$ String$ name
 
+```
+````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="ComponentRequirement">
+  <xs:attribute name="name" type="xs:string" use="required"/>
+</xs:complexType>
+
 ```
 ````
 `````
@@ -212,6 +418,16 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 
 **name**$ String$ name
 
+```
+````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="InstanceRequirement">
+  <xs:attribute name="name" type="xs:string" use="required"/>
+  <xs:attribute name="type" type="xs:string" use="required"/>
+</xs:complexType>
+
 ```
 ````
 `````
@@ -231,6 +447,36 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 **dimension**$ String$ The dimension, or 'none'. This should be the name of an already defined dimension element
 **description**$ String$ An optional description of the element
 
+```
+````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="Exposure">
+  <xs:complexContent>
+    <xs:extension base="NamedDimensionalType"/>
+  </xs:complexContent>
+</xs:complexType>
+
+```
+````
+
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<Exposure name="v" dimension="voltage"/>
+```
+```{code-block} xml
+<Exposure name="tsince" dimension="time"/>
+```
+```{code-block} xml
+<Exposure name="r" dimension="per_time"/>
+```
+```{code-block} xml
+<Exposure name="fcond" dimension="none"/>
+```
+```{code-block} xml
+<Exposure name="fcond" dimension="none"/>
 ```
 ````
 `````
@@ -250,6 +496,36 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 **type**$ String$ Reference to a component class, the value should be the name of the target class.
 **description**$ String$ An optional description of the child
 
+```
+````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="Child">
+  <xs:attribute name="name" type="xs:string" use="required"/>
+  <xs:attribute name="type" type="xs:string" use="required"/>
+  <xs:attribute name="description" type="xs:string" use="optional"/>
+</xs:complexType>
+
+```
+````
+
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<Child name="Connections" type="ConnectionPattern"/>
+```
+```{code-block} xml
+<Child name="Forward" type="HHRate"/>
+```
+```{code-block} xml
+<Child name="Reverse" type="HHRate"/>
+```
+```{code-block} xml
+<Child name="Forward" type="HHRate"/>
+```
+```{code-block} xml
+<Child name="Reverse" type="HHRate"/>
 ```
 ````
 `````
@@ -268,6 +544,38 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 **name**$ String$ Name of the children
 **type**$ String$ The class of component allowed as children.
 
+```
+````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="Children">
+  <xs:attribute name="name" type="xs:string" use="required"/>
+  <xs:attribute name="type" type="xs:string" use="optional"/>
+  <xs:attribute name="min" type="xs:integer" use="optional"/>
+  <xs:attribute name="max" type="xs:integer" use="optional"/>
+  <xs:attribute name="description" type="xs:string" use="optional"/>
+</xs:complexType>
+
+```
+````
+
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<Children name="populations" type="Population"/>
+```
+```{code-block} xml
+<Children name="connectivities" type="EventConnectivity"/>
+```
+```{code-block} xml
+<Children name="lines" type="Line"/>
+```
+```{code-block} xml
+<Children name="outputColumn" type="OutputColumn"/>
+```
+```{code-block} xml
+<Children name="displays" type="Display"/>
 ```
 ````
 `````
@@ -287,6 +595,36 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 **type**$ String$ The type of the target Component
 **description**$ String$ An optional description of the ComponentReference
 
+```
+````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="Link">
+  <xs:attribute name="name" type="xs:string" use="required"/>
+  <xs:attribute name="type" type="xs:string" use="required"/>
+  <xs:attribute name="description" type="xs:string" use="optional"/>
+</xs:complexType>
+
+```
+````
+
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<Link name="source" type="Population"/>
+```
+```{code-block} xml
+<Link name="target" type="Population"/>
+```
+```{code-block} xml
+<Link name="from" type="KSState"/>
+```
+```{code-block} xml
+<Link name="to" type="KSState"/>
+```
+```{code-block} xml
+<Link name="from" type="KSState"/>
 ```
 ````
 `````
@@ -306,6 +644,37 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 **type**$ String$ The type of the target Component
 **description**$ String$ An optional description of the ComponentReference
 
+```
+````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="ComponentReference">
+  <xs:attribute name="name" type="xs:string" use="required"/>
+  <xs:attribute name="type" type="xs:string" use="required"/>
+  <xs:attribute name="local" type="xs:string" use="optional"/>
+  <xs:attribute name="description" type="xs:string" use="optional"/>
+</xs:complexType>
+
+```
+````
+
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<ComponentReference name="component" type="Component"/>
+```
+```{code-block} xml
+<ComponentReference name="target" type="Component"/>
+```
+```{code-block} xml
+<ComponentReference name="channel" type="HHChannel"/>
+```
+```{code-block} xml
+<ComponentReference name="component" type="Component"/>
+```
+```{code-block} xml
+<ComponentReference name="synapse" type="Synapse"/>
 ```
 ````
 `````
@@ -376,6 +745,36 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 **direction**$ String$ 'IN' or 'OUT'
 **description**$ String$ An optional description of the EventPort
 
+```
+````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="EventPort">
+  <xs:attribute name="name" type="xs:string" use="required"/>
+  <xs:attribute name="direction" type="xs:string" use="required"/>
+  <xs:attribute name="description" type="xs:string" use="optional"/>
+</xs:complexType>
+
+```
+````
+
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<EventPort name="spikes-in" direction="in"/>
+```
+```{code-block} xml
+<EventPort name="a" direction="out"/>
+```
+```{code-block} xml
+<EventPort name="in" direction="in"/>
+```
+```{code-block} xml
+<EventPort name="out" direction="out"/>
+```
+```{code-block} xml
+<EventPort name="in" direction="in"/>
 ```
 ````
 `````
@@ -394,6 +793,35 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 **name**$ String$ The textual content
 **description**$ String$ An optional description of the element
 
+```
+````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="Text">
+  <xs:attribute name="name" type="xs:string" use="required"/>
+  <xs:attribute name="description" type="xs:string" use="optional"/>
+</xs:complexType>
+
+```
+````
+
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<Text name="title"/>
+```
+```{code-block} xml
+<Text name="color"/>
+```
+```{code-block} xml
+<Text name="path"/>
+```
+```{code-block} xml
+<Text name="fileName"/>
+```
+```{code-block} xml
+<Text name="destination"/>
 ```
 ````
 `````
@@ -411,6 +839,35 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 
 **name**$ String$ 
 
+```
+````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="Path">
+  <xs:attribute name="name" type="xs:string" use="required"/>
+  <xs:attribute name="description" type="xs:string" use="optional"/>
+</xs:complexType>
+
+```
+````
+
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<Path name="quantity"/>
+```
+```{code-block} xml
+<Path name="quantity"/>
+```
+```{code-block} xml
+<Path name="from"/>
+```
+```{code-block} xml
+<Path name="to"/>
+```
+```{code-block} xml
+<Path name="quantity"/>
 ```
 ````
 `````
@@ -429,6 +886,24 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 **name**$ String$ A name for the Attachments
 **type**$ String$ The type of the Attachments
 
+```
+````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="Attachments">
+  <xs:attribute name="name" type="xs:string" use="required"/>
+  <xs:attribute name="type" type="xs:string" use="required"/>
+  <xs:attribute name="description" type="xs:string" use="optional"/>
+</xs:complexType>
+
+```
+````
+
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<Attachments name="synapses" type="Synapse"/>
 ```
 ````
 `````
@@ -473,6 +948,15 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 **dimension**$ String$ The dimension, or 'none'. This should be the name of an already defined dimension element
 **description**$ String$ An optional description of the parameter
 
+```
+````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="IndexParameter">
+  <xs:attribute name="name" type="xs:string" use="required"/>
+</xs:complexType>
+
 ```
 ````
 `````
@@ -487,3 +971,16 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 
 <i>Meta element to provide arbitrary metadata to LEMS simulations. Note that this is not processed by the LEMS interpreter.</i>
 
+`````{tab-set}
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="Meta">
+  <xs:sequence>
+    <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax"/>
+  </xs:sequence>
+  <xs:anyAttribute processContents="skip"/>
+</xs:complexType>
+
+```
+````
+`````
\ No newline at end of file
diff --git a/source/Userdocs/LEMS_elements/Dynamics.md b/source/Userdocs/LEMS_elements/Dynamics.md
index 01bc22ac..4a016957 100644
--- a/source/Userdocs/LEMS_elements/Dynamics.md
+++ b/source/Userdocs/LEMS_elements/Dynamics.md
@@ -4,7 +4,8 @@
 
 
 
-Generated on 22/08/23.
+Schema against which LEMS based on these should be valid: [LEMS_v0.7.6.xsd](https://github.com/LEMS/LEMS/tree/master/Schemas/LEMS/LEMS_v0.7.6.xsd).
+Generated on 18/06/24 from [this](https://github.com/LEMS/LEMS/commit/fd7b30eceb6735ac343745c8f6992bdde72b248b) commit.
 Please file any issues or questions at the [issue tracker here](https://github.com/LEMS/LEMS/issues).
 
 ---
@@ -37,6 +38,73 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 
 ```
 ````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="Dynamics">
+  <xs:sequence>
+    <xs:element name="StateVariable" type="StateVariable" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:element name="DerivedVariable" type="DerivedVariable" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:element name="ConditionalDerivedVariable" type="ConditionalDerivedVariable" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:element name="TimeDerivative" type="TimeDerivative" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:element name="OnStart" type="OnStart" minOccurs="0" maxOccurs="1"/>
+    <xs:element name="OnEvent" type="OnEvent" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:element name="OnCondition" type="OnCondition" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:element name="Regime" type="Regime" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:element name="KineticScheme" type="KineticScheme" minOccurs="0" maxOccurs="1"/>
+  </xs:sequence>
+</xs:complexType>
+
+```
+````
+
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<Dynamics>
+            <StateVariable name="t" dimension="time"/>
+        </Dynamics>
+```
+```{code-block} xml
+<Dynamics>
+            <StateVariable name="x" dimension="none"/>
+            <DerivedVariable name="ex" dimension="none" value="exp(x)"/>
+            <DerivedVariable name="q" dimension="none" value="ex / (1 + ex)"/>
+            <DerivedVariable name="rf" dimension="per_time" select="Forward/r"/>
+            <DerivedVariable name="rr" dimension="per_time" select="Reverse/r"/>
+            <TimeDerivative variable="x" value="(1 + ex)^2 / ex * (rf * (1 - q) - rr * q)"/>
+            <DerivedVariable name="fcond" dimension="none" exposure="fcond" value="q^power"/>
+        </Dynamics>
+```
+```{code-block} xml
+<Dynamics>
+            <StateVariable name="q" dimension="none"/>
+            <DerivedVariable dimension="per_time" name="rf" select="Forward/r"/>
+            <DerivedVariable dimension="per_time" name="rr" select="Reverse/r"/>
+            <TimeDerivative variable="q" value="rf * (1 - q) - rr * q"/>
+            <DerivedVariable name="fcond" dimension="none" exposure="fcond" value="q^power"/>
+        </Dynamics>
+```
+```{code-block} xml
+<Dynamics>
+            <OnStart>
+                <StateAssignment variable="v" value="v0"/>
+            </OnStart>
+            <DerivedVariable name="totcurrent" dimension="current" select="populations[*]/current" reduce="add"/>
+            <StateVariable name="v" exposure="v" dimension="voltage"/>
+            <TimeDerivative variable="v" value="(totcurrent + injection) / capacitance"/>
+        </Dynamics>
+```
+```{code-block} xml
+<Dynamics>
+            <StateVariable name="v" exposure="v" dimension="voltage"/>
+            <TimeDerivative variable="v" value="leakConductance * (leakReversal - v) / capacitance"/>
+            <OnEvent port="spikes-in">
+                <StateAssignment variable="v" value="v + deltaV"/>
+            </OnEvent>
+        </Dynamics>
+```
+````
 `````
 (lemsschema:statevariable_)=
 ## StateVariable
@@ -55,6 +123,37 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 **exposure**$ String$ If this variable is to be accessed from outside, it should be linked to an Exposure that is defined in the ComponentType.
 **description**$ String$ An optional description of the state variable
 
+```
+````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="StateVariable">
+  <xs:attribute name="name" type="xs:string" use="required"/>
+  <xs:attribute name="dimension" type="xs:string" use="optional" default="none"/>
+  <xs:attribute name="exposure" type="xs:string" use="optional"/>
+  <xs:attribute name="description" type="xs:string" use="optional"/>
+</xs:complexType>
+
+```
+````
+
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<StateVariable name="t" dimension="time"/>
+```
+```{code-block} xml
+<StateVariable name="v" exposure="v" dimension="voltage"/>
+```
+```{code-block} xml
+<StateVariable name="tsince" exposure="tsince" dimension="time"/>
+```
+```{code-block} xml
+<StateVariable name="tlast" dimension="time"/>
+```
+```{code-block} xml
+<StateVariable name="q" dimension="none"/>
 ```
 ````
 `````
@@ -73,6 +172,35 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 **variable**$ String$ The name of the variable
 **value**$ String$ A string defining the value of the element
 
+```
+````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="StateAssignment">
+  <xs:attribute name="variable" type="xs:string" use="required"/>
+  <xs:attribute name="value" type="xs:string" use="required"/>
+</xs:complexType>
+
+```
+````
+
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<StateAssignment variable="v" value="v + deltaV"/>
+```
+```{code-block} xml
+<StateAssignment variable="tsince" value="0"/>
+```
+```{code-block} xml
+<StateAssignment variable="tlast" value="t"/>
+```
+```{code-block} xml
+<StateAssignment variable="v" value="v0"/>
+```
+```{code-block} xml
+<StateAssignment variable="geff" value="0"/>
 ```
 ````
 `````
@@ -91,6 +219,35 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 **variable**$ String$ The name of the variable
 **value**$ String$ A string defining the value of the element
 
+```
+````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="TimeDerivative">
+  <xs:attribute name="variable" type="xs:string" use="required"/>
+  <xs:attribute name="value" type="xs:string" use="required"/>
+</xs:complexType>
+
+```
+````
+
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<TimeDerivative variable="v" value="leakConductance * (leakReversal - v) / capacitance"/>
+```
+```{code-block} xml
+<TimeDerivative variable="tsince" value="1"/>
+```
+```{code-block} xml
+<TimeDerivative variable="q" value="rf * (1 - q) - rr * q"/>
+```
+```{code-block} xml
+<TimeDerivative variable="x" value="(1 + ex)^2 / ex * (rf * (1 - q) - rr * q)"/>
+```
+```{code-block} xml
+<TimeDerivative variable="v" value="(totcurrent + injection) / capacitance"/>
 ```
 ````
 `````
@@ -115,6 +272,41 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 **required**$ boolean$ Set to true if it OK for this variable to be absent. See 'reduce' for what happens in this case
 **value**$ String$ A string defining the value of the element
 
+```
+````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="DerivedVariable">
+  <xs:attribute name="name" type="xs:string" use="required"/>
+  <xs:attribute name="dimension" type="xs:string" use="optional" default="none"/>
+  <xs:attribute name="exposure" type="xs:string" use="optional"/>
+  <xs:attribute name="description" type="xs:string" use="optional"/>
+  <xs:attribute name="select" type="xs:string" use="optional"/>
+  <xs:attribute name="value" type="xs:string" use="optional"/>
+  <xs:attribute name="reduce" type="xs:string" use="optional"/>
+  <xs:attribute name="required" type="xs:string" use="optional"/>
+</xs:complexType>
+
+```
+````
+
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<DerivedVariable name="tsince" dimension="time" exposure="tsince" value="t - tlast"/>
+```
+```{code-block} xml
+<DerivedVariable name="r" dimension="per_time" exposure="r" value="rate * exp((v - midpoint)/scale)"/>
+```
+```{code-block} xml
+<DerivedVariable name="r" dimension="per_time" exposure="r" value="rate / (1 + exp( -(v - midpoint)/scale))"/>
+```
+```{code-block} xml
+<DerivedVariable name="x" dimension="none" value="(v - midpoint) / scale"/>
+```
+```{code-block} xml
+<DerivedVariable name="r" dimension="per_time" exposure="r" value="rate * x / (1 - exp(-x))"/>
 ```
 ````
 `````
@@ -136,6 +328,46 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 
 ```
 ````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="OnStart">
+  <xs:sequence>
+    <xs:element name="StateAssignment" type="StateAssignment" minOccurs="1" maxOccurs="unbounded"/>
+  </xs:sequence>
+</xs:complexType>
+
+```
+````
+
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<OnStart>
+                <StateAssignment variable="v" value="v0"/>
+            </OnStart>
+```
+```{code-block} xml
+<OnStart>
+                <StateAssignment variable="geff" value="0"/>
+            </OnStart>
+```
+```{code-block} xml
+<OnStart>
+                <StateAssignment variable="v" value="v0"/>
+            </OnStart>
+```
+```{code-block} xml
+<OnStart>
+                <StateAssignment variable="v" value="v0"/>
+            </OnStart>
+```
+```{code-block} xml
+<OnStart>
+                <StateAssignment variable="v" value="v0"/>
+            </OnStart>
+```
+````
 `````
 (lemsschema:oncondition_)=
 ## OnCondition
@@ -155,6 +387,53 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 
 ```
 ````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="OnCondition">
+  <xs:sequence>
+    <xs:element name="StateAssignment" type="StateAssignment" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:element name="EventOut" type="EventOut" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:element name="Transition" type="Transition" minOccurs="0" maxOccurs="1"/>
+  </xs:sequence>
+  <xs:attribute name="test" type="xs:string" use="required"/>
+</xs:complexType>
+
+```
+````
+
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<OnCondition test="tsince .gt. period">
+                <StateAssignment variable="tsince" value="0"/>
+                <EventOut port="a"/>
+            </OnCondition>
+```
+```{code-block} xml
+<OnCondition test="t - tlast .gt. period">
+                <StateAssignment variable="tlast" value="t"/>
+                <EventOut port="a"/>
+            </OnCondition>
+```
+```{code-block} xml
+<OnCondition test="v .gt. threshold">             
+                    <EventOut port="out"/>             
+                    <Transition regime="refr"/>         
+                </OnCondition>
+```
+```{code-block} xml
+<OnCondition test="t .gt. tin + refractoryPeriod">                 
+                    <Transition regime="int"/>             
+                </OnCondition>
+```
+```{code-block} xml
+<OnCondition test="tsince .gt. period">
+                <StateAssignment variable="tsince" value="0"/>
+                <EventOut port="a"/>
+            </OnCondition>
+```
+````
 `````
 (lemsschema:onevent_)=
 ## OnEvent
@@ -185,13 +464,78 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 
 ```
 ````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="OnEvent">
+  <xs:sequence>
+    <xs:element name="StateAssignment" type="StateAssignment" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:element name="EventOut" type="EventOut" minOccurs="0" maxOccurs="unbounded"/>
+  </xs:sequence>
+  <xs:attribute name="port" type="xs:string" use="required"/>
+</xs:complexType>
+
+```
+````
+
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<OnEvent port="spikes-in">
+                <StateAssignment variable="v" value="v + deltaV"/>
+            </OnEvent>
+```
+```{code-block} xml
+<OnEvent port="in">
+                <StateAssignment variable="geff" value="geff + deltaG"/>
+            </OnEvent>
+```
+```{code-block} xml
+<OnEvent port="in">
+                    <StateAssignment variable="v" value="v + deltaV"/>
+                </OnEvent>
+```
+```{code-block} xml
+<OnEvent port="spikes-in">
+                <StateAssignment variable="v" value="v + deltaV"/>
+            </OnEvent>
+```
+````
 `````
 (lemsschema:eventout_)=
 ## EventOut
 
 <i></i>
 
+`````{tab-set}
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="EventOut">
+  <xs:attribute name="port" type="xs:string" use="required"/>
+</xs:complexType>
+
+```
+````
+
 
+````{tab-item} Usage: XML
+```{code-block} xml
+<EventOut port="a"/>
+```
+```{code-block} xml
+<EventOut port="a"/>
+```
+```{code-block} xml
+<EventOut port="out"/>
+```
+```{code-block} xml
+<EventOut port="a"/>
+```
+```{code-block} xml
+<EventOut port="a"/>
+```
+````
+`````
 (lemsschema:kineticscheme_)=
 ## KineticScheme
 
@@ -213,6 +557,32 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 **forwardRate**$ String$ Name of forward rate exposure
 **reverseRate**$ String$ Name of reverse rate exposure
 
+```
+````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="KineticScheme">
+  <xs:attribute name="name" type="xs:string" use="required"/>
+  <xs:attribute name="nodes" type="xs:string" use="required"/>
+  <xs:attribute name="stateVariable" type="xs:string" use="required"/>
+  <xs:attribute name="edges" type="xs:string" use="required"/>
+  <xs:attribute name="edgeSource" type="xs:string" use="required"/>
+  <xs:attribute name="edgeTarget" type="xs:string" use="required"/>
+  <xs:attribute name="forwardRate" type="xs:string" use="required"/>
+  <xs:attribute name="reverseRate" type="xs:string" use="required"/>
+</xs:complexType>
+
+```
+````
+
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<KineticScheme name="ks" nodes="states" stateVariable="occupancy" edges="transitions" edgeSource="from" edgeTarget="to" forwardRate="rf" reverseRate="rr"/>
+```
+```{code-block} xml
+<KineticScheme name="ks" nodes="states" stateVariable="occupancy" edges="transitions" edgeSource="from" edgeTarget="to" forwardRate="rf" reverseRate="rr" dependency="v" step="deltaV"/>
 ```
 ````
 `````
@@ -251,6 +621,48 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 
 ```
 ````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="Regime">
+  <xs:sequence>
+    <xs:element name="TimeDerivative" type="TimeDerivative" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:element name="OnEntry" type="OnEntry" minOccurs="0" maxOccurs="1"/>
+    <xs:element name="OnCondition" type="OnCondition" minOccurs="0" maxOccurs="unbounded"/>
+  </xs:sequence>
+  <xs:attribute name="name" type="xs:string" use="required"/>
+  <xs:attribute name="initial" type="TrueOrFalse" use="optional"/>
+</xs:complexType>
+
+```
+````
+
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<Regime name="int" initial="true">         
+                <TimeDerivative variable="v" value="(current + gleak * (vleak - v)) / capacitance"/>         
+                <OnCondition test="v .gt. threshold">             
+                    <EventOut port="out"/>             
+                    <Transition regime="refr"/>         
+                </OnCondition>         
+                <OnEvent port="in">
+                    <StateAssignment variable="v" value="v + deltaV"/>
+                </OnEvent>
+            </Regime>
+```
+```{code-block} xml
+<Regime name="refr">         
+                <OnEntry>             
+                    <StateAssignment variable="tin" value="t"/>             
+                    <StateAssignment variable="v" value="vreset"/>          
+                </OnEntry>                   
+                <OnCondition test="t .gt. tin + refractoryPeriod">                 
+                    <Transition regime="int"/>             
+                </OnCondition>         
+            </Regime>
+```
+````
 `````
 (lemsschema:onentry_)=
 ## OnEntry
@@ -270,13 +682,53 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 
 ```
 ````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="OnEntry">
+  <xs:sequence>
+    <xs:element name="StateAssignment" type="StateAssignment" minOccurs="1" maxOccurs="unbounded"/>
+  </xs:sequence>
+</xs:complexType>
+
+```
+````
+
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<OnEntry>             
+                    <StateAssignment variable="tin" value="t"/>             
+                    <StateAssignment variable="v" value="vreset"/>          
+                </OnEntry>
+```
+````
 `````
 (lemsschema:transition_)=
 ## Transition
 
 <i></i>
 
+`````{tab-set}
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="Transition">
+  <xs:attribute name="regime" type="xs:string" use="required"/>
+</xs:complexType>
+
+```
+````
 
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<Transition regime="int"/>
+```
+```{code-block} xml
+<Transition regime="refr"/>
+```
+````
+`````
 (lemsschema:super_)=
 ## Super
 
@@ -310,6 +762,20 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 
 **cases**$ {ref}`lemsschema:case_`
 
+```
+````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="ConditionalDerivedVariable">
+  <xs:sequence>
+    <xs:element name="Case" type="Case" minOccurs="1" maxOccurs="unbounded"/>
+  </xs:sequence>
+  <xs:attribute name="name" type="xs:string" use="required"/>
+  <xs:attribute name="dimension" type="xs:string" use="optional" default="none"/>
+  <xs:attribute name="exposure" type="xs:string" use="optional"/>
+</xs:complexType>
+
 ```
 ````
 `````
@@ -327,6 +793,16 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 
 **value**$ String$ A string defining the value of the element
 
+```
+````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="Case">
+  <xs:attribute name="condition" type="xs:string" use="optional"/>
+  <xs:attribute name="value" type="xs:string" use="required"/>
+</xs:complexType>
+
 ```
 ````
 `````
diff --git a/source/Userdocs/LEMS_elements/Geometry.md b/source/Userdocs/LEMS_elements/Geometry.md
index 7260663d..87e29c59 100644
--- a/source/Userdocs/LEMS_elements/Geometry.md
+++ b/source/Userdocs/LEMS_elements/Geometry.md
@@ -4,7 +4,8 @@
 
 
 
-Generated on 22/08/23.
+Schema against which LEMS based on these should be valid: [LEMS_v0.7.6.xsd](https://github.com/LEMS/LEMS/tree/master/Schemas/LEMS/LEMS_v0.7.6.xsd).
+Generated on 18/06/24 from [this](https://github.com/LEMS/LEMS/commit/fd7b30eceb6735ac343745c8f6992bdde72b248b) commit.
 Please file any issues or questions at the [issue tracker here](https://github.com/LEMS/LEMS/issues).
 
 ---
diff --git a/source/Userdocs/LEMS_elements/Modelstructure.md b/source/Userdocs/LEMS_elements/Modelstructure.md
index 9aca0a51..c9382f80 100644
--- a/source/Userdocs/LEMS_elements/Modelstructure.md
+++ b/source/Userdocs/LEMS_elements/Modelstructure.md
@@ -6,7 +6,8 @@
 
 ---
 
-Generated on 22/08/23.
+Schema against which LEMS based on these should be valid: [LEMS_v0.7.6.xsd](https://github.com/LEMS/LEMS/tree/master/Schemas/LEMS/LEMS_v0.7.6.xsd).
+Generated on 18/06/24 from [this](https://github.com/LEMS/LEMS/commit/fd7b30eceb6735ac343745c8f6992bdde72b248b) commit.
 Please file any issues or questions at the [issue tracker here](https://github.com/LEMS/LEMS/issues).
 
 ---
@@ -50,6 +51,44 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 **reportFile**$ String$ Optional attribute specifying file in which to save short report of simulation
 **timesFile**$ String$ Optional attribute specifying file in which to save times used in simulation
 
+```
+````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="Target">
+  <xs:attribute name="component" type="xs:string" use="required"/>
+  <xs:attribute name="reportFile" type="xs:string" use="optional">
+    <xs:annotation>
+      <xs:documentation>jLEMS only optional attribute to also write a short report with simulation duration, version, etc.</xs:documentation>
+    </xs:annotation>
+  </xs:attribute>
+  <xs:attribute name="timesFile" type="xs:string" use="optional">
+    <xs:annotation>
+      <xs:documentation>jLEMS only optional attribute to also write a file containing actual times used in the simulation.</xs:documentation>
+    </xs:annotation>
+  </xs:attribute>
+</xs:complexType>
+
+```
+````
+
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<Target component="sim1"/>
+```
+```{code-block} xml
+<Target component="sim1"/>
+```
+```{code-block} xml
+<Target component="sim1"/>
+```
+```{code-block} xml
+<Target component="sim1"/>
+```
+```{code-block} xml
+<Target component="sim1"/>
 ```
 ````
 `````
@@ -70,6 +109,28 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 **value**$ String$ The value of a constant must be a plain number (no units) giving the SI magnitude of the quantity or an expression involving only plain numbers or other constants.
 **dimension**$ String$ 
 
+```
+````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="Constant">
+  <xs:attribute name="name" type="xs:string" use="required"/>
+  <xs:attribute name="dimension" type="xs:string" use="optional" default="none"/>
+  <xs:attribute name="value" type="PhysicalQuantity" use="required"/>
+  <xs:attribute name="description" type="xs:string" use="optional"/>
+</xs:complexType>
+
+```
+````
+
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<Constant name="kte" dimension="voltage" value="25.3mV"/>
+```
+```{code-block} xml
+<Constant name="kte" dimension="voltage" value="25.3mV"/>
 ```
 ````
 `````
@@ -87,6 +148,34 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 
 **file**$ String$ the name or relative path of a file to be included
 
+```
+````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="Include">
+  <xs:attribute name="file" type="xs:string" use="required"/>
+</xs:complexType>
+
+```
+````
+
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<Include file="SimpleNetwork.xml"/>
+```
+```{code-block} xml
+<Include file="SingleSimulation.xml"/>
+```
+```{code-block} xml
+<Include file="ex2dims.xml"/>
+```
+```{code-block} xml
+<Include file="hhchannel.xml"/>
+```
+```{code-block} xml
+<Include file="hhcell.xml"/>
 ```
 ````
 `````
\ No newline at end of file
diff --git a/source/Userdocs/LEMS_elements/Procedure.md b/source/Userdocs/LEMS_elements/Procedure.md
index dd57197d..5a5901cf 100644
--- a/source/Userdocs/LEMS_elements/Procedure.md
+++ b/source/Userdocs/LEMS_elements/Procedure.md
@@ -4,7 +4,8 @@
 
 
 
-Generated on 22/08/23.
+Schema against which LEMS based on these should be valid: [LEMS_v0.7.6.xsd](https://github.com/LEMS/LEMS/tree/master/Schemas/LEMS/LEMS_v0.7.6.xsd).
+Generated on 18/06/24 from [this](https://github.com/LEMS/LEMS/commit/fd7b30eceb6735ac343745c8f6992bdde72b248b) commit.
 Please file any issues or questions at the [issue tracker here](https://github.com/LEMS/LEMS/issues).
 
 ---
diff --git a/source/Userdocs/LEMS_elements/Simulation.md b/source/Userdocs/LEMS_elements/Simulation.md
index 14a8af65..72ae8ae6 100644
--- a/source/Userdocs/LEMS_elements/Simulation.md
+++ b/source/Userdocs/LEMS_elements/Simulation.md
@@ -4,7 +4,8 @@
 
 
 
-Generated on 22/08/23.
+Schema against which LEMS based on these should be valid: [LEMS_v0.7.6.xsd](https://github.com/LEMS/LEMS/tree/master/Schemas/LEMS/LEMS_v0.7.6.xsd).
+Generated on 18/06/24 from [this](https://github.com/LEMS/LEMS/commit/fd7b30eceb6735ac343745c8f6992bdde72b248b) commit.
 Please file any issues or questions at the [issue tracker here](https://github.com/LEMS/LEMS/issues).
 
 ---
@@ -30,6 +31,52 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 
 ```
 ````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="Simulation">
+  <xs:sequence>
+    <xs:element name="DataDisplay" type="DataDisplay" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:element name="Record" type="Record" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:element name="EventRecord" type="EventRecord" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:element name="Run" type="Run" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:element name="DataWriter" type="DataWriter" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:element name="EventWriter" type="EventWriter" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:element name="Meta" type="Meta" minOccurs="0" maxOccurs="unbounded"/>
+  </xs:sequence>
+</xs:complexType>
+
+```
+````
+
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<Simulation>
+            <DataDisplay title="title" dataRegion="xmin,xmax,ymin,ymax"/>
+        </Simulation>
+```
+```{code-block} xml
+<Simulation>
+            <Record quantity="quantity" timeScale="timeScale" scale="scale" color="color"/>
+        </Simulation>
+```
+```{code-block} xml
+<Simulation>
+            <DataWriter path="path" fileName="fileName"/>
+        </Simulation>
+```
+```{code-block} xml
+<Simulation>
+            <Record quantity="quantity"/>
+        </Simulation>
+```
+```{code-block} xml
+<Simulation>
+            <Run component="target" variable="t" increment="step" total="length"/>
+        </Simulation>
+```
+````
 `````
 (lemsschema:record_)=
 ## Record
@@ -47,6 +94,31 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 **scale**$ String$ path to the element that defines the scale for rendering the quantity dimensionless
 **color**$ String$ hex format color suggestion for how the data should be displayed
 
+```
+````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="Record">
+  <xs:attribute name="quantity" type="xs:string" use="required"/>
+  <xs:attribute name="timeScale" type="xs:string" use="optional"/>
+  <xs:attribute name="scale" type="xs:string" use="optional"/>
+  <xs:attribute name="color" type="xs:string" use="optional"/>
+</xs:complexType>
+
+```
+````
+
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<Record quantity="quantity" timeScale="timeScale" scale="scale" color="color"/>
+```
+```{code-block} xml
+<Record quantity="quantity"/>
+```
+```{code-block} xml
+<Record quantity="quantity" timeScale="timeScale" scale="scale" color="color"/>
 ```
 ````
 `````
@@ -65,6 +137,16 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 **quantity**$ String$ path for the component which will emit spikes to be recorded
 **eventPort**$ String$ event port for the component which will emit spikes
 
+```
+````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="EventRecord">
+  <xs:attribute name="quantity" type="xs:string" use="required"/>
+  <xs:attribute name="eventPort" type="xs:string" use="required"/>
+</xs:complexType>
+
 ```
 ````
 `````
@@ -73,19 +155,67 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 
 <i></i>
 
+`````{tab-set}
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="DataDisplay">
+  <xs:attribute name="title" type="xs:string" use="required"/>
+  <xs:attribute name="dataRegion" type="xs:string" use="required"/>
+</xs:complexType>
+
+```
+````
 
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<DataDisplay title="title" dataRegion="xmin,xmax,ymin,ymax"/>
+```
+```{code-block} xml
+<DataDisplay title="title" dataRegion="xmin,xmax,ymin,ymax"/>
+```
+````
+`````
 (lemsschema:datawriter_)=
 ## DataWriter
 
 <i></i>
 
+`````{tab-set}
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="DataWriter">
+  <xs:attribute name="path" type="xs:string" use="required"/>
+  <xs:attribute name="fileName" type="xs:string" use="required"/>
+</xs:complexType>
+
+```
+````
 
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<DataWriter path="path" fileName="fileName"/>
+```
+````
+`````
 (lemsschema:eventwriter_)=
 ## EventWriter
 
 <i></i>
 
+`````{tab-set}
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="EventWriter">
+  <xs:attribute name="path" type="xs:string" use="required"/>
+  <xs:attribute name="fileName" type="xs:string" use="required"/>
+  <xs:attribute name="format" type="xs:string" use="required"/>
+</xs:complexType>
 
+```
+````
+`````
 (lemsschema:run_)=
 ## Run
 
@@ -103,6 +233,28 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 **increment**$ String$ path to the parameter that sets the step size
 **total**$ String$ path to the parameter that sets the total span of the independent variable to be run
 
+```
+````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="Run">
+  <xs:attribute name="component" type="xs:string" use="required"/>
+  <xs:attribute name="variable" type="xs:string" use="required"/>
+  <xs:attribute name="increment" type="xs:string" use="required"/>
+  <xs:attribute name="total" type="xs:string" use="required"/>
+</xs:complexType>
+
+```
+````
+
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<Run component="target" variable="t" increment="step" total="length"/>
+```
+```{code-block} xml
+<Run component="target" variable="t" increment="step" total="length"/>
 ```
 ````
 `````
\ No newline at end of file
diff --git a/source/Userdocs/LEMS_elements/Structure.md b/source/Userdocs/LEMS_elements/Structure.md
index fbbe5f57..ae3b4f2e 100644
--- a/source/Userdocs/LEMS_elements/Structure.md
+++ b/source/Userdocs/LEMS_elements/Structure.md
@@ -4,7 +4,8 @@
 
 
 
-Generated on 22/08/23.
+Schema against which LEMS based on these should be valid: [LEMS_v0.7.6.xsd](https://github.com/LEMS/LEMS/tree/master/Schemas/LEMS/LEMS_v0.7.6.xsd).
+Generated on 18/06/24 from [this](https://github.com/LEMS/LEMS/commit/fd7b30eceb6735ac343745c8f6992bdde72b248b) commit.
 Please file any issues or questions at the [issue tracker here](https://github.com/LEMS/LEMS/issues).
 
 ---
@@ -25,6 +26,58 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 
 ```
 ````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="Structure">
+  <xs:sequence>
+    <xs:element name="ChildInstance" type="ChildInstance" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:element name="MultiInstantiate" type="MultiInstantiate" minOccurs="0" maxOccurs="1"/>
+    <xs:element name="ForEach" type="ForEach" minOccurs="0" maxOccurs="1"/>
+    <xs:element name="With" type="With" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:element name="Tunnel" type="Tunnel" minOccurs="0" maxOccurs="1"/>
+    <xs:element name="EventConnection" type="EventConnection" minOccurs="0" maxOccurs="unbounded"/>
+  </xs:sequence>
+</xs:complexType>
+
+```
+````
+
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<Structure>
+            <MultiInstantiate number="size" component="component"/>
+        </Structure>
+```
+```{code-block} xml
+<Structure>
+            <ForEach instances="../source" as="a">
+                <ForEach instances="../target" as="b">
+                    <EventConnection from="a" to="b"/>
+                </ForEach>
+            </ForEach>    
+        </Structure>
+```
+```{code-block} xml
+<Structure>
+            <ChildInstance component="channel"/>
+        </Structure>
+```
+```{code-block} xml
+<Structure>
+            <With instance="from" as="a"/>
+            <With instance="to" as="b"/>
+            <EventConnection from="a" to="b" receiver="synapse" receiverContainer="destination" sourcePort="sourcePort" targetPort="targetPort"/>
+        
+        </Structure>
+```
+```{code-block} xml
+<Structure>
+            <MultiInstantiate number="size" component="component"/>
+        </Structure>
+```
+````
 `````
 (lemsschema:buildelement_)=
 ## BuildElement
@@ -58,6 +111,32 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 **assigns**$ {ref}`lemsschema:assign_`
 **buildElements**$ {ref}`lemsschema:buildelement_`
 
+```
+````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="MultiInstantiate">
+  <xs:attribute name="component" type="xs:string" use="required"/>
+  <xs:attribute name="number" type="xs:string" use="required"/>
+</xs:complexType>
+
+```
+````
+
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<MultiInstantiate number="size" component="component"/>
+```
+```{code-block} xml
+<MultiInstantiate number="size" component="component"/>
+```
+```{code-block} xml
+<MultiInstantiate number="size" component="component"/>
+```
+```{code-block} xml
+<MultiInstantiate number="size" component="component"/>
 ```
 ````
 `````
@@ -84,7 +163,17 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 
 <i></i>
 
+`````{tab-set}
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="Assign">
+  <xs:attribute name="property" type="xs:string" use="required"/>
+  <xs:attribute name="value" type="xs:string" use="required"/>
+</xs:complexType>
 
+```
+````
+`````
 (lemsschema:choose_)=
 ## Choose
 
@@ -117,6 +206,31 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 **assigns**$ {ref}`lemsschema:assign_`
 **buildElements**$ {ref}`lemsschema:buildelement_`
 
+```
+````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="ChildInstance">
+  <xs:attribute name="component" type="xs:string" use="required"/>
+</xs:complexType>
+
+```
+````
+
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<ChildInstance component="channel"/>
+```
+```{code-block} xml
+<ChildInstance component="channel"/>
+```
+```{code-block} xml
+<ChildInstance component="channel"/>
+```
+```{code-block} xml
+<ChildInstance component="channel"/>
 ```
 ````
 `````
@@ -136,6 +250,54 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 
 ```
 ````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="ForEach">
+  <xs:sequence>
+    <xs:element name="MultiInstantiate" type="MultiInstantiate" minOccurs="0" maxOccurs="1"/>
+  </xs:sequence>
+  <xs:attribute name="instances" type="xs:string" use="required"/>
+  <xs:attribute name="as" type="xs:string" use="required"/>
+</xs:complexType>
+
+```
+````
+
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<ForEach instances="../source" as="a">
+                <ForEach instances="../target" as="b">
+                    <EventConnection from="a" to="b"/>
+                </ForEach>
+            </ForEach>
+```
+```{code-block} xml
+<ForEach instances="../target" as="b">
+                    <EventConnection from="a" to="b"/>
+                </ForEach>
+```
+```{code-block} xml
+<ForEach instances="../source" as="a">
+                <ForEach instances="../target" as="b">
+                    <EventConnection from="a" to="b"/>
+                </ForEach>
+            </ForEach>
+```
+```{code-block} xml
+<ForEach instances="../target" as="b">
+                    <EventConnection from="a" to="b"/>
+                </ForEach>
+```
+```{code-block} xml
+<ForEach instances="../source" as="a">
+                <ForEach instances="../target" as="b">
+                    <EventConnection from="a" to="b"/>
+                </ForEach>
+            </ForEach>
+```
+````
 `````
 (lemsschema:eventconnection_)=
 ## EventConnection
@@ -152,6 +314,40 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 **assigns**$ {ref}`lemsschema:assign_`
 **buildElements**$ {ref}`lemsschema:buildelement_`
 
+```
+````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="EventConnection">
+  <xs:sequence>
+    <xs:element name="Assign" type="Assign" minOccurs="0" maxOccurs="1"/>
+  </xs:sequence>
+  <xs:attribute name="from" type="xs:string" use="required"/>
+  <xs:attribute name="to" type="xs:string" use="required"/>
+  <xs:attribute name="sourcePort" type="xs:string" use="optional"/>
+  <xs:attribute name="targetPort" type="xs:string" use="optional"/>
+  <xs:attribute name="receiver" type="xs:string" use="optional"/>
+  <xs:attribute name="receiverContainer" type="xs:string" use="optional"/>
+  <xs:attribute name="delay" type="xs:string" use="optional"/>
+</xs:complexType>
+
+```
+````
+
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<EventConnection from="a" to="b"/>
+```
+```{code-block} xml
+<EventConnection from="a" to="b" receiver="synapse" receiverContainer="destination" sourcePort="sourcePort" targetPort="targetPort"/>
+```
+```{code-block} xml
+<EventConnection from="a" to="b"/>
+```
+```{code-block} xml
+<EventConnection from="a" to="b"/>
 ```
 ````
 `````
@@ -170,6 +366,22 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 **assigns**$ {ref}`lemsschema:assign_`
 **buildElements**$ {ref}`lemsschema:buildelement_`
 
+```
+````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="Tunnel">
+  <xs:sequence>
+    <xs:element name="Assign" type="Assign" minOccurs="0" maxOccurs="1"/>
+  </xs:sequence>
+  <xs:attribute name="name" type="xs:string" use="required"/>
+  <xs:attribute name="endA" type="xs:string" use="required"/>
+  <xs:attribute name="endB" type="xs:string" use="required"/>
+  <xs:attribute name="componentA" type="xs:string" use="required"/>
+  <xs:attribute name="componentB" type="xs:string" use="required"/>
+</xs:complexType>
+
 ```
 ````
 `````
@@ -238,6 +450,28 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 
 **buildElements**$ {ref}`lemsschema:buildelement_`
 
+```
+````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="With">
+  <xs:attribute name="instance" type="xs:string" use="optional"/>
+  <xs:attribute name="list" type="xs:string" use="optional"/>
+  <xs:attribute name="index" type="xs:string" use="optional"/>
+  <xs:attribute name="as" type="xs:string" use="required"/>
+</xs:complexType>
+
+```
+````
+
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<With instance="from" as="a"/>
+```
+```{code-block} xml
+<With instance="to" as="b"/>
 ```
 ````
 `````
diff --git a/source/Userdocs/LEMS_elements/Unitsanddimensions.md b/source/Userdocs/LEMS_elements/Unitsanddimensions.md
index fe9917da..d2f11289 100644
--- a/source/Userdocs/LEMS_elements/Unitsanddimensions.md
+++ b/source/Userdocs/LEMS_elements/Unitsanddimensions.md
@@ -4,7 +4,8 @@
 
 
 
-Generated on 22/08/23.
+Schema against which LEMS based on these should be valid: [LEMS_v0.7.6.xsd](https://github.com/LEMS/LEMS/tree/master/Schemas/LEMS/LEMS_v0.7.6.xsd).
+Generated on 18/06/24 from [this](https://github.com/LEMS/LEMS/commit/fd7b30eceb6735ac343745c8f6992bdde72b248b) commit.
 Please file any issues or questions at the [issue tracker here](https://github.com/LEMS/LEMS/issues).
 
 ---
@@ -30,6 +31,40 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 **n**$ int$ Amount of substance
 **j**$ int$ Luminous intensity
 
+```
+````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="Dimension">
+  <xs:attribute name="name" type="xs:string" use="required"/>
+  <xs:attribute name="m" type="xs:integer" use="optional" default="0"/>
+  <xs:attribute name="l" type="xs:integer" use="optional" default="0"/>
+  <xs:attribute name="t" type="xs:integer" use="optional" default="0"/>
+  <xs:attribute name="i" type="xs:integer" use="optional" default="0"/>
+  <xs:attribute name="k" type="xs:integer" use="optional" default="0"/>
+  <xs:attribute name="n" type="xs:integer" use="optional" default="0"/>
+</xs:complexType>
+
+```
+````
+
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<Dimension name="voltage" m="1" l="2" t="-3" i="-1"/>
+```
+```{code-block} xml
+<Dimension name="time" t="1"/>
+```
+```{code-block} xml
+<Dimension name="conductance" m="-1" l="-2" t="3" i="2"/>
+```
+```{code-block} xml
+<Dimension name="capacitance" m="-1" l="-2" t="4" i="2"/>
+```
+```{code-block} xml
+<Dimension name="current" i="1"/>
 ```
 ````
 `````
@@ -52,6 +87,42 @@ Please file any issues or questions at the [issue tracker here](https://github.c
 **scale**$ double$ Scale, only to be used for scales which are not powers of ten
 **offset**$ double$ Offset for non zero-offset units
 
+```
+````
+
+````{tab-item} Schema
+```{code-block} xml
+<xs:complexType name="Unit">
+  <xs:attribute name="symbol" type="xs:string" use="required"/>
+  <xs:attribute name="dimension" type="xs:string" use="required"/>
+  <xs:attribute name="power" type="xs:integer" use="optional" default="0">
+    <xs:annotation>
+      <xs:documentation>Some have asked whether fractional dimensions should be allowed. Disallowing it until needed...</xs:documentation>
+    </xs:annotation>
+  </xs:attribute>
+  <xs:attribute name="scale" type="xs:float" use="optional" default="1"/>
+  <xs:attribute name="offset" type="xs:float" use="optional" default="0"/>
+</xs:complexType>
+
+```
+````
+
+
+````{tab-item} Usage: XML
+```{code-block} xml
+<Unit symbol="mV" dimension="voltage" power="-3"/>
+```
+```{code-block} xml
+<Unit symbol="ms" dimension="time" power="-3"/>
+```
+```{code-block} xml
+<Unit symbol="pS" dimension="conductance" power="-12"/>
+```
+```{code-block} xml
+<Unit symbol="nS" dimension="conductance" power="-9"/>
+```
+```{code-block} xml
+<Unit symbol="uF" dimension="capacitance" power="-6"/>
 ```
 ````
 `````