From 2191d929a12a233347ee79c673b8f2971c10e6dd Mon Sep 17 00:00:00 2001
From: Daniel Himmelstein <daniel.himmelstein@gmail.com>
Date: Sun, 27 Dec 2020 18:12:42 -0500
Subject: [PATCH 01/54] enable citekey prefix inference

merges https://github.com/manubot/rootstock/pull/404
refs https://github.com/manubot/manubot/issues/123
---
 USAGE.md              | 15 ++++++++++++++-
 build/environment.yml |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/USAGE.md b/USAGE.md
index a7e446b..5bd004a 100644
--- a/USAGE.md
+++ b/USAGE.md
@@ -110,6 +110,19 @@ When choosing which source to use for a citation, we recommend the following ord
 9. For references that do not have any of the above persistent identifiers, the citation key does not need to include a prefix.
    Citing `@old-manuscript` will work, but only if reference metadata is [provided manually](#reference-metadata).
 
+Manubot is able to infer certain prefixes,
+such some citations can be formatted like `@accession` (without a prefix).
+Examples includes DOIs like `@10.15363/thinklab.4` or `@10/993`,
+PMC / PubMed identifiers like `@PMC4497619` or `@26158728`,
+arXiv identifier like `@1508.06576v2`,
+and Wikidata identifiers like `@Q50051684`.
+To disable citekey prefix inference, add the following to `metadata.yaml`:
+
+```yaml
+pandoc:
+  manubot-infer-citekey-prefixes: false
+```
+
 Cite multiple items at once like:
 
 ```md
@@ -136,7 +149,7 @@ By default, `pandoc-manubot-cite` does not fail upon invalid citations, although
 
 ```yaml
 pandoc:
-  manubot-fail-on-errors: True
+  manubot-fail-on-errors: true
 ```
 
 #### Citation aliases
diff --git a/build/environment.yml b/build/environment.yml
index f81dfc8..abee7fb 100644
--- a/build/environment.yml
+++ b/build/environment.yml
@@ -21,7 +21,7 @@ dependencies:
   - yamllint=1.25.0
   - pip:
     - errorhandler==2.0.1
-    - git+https://github.com/manubot/manubot@55c5e1e526261ebadd2aefed2c2757792d8d2ebf
+    - git+https://github.com/manubot/manubot@553090a16ac24a9fdc3f8df241a91b790c140865
     - isbnlib==3.10.3
     - opentimestamps-client==0.7.0
     - opentimestamps==0.4.1

From 87c11957cf69b73ebed5518f7928b99adb1dc5d6 Mon Sep 17 00:00:00 2001
From: Vincent Rubinetti <vince.rubinetti@gmail.com>
Date: Fri, 5 Feb 2021 12:43:51 -0500
Subject: [PATCH 02/54] Webpage: refactor plugins & add scite plugin

merges https://github.com/manubot/rootstock/pull/409

* moves repeated and shared/generic functions to separate "core" plugin
* reorganizes html.yaml config into first and third party plugins
* removes functionality to set plugin options from url
* reformats plugins with Prettier (eg 4 space tabs to 2 space)
* removes anonymizer wrapper. Just make <script> tag into module to keep scope local
  and avoid function name conflicts. this reduces the indent of the whole script by one level.
* moves plugin specific CSS to plugins themselves
* adds scite plugin (uncomment to enable)
---
 build/pandoc/defaults/html.yaml      |   24 +-
 build/plugins/accordion.html         |  405 ++----
 build/plugins/analytics.html         |    8 +-
 build/plugins/anchors.html           |  259 ++--
 build/plugins/attributes.html        |  212 ++-
 build/plugins/core.html              |  129 ++
 build/plugins/d3.html                |   24 +-
 build/plugins/hypothesis.html        |  234 ++--
 build/plugins/inline-svg.html        |  113 +-
 build/plugins/jump-to-first.html     |  362 ++----
 build/plugins/lightbox.html          | 1254 +++++++++---------
 build/plugins/link-highlight.html    |  339 +++--
 build/plugins/math.html              |   27 -
 build/plugins/mathjax.html           |   53 +
 build/plugins/scite.html             |   61 +
 build/plugins/table-of-contents.html |  707 +++++-----
 build/plugins/tooltips.html          | 1099 +++++++---------
 build/themes/default.html            | 1803 +++++++++-----------------
 18 files changed, 3212 insertions(+), 3901 deletions(-)
 create mode 100644 build/plugins/core.html
 delete mode 100644 build/plugins/math.html
 create mode 100644 build/plugins/mathjax.html
 create mode 100644 build/plugins/scite.html

diff --git a/build/pandoc/defaults/html.yaml b/build/pandoc/defaults/html.yaml
index 956bbbc..50d2981 100644
--- a/build/pandoc/defaults/html.yaml
+++ b/build/pandoc/defaults/html.yaml
@@ -3,22 +3,28 @@
 to: html5
 output-file: output/manuscript.html
 # include-before-body:
-# - build/plugins/d3.html
+### third-party plugins
+#- build/plugins/d3.html
 include-after-body:
+### theme
 - build/themes/default.html
-# - build/plugins/inline-svg.html
-- build/plugins/anchors.html
+### first-party plugins
+- build/plugins/core.html # needed for all first-party plugins
 - build/plugins/accordion.html
-- build/plugins/tooltips.html
+- build/plugins/anchors.html
+- build/plugins/attributes.html
+#- build/plugins/inline-svg.html
 - build/plugins/jump-to-first.html
+- build/plugins/lightbox.html
 - build/plugins/link-highlight.html
 - build/plugins/table-of-contents.html
-- build/plugins/lightbox.html
-- build/plugins/attributes.html
-- build/plugins/math.html
-- build/plugins/hypothesis.html
+- build/plugins/tooltips.html
+### third-party plugins
 - build/plugins/analytics.html
+- build/plugins/hypothesis.html
+- build/plugins/mathjax.html
+#- build/plugins/scite.html
 variables:
-  math: ''
+  math: ""
 html-math-method:
   method: mathjax
diff --git a/build/plugins/accordion.html b/build/plugins/accordion.html
index eaddd54..98ba165 100644
--- a/build/plugins/accordion.html
+++ b/build/plugins/accordion.html
@@ -1,272 +1,145 @@
-<!-- accordion plugin -->
-
-<script>
-    (function() {
-        // /////////////////////////
-        // DESCRIPTION
-        // /////////////////////////
-
-        // This Manubot plugin allows sections of content under <h2> headings
-        // to be collapsible.
-
-        // /////////////////////////
-        // OPTIONS
-        // /////////////////////////
-
-        // plugin name prefix for url parameters
-        const pluginName = 'accordion';
-
-        // default plugin options
-        const options = {
-            // whether to always start expanded ('false'), always start
-            // collapsed ('true'), or start collapsed when screen small ('auto')
-            startCollapsed: 'auto',
-            // whether plugin is on or not
-            enabled: 'true'
-        };
-
-        // change options above, or override with url parameter, eg:
-        // 'manuscript.html?pluginName-enabled=false'
-
-        // /////////////////////////
-        // SCRIPT
-        // /////////////////////////
-
-        // start script
-        function start() {
-            // run through each <h2> heading
-            const headings = document.querySelectorAll('h2');
-            for (const heading of headings) {
-                addArrow(heading);
-
-                // start expanded/collapsed based on option
-                if (
-                    options.startCollapsed === 'true' ||
-                    (options.startCollapsed === 'auto' && isSmallScreen())
-                )
-                    collapseHeading(heading);
-                else
-                    expandHeading(heading);
-            }
-
-            // attach hash change listener to window
-            window.addEventListener('hashchange', onHashChange);
-        }
-
-        // when hash (eg manuscript.html#introduction) changes
-        function onHashChange() {
-            const target = getHashTarget();
-            if (target)
-                goToElement(target);
-        }
-
-        // add arrow to heading
-        function addArrow(heading) {
-            // add arrow button
-            const arrow = document.createElement('button');
-            arrow.innerHTML = document.querySelector(
-                '.icon_angle_down'
-            ).innerHTML;
-            arrow.classList.add('icon_button', 'accordion_arrow');
-            heading.insertBefore(arrow, heading.firstChild);
-
-            // attach click listener to heading and button
-            heading.addEventListener('click', onHeadingClick);
-            arrow.addEventListener('click', onArrowClick);
-        }
-
-        // determine if on mobile-like device with small screen
-        function isSmallScreen() {
-            return Math.min(window.innerWidth, window.innerHeight) < 480;
-        }
-
-        // scroll to and focus element
-        function goToElement(element, offset) {
-            // expand accordion section if collapsed
-            expandElement(element);
-            const y =
-                getRectInView(element).top -
-                getRectInView(document.documentElement).top -
-                (offset || 0);
-            // trigger any function listening for "onscroll" event
-            window.dispatchEvent(new Event('scroll'));
-            window.scrollTo(0, y);
-            document.activeElement.blur();
-            element.focus();
-        }
-
-        // get element that is target of hash
-        function getHashTarget(link) {
-            const hash = link ? link.hash : window.location.hash;
-            const id = hash.slice(1);
-            let target = document.querySelector('[id="' + id + '"]');
-            if (!target)
-                return;
-
-            // if figure or table, modify target to get expected element
-            if (id.indexOf('fig:') === 0)
-                target = target.querySelector('figure');
-            if (id.indexOf('tbl:') === 0)
-                target = target.querySelector('table');
-
-            return target;
-        }
-
-        // when <h2> heading is clicked
-        function onHeadingClick(event) {
-            // only collapse if <h2> itself is target of click (eg, user did
-            // not click on anchor within <h2>)
-            if (event.target === this)
-                toggleCollapse(this);
-        }
-
-        // when arrow button is clicked
-        function onArrowClick() {
-            toggleCollapse(this.parentNode);
-        }
-
-        // collapse section if expanded, expand if collapsed
-        function toggleCollapse(heading) {
-            if (heading.dataset.collapsed === 'false')
-                collapseHeading(heading);
-            else
-                expandHeading(heading);
-        }
-
-        // elements to exclude from collapse, such as table of contents panel,
-        // hypothesis panel, etc
-        const exclude = '#toc_panel, div.annotator-frame, #lightbox_overlay';
-
-        // collapse section
-        function collapseHeading(heading) {
-            heading.setAttribute('data-collapsed', 'true');
-            const children = getChildren(heading);
-            for (const child of children)
-                child.setAttribute('data-collapsed', 'true');
-        }
-
-        // expand section
-        function expandHeading(heading) {
-            heading.setAttribute('data-collapsed', 'false');
-            const children = getChildren(heading);
-            for (const child of children)
-                child.setAttribute('data-collapsed', 'false');
-        }
-
-        // get list of elements between this <h2> and next <h2> or <h1>
-        // ("children" of the <h2> section)
-        function getChildren(heading) {
-            return nextUntil(heading, 'h2, h1', exclude);
-        }
-
-        // get position/dimensions of element or viewport
-        function getRectInView(element) {
-            let rect = {};
-            rect.left = 0;
-            rect.top = 0;
-            rect.right = document.documentElement.clientWidth;
-            rect.bottom = document.documentElement.clientHeight;
-            let style = {};
-
-            if (element instanceof HTMLElement) {
-                rect = element.getBoundingClientRect();
-                style = window.getComputedStyle(element);
-            }
-
-            const margin = {};
-            margin.left = parseFloat(style.marginLeftWidth) || 0;
-            margin.top = parseFloat(style.marginTopWidth) || 0;
-            margin.right = parseFloat(style.marginRightWidth) || 0;
-            margin.bottom = parseFloat(style.marginBottomWidth) || 0;
-
-            const border = {};
-            border.left = parseFloat(style.borderLeftWidth) || 0;
-            border.top = parseFloat(style.borderTopWidth) || 0;
-            border.right = parseFloat(style.borderRightWidth) || 0;
-            border.bottom = parseFloat(style.borderBottomWidth) || 0;
-
-            const newRect = {};
-            newRect.left = rect.left + margin.left + border.left;
-            newRect.top = rect.top + margin.top + border.top;
-            newRect.right = rect.right + margin.right + border.right;
-            newRect.bottom = rect.bottom + margin.bottom + border.bottom;
-            newRect.width = newRect.right - newRect.left;
-            newRect.height = newRect.bottom - newRect.top;
-
-            return newRect;
-        }
-
-        // get list of elements after a start element up to element matching
-        // query
-        function nextUntil(element, query, exclude) {
-            const elements = [];
-            while (element = element.nextElementSibling, element) {
-                if (element.matches(query))
-                    break;
-                if (!element.matches(exclude))
-                    elements.push(element);
-            }
-            return elements;
-        }
-
-        // get closest element before specified element that matches query
-        function firstBefore(element, query) {
-            while (
-                element &&
-                element !== document.body &&
-                !element.matches(query)
-            )
-                element = element.previousElementSibling || element.parentNode;
-
-            return element;
-        }
-
-        // check if element is part of collapsed heading
-        function isCollapsed(element) {
-            while (element && element !== document.body) {
-                if (element.dataset.collapsed === 'true')
-                    return true;
-                element = element.parentNode;
-            }
-            return false;
-        }
-
-        // expand heading containing element if necesary
-        function expandElement(element) {
-            if (isCollapsed(element)) {
-                const heading = firstBefore(element, 'h2');
-                if (heading)
-                    heading.click();
-            }
-        }
-
-        // load options from url parameters
-        function loadOptions() {
-            const url = window.location.search;
-            const params = new URLSearchParams(url);
-            for (const optionName of Object.keys(options)) {
-                const paramName = pluginName + '-' + optionName;
-                const param = params.get(paramName);
-                if (param !== '' && param !== null)
-                    options[optionName] = param;
-            }
-        }
-        loadOptions();
-
-        // start script when document is finished loading
-        if (options.enabled === 'true')
-            window.addEventListener('load', start);
-    })();
+<!--
+  Accordion Plugin
+
+  Allows sections of content under h2 headings to be collapsible.
+-->
+
+<script type="module">
+  // whether to always start expanded ('false'), always start collapsed
+  // ('true'), or start collapsed when screen small ('auto')
+  const startCollapsed = "auto";
+
+  // start script
+  function start() {
+    // run through each <h2> heading
+    const headings = document.querySelectorAll("h2");
+    for (const heading of headings) {
+      addArrow(heading);
+
+      // start expanded/collapsed based on option
+      if (
+        startCollapsed === "true" ||
+        (startCollapsed === "auto" && isSmallScreen())
+      )
+        collapseHeading(heading);
+      else expandElement(heading);
+    }
+
+    // attach hash change listener to window
+    window.addEventListener("hashchange", onHashChange);
+  }
+
+  // when hash (eg manuscript.html#introduction) changes
+  function onHashChange() {
+    const target = getHashTarget();
+    if (target) goToElement(target);
+  }
+
+  // add arrow to heading
+  function addArrow(heading) {
+    // add arrow button
+    const arrow = document.createElement("button");
+    arrow.innerHTML = document.querySelector(".icon_angle_down").innerHTML;
+    arrow.classList.add("icon_button", "accordion_arrow");
+    heading.insertBefore(arrow, heading.firstChild);
+
+    // attach click listener to heading and button
+    heading.addEventListener("click", onHeadingClick);
+    arrow.addEventListener("click", onArrowClick);
+  }
+
+  // determine if on mobile-like device with small screen
+  function isSmallScreen() {
+    return Math.min(window.innerWidth, window.innerHeight) < 480;
+  }
+
+  // when <h2> heading is clicked
+  function onHeadingClick(event) {
+    // only collapse if <h2> itself is target of click (eg, user did
+    // not click on anchor within <h2>)
+    if (event.target === this) toggleCollapse(this);
+  }
+
+  // when arrow button is clicked
+  function onArrowClick() {
+    toggleCollapse(this.parentNode);
+  }
+
+  // collapse section if expanded, expand if collapsed
+  function toggleCollapse(heading) {
+    if (heading.dataset.collapsed === "false") collapseHeading(heading);
+    else expandElement(heading);
+  }
+
+  // elements to exclude from collapse, such as table of contents panel,
+  // hypothesis panel, etc
+  const exclude = "#toc_panel, div.annotator-frame, #lightbox_overlay";
+
+  // collapse section
+  function collapseHeading(heading) {
+    heading.setAttribute("data-collapsed", "true");
+    const children = getChildren(heading);
+    for (const child of children) child.setAttribute("data-collapsed", "true");
+  }
+
+  // expand section
+  function expandElement(heading) {
+    heading.setAttribute("data-collapsed", "false");
+    const children = getChildren(heading);
+    for (const child of children) child.setAttribute("data-collapsed", "false");
+  }
+
+  // get list of elements between this <h2> and next <h2> or <h1>
+  // ("children" of the <h2> section)
+  function getChildren(heading) {
+    return nextUntil(heading, "h2, h1", exclude);
+  }
+
+  // start script when document is finished loading
+  window.addEventListener("load", start);
 </script>
 
 <!-- angle down icon -->
 
 <template class="icon_angle_down">
-    <!-- modified from: https://fontawesome.com/icons/angle-down -->
-    <svg width="16" height="16" viewBox="0 0 448 512">
-        <path
-            fill="currentColor"
-            d="M207.029 381.476L12.686 187.132c-9.373-9.373-9.373-24.569 0-33.941l22.667-22.667c9.357-9.357 24.522-9.375 33.901-.04L224 284.505l154.745-154.021c9.379-9.335 24.544-9.317 33.901.04l22.667 22.667c9.373 9.373 9.373 24.569 0 33.941L240.971 381.476c-9.373 9.372-24.569 9.372-33.942 0z"
-        ></path>
-    </svg>
+  <!-- modified from: https://fontawesome.com/icons/angle-down -->
+  <svg width="16" height="16" viewBox="0 0 448 512">
+    <path
+      fill="currentColor"
+      d="M207.029 381.476L12.686 187.132c-9.373-9.373-9.373-24.569 0-33.941l22.667-22.667c9.357-9.357 24.522-9.375 33.901-.04L224 284.505l154.745-154.021c9.379-9.335 24.544-9.317 33.901.04l22.667 22.667c9.373 9.373 9.373 24.569 0 33.941L240.971 381.476c-9.373 9.372-24.569 9.372-33.942 0z"
+    ></path>
+  </svg>
 </template>
+
+<style>
+  @media only screen {
+    /* accordion arrow button */
+    .accordion_arrow {
+      margin-right: 10px;
+    }
+
+    /* arrow icon when <h2> data-collapsed attribute true */
+    h2[data-collapsed="true"] > .accordion_arrow > svg {
+      transform: rotate(-90deg);
+    }
+
+    /* all elements (except <h2>'s) when data-collapsed attribute true */
+    *:not(h2)[data-collapsed="true"] {
+      display: none;
+    }
+
+    /* accordion arrow button when hovered and <h2>'s when hovered */
+    .accordion_arrow:hover,
+    h2[data-collapsed="true"]:hover,
+    h2[data-collapsed="false"]:hover {
+      cursor: pointer;
+    }
+  }
+
+  /* always hide accordion arrow button on print */
+  @media only print {
+    .accordion_arrow {
+      display: none;
+    }
+  }
+</style>
diff --git a/build/plugins/analytics.html b/build/plugins/analytics.html
index 0e641a1..cbab532 100644
--- a/build/plugins/analytics.html
+++ b/build/plugins/analytics.html
@@ -1,3 +1,5 @@
-<!-- analytics plugin -->
-
-<!-- copy and paste code from Google Analytics or similar service here -->
+<!--
+  Analytics Plugin (third-party) 
+  
+  Copy and paste code from Google Analytics or similar service here.
+-->
diff --git a/build/plugins/anchors.html b/build/plugins/anchors.html
index 4f2e6ba..68f1225 100644
--- a/build/plugins/anchors.html
+++ b/build/plugins/anchors.html
@@ -1,144 +1,127 @@
-<!-- anchors plugin -->
-
-<script>
-    (function() {
-        // /////////////////////////
-        // DESCRIPTION
-        // /////////////////////////
-
-        // This Manubot plugin adds an anchor next to each of a certain type
-        // of element that provides a human-readable url to that specific
-        // item/position in the document (eg "manuscript.html#abstract"). It
-        // also makes it such that scrolling out of view of a target removes
-        // its identifier from the url.
-
-        // /////////////////////////
-        // OPTIONS
-        // /////////////////////////
-
-        // plugin name prefix for url parameters
-        const pluginName = 'anchors';
-
-        // default plugin options
-        const options = {
-            // which types of elements to add anchors next to, in
-            // "document.querySelector" format
-            typesQuery: 'h1, h2, h3, [id^="fig:"], [id^="tbl:"], [id^="eq:"]',
-            // whether plugin is on or not
-            enabled: 'true'
-        };
-
-        // change options above, or override with url parameter, eg:
-        // 'manuscript.html?pluginName-enabled=false'
-
-        // /////////////////////////
-        // SCRIPT
-        // /////////////////////////
-
-        // start script
-        function start() {
-            // add anchor to each element of specified types
-            const elements = document.querySelectorAll(options.typesQuery);
-            for (const element of elements)
-                addAnchor(element);
-
-            // attach scroll listener to window
-            window.addEventListener('scroll', onScroll);
-        }
-
-        // when window is scrolled
-        function onScroll() {
-            // if url has hash and user has scrolled out of view of hash
-            // target, remove hash from url
-            const tolerance = 100;
-            const target = getHashTarget();
-            if (target) {
-                if (
-                    target.getBoundingClientRect().top >
-                        window.innerHeight + tolerance ||
-                    target.getBoundingClientRect().bottom < 0 - tolerance
-                )
-                    history.pushState(null, null, ' ');
-            }
-        }
-
-        // add anchor to element
-        function addAnchor(element) {
-            let addTo; // element to add anchor button to
-
-            // if figure or table, modify withId and addTo to get expected
-            // elements
-            if (element.id.indexOf('fig:') === 0) {
-                addTo = element.querySelector('figcaption');
-            } else if (element.id.indexOf('tbl:') === 0) {
-                addTo = element.querySelector('caption');
-            } else if (element.id.indexOf('eq:') === 0) {
-                addTo = element.querySelector('.eqnos-number');
-            }
-
-            addTo = addTo || element;
-            const id = element.id || null;
-
-            // do not add anchor if element doesn't have assigned id.
-            // id is generated by pandoc and is assumed to be unique and
-            // human-readable
-            if (!id)
-                return;
-
-            // create anchor button
-            const anchor = document.createElement('a');
-            anchor.innerHTML = document.querySelector('.icon_link').innerHTML;
-            anchor.title = 'Link to this part of the document';
-            anchor.classList.add('icon_button', 'anchor');
-            anchor.dataset.ignore = 'true';
-            anchor.href = '#' + id;
-            addTo.appendChild(anchor);
-        }
-
-        // get element that is target of link or url hash
-        function getHashTarget() {
-            const hash = window.location.hash;
-            const id = hash.slice(1);
-            let target = document.querySelector('[id="' + id + '"]');
-            if (!target)
-                return;
-
-            // if figure or table, modify target to get expected element
-            if (id.indexOf('fig:') === 0)
-                target = target.querySelector('figure');
-            if (id.indexOf('tbl:') === 0)
-                target = target.querySelector('table');
-
-            return target;
-        }
-
-        // load options from url parameters
-        function loadOptions() {
-            const url = window.location.search;
-            const params = new URLSearchParams(url);
-            for (const optionName of Object.keys(options)) {
-                const paramName = pluginName + '-' + optionName;
-                const param = params.get(paramName);
-                if (param !== '' && param !== null)
-                    options[optionName] = param;
-            }
-        }
-        loadOptions();
-
-        // start script when document is finished loading
-        if (options.enabled === 'true')
-            window.addEventListener('load', start);
-    })();
+<!--
+  Anchors Plugin
+
+  Adds an anchor next to each of a certain type of element that provides a
+  human-readable url to that specific item/position in the document (e.g.
+  "manuscript.html#abstract"). It also makes it such that scrolling out of view
+  of a target removes its identifier from the url.
+-->
+
+<script type="module">
+  // which types of elements to add anchors next to, in "document.querySelector"
+  // format
+  const typesQuery = 'h1, h2, h3, [id^="fig:"], [id^="tbl:"], [id^="eq:"]';
+
+  // start script
+  function start() {
+    // add anchor to each element of specified types
+    const elements = document.querySelectorAll(typesQuery);
+    for (const element of elements) addAnchor(element);
+
+    // attach scroll listener to window
+    window.addEventListener("scroll", onScroll);
+  }
+
+  // when window is scrolled
+  function onScroll() {
+    // if url has hash and user has scrolled out of view of hash
+    // target, remove hash from url
+    const tolerance = 100;
+    const target = getHashTarget();
+    if (target) {
+      if (
+        target.getBoundingClientRect().top > window.innerHeight + tolerance ||
+        target.getBoundingClientRect().bottom < 0 - tolerance
+      )
+        history.pushState(null, null, " ");
+    }
+  }
+
+  // add anchor to element
+  function addAnchor(element) {
+    let addTo; // element to add anchor button to
+
+    // if figure or table, modify withId and addTo to get expected
+    // elements
+    if (element.id.indexOf("fig:") === 0) {
+      addTo = element.querySelector("figcaption");
+    } else if (element.id.indexOf("tbl:") === 0) {
+      addTo = element.querySelector("caption");
+    } else if (element.id.indexOf("eq:") === 0) {
+      addTo = element.querySelector(".eqnos-number");
+    }
+
+    addTo = addTo || element;
+    const id = element.id || null;
+
+    // do not add anchor if element doesn't have assigned id.
+    // id is generated by pandoc and is assumed to be unique and
+    // human-readable
+    if (!id) return;
+
+    // create anchor button
+    const anchor = document.createElement("a");
+    anchor.innerHTML = document.querySelector(".icon_link").innerHTML;
+    anchor.title = "Link to this part of the document";
+    anchor.classList.add("icon_button", "anchor");
+    anchor.dataset.ignore = "true";
+    anchor.href = "#" + id;
+    addTo.appendChild(anchor);
+  }
+
+  // start script when document is finished loading
+  window.addEventListener("load", start);
 </script>
 
 <!-- link icon -->
 
 <template class="icon_link">
-    <!-- modified from: https://fontawesome.com/icons/link -->
-    <svg width="16" height="16" viewBox="0 0 512 512">
-        <path
-            fill="currentColor"
-            d="M326.612 185.391c59.747 59.809 58.927 155.698.36 214.59-.11.12-.24.25-.36.37l-67.2 67.2c-59.27 59.27-155.699 59.262-214.96 0-59.27-59.26-59.27-155.7 0-214.96l37.106-37.106c9.84-9.84 26.786-3.3 27.294 10.606.648 17.722 3.826 35.527 9.69 52.721 1.986 5.822.567 12.262-3.783 16.612l-13.087 13.087c-28.026 28.026-28.905 73.66-1.155 101.96 28.024 28.579 74.086 28.749 102.325.51l67.2-67.19c28.191-28.191 28.073-73.757 0-101.83-3.701-3.694-7.429-6.564-10.341-8.569a16.037 16.037 0 0 1-6.947-12.606c-.396-10.567 3.348-21.456 11.698-29.806l21.054-21.055c5.521-5.521 14.182-6.199 20.584-1.731a152.482 152.482 0 0 1 20.522 17.197zM467.547 44.449c-59.261-59.262-155.69-59.27-214.96 0l-67.2 67.2c-.12.12-.25.25-.36.37-58.566 58.892-59.387 154.781.36 214.59a152.454 152.454 0 0 0 20.521 17.196c6.402 4.468 15.064 3.789 20.584-1.731l21.054-21.055c8.35-8.35 12.094-19.239 11.698-29.806a16.037 16.037 0 0 0-6.947-12.606c-2.912-2.005-6.64-4.875-10.341-8.569-28.073-28.073-28.191-73.639 0-101.83l67.2-67.19c28.239-28.239 74.3-28.069 102.325.51 27.75 28.3 26.872 73.934-1.155 101.96l-13.087 13.087c-4.35 4.35-5.769 10.79-3.783 16.612 5.864 17.194 9.042 34.999 9.69 52.721.509 13.906 17.454 20.446 27.294 10.606l37.106-37.106c59.271-59.259 59.271-155.699.001-214.959z"
-        ></path>
-    </svg>
+  <!-- modified from: https://fontawesome.com/icons/link -->
+  <svg width="16" height="16" viewBox="0 0 512 512">
+    <path
+      fill="currentColor"
+      d="M326.612 185.391c59.747 59.809 58.927 155.698.36 214.59-.11.12-.24.25-.36.37l-67.2 67.2c-59.27 59.27-155.699 59.262-214.96 0-59.27-59.26-59.27-155.7 0-214.96l37.106-37.106c9.84-9.84 26.786-3.3 27.294 10.606.648 17.722 3.826 35.527 9.69 52.721 1.986 5.822.567 12.262-3.783 16.612l-13.087 13.087c-28.026 28.026-28.905 73.66-1.155 101.96 28.024 28.579 74.086 28.749 102.325.51l67.2-67.19c28.191-28.191 28.073-73.757 0-101.83-3.701-3.694-7.429-6.564-10.341-8.569a16.037 16.037 0 0 1-6.947-12.606c-.396-10.567 3.348-21.456 11.698-29.806l21.054-21.055c5.521-5.521 14.182-6.199 20.584-1.731a152.482 152.482 0 0 1 20.522 17.197zM467.547 44.449c-59.261-59.262-155.69-59.27-214.96 0l-67.2 67.2c-.12.12-.25.25-.36.37-58.566 58.892-59.387 154.781.36 214.59a152.454 152.454 0 0 0 20.521 17.196c6.402 4.468 15.064 3.789 20.584-1.731l21.054-21.055c8.35-8.35 12.094-19.239 11.698-29.806a16.037 16.037 0 0 0-6.947-12.606c-2.912-2.005-6.64-4.875-10.341-8.569-28.073-28.073-28.191-73.639 0-101.83l67.2-67.19c28.239-28.239 74.3-28.069 102.325.51 27.75 28.3 26.872 73.934-1.155 101.96l-13.087 13.087c-4.35 4.35-5.769 10.79-3.783 16.612 5.864 17.194 9.042 34.999 9.69 52.721.509 13.906 17.454 20.446 27.294 10.606l37.106-37.106c59.271-59.259 59.271-155.699.001-214.959z"
+    ></path>
+  </svg>
 </template>
+
+<style>
+  @media only screen {
+    /* anchor button */
+    .anchor {
+      opacity: 0;
+      margin-left: 5px;
+    }
+
+    /* anchor buttons within <h2>'s */
+    h2 .anchor {
+      margin-left: 10px;
+    }
+
+    /* anchor buttons when hovered/focused and anything containing an anchor button when hovered */
+    *:hover > .anchor,
+    .anchor:hover,
+    .anchor:focus {
+      opacity: 1;
+    }
+
+    /* anchor button when hovered */
+    .anchor:hover {
+      cursor: pointer;
+    }
+  }
+
+  /* always show anchor button on devices with no mouse/hover ability */
+  @media (hover: none) {
+    .anchor {
+      opacity: 1;
+    }
+  }
+
+  /* always hide anchor button on print */
+  @media only print {
+    .anchor {
+      display: none;
+    }
+  }
+</style>
diff --git a/build/plugins/attributes.html b/build/plugins/attributes.html
index b968198..7009782 100644
--- a/build/plugins/attributes.html
+++ b/build/plugins/attributes.html
@@ -1,130 +1,84 @@
-<!-- attributes plugin -->
-
-<script>
-    (function() {
-        // /////////////////////////
-        // DESCRIPTION
-        // /////////////////////////
-
-        // This Manubot plugin allows arbitrary HTML attributes to be attached
-        // to (almost) any element. Place an HTML comment inside or next to the
-        // desired element in the format <!-- $attribute="value" -->
-
-        // /////////////////////////
-        // OPTIONS
-        // /////////////////////////
-
-        // plugin name prefix for url parameters
-        const pluginName = 'attributes';
-
-        // default plugin options
-        const options = {
-            // whether plugin is on or not
-            enabled: 'true'
-        };
-
-        // change options above, or override with url parameter, eg:
-        // 'manuscript.html?pluginName-enabled=false'
-
-        // /////////////////////////
-        // SCRIPT
-        // /////////////////////////
-
-        // start script
-        function start() {
-            // get list of comments in document
-            const comments = findComments();
-
-            for(const comment of comments)
-                if (comment.parentElement)
-                    addAttributes(
-                        comment.parentElement,
-                        comment.nodeValue.trim()
-                    );
-        }
-
-        // add html attributes to specified element based on string of 
-        // html attributes and values
-        function addAttributes(element, text) {
-            // regex's for finding attribute/value pairs in the format of
-            // attribute="value" or attribute='value
-            const regex2 = /\$([a-zA-Z\-]+)?=\"(.+?)\"/;
-            const regex1 = /\$([a-zA-Z\-]+)?=\'(.+?)\'/;
-
-            // loop through attribute/value pairs
-            let match;
-            while(match = text.match(regex2) || text.match(regex1)) {
-                // get attribute and value from regex capture groups
-                let attribute = match[1];
-                let value = match[2];
-
-                // remove from string
-                text = text.substring(match.index + match[0].length);
-
-                if (!attribute || !value)
-                    break;
-
-                // set attribute of parent element
-                try {
-                    element.setAttribute(attribute, value);
-                } catch(error) {
-                    console.log(error);
-                }
-
-                // special case for colspan
-                if (attribute === 'colspan')
-                    removeTableCells(element, value);
-            }
-        }
-
-        // get list of comment elements in document
-        function findComments() {
-            const comments = [];
-
-            // iterate over comment nodes in document
-            function acceptNode(node) {
-                return NodeFilter.FILTER_ACCEPT;
-            }
-            const iterator = document.createNodeIterator(
-                document.body,
-                NodeFilter.SHOW_COMMENT,
-                acceptNode
-            );
-            let node;
-            while(node = iterator.nextNode())
-                comments.push(node);
-
-            return comments;
-        }
-
-        // remove certain number of cells after specified cell
-        function removeTableCells(cell, number) {
-            number = parseInt(number);
-            if (!number)
-                return;
-
-            // remove elements
-            for(; number > 1; number--) {
-                if (cell.nextElementSibling)
-                    cell.nextElementSibling.remove();
-            }
-        }
-
-        // load options from url parameters
-        function loadOptions() {
-            const url = window.location.search;
-            const params = new URLSearchParams(url);
-            for (const optionName of Object.keys(options)) {
-                const paramName = pluginName + '-' + optionName;
-                const param = params.get(paramName);
-                if (param !== '' && param !== null)
-                    options[optionName] = param;
-            }
-        }
-        loadOptions();
-
-        // start script when document is finished loading
-        if (options.enabled === 'true')
-            window.addEventListener('load', start);
-    })();
+<!-- 
+    Attributes Plugin
+
+    Allows arbitrary HTML attributes to be attached to (almost) any element.
+    Place an HTML comment inside or next to the desired element with the content:
+    $attribute="value"
+-->
+
+<script type="module">
+  // start script
+  function start() {
+    // get list of comments in document
+    const comments = findComments();
+
+    for (const comment of comments)
+      if (comment.parentElement)
+        addAttributes(comment.parentElement, comment.nodeValue.trim());
+  }
+
+  // add html attributes to specified element based on string of
+  // html attributes and values
+  function addAttributes(element, text) {
+    // regex's for finding attribute/value pairs in the format of
+    // attribute="value" or attribute='value
+    const regex2 = /\$([a-zA-Z\-]+)?=\"(.+?)\"/;
+    const regex1 = /\$([a-zA-Z\-]+)?=\'(.+?)\'/;
+
+    // loop through attribute/value pairs
+    let match;
+    while ((match = text.match(regex2) || text.match(regex1))) {
+      // get attribute and value from regex capture groups
+      let attribute = match[1];
+      let value = match[2];
+
+      // remove from string
+      text = text.substring(match.index + match[0].length);
+
+      if (!attribute || !value) break;
+
+      // set attribute of parent element
+      try {
+        element.setAttribute(attribute, value);
+      } catch (error) {
+        console.log(error);
+      }
+
+      // special case for colspan
+      if (attribute === "colspan") removeTableCells(element, value);
+    }
+  }
+
+  // get list of comment elements in document
+  function findComments() {
+    const comments = [];
+
+    // iterate over comment nodes in document
+    function acceptNode(node) {
+      return NodeFilter.FILTER_ACCEPT;
+    }
+    const iterator = document.createNodeIterator(
+      document.body,
+      NodeFilter.SHOW_COMMENT,
+      acceptNode
+    );
+    let node;
+    while ((node = iterator.nextNode())) comments.push(node);
+
+    return comments;
+  }
+
+  // remove certain number of cells after specified cell
+  function removeTableCells(cell, number) {
+    number = parseInt(number);
+    if (!number) return;
+
+    // remove elements
+    for (; number > 1; number--) {
+      if (cell.nextElementSibling) cell.nextElementSibling.remove();
+    }
+  }
+
+  // start script when document is finished loading
+  window.addEventListener("load", start);
 </script>
diff --git a/build/plugins/core.html b/build/plugins/core.html
new file mode 100644
index 0000000..4c680a4
--- /dev/null
+++ b/build/plugins/core.html
@@ -0,0 +1,129 @@
+<!-- 
+    Plugin Core
+
+    Functions needed for and shared across all first-party plugins.
+-->
+
+<script>
+  // get element that is target of hash (from link element or url)
+  function getHashTarget(link) {
+    const hash = link ? link.hash : window.location.hash;
+    const id = hash.slice(1);
+    let target = document.querySelector(`[id="${id}"]`);
+    if (!target) return;
+
+    // if figure or table, modify target to get expected element
+    if (id.indexOf("fig:") === 0) target = target.querySelector("figure");
+    if (id.indexOf("tbl:") === 0) target = target.querySelector("table");
+
+    return target;
+  }
+
+  // get position/dimensions of element or viewport
+  function getRectInView(element) {
+    let rect = {};
+    rect.left = 0;
+    rect.top = 0;
+    rect.right = document.documentElement.clientWidth;
+    rect.bottom = document.documentElement.clientHeight;
+    let style = {};
+
+    if (element instanceof HTMLElement) {
+      rect = element.getBoundingClientRect();
+      style = window.getComputedStyle(element);
+    }
+
+    const margin = {};
+    margin.left = parseFloat(style.marginLeftWidth) || 0;
+    margin.top = parseFloat(style.marginTopWidth) || 0;
+    margin.right = parseFloat(style.marginRightWidth) || 0;
+    margin.bottom = parseFloat(style.marginBottomWidth) || 0;
+
+    const border = {};
+    border.left = parseFloat(style.borderLeftWidth) || 0;
+    border.top = parseFloat(style.borderTopWidth) || 0;
+    border.right = parseFloat(style.borderRightWidth) || 0;
+    border.bottom = parseFloat(style.borderBottomWidth) || 0;
+
+    const newRect = {};
+    newRect.left = rect.left + margin.left + border.left;
+    newRect.top = rect.top + margin.top + border.top;
+    newRect.right = rect.right + margin.right + border.right;
+    newRect.bottom = rect.bottom + margin.bottom + border.bottom;
+    newRect.width = newRect.right - newRect.left;
+    newRect.height = newRect.bottom - newRect.top;
+
+    return newRect;
+  }
+
+  // get position of element relative to page
+  function getRectInPage(element) {
+    const rect = getRectInView(element);
+    const body = getRectInView(document.body);
+
+    const newRect = {};
+    newRect.left = rect.left - body.left;
+    newRect.top = rect.top - body.top;
+    newRect.right = rect.right - body.left;
+    newRect.bottom = rect.bottom - body.top;
+    newRect.width = rect.width;
+    newRect.height = rect.height;
+
+    return newRect;
+  }
+
+  // get closest element before specified element that matches query
+  function firstBefore(element, query) {
+    while (element && element !== document.body && !element.matches(query))
+      element = element.previousElementSibling || element.parentNode;
+
+    return element;
+  }
+
+  // check if element is part of collapsed heading
+  function isCollapsed(element) {
+    while (element && element !== document.body) {
+      if (element.dataset.collapsed === "true") return true;
+      element = element.parentNode;
+    }
+    return false;
+  }
+
+  // expand any collapsed parent containers of element if necessary
+  function expandElement(element) {
+    if (isCollapsed(element)) {
+      // accordion plugin
+      const heading = firstBefore(element, "h2");
+      if (heading) heading.click();
+      // details/summary HTML element
+      const summary = firstBefore(element, "summary");
+      if (summary) summary.click();
+    }
+  }
+
+  // scroll to and focus element
+  function goToElement(element, offset) {
+    // expand accordion section if collapsed
+    expandElement(element);
+    const y =
+      getRectInView(element).top -
+      getRectInView(document.documentElement).top -
+      (offset || 0);
+
+    // trigger any function listening for "onscroll" event
+    window.dispatchEvent(new Event("scroll"));
+    window.scrollTo(0, y);
+    document.activeElement.blur();
+    element.focus();
+  }
+
+  // get list of elements after a start element up to element matching query
+  function nextUntil(element, query, exclude) {
+    const elements = [];
+    while (((element = element.nextElementSibling), element)) {
+      if (element.matches(query)) break;
+      if (!element.matches(exclude)) elements.push(element);
+    }
+    return elements;
+  }
+</script>
diff --git a/build/plugins/d3.html b/build/plugins/d3.html
index 48c16d8..d04226e 100644
--- a/build/plugins/d3.html
+++ b/build/plugins/d3.html
@@ -1,16 +1,12 @@
-<!-- d3 plugin -->
+<!--
+  D3 Plugin (third-party) 
+  
+  Allows you to create complex, dynamic,interactive, data-driven visualizations
+  in SVG. See https://d3js.org/.
+-->
 
 <script
-    src="https://cdnjs.cloudflare.com/ajax/libs/d3/6.2.0/d3.min.js"
-    integrity="sha512-C2RveGuPIWqkaLAluvoxyiaN1XYNe5ss11urhZWZYBUA9Ydgj+hfGKPcxCzTwut1/fmjEZR7Ac35f2aycT8Ogw=="
-    crossorigin="anonymous"
->
-    // /////////////////////////
-    // DESCRIPTION
-    // /////////////////////////
-
-    // This third-party plugin 'D3' allows you to create complex, dynamic,
-    // interactive, data-driven visualizations in SVG.
-
-    // https://d3js.org/
-</script>
+  src="https://cdnjs.cloudflare.com/ajax/libs/d3/6.2.0/d3.min.js"
+  integrity="sha512-C2RveGuPIWqkaLAluvoxyiaN1XYNe5ss11urhZWZYBUA9Ydgj+hfGKPcxCzTwut1/fmjEZR7Ac35f2aycT8Ogw=="
+  crossorigin="anonymous"
+></script>
diff --git a/build/plugins/hypothesis.html b/build/plugins/hypothesis.html
index 7bd1691..1986d36 100644
--- a/build/plugins/hypothesis.html
+++ b/build/plugins/hypothesis.html
@@ -1,104 +1,166 @@
-<!-- annotations plugin -->
+<!-- 
+  Annotations Plugin
+
+  Allows public annotation of the  manuscript. See https://web.hypothes.is/.
+-->
 
 <script>
-    // /////////////////////////
-    // DESCRIPTION
-    // /////////////////////////
-
-    // This third-party plugin 'Hypothesis' allows public annotation of the
-    // manuscript.
-
-    // https://web.hypothes.is/
-
-    // plugin configuration
-    window.hypothesisConfig = function() {
-        return {
-            branding: {
-                accentColor: '#2196f3',
-                appBackgroundColor: '#f8f8f8',
-                ctaBackgroundColor: '#f8f8f8',
-                ctaTextColor: '#000000',
-                selectionFontFamily: 'Open Sans, Helvetica, sans serif',
-                annotationFontFamily: 'Open Sans, Helvetica, sans serif'
-            }
-        };
+  // configuration
+  window.hypothesisConfig = function () {
+    return {
+      branding: {
+        accentColor: "#2196f3",
+        appBackgroundColor: "#f8f8f8",
+        ctaBackgroundColor: "#f8f8f8",
+        ctaTextColor: "#000000",
+        selectionFontFamily: "Open Sans, Helvetica, sans serif",
+        annotationFontFamily: "Open Sans, Helvetica, sans serif",
+      },
     };
+  };
 
-    // hypothesis client script
-    const embed = 'https://hypothes.is/embed.js';
-    // hypothesis annotation count query url
-    const query = 'https://api.hypothes.is/api/search?limit=0&url='
-
-    
-    // start script
-    function start() {
-        const button = makeButton();
-        document.body.insertBefore(button, document.body.firstChild);
-        insertCount(button);
-    }
-
-    // make button
-    function makeButton() {
-        // create button
-        const button = document.createElement('button');
-        button.id = 'hypothesis_button';
-        button.innerHTML = document.querySelector('.icon_hypothesis').innerHTML;
-        button.title = 'Hypothesis annotations';
-        button.classList.add('icon_button');
+  // hypothesis client script
+  const embed = "https://hypothes.is/embed.js";
+  // hypothesis annotation count query url
+  const query = "https://api.hypothes.is/api/search?limit=0&url=";
 
-        function onClick(event) {
-            onButtonClick(event, button);
-        }
+  // start script
+  function start() {
+    const button = makeButton();
+    document.body.insertBefore(button, document.body.firstChild);
+    insertCount(button);
+  }
 
-        // attach click listeners
-        button.addEventListener('click', onClick);
+  // make button
+  function makeButton() {
+    // create button
+    const button = document.createElement("button");
+    button.id = "hypothesis_button";
+    button.innerHTML = document.querySelector(".icon_hypothesis").innerHTML;
+    button.title = "Hypothesis annotations";
+    button.classList.add("icon_button");
 
-        return button;
+    function onClick(event) {
+      onButtonClick(event, button);
     }
 
-    // insert annotations count
-    async function insertCount(button) {
-        // get annotation count from Hypothesis based on url
-        let count = '-';
-        try {
-            const canonical = document.querySelector('link[rel="canonical"]');
-            const location = window.location;
-            const url = encodeURIComponent((canonical || location).href);
-            const response = await fetch(query + url);
-            const json = await response.json();
-            count = json.total || '-';
-        } catch(error) {
-            console.log(error);
-        }
-        
-        // put count into button
-        const counter = document.createElement('span');
-        counter.id = 'hypothesis_count';
-        counter.innerHTML = count;
-        button.title = 'View ' + count + ' Hypothesis annotations';
-        button.append(counter);
-    }
+    // attach click listeners
+    button.addEventListener("click", onClick);
+
+    return button;
+  }
 
-    // when button is clicked
-    function onButtonClick(event, button) {
-        const script = document.createElement('script');
-        script.src = embed;
-        document.body.append(script);
-        button.remove();
+  // insert annotations count
+  async function insertCount(button) {
+    // get annotation count from Hypothesis based on url
+    let count = "-";
+    try {
+      const canonical = document.querySelector('link[rel="canonical"]');
+      const location = window.location;
+      const url = encodeURIComponent((canonical || location).href);
+      const response = await fetch(query + url);
+      const json = await response.json();
+      count = json.total || "-";
+    } catch (error) {
+      console.log(error);
     }
 
-    window.addEventListener('load', start);
+    // put count into button
+    const counter = document.createElement("span");
+    counter.id = "hypothesis_count";
+    counter.innerHTML = count;
+    button.title = "View " + count + " Hypothesis annotations";
+    button.append(counter);
+  }
+
+  // when button is clicked
+  function onButtonClick(event, button) {
+    const script = document.createElement("script");
+    script.src = embed;
+    document.body.append(script);
+    button.remove();
+  }
+
+  // start script when document is finished loading
+  window.addEventListener("load", start);
 </script>
 
 <!-- hypothesis icon -->
 
 <template class="icon_hypothesis">
-    <!-- modified from: https://simpleicons.org/icons/hypothesis.svg / https://git.io/Jf1VB -->
-    <svg width="16" height="16" viewBox="0 0 24 24" tabindex="-1">
-        <path
-            fill="currentColor"
-            d="M3.43 0C2.5 0 1.72 .768 1.72 1.72V18.86C1.72 19.8 2.5 20.57 3.43 20.57H9.38L12 24L14.62 20.57H20.57C21.5 20.57 22.29 19.8 22.29 18.86V1.72C22.29 .77 21.5 0 20.57 0H3.43M5.14 3.43H7.72V9.43S8.58 7.72 10.28 7.72C12 7.72 13.74 8.57 13.74 11.24V17.14H11.16V12C11.16 10.61 10.28 10.07 9.43 10.29C8.57 10.5 7.72 11.41 7.72 13.29V17.14H5.14V3.43M18 13.72C18.95 13.72 19.72 14.5 19.72 15.42A1.71 1.71 0 0 1 18 17.13A1.71 1.71 0 0 1 16.29 15.42C16.29 14.5 17.05 13.71 18 13.71Z"
-            tabindex="-1"
-        ></path>
-    </svg>
+  <!-- modified from: https://simpleicons.org/icons/hypothesis.svg / https://git.io/Jf1VB -->
+  <svg width="16" height="16" viewBox="0 0 24 24" tabindex="-1">
+    <path
+      fill="currentColor"
+      d="M3.43 0C2.5 0 1.72 .768 1.72 1.72V18.86C1.72 19.8 2.5 20.57 3.43 20.57H9.38L12 24L14.62 20.57H20.57C21.5 20.57 22.29 19.8 22.29 18.86V1.72C22.29 .77 21.5 0 20.57 0H3.43M5.14 3.43H7.72V9.43S8.58 7.72 10.28 7.72C12 7.72 13.74 8.57 13.74 11.24V17.14H11.16V12C11.16 10.61 10.28 10.07 9.43 10.29C8.57 10.5 7.72 11.41 7.72 13.29V17.14H5.14V3.43M18 13.72C18.95 13.72 19.72 14.5 19.72 15.42A1.71 1.71 0 0 1 18 17.13A1.71 1.71 0 0 1 16.29 15.42C16.29 14.5 17.05 13.71 18 13.71Z"
+      tabindex="-1"
+    ></path>
+  </svg>
 </template>
+
+<style>
+  /* hypothesis activation button */
+  #hypothesis_button {
+    box-sizing: border-box;
+    position: fixed;
+    top: 0;
+    right: 0;
+    width: 60px;
+    height: 60px;
+    background: #ffffff;
+    border-radius: 0;
+    border-left: solid 1px #bdbdbd;
+    border-bottom: solid 1px #bdbdbd;
+    box-shadow: 0 0 20px rgba(0, 0, 0, 0.05);
+    z-index: 2;
+  }
+
+  /* hypothesis button svg */
+  #hypothesis_button > svg {
+    position: relative;
+    top: -4px;
+  }
+
+  /* hypothesis annotation count */
+  #hypothesis_count {
+    position: absolute;
+    left: 0;
+    right: 0;
+    bottom: 5px;
+  }
+
+  /* side panel */
+  .annotator-frame {
+    width: 280px !important;
+  }
+
+  /* match highlight color to rest of theme */
+  .annotator-highlights-always-on .annotator-hl {
+    background-color: #ffeb3b !important;
+  }
+
+  /* match focused color to rest of theme */
+  .annotator-hl.annotator-hl-focused {
+    background-color: #ff8a65 !important;
+  }
+
+  /* match bucket bar color to rest of theme */
+  .annotator-bucket-bar {
+    background: #f5f5f5 !important;
+  }
+
+  /* always hide button, toolbar, and tooltip on print */
+  @media only print {
+    #hypothesis_button {
+      display: none;
+    }
+
+    .annotator-frame {
+      display: none !important;
+    }
+
+    hypothesis-adder {
+      display: none !important;
+    }
+  }
+</style>
diff --git a/build/plugins/inline-svg.html b/build/plugins/inline-svg.html
index be40242..619a3a1 100644
--- a/build/plugins/inline-svg.html
+++ b/build/plugins/inline-svg.html
@@ -1,62 +1,53 @@
-<!-- inline svg plugin -->
-
-<script>
-  (function() {
-      // /////////////////////////
-      // DESCRIPTION
-      // /////////////////////////
-
-      // This Manubot plugin fetches the text source code of SVGs in <img> tags,
-      // and inserts it into the document in-place. This provides many
-      // advantages, such as being able to style SVGs globally from the CSS
-      // themes, and being able to make SVGs interactive with JavaScript and D3.
-      // If you have a script that expects SVGs to be inlined, wait for an
-      // "SVGLoaded" event before running it.
-
-      // Note: This requires the page to be served from a server to work
-      // See: https://stackoverflow.com/a/11063963/2180570
-      // Tip: Use the manubot commands to open the page in a local webserver
-      // See: https://github.com/manubot/rootstock#local-execution
-
-      // /////////////////////////
-      // SCRIPT
-      // /////////////////////////
-
-      // start script
-      async function start() {
-          // get all <img> tags that have "src" attributes that end with ".svg"
-          const imgs = document.querySelectorAll('img[src$=".svg"]');
-          const inlineSvgs = Array.from(imgs).map(inlineSvg);
-          await Promise.all(inlineSvgs);
-
-          // dispatch "inline finished" event
-          document.dispatchEvent(new Event('SVGLoaded'));
-      }
-
-      // take an svg <img> tag, fetch its source code, and replace it 
-      async function inlineSvg(img) {
-          try {
-              // fetch svg source code
-              const response = await fetch(img.src);
-              if (!response.ok) throw new Error('Couldn\'t get SVG source');
-              const source = await response.text();
-              if (!source.trim()) throw new Error('No SVG source');
-              // parse specifically as svg, create new (hidden) dom node
-              const svg = new DOMParser()
-                  .parseFromString(source, 'image/svg+xml')
-                  .querySelector('svg');
-              if (!svg) throw new Error('Couldn\'t parse SVG');
-              // transfer original img attributes into new svg
-              for (const { name, value } of img.attributes)
-                  svg.setAttribute(name, value);
-              // replace original image with new svg
-              img.outerHTML = svg.outerHTML;
-          } catch (error) {
-              console.log(error);
-          }
-      }
-
-      // start script when document is finished loading
-      window.addEventListener('load', start);
-  })();
+<!--
+  Inline Svg Plugin
+
+  Fetches the text source code of SVGs in <img> tags, and inserts it into the
+  document in-place. This provides many advantages, such as being able to style
+  SVGs globally from the CSS themes, and being able to make SVGs interactive
+  with JavaScript and D3. If you have a script that expects SVGs to be inlined,
+  wait for an "SVGLoaded" event before running it.
+
+  Note: This requires the page to be served from a server to work
+  See: https://stackoverflow.com/a/11063963/2180570
+  Tip: Use the manubot commands to open the page in a local webserver
+  See: https://github.com/manubot/rootstock#local-execution
+-->
+
+<script type="module">
+  // start script
+  async function start() {
+    // get all <img> tags that have "src" attributes that end with ".svg"
+    const imgs = document.querySelectorAll('img[src$=".svg"]');
+    const inlineSvgs = Array.from(imgs).map(inlineSvg);
+    await Promise.all(inlineSvgs);
+
+    // dispatch "inline finished" event
+    document.dispatchEvent(new Event("SVGLoaded"));
+  }
+
+  // take an svg <img> tag, fetch its source code, and replace it
+  async function inlineSvg(img) {
+    try {
+      // fetch svg source code
+      const response = await fetch(img.src);
+      if (!response.ok) throw new Error("Couldn't get SVG source");
+      const source = await response.text();
+      if (!source.trim()) throw new Error("No SVG source");
+      // parse specifically as svg, create new (hidden) dom node
+      const svg = new DOMParser()
+        .parseFromString(source, "image/svg+xml")
+        .querySelector("svg");
+      if (!svg) throw new Error("Couldn't parse SVG");
+      // transfer original img attributes into new svg
+      for (const { name, value } of img.attributes)
+        svg.setAttribute(name, value);
+      // replace original image with new svg
+      img.outerHTML = svg.outerHTML;
+    } catch (error) {
+      console.log(error);
+    }
+  }
+
+  // start script when document is finished loading
+  window.addEventListener("load", start);
 </script>
diff --git a/build/plugins/jump-to-first.html b/build/plugins/jump-to-first.html
index e8a8088..d205093 100644
--- a/build/plugins/jump-to-first.html
+++ b/build/plugins/jump-to-first.html
@@ -1,272 +1,102 @@
-<!-- jump to first plugin -->
-
-<script>
-    (function() {
-        // /////////////////////////
-        // DESCRIPTION
-        // /////////////////////////
-
-        // This Manubot plugin adds a button next to each reference entry,
-        // figure, and table that jumps the page to the first occurrence of a
-        // link to that item in the manuscript.
-
-        // /////////////////////////
-        // OPTIONS
-        // /////////////////////////
-
-        // plugin name prefix for url parameters
-        const pluginName = 'jumpToFirst';
-
-        // default plugin options
-        const options = {
-            // whether to add buttons next to reference entries
-            references: 'true',
-            // whether to add buttons next to figures
-            figures: 'true',
-            // whether to add buttons next to tables
-            tables: 'true',
-            // whether plugin is on or not
-            enabled: 'true'
-        };
-
-        // change options above, or override with url parameter, eg:
-        // 'manuscript.html?pluginName-enabled=false'
-
-        // /////////////////////////
-        // SCRIPT
-        // /////////////////////////
-
-        // start script
-        function start() {
-            if (options.references !== 'false')
-                makeReferenceButtons();
-            if (options.figures !== 'false')
-                makeFigureButtons();
-            if (options.tables !== 'false')
-                makeTableButtons();
-        }
-
-        // when jump button clicked
-        function onButtonClick() {
-            const first = getFirstOccurrence(this.dataset.id);
-            if (!first)
-                return;
-
-            // update url hash so navigating "back" in history will return
-            // user to jump button
-            window.location.hash = this.dataset.id;
-            // scroll to link
-            window.setTimeout(function() {
-                goToElement(first, window.innerHeight * 0.5);
-            }, 0);
-        }
-
-        // get first occurence of link to item in document
-        function getFirstOccurrence(id) {
-            let query = 'a';
-            query += '[href="#' + id + '"]';
-            // exclude buttons, anchor links, toc links, etc
-            query +=
-                ':not(.button):not(.icon_button):not(.anchor):not(.toc_link)';
-            return document.querySelector(query);
-        }
-
-        // add button next to each reference entry
-        function makeReferenceButtons() {
-            const references = document.querySelectorAll('div[id^="ref-"]');
-            for (const reference of references) {
-                // get reference id and element to add button to
-                const id = reference.id;
-                const container = reference.firstElementChild;
-                const first = getFirstOccurrence(id);
-
-                // if can't find link to reference, ignore
-                if (!first)
-                    continue;
-
-                // make jump button
-                let button = document.createElement('button');
-                button.classList.add('icon_button', 'jump_arrow');
-                button.title =
-                    'Jump to the first occurence of this reference in the document';
-                button.innerHTML = document.querySelector(
-                    '.icon_angle_double_up'
-                ).innerHTML;
-                button.dataset.id = id;
-                button.dataset.ignore = 'true';
-                container.innerHTML = button.outerHTML + container.innerHTML;
-                button = container.firstElementChild;
-                button.addEventListener('click', onButtonClick);
-            }
-        }
-
-        // add button next to each figure
-        function makeFigureButtons() {
-            const figures = document.querySelectorAll('[id^="fig:"]');
-            for (const figure of figures) {
-                // get figure id and element to add button to
-                const id = figure.id;
-                const container = figure.querySelector('figcaption') || figure;
-                const first = getFirstOccurrence(id);
-
-                // if can't find link to figure, ignore
-                if (!first)
-                    continue;
-
-                // make jump button
-                const button = document.createElement('button');
-                button.classList.add('icon_button', 'jump_arrow');
-                button.title =
-                    'Jump to the first occurence of this figure in the document';
-                button.innerHTML = document.querySelector(
-                    '.icon_angle_double_up'
-                ).innerHTML;
-                button.dataset.id = id;
-                button.dataset.ignore = 'true';
-                container.insertBefore(button, container.firstElementChild);
-                button.addEventListener('click', onButtonClick);
-            }
-        }
-
-        // add button next to each figure
-        function makeTableButtons() {
-            const tables = document.querySelectorAll('[id^="tbl:"]');
-            for (const table of tables) {
-                // get ref id and element to add button to
-                const id = table.id;
-                const container = table.querySelector('caption') || table;
-                const first = getFirstOccurrence(id);
-
-                // if can't find link to table, ignore
-                if (!first)
-                    continue;
-
-                // make jump button
-                const button = document.createElement('button');
-                button.classList.add('icon_button', 'jump_arrow');
-                button.title =
-                    'Jump to the first occurence of this table in the document';
-                button.innerHTML = document.querySelector(
-                    '.icon_angle_double_up'
-                ).innerHTML;
-                button.dataset.id = id;
-                button.dataset.ignore = 'true';
-                container.insertBefore(button, container.firstElementChild);
-                button.addEventListener('click', onButtonClick);
-            }
-        }
-
-        // scroll to and focus element
-        function goToElement(element, offset) {
-            // expand accordion section if collapsed
-            expandElement(element);
-            const y =
-                getRectInView(element).top -
-                getRectInView(document.documentElement).top -
-                (offset || 0);
-            // trigger any function listening for "onscroll" event
-            window.dispatchEvent(new Event('scroll'));
-            window.scrollTo(0, y);
-            document.activeElement.blur();
-            element.focus();
-        }
-
-        // get position/dimensions of element or viewport
-        function getRectInView(element) {
-            let rect = {};
-            rect.left = 0;
-            rect.top = 0;
-            rect.right = document.documentElement.clientWidth;
-            rect.bottom = document.documentElement.clientHeight;
-            let style = {};
-
-            if (element instanceof HTMLElement) {
-                rect = element.getBoundingClientRect();
-                style = window.getComputedStyle(element);
-            }
-
-            const margin = {};
-            margin.left = parseFloat(style.marginLeftWidth) || 0;
-            margin.top = parseFloat(style.marginTopWidth) || 0;
-            margin.right = parseFloat(style.marginRightWidth) || 0;
-            margin.bottom = parseFloat(style.marginBottomWidth) || 0;
-
-            const border = {};
-            border.left = parseFloat(style.borderLeftWidth) || 0;
-            border.top = parseFloat(style.borderTopWidth) || 0;
-            border.right = parseFloat(style.borderRightWidth) || 0;
-            border.bottom = parseFloat(style.borderBottomWidth) || 0;
-
-            const newRect = {};
-            newRect.left = rect.left + margin.left + border.left;
-            newRect.top = rect.top + margin.top + border.top;
-            newRect.right = rect.right + margin.right + border.right;
-            newRect.bottom = rect.bottom + margin.bottom + border.bottom;
-            newRect.width = newRect.right - newRect.left;
-            newRect.height = newRect.bottom - newRect.top;
-
-            return newRect;
-        }
-
-        // get closest element before specified element that matches query
-        function firstBefore(element, query) {
-            while (
-                element &&
-                element !== document.body &&
-                !element.matches(query)
-            )
-                element = element.previousElementSibling || element.parentNode;
-
-            return element;
-        }
-
-        // check if element is part of collapsed heading
-        function isCollapsed(element) {
-            while (element && element !== document.body) {
-                if (element.dataset.collapsed === 'true')
-                    return true;
-                element = element.parentNode;
-            }
-            return false;
-        }
-
-        // (for interaction with accordion plugin)
-        // expand heading containing element if necesary
-        function expandElement(element) {
-            if (isCollapsed(element)) {
-                const heading = firstBefore(element, 'h2');
-                if (heading)
-                    heading.click();
-            }
-        }
-
-        // load options from url parameters
-        function loadOptions() {
-            const url = window.location.search;
-            const params = new URLSearchParams(url);
-            for (const optionName of Object.keys(options)) {
-                const paramName = pluginName + '-' + optionName;
-                const param = params.get(paramName);
-                if (param !== '' && param !== null)
-                    options[optionName] = param;
-            }
-        }
-        loadOptions();
-
-        // start script when document is finished loading
-        if (options.enabled === 'true')
-            window.addEventListener('load', start);
-    })();
+<!--
+  Jump to First Plugin
+
+  Adds a button next to each reference entry, figure, and table that jumps the
+  page to the first occurrence of a link to that item in the manuscript.
+-->
+
+<script type="module">
+  // whether to add buttons next to reference entries
+  const references = "true";
+  // whether to add buttons next to figures
+  const figures = "true";
+  // whether to add buttons next to tables
+  const tables = "true";
+
+  // start script
+  function start() {
+    if (references !== "false") makeButtons("ref-", "p", "reference");
+    if (figures !== "false") makeButtons("fig:", "figcaption", "figure");
+    if (tables !== "false") makeButtons("tbl:", "caption", "table");
+  }
+
+  // when jump button clicked
+  function onButtonClick() {
+    const first = getFirstOccurrence(this.dataset.id);
+    if (!first) return;
+
+    // update url hash so navigating "back" in history will return user to button
+    window.location.hash = this.dataset.id;
+    // scroll to link
+    const timeout = function () {
+      goToElement(first, window.innerHeight * 0.5);
+    };
+    window.setTimeout(timeout, 0);
+  }
+
+  // get first occurrence of link to item in document
+  function getFirstOccurrence(id) {
+    let query = "a";
+    query += '[href="#' + id + '"]';
+    // exclude buttons, anchor links, toc links, etc
+    query += ":not(.button):not(.icon_button):not(.anchor):not(.toc_link)";
+    return document.querySelector(query);
+  }
+
+  // add button next to each reference entry, figure, or table
+  function makeButtons(query, containerQuery, subject) {
+    const elements = document.querySelectorAll(`[id^="${query}"`);
+    for (const element of elements) {
+      const id = element.id;
+      const buttonContainer = element.querySelector(containerQuery);
+      const first = getFirstOccurrence(id);
+
+      // if can't find link to reference or place to put button, ignore
+      if (!first || !buttonContainer) continue;
+
+      // make jump button
+      let button = document.createElement("button");
+      button.classList.add("icon_button", "jump_arrow");
+      button.title = `Jump to the first occurrence of this ${subject} in the document`;
+      const icon = document.querySelector(".icon_angle_double_up");
+      button.innerHTML = icon.innerHTML;
+      button.dataset.id = id;
+      button.dataset.ignore = "true";
+      button.addEventListener("click", onButtonClick);
+      buttonContainer.prepend(button);
+    }
+  }
+
+  // start script when document is finished loading
+  window.addEventListener("load", start);
 </script>
 
 <!-- angle double up icon -->
 
 <template class="icon_angle_double_up">
-    <!-- modified from: https://fontawesome.com/icons/angle-double-up -->
-    <svg width="16" height="16" viewBox="0 0 320 512">
-        <path
-            fill="currentColor"
-            d="M177 255.7l136 136c9.4 9.4 9.4 24.6 0 33.9l-22.6 22.6c-9.4 9.4-24.6 9.4-33.9 0L160 351.9l-96.4 96.4c-9.4 9.4-24.6 9.4-33.9 0L7 425.7c-9.4-9.4-9.4-24.6 0-33.9l136-136c9.4-9.5 24.6-9.5 34-.1zm-34-192L7 199.7c-9.4 9.4-9.4 24.6 0 33.9l22.6 22.6c9.4 9.4 24.6 9.4 33.9 0l96.4-96.4 96.4 96.4c9.4 9.4 24.6 9.4 33.9 0l22.6-22.6c9.4-9.4 9.4-24.6 0-33.9l-136-136c-9.2-9.4-24.4-9.4-33.8 0z"
-        ></path>
-    </svg>
+  <!-- modified from: https://fontawesome.com/icons/angle-double-up -->
+  <svg width="16" height="16" viewBox="0 0 320 512">
+    <path
+      fill="currentColor"
+      d="M177 255.7l136 136c9.4 9.4 9.4 24.6 0 33.9l-22.6 22.6c-9.4 9.4-24.6 9.4-33.9 0L160 351.9l-96.4 96.4c-9.4 9.4-24.6 9.4-33.9 0L7 425.7c-9.4-9.4-9.4-24.6 0-33.9l136-136c9.4-9.5 24.6-9.5 34-.1zm-34-192L7 199.7c-9.4 9.4-9.4 24.6 0 33.9l22.6 22.6c9.4 9.4 24.6 9.4 33.9 0l96.4-96.4 96.4 96.4c9.4 9.4 24.6 9.4 33.9 0l22.6-22.6c9.4-9.4 9.4-24.6 0-33.9l-136-136c-9.2-9.4-24.4-9.4-33.8 0z"
+    ></path>
+  </svg>
 </template>
+
+<style>
+  @media only screen {
+    /* jump button */
+    .jump_arrow {
+      position: relative;
+      top: 0.125em;
+      margin-right: 5px;
+    }
+  }
+
+  /* always hide jump button on print */
+  @media only print {
+    .jump_arrow {
+      display: none;
+    }
+  }
+</style>
diff --git a/build/plugins/lightbox.html b/build/plugins/lightbox.html
index 6b9f2ae..1fbdf77 100644
--- a/build/plugins/lightbox.html
+++ b/build/plugins/lightbox.html
@@ -1,620 +1,660 @@
-<!-- lightbox plugin -->
-
-<script>
-    (function() {
-        // /////////////////////////
-        // DESCRIPTION
-        // /////////////////////////
-
-        // This Manubot plugin makes it such that when a user clicks on an
-        // image, the image fills the screen and the user can pan/drag/zoom
-        // the image and navigate between other images in the document.
-
-        // /////////////////////////
-        // OPTIONS
-        // /////////////////////////
-
-        // plugin name prefix for url parameters
-        const pluginName = 'lightbox';
-
-        // default plugin options
-        const options = {
-            // list of possible zoom/scale factors
-            zoomSteps:
-                '0.1, 0.25, 0.333333, 0.5, 0.666666, 0.75, 1,' +
-                '1.25, 1.5, 1.75, 2, 2.5, 3, 3.5, 4, 5, 6, 7, 8',
-            // whether to fit image to view ('fit'), display at 100% and shrink
-            // if necessary ('shrink'), or always display at 100% ('100')
-            defaultZoom: 'fit',
-            // whether to zoom in/out toward center of view ('true') or mouse
-            // ('false')
-            centerZoom: 'false',
-            // whether plugin is on or not
-            enabled: 'true'
-        };
-
-        // change options above, or override with url parameter, eg:
-        // 'manuscript.html?pluginName-enabled=false'
-
-        // /////////////////////////
-        // SCRIPT
-        // /////////////////////////
-
-        // start script
-        function start() {
-            // run through each <img> element
-            const imgs = document.querySelectorAll('figure > img');
-            let count = 1;
-            for (const img of imgs) {
-                img.classList.add('lightbox_document_img');
-                img.dataset.number = count;
-                img.dataset.total = imgs.length;
-                img.addEventListener('click', openLightbox);
-                count++;
-            }
-
-            // attach mouse and key listeners to window
-            window.addEventListener('mousemove', onWindowMouseMove);
-            window.addEventListener('keyup', onKeyUp);
+<!-- 
+    Lightbox Plugin
+
+    Makes it such that when a user clicks on an image, the image fills the
+    screen and the user can pan/drag/zoom the image and navigate between other
+    images in the document.
+-->
+
+<script type="module">
+  // list of possible zoom/scale factors
+  const zooms =
+    "0.1, 0.25, 0.333333, 0.5, 0.666666, 0.75, 1, 1.25, 1.5, 1.75, 2, 2.5, 3, 3.5, 4, 5, 6, 7, 8";
+  // whether to fit image to view ('fit'), display at 100% and shrink if
+  // necessary ('shrink'), or always display at 100% ('100')
+  const defaultZoom = "fit";
+  // whether to zoom in/out toward center of view ('true') or mouse ('false')
+  const centerZoom = "false";
+
+  // start script
+  function start() {
+    // run through each <img> element
+    const imgs = document.querySelectorAll("figure > img");
+    let count = 1;
+    for (const img of imgs) {
+      img.classList.add("lightbox_document_img");
+      img.dataset.number = count;
+      img.dataset.total = imgs.length;
+      img.addEventListener("click", openLightbox);
+      count++;
+    }
+
+    // attach mouse and key listeners to window
+    window.addEventListener("mousemove", onWindowMouseMove);
+    window.addEventListener("keyup", onKeyUp);
+  }
+
+  // when mouse is moved anywhere in window
+  function onWindowMouseMove(event) {
+    window.mouseX = event.clientX;
+    window.mouseY = event.clientY;
+  }
+
+  // when key pressed
+  function onKeyUp(event) {
+    if (!event || !event.key) return;
+
+    switch (event.key) {
+      // trigger click of prev button
+      case "ArrowLeft":
+        const prevButton = document.getElementById("lightbox_prev_button");
+        if (prevButton) prevButton.click();
+        break;
+      // trigger click of next button
+      case "ArrowRight":
+        const nextButton = document.getElementById("lightbox_next_button");
+        if (nextButton) nextButton.click();
+        break;
+      // close on esc
+      case "Escape":
+        closeLightbox();
+        break;
+    }
+  }
+
+  // open lightbox
+  function openLightbox() {
+    const lightbox = makeLightbox(this);
+    if (!lightbox) return;
+
+    blurBody(lightbox);
+    document.body.appendChild(lightbox);
+  }
+
+  // make lightbox
+  function makeLightbox(img) {
+    // delete lightbox if it exists, start fresh
+    closeLightbox();
+
+    // create screen overlay containing lightbox
+    const overlay = document.createElement("div");
+    overlay.id = "lightbox_overlay";
+
+    // create image info boxes
+    const numberInfo = document.createElement("div");
+    const zoomInfo = document.createElement("div");
+    numberInfo.id = "lightbox_number_info";
+    zoomInfo.id = "lightbox_zoom_info";
+
+    // create container for image
+    const imageContainer = document.createElement("div");
+    imageContainer.id = "lightbox_image_container";
+    const lightboxImg = makeLightboxImg(
+      img,
+      imageContainer,
+      numberInfo,
+      zoomInfo
+    );
+    imageContainer.appendChild(lightboxImg);
+
+    // create bottom container for caption and navigation buttons
+    const bottomContainer = document.createElement("div");
+    bottomContainer.id = "lightbox_bottom_container";
+    const caption = makeCaption(img);
+    const prevButton = makePrevButton(img);
+    const nextButton = makeNextButton(img);
+    bottomContainer.appendChild(prevButton);
+    bottomContainer.appendChild(caption);
+    bottomContainer.appendChild(nextButton);
+
+    // attach top middle and bottom to overlay
+    overlay.appendChild(numberInfo);
+    overlay.appendChild(zoomInfo);
+    overlay.appendChild(imageContainer);
+    overlay.appendChild(bottomContainer);
+
+    return overlay;
+  }
+
+  // make <img> object that is intuitively draggable and zoomable
+  function makeLightboxImg(sourceImg, container, numberInfoBox, zoomInfoBox) {
+    // create copy of source <img>
+    const img = sourceImg.cloneNode(true);
+    img.classList.remove("lightbox_document_img");
+    img.removeAttribute("id");
+    img.removeAttribute("width");
+    img.removeAttribute("height");
+    img.style.position = "unset";
+    img.style.margin = "0";
+    img.style.padding = "0";
+    img.style.width = "";
+    img.style.height = "";
+    img.style.minWidth = "";
+    img.style.minHeight = "";
+    img.style.maxWidth = "";
+    img.style.maxHeight = "";
+    img.id = "lightbox_img";
+
+    // build sorted list of zoomSteps
+    const zoomSteps = zooms.split(/[^0-9.]/).map((step) => parseFloat(step));
+    zoomSteps.sort((a, b) => a - b);
+
+    // <img> object property variables
+    let zoom = 1;
+    let translateX = 0;
+    let translateY = 0;
+    let clickMouseX = undefined;
+    let clickMouseY = undefined;
+    let clickTranslateX = undefined;
+    let clickTranslateY = undefined;
+
+    updateNumberInfo();
+
+    // update image numbers displayed in info box
+    function updateNumberInfo() {
+      numberInfoBox.innerHTML =
+        sourceImg.dataset.number + " of " + sourceImg.dataset.total;
+    }
+
+    // update zoom displayed in info box
+    function updateZoomInfo() {
+      let zoomInfo = zoom * 100;
+      if (!Number.isInteger(zoomInfo)) zoomInfo = zoomInfo.toFixed(2);
+      zoomInfoBox.innerHTML = zoomInfo + "%";
+    }
+
+    // move to closest zoom step above current zoom
+    const zoomIn = function () {
+      for (const zoomStep of zoomSteps) {
+        if (zoomStep > zoom) {
+          zoom = zoomStep;
+          break;
         }
-
-        // when mouse is moved anywhere in window
-        function onWindowMouseMove(event) {
-            window.mouseX = event.clientX;
-            window.mouseY = event.clientY;
-        }
-
-        // when key pressed
-        function onKeyUp(event) {
-            if (!event || !event.key)
-                return;
-
-            switch (event.key) {
-                // trigger click of prev button
-                case 'ArrowLeft':
-                    const prevButton = document.getElementById(
-                        'lightbox_prev_button'
-                    );
-                    if (prevButton)
-                        prevButton.click();
-                    break;
-                // trigger click of next button
-                case 'ArrowRight':
-                    const nextButton = document.getElementById(
-                        'lightbox_next_button'
-                    );
-                    if (nextButton)
-                        nextButton.click();
-                    break;
-                // close on esc
-                case 'Escape':
-                    closeLightbox();
-                    break;
-            }
-        }
-
-        // open lightbox
-        function openLightbox() {
-            const lightbox = makeLightbox(this);
-            if (!lightbox)
-                return;
-
-            blurBody(lightbox);
-            document.body.appendChild(lightbox);
-        }
-
-        // make lightbox
-        function makeLightbox(img) {
-            // delete lightbox if it exists, start fresh
-            closeLightbox();
-
-            // create screen overlay containing lightbox
-            const overlay = document.createElement('div');
-            overlay.id = 'lightbox_overlay';
-
-            // create image info boxes
-            const numberInfo = document.createElement('div');
-            const zoomInfo = document.createElement('div');
-            numberInfo.id = 'lightbox_number_info';
-            zoomInfo.id = 'lightbox_zoom_info';
-
-            // create container for image
-            const imageContainer = document.createElement('div');
-            imageContainer.id = 'lightbox_image_container';
-            const lightboxImg = makeLightboxImg(
-                img,
-                imageContainer,
-                numberInfo,
-                zoomInfo
-            );
-            imageContainer.appendChild(lightboxImg);
-
-            // create bottom container for caption and navigation buttons
-            const bottomContainer = document.createElement('div');
-            bottomContainer.id = 'lightbox_bottom_container';
-            const caption = makeCaption(img);
-            const prevButton = makePrevButton(img);
-            const nextButton = makeNextButton(img);
-            bottomContainer.appendChild(prevButton);
-            bottomContainer.appendChild(caption);
-            bottomContainer.appendChild(nextButton);
-
-            // attach top middle and bottom to overlay
-            overlay.appendChild(numberInfo);
-            overlay.appendChild(zoomInfo);
-            overlay.appendChild(imageContainer);
-            overlay.appendChild(bottomContainer);
-
-            return overlay;
-        }
-
-        // make <img> object that is intuitively draggable and zoomable
-        function makeLightboxImg(
-            sourceImg,
-            container,
-            numberInfoBox,
-            zoomInfoBox
-        ) {
-            // create copy of source <img>
-            const img = sourceImg.cloneNode(true);
-            img.classList.remove('lightbox_document_img');
-            img.removeAttribute('id');
-            img.removeAttribute('width');
-            img.removeAttribute('height');
-            img.style.position = 'unset';
-            img.style.margin = '0';
-            img.style.padding = '0';
-            img.style.width = '';
-            img.style.height = '';
-            img.style.minWidth = '';
-            img.style.minHeight = '';
-            img.style.maxWidth = '';
-            img.style.maxHeight = '';
-            img.id = 'lightbox_img';
-
-            // build sorted list of unique zoomSteps, always including a 100%
-            let zoomSteps = [];
-            const optionsZooms = options.zoomSteps.split(/[^0-9.]/);
-            for (const optionZoom of optionsZooms) {
-                const newZoom = parseFloat(optionZoom);
-                if (newZoom && !zoomSteps.includes(newZoom))
-                    zoomSteps.push(newZoom);
-            }
-            if (!zoomSteps.includes(1))
-                zoomSteps.push(1);
-            zoomSteps = zoomSteps.sort(function sortNumber(a, b) {
-                return a - b;
-            });
-
-            // <img> object property variables
-            let zoom = 1;
-            let translateX = 0;
-            let translateY = 0;
-            let clickMouseX = undefined;
-            let clickMouseY = undefined;
-            let clickTranslateX = undefined;
-            let clickTranslateY = undefined;
-
-            updateNumberInfo();
-
-            // update image numbers displayed in info box
-            function updateNumberInfo() {
-                numberInfoBox.innerHTML =
-                    sourceImg.dataset.number + ' of ' + sourceImg.dataset.total;
-            }
-
-            // update zoom displayed in info box
-            function updateZoomInfo() {
-                let zoomInfo = zoom * 100;
-                if (!Number.isInteger(zoomInfo))
-                    zoomInfo = zoomInfo.toFixed(2);
-                zoomInfoBox.innerHTML = zoomInfo + '%';
-            }
-
-            // move to closest zoom step above current zoom
-            const zoomIn = function() {
-                for (const zoomStep of zoomSteps) {
-                    if (zoomStep > zoom) {
-                        zoom = zoomStep;
-                        break;
-                    }
-                }
-                updateTransform();
-            };
-
-            // move to closest zoom step above current zoom
-            const zoomOut = function() {
-                zoomSteps.reverse();
-                for (const zoomStep of zoomSteps) {
-                    if (zoomStep < zoom) {
-                        zoom = zoomStep;
-                        break;
-                    }
-                }
-                zoomSteps.reverse();
-
-                updateTransform();
-            };
-
-            // update display of <img> based on scale/translate properties
-            const updateTransform = function() {
-                // set transform
-                img.style.transform =
-                    'translate(' +
-                    (translateX || 0) +
-                    'px,' +
-                    (translateY || 0) +
-                    'px) scale(' +
-                    (zoom || 1) +
-                    ')';
-
-                // get new width/height after scale
-                const rect = img.getBoundingClientRect();
-                // limit translate
-                translateX = Math.max(translateX, -rect.width / 2);
-                translateX = Math.min(translateX, rect.width / 2);
-                translateY = Math.max(translateY, -rect.height / 2);
-                translateY = Math.min(translateY, rect.height / 2);
-
-                // set transform
-                img.style.transform =
-                    'translate(' +
-                    (translateX || 0) +
-                    'px,' +
-                    (translateY || 0) +
-                    'px) scale(' +
-                    (zoom || 1) +
-                    ')';
-
-                updateZoomInfo();
-            };
-
-            // fit <img> to container
-            const fit = function() {
-                // no x/y offset, 100% zoom by default
-                translateX = 0;
-                translateY = 0;
-                zoom = 1;
-
-                // widths of <img> and container
-                const imgWidth = img.naturalWidth;
-                const imgHeight = img.naturalHeight;
-                const containerWidth = parseFloat(
-                    window.getComputedStyle(container).width
-                );
-                const containerHeight = parseFloat(
-                    window.getComputedStyle(container).height
-                );
-
-                // how much zooming is needed to fit <img> to container
-                const xRatio = imgWidth / containerWidth;
-                const yRatio = imgHeight / containerHeight;
-                const maxRatio = Math.max(xRatio, yRatio);
-                const newZoom = 1 / maxRatio;
-
-                // fit <img> to container according to option
-                if (options.defaultZoom === 'shrink') {
-                    if (maxRatio > 1)
-                        zoom = newZoom;
-                } else if (options.defaultZoom === 'fit')
-                    zoom = newZoom;
-
-                updateTransform();
-            };
-
-            // when mouse wheel is rolled anywhere in container
-            const onContainerWheel = function(event) {
-                if (!event)
-                    return;
-
-                // let ctrl + mouse wheel to zoom behave as normal
-                if (event.ctrlKey)
-                    return;
-
-                // prevent normal scroll behavior
-                event.preventDefault();
-                event.stopPropagation();
-
-                // point around which to scale img
-                const viewRect = container.getBoundingClientRect();
-                const viewX = (viewRect.left + viewRect.right) / 2;
-                const viewY = (viewRect.top + viewRect.bottom) / 2;
-                const originX = options.centerZoom === 'true' ? viewX : mouseX;
-                const originY = options.centerZoom === 'true' ? viewY : mouseY;
-
-                // get point on image under origin
-                const oldRect = img.getBoundingClientRect();
-                const oldPercentX = (originX - oldRect.left) / oldRect.width;
-                const oldPercentY = (originY - oldRect.top) / oldRect.height;
-
-                // increment/decrement zoom
-                if (event.deltaY < 0)
-                    zoomIn();
-                if (event.deltaY > 0)
-                    zoomOut();
-
-                // get offset between previous image point and origin
-                const newRect = img.getBoundingClientRect();
-                const offsetX =
-                    originX - (newRect.left + newRect.width * oldPercentX);
-                const offsetY =
-                    originY - (newRect.top + newRect.height * oldPercentY);
-
-                // translate image to keep image point under origin
-                translateX += offsetX;
-                translateY += offsetY;
-
-                // perform translate
-                updateTransform();
-            };
-
-            // when container is clicked
-            function onContainerClick(event) {
-                // if container itself is target of click, and not other
-                // element above it
-                if (event.target === this)
-                    closeLightbox();
-            }
-
-            // when mouse button is pressed on image
-            const onImageMouseDown = function(event) {
-                // store original mouse position relative to image
-                clickMouseX = window.mouseX;
-                clickMouseY = window.mouseY;
-                clickTranslateX = translateX;
-                clickTranslateY = translateY;
-                event.stopPropagation();
-                event.preventDefault();
-            };
-
-            // when mouse button is released anywhere in window
-            const onWindowMouseUp = function(event) {
-                // reset original mouse position
-                clickMouseX = undefined;
-                clickMouseY = undefined;
-                clickTranslateX = undefined;
-                clickTranslateY = undefined;
-
-                // remove global listener if lightbox removed from document
-                if (!document.body.contains(container))
-                    window.removeEventListener('mouseup', onWindowMouseUp);
-            };
-
-            // when mouse is moved anywhere in window
-            const onWindowMouseMove = function(event) {
-                if (
-                    clickMouseX === undefined ||
-                    clickMouseY === undefined ||
-                    clickTranslateX === undefined ||
-                    clickTranslateY === undefined
-                )
-                    return;
-
-                // offset image based on original and current mouse position
-                translateX = clickTranslateX + window.mouseX - clickMouseX;
-                translateY = clickTranslateY + window.mouseY - clickMouseY;
-                updateTransform();
-                event.preventDefault();
-
-                // remove global listener if lightbox removed from document
-                if (!document.body.contains(container))
-                    window.removeEventListener('mousemove', onWindowMouseMove);
-            };
-
-            // when window is resized
-            const onWindowResize = function(event) {
-                fit();
-
-                // remove global listener if lightbox removed from document
-                if (!document.body.contains(container))
-                    window.removeEventListener('resize', onWindowResize);
-            };
-
-            // attach the necessary event listeners
-            img.addEventListener('dblclick', fit);
-            img.addEventListener('mousedown', onImageMouseDown);
-            container.addEventListener('wheel', onContainerWheel);
-            container.addEventListener('mousedown', onContainerClick);
-            container.addEventListener('touchstart', onContainerClick);
-            window.addEventListener('mouseup', onWindowMouseUp);
-            window.addEventListener('mousemove', onWindowMouseMove);
-            window.addEventListener('resize', onWindowResize);
-
-            // run fit() after lightbox atttached to document and <img> Loaded
-            // so needed container and img dimensions available
-            img.addEventListener('load', fit);
-
-            return img;
+      }
+      updateTransform();
+    };
+
+    // move to closest zoom step above current zoom
+    const zoomOut = function () {
+      zoomSteps.reverse();
+      for (const zoomStep of zoomSteps) {
+        if (zoomStep < zoom) {
+          zoom = zoomStep;
+          break;
         }
-
-        // make caption
-        function makeCaption(img) {
-            const caption = document.createElement('div');
-            caption.id = 'lightbox_caption';
-            const captionSource = img.nextElementSibling;
-            if (captionSource.tagName.toLowerCase() === 'figcaption') {
-                const captionCopy = makeCopy(captionSource);
-                caption.innerHTML = captionCopy.innerHTML;
-            }
-
-            caption.addEventListener('touchstart', function(event) {
-                event.stopPropagation();
-            });
-
-            return caption;
-        }
-
-        // make carbon copy of html dom element
-        function makeCopy(source) {
-            const sourceCopy = source.cloneNode(true);
-
-            // delete elements marked with ignore (eg anchor and jump buttons)
-            const deleteFromCopy = sourceCopy.querySelectorAll(
-                '[data-ignore="true"]'
-            );
-            for (const element of deleteFromCopy)
-                element.remove();
-
-            // delete certain element attributes
-            const attributes = [
-                'id',
-                'data-collapsed',
-                'data-selected',
-                'data-highlighted',
-                'data-glow'
-            ];
-            for (const attribute of attributes) {
-                sourceCopy.removeAttribute(attribute);
-                const elements = sourceCopy.querySelectorAll(
-                    '[' + attribute + ']'
-                );
-                for (const element of elements)
-                    element.removeAttribute(attribute);
-            }
-
-            return sourceCopy;
-        }
-
-        // make button to jump to previous image in document
-        function makePrevButton(img) {
-            const prevButton = document.createElement('button');
-            prevButton.id = 'lightbox_prev_button';
-            prevButton.title = 'Jump to the previous image in the document [←]';
-            prevButton.classList.add('icon_button', 'lightbox_button');
-            prevButton.innerHTML = document.querySelector(
-                '.icon_caret_left'
-            ).innerHTML;
-
-            // attach click listeners to button
-            prevButton.addEventListener('click', function() {
-                getPrevImg(img).click();
-            });
-
-            return prevButton;
-        }
-
-        // make button to jump to next image in document
-        function makeNextButton(img) {
-            const nextButton = document.createElement('button');
-            nextButton.id = 'lightbox_next_button';
-            nextButton.title = 'Jump to the next image in the document [→]';
-            nextButton.classList.add('icon_button', 'lightbox_button');
-            nextButton.innerHTML = document.querySelector(
-                '.icon_caret_right'
-            ).innerHTML;
-
-            // attach click listeners to button
-            nextButton.addEventListener('click', function() {
-                getNextImg(img).click();
-            });
-
-            return nextButton;
-        }
-
-        // get previous image in document
-        function getPrevImg(img) {
-            const imgs = document.querySelectorAll('.lightbox_document_img');
-
-            // find index of provided img
-            let index;
-            for (index = 0; index < imgs.length; index++) {
-                if (imgs[index] === img)
-                    break;
-            }
-
-
-            // wrap index to other side if < 1
-            if (index - 1 >= 0)
-                index--;
-            else
-                index = imgs.length - 1;
-            return imgs[index];
-        }
-
-        // get next image in document
-        function getNextImg(img) {
-            const imgs = document.querySelectorAll('.lightbox_document_img');
-
-            // find index of provided img
-            let index;
-            for (index = 0; index < imgs.length; index++) {
-                if (imgs[index] === img)
-                    break;
-            }
-
-
-            // wrap index to other side if > total
-            if (index + 1 <= imgs.length - 1)
-                index++;
-            else
-                index = 0;
-            return imgs[index];
-        }
-
-        // close lightbox
-        function closeLightbox() {
-            focusBody();
-
-            const lightbox = document.getElementById('lightbox_overlay');
-            if (lightbox)
-                lightbox.remove();
-        }
-
-        // make all elements behind lightbox non-focusable
-        function blurBody(overlay) {
-            const all = document.querySelectorAll('*');
-            for (const element of all)
-                element.tabIndex = -1;
-            document.body.classList.add('body_no_scroll');
-        }
-
-        // make all elements focusable again
-        function focusBody() {
-            const all = document.querySelectorAll('*');
-            for (const element of all)
-                element.removeAttribute('tabIndex');
-            document.body.classList.remove('body_no_scroll');
-        }
-
-        // load options from url parameters
-        function loadOptions() {
-            const url = window.location.search;
-            const params = new URLSearchParams(url);
-            for (const optionName of Object.keys(options)) {
-                const paramName = pluginName + '-' + optionName;
-                const param = params.get(paramName);
-                if (param !== '' && param !== null)
-                    options[optionName] = param;
-            }
-        }
-        loadOptions();
-
-        // start script when document is finished loading
-        if (options.enabled === 'true')
-            window.addEventListener('load', start);
-    })();
+      }
+      zoomSteps.reverse();
+
+      updateTransform();
+    };
+
+    // update display of <img> based on scale/translate properties
+    const updateTransform = function () {
+      // set transform
+      img.style.transform =
+        "translate(" +
+        (translateX || 0) +
+        "px," +
+        (translateY || 0) +
+        "px) scale(" +
+        (zoom || 1) +
+        ")";
+
+      // get new width/height after scale
+      const rect = img.getBoundingClientRect();
+      // limit translate
+      translateX = Math.max(translateX, -rect.width / 2);
+      translateX = Math.min(translateX, rect.width / 2);
+      translateY = Math.max(translateY, -rect.height / 2);
+      translateY = Math.min(translateY, rect.height / 2);
+
+      // set transform
+      img.style.transform =
+        "translate(" +
+        (translateX || 0) +
+        "px," +
+        (translateY || 0) +
+        "px) scale(" +
+        (zoom || 1) +
+        ")";
+
+      updateZoomInfo();
+    };
+
+    // fit <img> to container
+    const fit = function () {
+      // no x/y offset, 100% zoom by default
+      translateX = 0;
+      translateY = 0;
+      zoom = 1;
+
+      // widths of <img> and container
+      const imgWidth = img.naturalWidth;
+      const imgHeight = img.naturalHeight;
+      const containerWidth = parseFloat(
+        window.getComputedStyle(container).width
+      );
+      const containerHeight = parseFloat(
+        window.getComputedStyle(container).height
+      );
+
+      // how much zooming is needed to fit <img> to container
+      const xRatio = imgWidth / containerWidth;
+      const yRatio = imgHeight / containerHeight;
+      const maxRatio = Math.max(xRatio, yRatio);
+      const newZoom = 1 / maxRatio;
+
+      // fit <img> to container according to option
+      if (defaultZoom === "shrink") {
+        if (maxRatio > 1) zoom = newZoom;
+      } else if (defaultZoom === "fit") zoom = newZoom;
+
+      updateTransform();
+    };
+
+    // when mouse wheel is rolled anywhere in container
+    const onContainerWheel = function (event) {
+      if (!event) return;
+
+      // let ctrl + mouse wheel to zoom behave as normal
+      if (event.ctrlKey) return;
+
+      // prevent normal scroll behavior
+      event.preventDefault();
+      event.stopPropagation();
+
+      // point around which to scale img
+      const viewRect = container.getBoundingClientRect();
+      const viewX = (viewRect.left + viewRect.right) / 2;
+      const viewY = (viewRect.top + viewRect.bottom) / 2;
+      const originX = centerZoom === "true" ? viewX : mouseX;
+      const originY = centerZoom === "true" ? viewY : mouseY;
+
+      // get point on image under origin
+      const oldRect = img.getBoundingClientRect();
+      const oldPercentX = (originX - oldRect.left) / oldRect.width;
+      const oldPercentY = (originY - oldRect.top) / oldRect.height;
+
+      // increment/decrement zoom
+      if (event.deltaY < 0) zoomIn();
+      if (event.deltaY > 0) zoomOut();
+
+      // get offset between previous image point and origin
+      const newRect = img.getBoundingClientRect();
+      const offsetX = originX - (newRect.left + newRect.width * oldPercentX);
+      const offsetY = originY - (newRect.top + newRect.height * oldPercentY);
+
+      // translate image to keep image point under origin
+      translateX += offsetX;
+      translateY += offsetY;
+
+      // perform translate
+      updateTransform();
+    };
+
+    // when container is clicked
+    function onContainerClick(event) {
+      // if container itself is target of click, and not other
+      // element above it
+      if (event.target === this) closeLightbox();
+    }
+
+    // when mouse button is pressed on image
+    const onImageMouseDown = function (event) {
+      // store original mouse position relative to image
+      clickMouseX = window.mouseX;
+      clickMouseY = window.mouseY;
+      clickTranslateX = translateX;
+      clickTranslateY = translateY;
+      event.stopPropagation();
+      event.preventDefault();
+    };
+
+    // when mouse button is released anywhere in window
+    const onWindowMouseUp = function (event) {
+      // reset original mouse position
+      clickMouseX = undefined;
+      clickMouseY = undefined;
+      clickTranslateX = undefined;
+      clickTranslateY = undefined;
+
+      // remove global listener if lightbox removed from document
+      if (!document.body.contains(container))
+        window.removeEventListener("mouseup", onWindowMouseUp);
+    };
+
+    // when mouse is moved anywhere in window
+    const onWindowMouseMove = function (event) {
+      if (
+        clickMouseX === undefined ||
+        clickMouseY === undefined ||
+        clickTranslateX === undefined ||
+        clickTranslateY === undefined
+      )
+        return;
+
+      // offset image based on original and current mouse position
+      translateX = clickTranslateX + window.mouseX - clickMouseX;
+      translateY = clickTranslateY + window.mouseY - clickMouseY;
+      updateTransform();
+      event.preventDefault();
+
+      // remove global listener if lightbox removed from document
+      if (!document.body.contains(container))
+        window.removeEventListener("mousemove", onWindowMouseMove);
+    };
+
+    // when window is resized
+    const onWindowResize = function (event) {
+      fit();
+
+      // remove global listener if lightbox removed from document
+      if (!document.body.contains(container))
+        window.removeEventListener("resize", onWindowResize);
+    };
+
+    // attach the necessary event listeners
+    img.addEventListener("dblclick", fit);
+    img.addEventListener("mousedown", onImageMouseDown);
+    container.addEventListener("wheel", onContainerWheel);
+    container.addEventListener("mousedown", onContainerClick);
+    container.addEventListener("touchstart", onContainerClick);
+    window.addEventListener("mouseup", onWindowMouseUp);
+    window.addEventListener("mousemove", onWindowMouseMove);
+    window.addEventListener("resize", onWindowResize);
+
+    // run fit() after lightbox atttached to document and <img> Loaded
+    // so needed container and img dimensions available
+    img.addEventListener("load", fit);
+
+    return img;
+  }
+
+  // make caption
+  function makeCaption(img) {
+    const caption = document.createElement("div");
+    caption.id = "lightbox_caption";
+    const captionSource = img.nextElementSibling;
+    if (captionSource.tagName.toLowerCase() === "figcaption") {
+      const captionCopy = makeCopy(captionSource);
+      caption.innerHTML = captionCopy.innerHTML;
+    }
+
+    caption.addEventListener("touchstart", function (event) {
+      event.stopPropagation();
+    });
+
+    return caption;
+  }
+
+  // make carbon copy of html dom element
+  function makeCopy(source) {
+    const sourceCopy = source.cloneNode(true);
+
+    // delete elements marked with ignore (eg anchor and jump buttons)
+    const deleteFromCopy = sourceCopy.querySelectorAll('[data-ignore="true"]');
+    for (const element of deleteFromCopy) element.remove();
+
+    // delete certain element attributes
+    const attributes = [
+      "id",
+      "data-collapsed",
+      "data-selected",
+      "data-highlighted",
+      "data-glow",
+    ];
+    for (const attribute of attributes) {
+      sourceCopy.removeAttribute(attribute);
+      const elements = sourceCopy.querySelectorAll("[" + attribute + "]");
+      for (const element of elements) element.removeAttribute(attribute);
+    }
+
+    return sourceCopy;
+  }
+
+  // make button to jump to previous image in document
+  function makePrevButton(img) {
+    const prevButton = document.createElement("button");
+    prevButton.id = "lightbox_prev_button";
+    prevButton.title = "Jump to the previous image in the document [←]";
+    prevButton.classList.add("icon_button", "lightbox_button");
+    prevButton.innerHTML = document.querySelector(".icon_caret_left").innerHTML;
+
+    // attach click listeners to button
+    prevButton.addEventListener("click", function () {
+      getPrevImg(img).click();
+    });
+
+    return prevButton;
+  }
+
+  // make button to jump to next image in document
+  function makeNextButton(img) {
+    const nextButton = document.createElement("button");
+    nextButton.id = "lightbox_next_button";
+    nextButton.title = "Jump to the next image in the document [→]";
+    nextButton.classList.add("icon_button", "lightbox_button");
+    nextButton.innerHTML = document.querySelector(
+      ".icon_caret_right"
+    ).innerHTML;
+
+    // attach click listeners to button
+    nextButton.addEventListener("click", function () {
+      getNextImg(img).click();
+    });
+
+    return nextButton;
+  }
+
+  // get previous image in document
+  function getPrevImg(img) {
+    const imgs = document.querySelectorAll(".lightbox_document_img");
+
+    // find index of provided img
+    let index;
+    for (index = 0; index < imgs.length; index++) {
+      if (imgs[index] === img) break;
+    }
+
+    // wrap index to other side if < 1
+    if (index - 1 >= 0) index--;
+    else index = imgs.length - 1;
+    return imgs[index];
+  }
+
+  // get next image in document
+  function getNextImg(img) {
+    const imgs = document.querySelectorAll(".lightbox_document_img");
+
+    // find index of provided img
+    let index;
+    for (index = 0; index < imgs.length; index++) {
+      if (imgs[index] === img) break;
+    }
+
+    // wrap index to other side if > total
+    if (index + 1 <= imgs.length - 1) index++;
+    else index = 0;
+    return imgs[index];
+  }
+
+  // close lightbox
+  function closeLightbox() {
+    focusBody();
+
+    const lightbox = document.getElementById("lightbox_overlay");
+    if (lightbox) lightbox.remove();
+  }
+
+  // make all elements behind lightbox non-focusable
+  function blurBody(overlay) {
+    const all = document.querySelectorAll("*");
+    for (const element of all) element.tabIndex = -1;
+    document.body.classList.add("body_no_scroll");
+  }
+
+  // make all elements focusable again
+  function focusBody() {
+    const all = document.querySelectorAll("*");
+    for (const element of all) element.removeAttribute("tabIndex");
+    document.body.classList.remove("body_no_scroll");
+  }
+
+  // start script when document is finished loading
+  window.addEventListener("load", start);
 </script>
 
 <!-- caret left icon -->
 
 <template class="icon_caret_left">
-    <!-- modified from: https://fontawesome.com/icons/caret-left -->
-    <svg width="16" height="16" viewBox="0 0 192 512">
-        <path
-            fill="currentColor"
-            d="M192 127.338v257.324c0 17.818-21.543 26.741-34.142 14.142L29.196 270.142c-7.81-7.81-7.81-20.474 0-28.284l128.662-128.662c12.599-12.6 34.142-3.676 34.142 14.142z"
-        ></path>
-    </svg>
+  <!-- modified from: https://fontawesome.com/icons/caret-left -->
+  <svg width="16" height="16" viewBox="0 0 192 512">
+    <path
+      fill="currentColor"
+      d="M192 127.338v257.324c0 17.818-21.543 26.741-34.142 14.142L29.196 270.142c-7.81-7.81-7.81-20.474 0-28.284l128.662-128.662c12.599-12.6 34.142-3.676 34.142 14.142z"
+    ></path>
+  </svg>
 </template>
 
 <!-- caret right icon -->
 
 <template class="icon_caret_right">
-    <!-- modified from: https://fontawesome.com/icons/caret-right -->
-    <svg width="16" height="16" viewBox="0 0 192 512">
-        <path
-            fill="currentColor"
-            d="M0 384.662V127.338c0-17.818 21.543-26.741 34.142-14.142l128.662 128.662c7.81 7.81 7.81 20.474 0 28.284L34.142 398.804C21.543 411.404 0 402.48 0 384.662z"
-        ></path>
-    </svg>
+  <!-- modified from: https://fontawesome.com/icons/caret-right -->
+  <svg width="16" height="16" viewBox="0 0 192 512">
+    <path
+      fill="currentColor"
+      d="M0 384.662V127.338c0-17.818 21.543-26.741 34.142-14.142l128.662 128.662c7.81 7.81 7.81 20.474 0 28.284L34.142 398.804C21.543 411.404 0 402.48 0 384.662z"
+    ></path>
+  </svg>
 </template>
+
+<style>
+  @media only screen {
+    /* regular <img> in document when hovered */
+    img.lightbox_document_img:hover {
+      cursor: pointer;
+    }
+
+    .body_no_scroll {
+      overflow: hidden !important;
+    }
+
+    /* screen overlay */
+    #lightbox_overlay {
+      display: flex;
+      flex-direction: column;
+      position: fixed;
+      left: 0;
+      top: 0;
+      right: 0;
+      bottom: 0;
+      background: rgba(0, 0, 0, 0.75);
+      z-index: 3;
+    }
+
+    /* middle area containing lightbox image */
+    #lightbox_image_container {
+      flex-grow: 1;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      overflow: hidden;
+      position: relative;
+      padding: 20px;
+    }
+
+    /* bottom area containing caption */
+    #lightbox_bottom_container {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      height: 100px;
+      min-height: 100px;
+      max-height: 100px;
+      background: rgba(0, 0, 0, 0.5);
+    }
+
+    /* image number info text box */
+    #lightbox_number_info {
+      position: absolute;
+      color: #ffffff;
+      font-weight: 600;
+      left: 2px;
+      top: 0;
+      z-index: 4;
+    }
+
+    /* zoom info text box */
+    #lightbox_zoom_info {
+      position: absolute;
+      color: #ffffff;
+      font-weight: 600;
+      right: 2px;
+      top: 0;
+      z-index: 4;
+    }
+
+    /* copy of image caption */
+    #lightbox_caption {
+      box-sizing: border-box;
+      display: inline-block;
+      width: 100%;
+      max-height: 100%;
+      padding: 10px 0;
+      text-align: center;
+      overflow-y: auto;
+      color: #ffffff;
+    }
+
+    /* navigation previous/next button */
+    .lightbox_button {
+      width: 100px;
+      height: 100%;
+      min-width: 100px;
+      min-height: 100%;
+      color: #ffffff;
+    }
+
+    /* navigation previous/next button when hovered */
+    .lightbox_button:hover {
+      background: none !important;
+    }
+
+    /* navigation button icon */
+    .lightbox_button > svg {
+      height: 25px;
+    }
+
+    /* figure auto-number */
+    #lightbox_caption > span:first-of-type {
+      font-weight: bold;
+      margin-right: 5px;
+    }
+
+    /* lightbox image when hovered */
+    #lightbox_img:hover {
+      cursor: grab;
+    }
+
+    /* lightbox image when grabbed */
+    #lightbox_img:active {
+      cursor: grabbing;
+    }
+  }
+
+  /* when on screen < 480px wide */
+  @media only screen and (max-width: 480px) {
+    /* make navigation buttons skinnier on small screens to make more room for caption text */
+    .lightbox_button {
+      width: 50px;
+      min-width: 50px;
+    }
+  }
+
+  /* always hide lightbox on print */
+  @media only print {
+    #lightbox_overlay {
+      display: none;
+    }
+  }
+</style>
diff --git a/build/plugins/link-highlight.html b/build/plugins/link-highlight.html
index 4462f50..04263a8 100644
--- a/build/plugins/link-highlight.html
+++ b/build/plugins/link-highlight.html
@@ -1,184 +1,157 @@
-<!-- link highlight plugin -->
-
-<script>
-    (function() {
-        // /////////////////////////
-        // DESCRIPTION
-        // /////////////////////////
-
-        // This Manubot plugin makes it such that when a user hovers or
-        // focuses a link, other links that have the same target will be
-        // highlighted. It also makes it such that when clicking a link, the
-        // target of the link (eg reference, figure, table) is briefly
-        // highlighted.
-
-        // /////////////////////////
-        // OPTIONS
-        // /////////////////////////
-
-        // plugin name prefix for url parameters
-        const pluginName = 'linkHighlight';
-
-        // default plugin options
-        const options = {
-            // whether to also highlight links that go to external urls
-            externalLinks: 'false',
-            // whether user must click off to unhighlight instead of just
-            // un-hovering
-            clickUnhighlight: 'false',
-            // whether to also highlight links that are unique
-            highlightUnique: 'true',
-            // whether plugin is on or not
-            enabled: 'true'
-        };
-
-        // change options above, or override with url parameter, eg:
-        // 'manuscript.html?pluginName-enabled=false'
-
-        // /////////////////////////
-        // SCRIPT
-        // /////////////////////////
-
-        // start script
-        function start() {
-            const links = getLinks();
-            for (const link of links) {
-                // attach mouse and focus listeners to link
-                link.addEventListener('mouseenter', onLinkFocus);
-                link.addEventListener('focus', onLinkFocus);
-                link.addEventListener('mouseleave', onLinkUnhover);
-            }
-
-            // attach click and hash change listeners to window
-            window.addEventListener('click', onClick);
-            window.addEventListener('touchstart', onClick);
-            window.addEventListener('hashchange', onHashChange);
-
-            // run hash change on window load in case user has navigated
-            // directly to hash
-            onHashChange();
-        }
-
-        // when link is focused (tabbed to) or hovered
-        function onLinkFocus() {
-            highlight(this);
-        }
-
-        // when link is unhovered
-        function onLinkUnhover() {
-            if (options.clickUnhighlight !== 'true')
-                unhighlightAll();
-        }
-
-        // when the mouse is clicked anywhere in window
-        function onClick(event) {
-            unhighlightAll();
-        }
-
-        // when hash (eg manuscript.html#introduction) changes
-        function onHashChange() {
-            const target = getHashTarget();
-            if (target)
-                glowElement(target);
-        }
-
-        // get element that is target of link or url hash
-        function getHashTarget(link) {
-            const hash = link ? link.hash : window.location.hash;
-            const id = hash.slice(1);
-            let target = document.querySelector('[id="' + id + '"]');
-            if (!target)
-                return;
-
-            return target;
-        }
-
-        // start glow sequence on an element
-        function glowElement(element) {
-            const startGlow = function() {
-                onGlowEnd();
-                element.dataset.glow = 'true';
-                element.addEventListener('animationend', onGlowEnd);
-            };
-            const onGlowEnd = function() {
-                element.removeAttribute('data-glow');
-                element.removeEventListener('animationend', onGlowEnd);
-            };
-            startGlow();
-        }
-
-        // highlight link and all others with same target
-        function highlight(link) {
-            // force unhighlight all to start fresh
-            unhighlightAll();
-
-            // get links with same target
-            if (!link)
-                return;
-            const sameLinks = getSameLinks(link);
-
-            // if link unique and option is off, exit and don't highlight
-            if (sameLinks.length <= 1 && options.highlightUnique !== 'true')
-                return;
-
-            // highlight all same links, and "select" (special highlight) this
-            // one
-            for (const sameLink of sameLinks) {
-                if (sameLink === link)
-                    sameLink.setAttribute('data-selected', 'true');
-                else
-                    sameLink.setAttribute('data-highlighted', 'true');
-            }
-        }
-
-        // unhighlight all links
-        function unhighlightAll() {
-            const links = getLinks();
-            for (const link of links) {
-                link.setAttribute('data-selected', 'false');
-                link.setAttribute('data-highlighted', 'false');
-            }
-        }
-
-        // get links with same target
-        function getSameLinks(link) {
-            const results = [];
-            const links = getLinks();
-            for (const otherLink of links) {
-                if (
-                    otherLink.getAttribute('href') === link.getAttribute('href')
-                )
-                    results.push(otherLink);
-            }
-            return results;
-        }
-
-        // get all links of types we wish to handle
-        function getLinks() {
-            let query = 'a';
-            if (options.externalLinks !== 'true')
-                query += '[href^="#"]';
-            // exclude buttons, anchor links, toc links, etc
-            query +=
-                ':not(.button):not(.icon_button):not(.anchor):not(.toc_link)';
-            return document.querySelectorAll(query);
-        }
-
-        // load options from url parameters
-        function loadOptions() {
-            const url = window.location.search;
-            const params = new URLSearchParams(url);
-            for (const optionName of Object.keys(options)) {
-                const paramName = pluginName + '-' + optionName;
-                const param = params.get(paramName);
-                if (param !== '' && param !== null)
-                    options[optionName] = param;
-            }
-        }
-        loadOptions();
-
-        // start script when document is finished loading
-        if (options.enabled === 'true')
-            window.addEventListener('load', start);
-    })();
+<!-- 
+  Link Highlight Plugin
+
+  Makes it such that when a user hovers or focuses a link, other links that have
+  the same target will be highlighted. It also makes it such that when clicking
+  a link, the target of the link (eg reference, figure, table) is briefly
+  highlighted.
+-->
+
+<script type="module">
+  // whether to also highlight links that go to external urls
+  const externalLinks = "false";
+  // whether user must click off to unhighlight instead of just
+  // un-hovering
+  const clickUnhighlight = "false";
+  // whether to also highlight links that are unique
+  const highlightUnique = "true";
+
+  // start script
+  function start() {
+    const links = getLinks();
+    for (const link of links) {
+      // attach mouse and focus listeners to link
+      link.addEventListener("mouseenter", onLinkFocus);
+      link.addEventListener("focus", onLinkFocus);
+      link.addEventListener("mouseleave", onLinkUnhover);
+    }
+
+    // attach click and hash change listeners to window
+    window.addEventListener("click", onClick);
+    window.addEventListener("touchstart", onClick);
+    window.addEventListener("hashchange", onHashChange);
+
+    // run hash change on window load in case user has navigated
+    // directly to hash
+    onHashChange();
+  }
+
+  // when link is focused (tabbed to) or hovered
+  function onLinkFocus() {
+    highlight(this);
+  }
+
+  // when link is unhovered
+  function onLinkUnhover() {
+    if (clickUnhighlight !== "true") unhighlightAll();
+  }
+
+  // when the mouse is clicked anywhere in window
+  function onClick(event) {
+    unhighlightAll();
+  }
+
+  // when hash (eg manuscript.html#introduction) changes
+  function onHashChange() {
+    const target = getHashTarget();
+    if (target) glowElement(target);
+  }
+
+  // start glow sequence on an element
+  function glowElement(element) {
+    const startGlow = function () {
+      onGlowEnd();
+      element.dataset.glow = "true";
+      element.addEventListener("animationend", onGlowEnd);
+    };
+    const onGlowEnd = function () {
+      element.removeAttribute("data-glow");
+      element.removeEventListener("animationend", onGlowEnd);
+    };
+    startGlow();
+  }
+
+  // highlight link and all others with same target
+  function highlight(link) {
+    // force unhighlight all to start fresh
+    unhighlightAll();
+
+    // get links with same target
+    if (!link) return;
+    const sameLinks = getSameLinks(link);
+
+    // if link unique and option is off, exit and don't highlight
+    if (sameLinks.length <= 1 && highlightUnique !== "true") return;
+
+    // highlight all same links, and "select" (special highlight) this
+    // one
+    for (const sameLink of sameLinks) {
+      if (sameLink === link) sameLink.setAttribute("data-selected", "true");
+      else sameLink.setAttribute("data-highlighted", "true");
+    }
+  }
+
+  // unhighlight all links
+  function unhighlightAll() {
+    const links = getLinks();
+    for (const link of links) {
+      link.setAttribute("data-selected", "false");
+      link.setAttribute("data-highlighted", "false");
+    }
+  }
+
+  // get links with same target
+  function getSameLinks(link) {
+    const results = [];
+    const links = getLinks();
+    for (const otherLink of links) {
+      if (otherLink.getAttribute("href") === link.getAttribute("href"))
+        results.push(otherLink);
+    }
+    return results;
+  }
+
+  // get all links of types we wish to handle
+  function getLinks() {
+    let query = "a";
+    if (externalLinks !== "true") query += '[href^="#"]';
+    // exclude buttons, anchor links, toc links, etc
+    query += ":not(.button):not(.icon_button):not(.anchor):not(.toc_link)";
+    return document.querySelectorAll(query);
+  }
+
+  // start script when document is finished loading
+  window.addEventListener("load", start);
 </script>
+
+<style>
+  @media only screen {
+    /* anything with data-highlighted attribute true */
+    [data-highlighted="true"] {
+      background: #ffeb3b;
+    }
+
+    /* anything with data-selected attribute true */
+    [data-selected="true"] {
+      background: #ff8a65 !important;
+    }
+
+    /* animation definition for glow */
+    @keyframes highlight_glow {
+      0% {
+        background: none;
+      }
+      10% {
+        background: #bbdefb;
+      }
+      100% {
+        background: none;
+      }
+    }
+
+    /* anything with data-glow attribute true */
+    [data-glow="true"] {
+      animation: highlight_glow 2s;
+    }
+  }
+</style>
diff --git a/build/plugins/math.html b/build/plugins/math.html
deleted file mode 100644
index f47b24d..0000000
--- a/build/plugins/math.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!-- mathjax plugin configuration -->
-
-<script type="text/x-mathjax-config">
-    MathJax.Hub.Config({
-        "CommonHTML": { linebreaks: { automatic: true } },
-        "HTML-CSS": { linebreaks: { automatic: true } },
-        "SVG": { linebreaks: { automatic: true } },
-        "fast-preview": { disabled: true }
-  });
-</script>
-
-<!-- mathjax plugin -->
-
-<script
-    src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-MML-AM_CHTML"
-    integrity="sha512-0doc9hKxR3PYwso42RD1p5ySZpzzuDiOwMrdCEh2WdJZCjcmFKc/wEnL+z8fBQrnHoiNWbo+3fiGkOYXBdQp4A=="
-    crossorigin="anonymous"
->
-    // /////////////////////////
-    // DESCRIPTION
-    // /////////////////////////
-
-    // This third-party plugin 'MathJax' allows the proper rendering of
-    // math/equations written in LaTeX.
-
-    // https://www.mathjax.org/
-</script>
diff --git a/build/plugins/mathjax.html b/build/plugins/mathjax.html
new file mode 100644
index 0000000..14ba331
--- /dev/null
+++ b/build/plugins/mathjax.html
@@ -0,0 +1,53 @@
+<!-- 
+  Mathjax Plugin (third-party) 
+
+  Allows the proper rendering of math/equations written in LaTeX.
+  See https://www.mathjax.org/.
+-->
+
+<script type="text/x-mathjax-config">
+  // configuration
+  MathJax.Hub.Config({
+    "CommonHTML": { linebreaks: { automatic: true } },
+    "HTML-CSS": { linebreaks: { automatic: true } },
+    "SVG": { linebreaks: { automatic: true } },
+    "fast-preview": { disabled: true }
+  });
+</script>
+
+<script
+  src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-MML-AM_CHTML"
+  integrity="sha512-0doc9hKxR3PYwso42RD1p5ySZpzzuDiOwMrdCEh2WdJZCjcmFKc/wEnL+z8fBQrnHoiNWbo+3fiGkOYXBdQp4A=="
+  crossorigin="anonymous"
+></script>
+
+<style>
+  /* mathjax containers */
+  .math.display > span:not(.MathJax_Preview) {
+    /* turn inline element (no dimensions) into block (allows fixed width and thus scrolling) */
+    display: flex !important;
+    overflow-x: auto !important;
+    overflow-y: hidden !important;
+    justify-content: center;
+    align-items: center;
+    margin: 0 !important;
+  }
+
+  /* right click menu */
+  .MathJax_Menu {
+    border-radius: 5px !important;
+    border: solid 1px #bdbdbd !important;
+    box-shadow: none !important;
+  }
+
+  /* equation auto-number */
+  span[id^="eq:"] > span.math.display + span {
+    font-weight: 600;
+  }
+
+  /* equation */
+  span[id^="eq:"] > span.math.display > span {
+    /* nudge to make room for equation auto-number and anchor */
+    margin-right: 60px !important;
+  }
+</style>
diff --git a/build/plugins/scite.html b/build/plugins/scite.html
new file mode 100644
index 0000000..d01fe51
--- /dev/null
+++ b/build/plugins/scite.html
@@ -0,0 +1,61 @@
+<!-- 
+  Scite Plugin (third party)
+
+  Adds a Scite badge next to each citation in the references section.
+  See https://scite.ai/.
+-->
+
+<link
+  rel="stylesheet"
+  type="text/css"
+  href="https://cdn.scite.ai/badge/scite-badge-latest.min.css"
+/>
+<script
+  async
+  type="application/javascript"
+  src="https://cdn.scite.ai/badge/scite-badge-latest.min.js"
+></script>
+
+<script>
+  // start script
+  function start() {
+    // get citation elements
+    const query = ".references div[id*='ref-']";
+    const elements = document.querySelectorAll(query);
+    for (const element of elements) addBadge(element);
+
+    // attach scroll listener to window
+    window.addEventListener("scroll", onScroll);
+  }
+
+  // add badge in citation element
+  function addBadge(element) {
+    // get citation text
+    const text = element.innerText;
+    // find doi string, eg "DOI: xxxxx/xxxxx"
+    const match = text.match(/DOI:\s+(\S*)/) || {};
+    const doi = match[1];
+    if (!doi) return;
+    // create cite badge and put after citation
+    const badge = document.createElement("div");
+    badge.innerHTML = "Loading Scite badge...";
+    badge.classList.add("scite-badge");
+    badge.setAttribute("data-doi", doi);
+    badge.setAttribute("data-layout", "horizontal");
+    badge.setAttribute("data-show-zero", "true");
+    element.append(badge);
+    // modify preceding citation <p> element
+    const p = element.querySelector("p");
+    if (p) p.style.marginBottom = "0";
+  }
+
+  // start script when document is finished loading
+  window.addEventListener("load", start);
+</script>
+
+<style>
+  .scite-badge {
+    text-indent: 0;
+    margin-top: 10px;
+  }
+</style>
diff --git a/build/plugins/table-of-contents.html b/build/plugins/table-of-contents.html
index e415945..ea24c97 100644
--- a/build/plugins/table-of-contents.html
+++ b/build/plugins/table-of-contents.html
@@ -1,315 +1,404 @@
-<script>
-    (function() {
-        // /////////////////////////
-        // DESCRIPTION
-        // /////////////////////////
-
-        // This Manubot plugin provides a "table of contents" (toc) panel on
-        // the side of the document that allows the user to conveniently
-        // navigate between sections of the document.
-
-        // /////////////////////////
-        // OPTIONS
-        // /////////////////////////
-
-        // plugin name prefix for url parameters
-        const pluginName = 'tableOfContents';
-
-        // default plugin options
-        const options = {
-            // which types of elements to add links for, in
-            // "document.querySelector" format
-            typesQuery: 'h1, h2, h3',
-            // whether toc starts open. use 'true' or 'false', or 'auto' to
-            // use 'true' behavior when screen wide enough and 'false' when not
-            startOpen: 'false',
-            // whether toc closes when clicking on toc link. use 'true' or
-            // 'false', or 'auto' to use 'false' behavior when screen wide
-            // enough and 'true' when not
-            clickClose: 'auto',
-            // if list item is more than this many characters, text will be
-            // truncated
-            charLimit: '50',
-            // whether or not to show bullets next to each toc item
-            bullets: 'false',
-            // whether plugin is on or not
-            enabled: 'true'
-        };
-
-        // change options above, or override with url parameter, eg:
-        // 'manuscript.html?pluginName-enabled=false'
-
-        // /////////////////////////
-        // SCRIPT
-        // /////////////////////////
-
-        // start script
-        function start() {
-            // make toc panel and populate with entries (links to document
-            // sections)
-            const panel = makePanel();
-            if (!panel)
-                return;
-            makeEntries(panel);
-            // attach panel to document after making entries, so 'toc' heading
-            // in panel isn't included in toc
-            document.body.insertBefore(panel, document.body.firstChild);
-
-            // initial panel state
-            if (
-                options.startOpen === 'true' ||
-                (options.startOpen === 'auto' && !isSmallScreen())
-            )
-                openPanel();
-            else
-                closePanel();
-
-            // attach click, scroll, and hash change listeners to window
-            window.addEventListener('click', onClick);
-            window.addEventListener('scroll', onScroll);
-            window.addEventListener('hashchange', onScroll);
-            window.addEventListener('keyup', onKeyUp);
-            onScroll();
-
-            // add class to push document body down out of way of toc button
-            document.body.classList.add('toc_body_nudge');
-        }
-
-        // determine if screen wide enough to fit toc panel
-        function isSmallScreen() {
-            // in default theme:
-            // 816px = 8.5in = width of "page" (<body>) element
-            // 260px = min width of toc panel (*2 for both sides of <body>)
-            return window.innerWidth < 816 + 260 * 2;
-        }
-
-        // when mouse is clicked anywhere in window
-        function onClick() {
-            if (isSmallScreen())
-                closePanel();
-        }
-
-        // when window is scrolled or hash changed
-        function onScroll() {
-            highlightViewed();
-        }
-
-        // when key pressed
-        function onKeyUp(event) {
-            if (!event || !event.key)
-                return;
-
-            // close on esc
-            if (event.key === 'Escape')
-                closePanel();
-        }
-
-        // find entry of currently viewed document section in toc and highlight
-        function highlightViewed() {
-            const firstId = getFirstInView(options.typesQuery);
-
-            // get toc entries (links), unhighlight all, then highlight viewed
-            const list = document.getElementById('toc_list');
-            if (!firstId || !list)
-                return;
-            const links = list.querySelectorAll('a');
-            for (const link of links)
-                link.dataset.viewing = 'false';
-            const link = list.querySelector('a[href="#' + firstId + '"]');
-            if (!link)
-                return;
-            link.dataset.viewing = 'true';
-        }
-
-        // get first or previous toc listed element in top half of view
-        function getFirstInView(query) {
-            // get all elements matching query and with id
-            const elements = document.querySelectorAll(query);
-            const elementsWithIds = [];
-            for (const element of elements) {
-                if (element.id)
-                    elementsWithIds.push(element);
-            }
-
-
-            // get first or previous element in top half of view
-            for (let i = 0; i < elementsWithIds.length; i++) {
-                const element = elementsWithIds[i];
-                const prevElement = elementsWithIds[Math.max(0, i - 1)];
-                if (element.getBoundingClientRect().top >= 0) {
-                    if (
-                        element.getBoundingClientRect().top <
-                        window.innerHeight / 2
-                    )
-                        return element.id;
-                    else
-                        return prevElement.id;
-                }
-            }
-        }
-
-        // make panel
-        function makePanel() {
-            // create panel
-            const panel = document.createElement('div');
-            panel.id = 'toc_panel';
-            if (options.bullets === 'true')
-                panel.dataset.bullets = 'true';
-
-            // create header
-            const header = document.createElement('div');
-            header.id = 'toc_header';
-
-            // create toc button
-            const button = document.createElement('button');
-            button.id = 'toc_button';
-            button.innerHTML = document.querySelector('.icon_th_list').innerHTML;
-            button.title = 'Table of Contents';
-            button.classList.add('icon_button');
-
-            // create header text
-            const text = document.createElement('h4');
-            text.innerHTML = 'Table of Contents';
-
-            // create container for toc list
-            const list = document.createElement('div');
-            list.id = 'toc_list';
-
-            // attach click listeners
-            panel.addEventListener('click', onPanelClick);
-            header.addEventListener('click', onHeaderClick);
-            button.addEventListener('click', onButtonClick);
-
-            // attach elements
-            header.appendChild(button);
-            header.appendChild(text);
-            panel.appendChild(header);
-            panel.appendChild(list);
-
-            return panel;
-        }
-
-        // create toc entries (links) to each element of the specified types
-        function makeEntries(panel) {
-            const elements = document.querySelectorAll(options.typesQuery);
-            for (const element of elements) {
-                // do not add link if element doesn't have assigned id
-                if (!element.id)
-                    continue;
-
-                // create link/list item
-                const link = document.createElement('a');
-                link.classList.add('toc_link');
-                switch (element.tagName.toLowerCase()) {
-                    case 'h1':
-                        link.dataset.level = '1';
-                        break;
-                    case 'h2':
-                        link.dataset.level = '2';
-                        break;
-                    case 'h3':
-                        link.dataset.level = '3';
-                        break;
-                    case 'h4':
-                        link.dataset.level = '4';
-                        break;
-                }
-                link.title = element.innerText;
-                let text = element.innerText;
-                if (text.length > options.charLimit)
-                    text = text.slice(0, options.charLimit) + '...';
-                link.innerHTML = text;
-                link.href = '#' + element.id;
-                link.addEventListener('click', onLinkClick);
-
-                // attach link
-                panel.querySelector('#toc_list').appendChild(link);
-            }
-        }
-
-        // when panel is clicked
-        function onPanelClick(event) {
-            // stop click from propagating to window/document and closing panel
-            event.stopPropagation();
-        }
-
-        // when header itself is clicked
-        function onHeaderClick(event) {
-            togglePanel();
-        }
-
-        // when button is clicked
-        function onButtonClick(event) {
-            togglePanel();
-            // stop header underneath button from also being clicked
-            event.stopPropagation();
-        }
-
-        // when link is clicked
-        function onLinkClick(event) {
-            if (
-                options.clickClose === 'true' ||
-                (options.clickClose === 'auto' && isSmallScreen())
-            )
-                closePanel();
-            else
-                openPanel();
-        }
-
-        // open panel if closed, close if opened
-        function togglePanel() {
-            const panel = document.getElementById('toc_panel');
-            if (!panel)
-                return;
-
-            if (panel.dataset.open === 'true')
-                closePanel();
-            else
-                openPanel();
-        }
-
-        // open panel
-        function openPanel() {
-            const panel = document.getElementById('toc_panel');
-            if (panel)
-                panel.dataset.open = 'true';
-        }
-
-        // close panel
-        function closePanel() {
-            const panel = document.getElementById('toc_panel');
-            if (panel)
-                panel.dataset.open = 'false';
-        }
-
-        // load options from url parameters
-        function loadOptions() {
-            const url = window.location.search;
-            const params = new URLSearchParams(url);
-            for (const optionName of Object.keys(options)) {
-                const paramName = pluginName + '-' + optionName;
-                const param = params.get(paramName);
-                if (param !== '' && param !== null)
-                    options[optionName] = param;
-            }
-        }
-        loadOptions();
-
-        // start script when document is finished loading
-        if (options.enabled === 'true')
-            window.addEventListener('load', start);
-    })();
+<!--
+  Table of Contents Plugin
+
+  Provides a "table of contents" (toc) panel on the side of the document that
+  allows the user to conveniently navigate between sections of the document.
+-->
+
+<script type="module">
+  // which types of elements to add links for, in "document.querySelector" format
+  const typesQuery = "h1, h2, h3";
+  // whether toc starts open. use 'true' or 'false', or 'auto' to
+  // use 'true' behavior when screen wide enough and 'false' when not
+  const startOpen = "false";
+  // whether toc closes when clicking on toc link. use 'true' or
+  // 'false', or 'auto' to use 'false' behavior when screen wide
+  // enough and 'true' when not
+  const clickClose = "auto";
+  // if list item is more than this many characters, text will be
+  // truncated
+  const charLimit = "50";
+  // whether or not to show bullets next to each toc item
+  const bullets = "false";
+
+  // start script
+  function start() {
+    // make toc panel and populate with entries (links to document
+    // sections)
+    const panel = makePanel();
+    if (!panel) return;
+    makeEntries(panel);
+    // attach panel to document after making entries, so 'toc' heading
+    // in panel isn't included in toc
+    document.body.insertBefore(panel, document.body.firstChild);
+
+    // initial panel state
+    if (startOpen === "true" || (startOpen === "auto" && !isSmallScreen()))
+      openPanel();
+    else closePanel();
+
+    // attach click, scroll, and hash change listeners to window
+    window.addEventListener("click", onClick);
+    window.addEventListener("scroll", onScroll);
+    window.addEventListener("hashchange", onScroll);
+    window.addEventListener("keyup", onKeyUp);
+    onScroll();
+
+    // add class to push document body down out of way of toc button
+    document.body.classList.add("toc_body_nudge");
+  }
+
+  // determine if screen wide enough to fit toc panel
+  function isSmallScreen() {
+    // in default theme:
+    // 816px = 8.5in = width of "page" (<body>) element
+    // 260px = min width of toc panel (*2 for both sides of <body>)
+    return window.innerWidth < 816 + 260 * 2;
+  }
+
+  // when mouse is clicked anywhere in window
+  function onClick() {
+    if (isSmallScreen()) closePanel();
+  }
+
+  // when window is scrolled or hash changed
+  function onScroll() {
+    highlightViewed();
+  }
+
+  // when key pressed
+  function onKeyUp(event) {
+    if (!event || !event.key) return;
+
+    // close on esc
+    if (event.key === "Escape") closePanel();
+  }
+
+  // find entry of currently viewed document section in toc and highlight
+  function highlightViewed() {
+    const firstId = getFirstInView(typesQuery);
+
+    // get toc entries (links), unhighlight all, then highlight viewed
+    const list = document.getElementById("toc_list");
+    if (!firstId || !list) return;
+    const links = list.querySelectorAll("a");
+    for (const link of links) link.dataset.viewing = "false";
+    const link = list.querySelector('a[href="#' + firstId + '"]');
+    if (!link) return;
+    link.dataset.viewing = "true";
+  }
+
+  // get first or previous toc listed element in top half of view
+  function getFirstInView(query) {
+    // get all elements matching query and with id
+    const elements = document.querySelectorAll(query);
+    const elementsWithIds = [];
+    for (const element of elements) {
+      if (element.id) elementsWithIds.push(element);
+    }
+
+    // get first or previous element in top half of view
+    for (let i = 0; i < elementsWithIds.length; i++) {
+      const element = elementsWithIds[i];
+      const prevElement = elementsWithIds[Math.max(0, i - 1)];
+      if (element.getBoundingClientRect().top >= 0) {
+        if (element.getBoundingClientRect().top < window.innerHeight / 2)
+          return element.id;
+        else return prevElement.id;
+      }
+    }
+  }
+
+  // make panel
+  function makePanel() {
+    // create panel
+    const panel = document.createElement("div");
+    panel.id = "toc_panel";
+    if (bullets === "true") panel.dataset.bullets = "true";
+
+    // create header
+    const header = document.createElement("div");
+    header.id = "toc_header";
+
+    // create toc button
+    const button = document.createElement("button");
+    button.id = "toc_button";
+    button.innerHTML = document.querySelector(".icon_th_list").innerHTML;
+    button.title = "Table of Contents";
+    button.classList.add("icon_button");
+
+    // create header text
+    const text = document.createElement("h4");
+    text.innerHTML = "Table of Contents";
+
+    // create container for toc list
+    const list = document.createElement("div");
+    list.id = "toc_list";
+
+    // attach click listeners
+    panel.addEventListener("click", onPanelClick);
+    header.addEventListener("click", onHeaderClick);
+    button.addEventListener("click", onButtonClick);
+
+    // attach elements
+    header.appendChild(button);
+    header.appendChild(text);
+    panel.appendChild(header);
+    panel.appendChild(list);
+
+    return panel;
+  }
+
+  // create toc entries (links) to each element of the specified types
+  function makeEntries(panel) {
+    const elements = document.querySelectorAll(typesQuery);
+    for (const element of elements) {
+      // do not add link if element doesn't have assigned id
+      if (!element.id) continue;
+
+      // create link/list item
+      const link = document.createElement("a");
+      link.classList.add("toc_link");
+      switch (element.tagName.toLowerCase()) {
+        case "h1":
+          link.dataset.level = "1";
+          break;
+        case "h2":
+          link.dataset.level = "2";
+          break;
+        case "h3":
+          link.dataset.level = "3";
+          break;
+        case "h4":
+          link.dataset.level = "4";
+          break;
+      }
+      link.title = element.innerText;
+      let text = element.innerText;
+      if (text.length > charLimit) text = text.slice(0, charLimit) + "...";
+      link.innerHTML = text;
+      link.href = "#" + element.id;
+      link.addEventListener("click", onLinkClick);
+
+      // attach link
+      panel.querySelector("#toc_list").appendChild(link);
+    }
+  }
+
+  // when panel is clicked
+  function onPanelClick(event) {
+    // stop click from propagating to window/document and closing panel
+    event.stopPropagation();
+  }
+
+  // when header itself is clicked
+  function onHeaderClick(event) {
+    togglePanel();
+  }
+
+  // when button is clicked
+  function onButtonClick(event) {
+    togglePanel();
+    // stop header underneath button from also being clicked
+    event.stopPropagation();
+  }
+
+  // when link is clicked
+  function onLinkClick(event) {
+    if (clickClose === "true" || (clickClose === "auto" && isSmallScreen()))
+      closePanel();
+    else openPanel();
+  }
+
+  // open panel if closed, close if opened
+  function togglePanel() {
+    const panel = document.getElementById("toc_panel");
+    if (!panel) return;
+
+    if (panel.dataset.open === "true") closePanel();
+    else openPanel();
+  }
+
+  // open panel
+  function openPanel() {
+    const panel = document.getElementById("toc_panel");
+    if (panel) panel.dataset.open = "true";
+  }
+
+  // close panel
+  function closePanel() {
+    const panel = document.getElementById("toc_panel");
+    if (panel) panel.dataset.open = "false";
+  }
+
+  // start script when document is finished loading
+  window.addEventListener("load", start);
 </script>
 
 <!-- th list icon -->
 
 <template class="icon_th_list">
-    <!-- modified from: https://fontawesome.com/icons/th-list -->
-    <svg width="16" height="16" viewBox="0 0 512 512" tabindex="-1">
-        <path
-            fill="currentColor"
-            d="M96 96c0 26.51-21.49 48-48 48S0 122.51 0 96s21.49-48 48-48 48 21.49 48 48zM48 208c-26.51 0-48 21.49-48 48s21.49 48 48 48 48-21.49 48-48-21.49-48-48-48zm0 160c-26.51 0-48 21.49-48 48s21.49 48 48 48 48-21.49 48-48-21.49-48-48-48zm96-236h352c8.837 0 16-7.163 16-16V76c0-8.837-7.163-16-16-16H144c-8.837 0-16 7.163-16 16v40c0 8.837 7.163 16 16 16zm0 160h352c8.837 0 16-7.163 16-16v-40c0-8.837-7.163-16-16-16H144c-8.837 0-16 7.163-16 16v40c0 8.837 7.163 16 16 16zm0 160h352c8.837 0 16-7.163 16-16v-40c0-8.837-7.163-16-16-16H144c-8.837 0-16 7.163-16 16v40c0 8.837 7.163 16 16 16z"
-            tabindex="-1"
-        ></path>
-    </svg>
+  <!-- modified from: https://fontawesome.com/icons/th-list -->
+  <svg width="16" height="16" viewBox="0 0 512 512" tabindex="-1">
+    <path
+      fill="currentColor"
+      d="M96 96c0 26.51-21.49 48-48 48S0 122.51 0 96s21.49-48 48-48 48 21.49 48 48zM48 208c-26.51 0-48 21.49-48 48s21.49 48 48 48 48-21.49 48-48-21.49-48-48-48zm0 160c-26.51 0-48 21.49-48 48s21.49 48 48 48 48-21.49 48-48-21.49-48-48-48zm96-236h352c8.837 0 16-7.163 16-16V76c0-8.837-7.163-16-16-16H144c-8.837 0-16 7.163-16 16v40c0 8.837 7.163 16 16 16zm0 160h352c8.837 0 16-7.163 16-16v-40c0-8.837-7.163-16-16-16H144c-8.837 0-16 7.163-16 16v40c0 8.837 7.163 16 16 16zm0 160h352c8.837 0 16-7.163 16-16v-40c0-8.837-7.163-16-16-16H144c-8.837 0-16 7.163-16 16v40c0 8.837 7.163 16 16 16z"
+      tabindex="-1"
+    ></path>
+  </svg>
 </template>
+
+<style>
+  @media only screen {
+    /* toc panel */
+    #toc_panel {
+      box-sizing: border-box;
+      position: fixed;
+      top: 0;
+      left: 0;
+      background: #ffffff;
+      box-shadow: 0 0 20px rgba(0, 0, 0, 0.05);
+      z-index: 2;
+    }
+
+    /* toc panel when closed */
+    #toc_panel[data-open="false"] {
+      min-width: 60px;
+      width: 60px;
+      height: 60px;
+      border-right: solid 1px #bdbdbd;
+      border-bottom: solid 1px #bdbdbd;
+    }
+
+    /* toc panel when open */
+    #toc_panel[data-open="true"] {
+      min-width: 260px;
+      max-width: 480px;
+      /* keep panel edge consistent distance away from "page" edge */
+      width: calc(((100vw - 8.5in) / 2) - 30px - 40px);
+      bottom: 0;
+      border-right: solid 1px #bdbdbd;
+    }
+
+    /* toc panel header */
+    #toc_header {
+      box-sizing: border-box;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      height: 60px;
+      margin: 0;
+      padding: 20px;
+    }
+
+    /* toc panel header when hovered */
+    #toc_header:hover {
+      cursor: pointer;
+    }
+
+    /* toc panel header when panel open */
+    #toc_panel[data-open="true"] > #toc_header {
+      border-bottom: solid 1px #bdbdbd;
+    }
+
+    /* toc open/close header button */
+    #toc_button {
+      margin-right: 20px;
+    }
+
+    /* hide toc list and header text when closed */
+    #toc_panel[data-open="false"] > #toc_header > *:not(#toc_button),
+    #toc_panel[data-open="false"] > #toc_list {
+      display: none;
+    }
+
+    /* toc list of entries */
+    #toc_list {
+      box-sizing: border-box;
+      width: 100%;
+      padding: 20px;
+      position: absolute;
+      top: calc(60px + 1px);
+      bottom: 0;
+      overflow: auto;
+    }
+
+    /* toc entry, link to section in document */
+    .toc_link {
+      display: block;
+      padding: 5px;
+      position: relative;
+      font-weight: 600;
+      text-decoration: none;
+    }
+
+    /* toc entry when hovered or when "viewed" */
+    .toc_link:hover,
+    .toc_link[data-viewing="true"] {
+      background: #f5f5f5;
+    }
+
+    /* toc entry, level 1 indentation */
+    .toc_link[data-level="1"] {
+      margin-left: 0;
+    }
+
+    /* toc entry, level 2 indentation */
+    .toc_link[data-level="2"] {
+      margin-left: 20px;
+    }
+
+    /* toc entry, level 3 indentation */
+    .toc_link[data-level="3"] {
+      margin-left: 40px;
+    }
+
+    /* toc entry, level 4 indentation */
+    .toc_link[data-level="4"] {
+      margin-left: 60px;
+    }
+
+    /* toc entry bullets */
+    #toc_panel[data-bullets="true"] .toc_link[data-level]:before {
+      position: absolute;
+      left: -15px;
+      top: -1px;
+      font-size: 1.5em;
+    }
+
+    /* toc entry, level 2 bullet */
+    #toc_panel[data-bullets="true"] .toc_link[data-level="2"]:before {
+      content: "\2022";
+    }
+
+    /* toc entry, level 3 bullet */
+    #toc_panel[data-bullets="true"] .toc_link[data-level="3"]:before {
+      content: "\25AB";
+    }
+
+    /* toc entry, level 4 bullet */
+    #toc_panel[data-bullets="true"] .toc_link[data-level="4"]:before {
+      content: "-";
+    }
+  }
+
+  /* when on screen < 8.5in wide */
+  @media only screen and (max-width: 8.5in) {
+    /* push <body> ("page") element down to make room for toc icon */
+    .toc_body_nudge {
+      padding-top: 60px;
+    }
+
+    /* toc icon when panel closed and not hovered */
+    #toc_panel[data-open="false"]:not(:hover) {
+      background: rgba(255, 255, 255, 0.75);
+    }
+  }
+
+  /* always hide toc panel on print */
+  @media only print {
+    #toc_panel {
+      display: none;
+    }
+  }
+</style>
diff --git a/build/plugins/tooltips.html b/build/plugins/tooltips.html
index f9cbc60..b6fc505 100644
--- a/build/plugins/tooltips.html
+++ b/build/plugins/tooltips.html
@@ -1,614 +1,507 @@
-<!-- tooltips plugin -->
-
-<script>
-    (function() {
-        // /////////////////////////
-        // DESCRIPTION
-        // /////////////////////////
-
-        // This Manubot plugin makes it such that when the user hovers or
-        // focuses a link to a citation or figure, a tooltip appears with a
-        // preview of the reference content, along with arrows to navigate
-        // between instances of the same reference in the document.
-
-        // /////////////////////////
-        // OPTIONS
-        // /////////////////////////
-
-        // plugin name prefix for url parameters
-        const pluginName = 'tooltips';
-
-        // default plugin options
-        const options = {
-            // whether user must click off to close tooltip instead of just
-            // un-hovering
-            clickClose: 'false',
-            // delay (in ms) between opening and closing tooltip
-            delay: '100',
-            // whether plugin is on or not
-            enabled: 'true'
-        };
-
-        // change options above, or override with url parameter, eg:
-        // 'manuscript.html?pluginName-enabled=false'
-
-        // /////////////////////////
-        // SCRIPT
-        // /////////////////////////
-
-        // start script
-        function start() {
-            const links = getLinks();
-            for (const link of links) {
-                // attach hover and focus listeners to link
-                link.addEventListener('mouseover', onLinkHover);
-                link.addEventListener('mouseleave', onLinkUnhover);
-                link.addEventListener('focus', onLinkFocus);
-                link.addEventListener('touchend', onLinkTouch);
-            }
-
-            // attach mouse, key, and resize listeners to window
-            window.addEventListener('mousedown', onClick);
-            window.addEventListener('touchstart', onClick);
-            window.addEventListener('keyup', onKeyUp);
-            window.addEventListener('resize', onResize);
-        }
-
-        // when link is hovered
-        function onLinkHover() {
-            // function to open tooltip
-            const delayOpenTooltip = function() {
-                openTooltip(this);
-            }.bind(this);
-
-            // run open function after delay
-            this.openTooltipTimer = window.setTimeout(
-                delayOpenTooltip,
-                options.delay
-            );
-        }
-
-        // when mouse leaves link
-        function onLinkUnhover() {
-            // cancel opening tooltip
-            window.clearTimeout(this.openTooltipTimer);
-
-            // don't close on unhover if option specifies
-            if (options.clickClose === 'true')
-                return;
-
-            // function to close tooltip
-            const delayCloseTooltip = function() {
-                // if tooltip open and if mouse isn't over tooltip, close
-                const tooltip = document.getElementById('tooltip');
-                if (tooltip && !tooltip.matches(':hover'))
-                    closeTooltip();
-            };
-
-            // run close function after delay
-            this.closeTooltipTimer = window.setTimeout(
-                delayCloseTooltip,
-                options.delay
-            );
-        }
-
-        // when link is focused (tabbed to)
-        function onLinkFocus(event) {
-            openTooltip(this);
-        }
-
-        // when link is touched on touch screen
-        function onLinkTouch(event) {
-            // attempt to force hover state on first tap always, and trigger
-            // regular link click (and navigation) on second tap
-            if (event.target === document.activeElement)
-                event.target.click();
-            else {
-                document.activeElement.blur();
-                event.target.focus();
-            }
-            if (event.cancelable)
-                event.preventDefault();
-            event.stopPropagation();
-            return false;
-        }
-
-        // when mouse is clicked anywhere in window
-        function onClick(event) {
-            closeTooltip();
-        }
-
-        // when key pressed
-        function onKeyUp(event) {
-            if (!event || !event.key)
-                return;
-
-            switch (event.key) {
-                // trigger click of prev button
-                case 'ArrowLeft':
-                    const prevButton = document.getElementById(
-                        'tooltip_prev_button'
-                    );
-                    if (prevButton)
-                        prevButton.click();
-                    break;
-                // trigger click of next button
-                case 'ArrowRight':
-                    const nextButton = document.getElementById(
-                        'tooltip_next_button'
-                    );
-                    if (nextButton)
-                        nextButton.click();
-                    break;
-                // close on esc
-                case 'Escape':
-                    closeTooltip();
-                    break;
-            }
-        }
-
-        // when window is resized or zoomed
-        function onResize() {
-            closeTooltip();
-        }
-
-        // get all links of types we wish to handle
-        function getLinks() {
-            const queries = [];
-            // exclude buttons, anchor links, toc links, etc
-            const exclude =
-                ':not(.button):not(.icon_button):not(.anchor):not(.toc_link)';
-            queries.push('a[href^="#ref-"]' + exclude); // citation links
-            queries.push('a[href^="#fig:"]' + exclude); // figure links
-            const query = queries.join(', ');
-            return document.querySelectorAll(query);
-        }
-
-        // get links with same target, get index of link in set, get total
-        // same links
-        function getSameLinks(link) {
-            const sameLinks = [];
-            const links = getLinks();
-            for (const otherLink of links) {
-                if (
-                    otherLink.getAttribute('href') === link.getAttribute('href')
-                )
-                    sameLinks.push(otherLink);
-            }
-
-            return {
-                elements: sameLinks,
-                index: sameLinks.indexOf(link),
-                total: sameLinks.length
-            };
-        }
-
-        // open tooltip
-        function openTooltip(link) {
-            // delete tooltip if it exists, start fresh
-            closeTooltip();
-
-            // make tooltip element
-            const tooltip = makeTooltip(link);
-
-            // if source couldn't be found and tooltip not made, exit
-            if (!tooltip)
-                return;
-
-            // make navbar elements
-            const navBar = makeNavBar(link);
-            if (navBar)
-                tooltip.firstElementChild.appendChild(navBar);
-
-            // attach tooltip to page
-            document.body.appendChild(tooltip);
-
-            // position tooltip
-            const position = function() {
-                positionTooltip(link);
-            };
-            position();
-
-            // if tooltip contains images, position again after they've loaded
-            const imgs = tooltip.querySelectorAll('img');
-            for (const img of imgs)
-                img.addEventListener('load', position);
-        }
-
-        // close (delete) tooltip
-        function closeTooltip() {
-            const tooltip = document.getElementById('tooltip');
-            if (tooltip)
-                tooltip.remove();
-        }
-
-        // make tooltip
-        function makeTooltip(link) {
-            // get target element that link points to
-            const source = getSource(link);
-
-            // if source can't be found, exit
-            if (!source)
-                return;
-
-            // create new tooltip
-            const tooltip = document.createElement('div');
-            tooltip.id = 'tooltip';
-            const tooltipContent = document.createElement('div');
-            tooltipContent.id = 'tooltip_content';
-            tooltip.appendChild(tooltipContent);
-
-            // make copy of source node and put in tooltip
-            const sourceCopy = makeCopy(source);
-            tooltipContent.appendChild(sourceCopy);
-
-            // attach mouse event listeners
-            tooltip.addEventListener('click', onTooltipClick);
-            tooltip.addEventListener('mousedown', onTooltipClick);
-            tooltip.addEventListener('touchstart', onTooltipClick);
-            tooltip.addEventListener('mouseleave', onTooltipUnhover);
-
-            // (for interaction with lightbox plugin)
-            // transfer click on tooltip copied img to original img
-            const sourceImg = source.querySelector('img');
-            const sourceCopyImg = sourceCopy.querySelector('img');
-            if (sourceImg && sourceCopyImg) {
-                const clickImg = function() {
-                    sourceImg.click();
-                    closeTooltip();
-                };
-                sourceCopyImg.addEventListener('click', clickImg);
-            }
-
-            return tooltip;
-        }
-
-        // make carbon copy of html dom element
-        function makeCopy(source) {
-            const sourceCopy = source.cloneNode(true);
-
-            // delete elements marked with ignore (eg anchor and jump buttons)
-            const deleteFromCopy = sourceCopy.querySelectorAll(
-                '[data-ignore="true"]'
-            );
-            for (const element of deleteFromCopy)
-                element.remove();
-
-            // delete certain element attributes
-            const attributes = [
-                'id',
-                'data-collapsed',
-                'data-selected',
-                'data-highlighted',
-                'data-glow'
-            ];
-            for (const attribute of attributes) {
-                sourceCopy.removeAttribute(attribute);
-                const elements = sourceCopy.querySelectorAll(
-                    '[' + attribute + ']'
-                );
-                for (const element of elements)
-                    element.removeAttribute(attribute);
-            }
-
-            return sourceCopy;
-        }
-
-        // when tooltip is clicked
-        function onTooltipClick(event) {
-            // when user clicks on tooltip, stop click from transferring
-            // outside of tooltip (eg, click off to close tooltip, or eg click
-            // off to unhighlight same refs)
-            event.stopPropagation();
-        }
-
-        // when tooltip is unhovered
-        function onTooltipUnhover(event) {
-            if (options.clickClose === 'true')
-                return;
-
-            // make sure new mouse/touch/focus no longer over tooltip or any
-            // element within it
-            const tooltip = document.getElementById('tooltip');
-            if (!tooltip)
-                return;
-            if (this.contains(event.relatedTarget))
-                return;
-
-            closeTooltip();
-        }
-
-        // make nav bar to go betwen prev/next instances of same reference
-        function makeNavBar(link) {
-            // find other links to the same source
-            const sameLinks = getSameLinks(link);
-
-            // don't show nav bar when singular reference
-            if (sameLinks.total <= 1)
-                return;
-
-            // find prev/next links with same target
-            const prevLink = getPrevLink(link, sameLinks);
-            const nextLink = getNextLink(link, sameLinks);
-
-            // create nav bar
-            const navBar = document.createElement('div');
-            navBar.id = 'tooltip_nav_bar';
-            const text = sameLinks.index + 1 + ' of ' + sameLinks.total;
-
-            // create nav bar prev/next buttons
-            const prevButton = document.createElement('button');
-            const nextButton = document.createElement('button');
-            prevButton.id = 'tooltip_prev_button';
-            nextButton.id = 'tooltip_next_button';
-            prevButton.title =
-                'Jump to the previous occurence of this item in the document [←]';
-            nextButton.title =
-                'Jump to the next occurence of this item in the document [→]';
-            prevButton.classList.add('icon_button');
-            nextButton.classList.add('icon_button');
-            prevButton.innerHTML = document.querySelector(
-                '.icon_caret_left'
-            ).innerHTML;
-            nextButton.innerHTML = document.querySelector(
-                '.icon_caret_right'
-            ).innerHTML;
-            navBar.appendChild(prevButton);
-            navBar.appendChild(document.createTextNode(text));
-            navBar.appendChild(nextButton);
-
-            // attach click listeners to buttons
-            prevButton.addEventListener('click', function() {
-                onPrevNextClick(link, prevLink);
-            });
-            nextButton.addEventListener('click', function() {
-                onPrevNextClick(link, nextLink);
-            });
-
-            return navBar;
-        }
-
-        // get previous link with same target
-        function getPrevLink(link, sameLinks) {
-            if (!sameLinks)
-                sameLinks = getSameLinks(link);
-            // wrap index to other side if < 1
-            let index;
-            if (sameLinks.index - 1 >= 0)
-                index = sameLinks.index - 1;
-            else
-                index = sameLinks.total - 1;
-            return sameLinks.elements[index];
-        }
-
-        // get next link with same target
-        function getNextLink(link, sameLinks) {
-            if (!sameLinks)
-                sameLinks = getSameLinks(link);
-            // wrap index to other side if > total
-            let index;
-            if (sameLinks.index + 1 <= sameLinks.total - 1)
-                index = sameLinks.index + 1;
-            else
-                index = 0;
-            return sameLinks.elements[index];
-        }
-
-        // get element that is target of link or url hash
-        function getSource(link) {
-            const hash = link ? link.hash : window.location.hash;
-            const id = hash.slice(1);
-            let target = document.querySelector('[id="' + id + '"]');
-            if (!target)
-                return;
-
-            // if ref or figure, modify target to get expected element
-            if (id.indexOf('ref-') === 0)
-                target = target.querySelector('p');
-            else if (id.indexOf('fig:') === 0)
-                target = target.querySelector('figure');
-
-            return target;
-        }
-
-        // when prev/next arrow button is clicked
-        function onPrevNextClick(link, prevNextLink) {
-            if (link && prevNextLink)
-                goToElement(prevNextLink, window.innerHeight * 0.5);
-        }
-
-        // scroll to and focus element
-        function goToElement(element, offset) {
-            // expand accordion section if collapsed
-            expandElement(element);
-            const y =
-                getRectInView(element).top -
-                getRectInView(document.documentElement).top -
-                (offset || 0);
-            // trigger any function listening for "onscroll" event
-            window.dispatchEvent(new Event('scroll'));
-            window.scrollTo(0, y);
-            document.activeElement.blur();
-            element.focus();
-        }
-
-        // determine position to place tooltip based on link position in
-        // viewport and tooltip size
-        function positionTooltip(link, left, top) {
-            const tooltipElement = document.getElementById('tooltip');
-            if (!tooltipElement)
-                return;
-
-            // get convenient vars for position/dimensions of
-            // link/tooltip/page/view
-            link = getRectInPage(link);
-            const tooltip = getRectInPage(tooltipElement);
-            const view = getRectInPage();
-
-            // horizontal positioning
-            if (left)
-                // use explicit value
-                left = left;
-            else if (link.left + tooltip.width < view.right)
-                // fit tooltip to right of link
-                left = link.left;
-            else if (link.right - tooltip.width > view.left)
-                // fit tooltip to left of link
-                left = link.right - tooltip.width;
-            // center tooltip in view
-            else
-                left = (view.right - view.left) / 2 - tooltip.width / 2;
-
-            // vertical positioning
-            if (top)
-                // use explicit value
-                top = top;
-            else if (link.top - tooltip.height > view.top)
-                // fit tooltip above link
-                top = link.top - tooltip.height;
-            else if (link.bottom + tooltip.height < view.bottom)
-                // fit tooltip below link
-                top = link.bottom;
-            else {
-                // center tooltip in view
-                top = view.top + view.height / 2 - tooltip.height / 2;
-                // nudge off of link to left/right if possible
-                if (link.right + tooltip.width < view.right)
-                    left = link.right;
-                else if (link.left - tooltip.width > view.left)
-                    left = link.left - tooltip.width;
-            }
-
-            tooltipElement.style.left = left + 'px';
-            tooltipElement.style.top = top + 'px';
-        }
-
-        // get position/dimensions of element or viewport
-        function getRectInView(element) {
-            let rect = {};
-            rect.left = 0;
-            rect.top = 0;
-            rect.right = document.documentElement.clientWidth;
-            rect.bottom = document.documentElement.clientHeight;
-            let style = {};
-
-            if (element instanceof HTMLElement) {
-                rect = element.getBoundingClientRect();
-                style = window.getComputedStyle(element);
-            }
-
-            const margin = {};
-            margin.left = parseFloat(style.marginLeftWidth) || 0;
-            margin.top = parseFloat(style.marginTopWidth) || 0;
-            margin.right = parseFloat(style.marginRightWidth) || 0;
-            margin.bottom = parseFloat(style.marginBottomWidth) || 0;
-
-            const border = {};
-            border.left = parseFloat(style.borderLeftWidth) || 0;
-            border.top = parseFloat(style.borderTopWidth) || 0;
-            border.right = parseFloat(style.borderRightWidth) || 0;
-            border.bottom = parseFloat(style.borderBottomWidth) || 0;
-
-            const newRect = {};
-            newRect.left = rect.left + margin.left + border.left;
-            newRect.top = rect.top + margin.top + border.top;
-            newRect.right = rect.right + margin.right + border.right;
-            newRect.bottom = rect.bottom + margin.bottom + border.bottom;
-            newRect.width = newRect.right - newRect.left;
-            newRect.height = newRect.bottom - newRect.top;
-
-            return newRect;
-        }
-
-        // get position of element relative to page
-        function getRectInPage(element) {
-            const rect = getRectInView(element);
-            const body = getRectInView(document.body);
-
-            const newRect = {};
-            newRect.left = rect.left - body.left;
-            newRect.top = rect.top - body.top;
-            newRect.right = rect.right - body.left;
-            newRect.bottom = rect.bottom - body.top;
-            newRect.width = rect.width;
-            newRect.height = rect.height;
-
-            return newRect;
-        }
-
-        // (for interaction with accordion plugin)
-        // get closest element before specified element that matches query
-        function firstBefore(element, query) {
-            while (
-                element &&
-                element !== document.body &&
-                !element.matches(query)
-            )
-                element = element.previousElementSibling || element.parentNode;
-
-            return element;
-        }
-
-        // (for interaction with accordion plugin)
-        // check if element is part of collapsed heading
-        function isCollapsed(element) {
-            while (element && element !== document.body) {
-                if (element.dataset.collapsed === 'true')
-                    return true;
-                element = element.parentNode;
-            }
-            return false;
-        }
-
-        // (for interaction with accordion plugin)
-        // expand heading containing element if necesary
-        function expandElement(element) {
-            if (isCollapsed(element)) {
-                const heading = firstBefore(element, 'h2');
-                if (heading)
-                    heading.click();
-            }
-        }
-
-        // load options from url parameters
-        function loadOptions() {
-            const url = window.location.search;
-            const params = new URLSearchParams(url);
-            for (const optionName of Object.keys(options)) {
-                const paramName = pluginName + '-' + optionName;
-                const param = params.get(paramName);
-                if (param !== '' && param !== null)
-                    options[optionName] = param;
-            }
-        }
-        loadOptions();
-
-        // start script when document is finished loading
-        if (options.enabled === 'true')
-            window.addEventListener('load', start);
-    })();
+<!-- 
+  Tooltips Plugin
+
+  Makes it such that when the user hovers or focuses a link to a citation or
+  figure, a tooltip appears with a preview of the reference content, along with
+  arrows to navigate between instances of the same reference in the document.
+-->
+
+<script type="module">
+  // whether user must click off to close tooltip instead of just un-hovering
+  const clickClose = "false";
+  // delay (in ms) between opening and closing tooltip
+  const delay = "100";
+
+  // start script
+  function start() {
+    const links = getLinks();
+    for (const link of links) {
+      // attach hover and focus listeners to link
+      link.addEventListener("mouseover", onLinkHover);
+      link.addEventListener("mouseleave", onLinkUnhover);
+      link.addEventListener("focus", onLinkFocus);
+      link.addEventListener("touchend", onLinkTouch);
+    }
+
+    // attach mouse, key, and resize listeners to window
+    window.addEventListener("mousedown", onClick);
+    window.addEventListener("touchstart", onClick);
+    window.addEventListener("keyup", onKeyUp);
+    window.addEventListener("resize", onResize);
+  }
+
+  // when link is hovered
+  function onLinkHover() {
+    // function to open tooltip
+    const delayOpenTooltip = function () {
+      openTooltip(this);
+    }.bind(this);
+
+    // run open function after delay
+    this.openTooltipTimer = window.setTimeout(delayOpenTooltip, delay);
+  }
+
+  // when mouse leaves link
+  function onLinkUnhover() {
+    // cancel opening tooltip
+    window.clearTimeout(this.openTooltipTimer);
+
+    // don't close on unhover if option specifies
+    if (clickClose === "true") return;
+
+    // function to close tooltip
+    const delayCloseTooltip = function () {
+      // if tooltip open and if mouse isn't over tooltip, close
+      const tooltip = document.getElementById("tooltip");
+      if (tooltip && !tooltip.matches(":hover")) closeTooltip();
+    };
+
+    // run close function after delay
+    this.closeTooltipTimer = window.setTimeout(delayCloseTooltip, delay);
+  }
+
+  // when link is focused (tabbed to)
+  function onLinkFocus(event) {
+    openTooltip(this);
+  }
+
+  // when link is touched on touch screen
+  function onLinkTouch(event) {
+    // attempt to force hover state on first tap always, and trigger
+    // regular link click (and navigation) on second tap
+    if (event.target === document.activeElement) event.target.click();
+    else {
+      document.activeElement.blur();
+      event.target.focus();
+    }
+    if (event.cancelable) event.preventDefault();
+    event.stopPropagation();
+    return false;
+  }
+
+  // when mouse is clicked anywhere in window
+  function onClick(event) {
+    closeTooltip();
+  }
+
+  // when key pressed
+  function onKeyUp(event) {
+    if (!event || !event.key) return;
+
+    switch (event.key) {
+      // trigger click of prev button
+      case "ArrowLeft":
+        const prevButton = document.getElementById("tooltip_prev_button");
+        if (prevButton) prevButton.click();
+        break;
+      // trigger click of next button
+      case "ArrowRight":
+        const nextButton = document.getElementById("tooltip_next_button");
+        if (nextButton) nextButton.click();
+        break;
+      // close on esc
+      case "Escape":
+        closeTooltip();
+        break;
+    }
+  }
+
+  // when window is resized or zoomed
+  function onResize() {
+    closeTooltip();
+  }
+
+  // get all links of types we wish to handle
+  function getLinks() {
+    const queries = [];
+    // exclude buttons, anchor links, toc links, etc
+    const exclude =
+      ":not(.button):not(.icon_button):not(.anchor):not(.toc_link)";
+    queries.push('a[href^="#ref-"]' + exclude); // citation links
+    queries.push('a[href^="#fig:"]' + exclude); // figure links
+    const query = queries.join(", ");
+    return document.querySelectorAll(query);
+  }
+
+  // get links with same target, get index of link in set, get total
+  // same links
+  function getSameLinks(link) {
+    const sameLinks = [];
+    const links = getLinks();
+    for (const otherLink of links) {
+      if (otherLink.getAttribute("href") === link.getAttribute("href"))
+        sameLinks.push(otherLink);
+    }
+
+    return {
+      elements: sameLinks,
+      index: sameLinks.indexOf(link),
+      total: sameLinks.length,
+    };
+  }
+
+  // open tooltip
+  function openTooltip(link) {
+    // delete tooltip if it exists, start fresh
+    closeTooltip();
+
+    // make tooltip element
+    const tooltip = makeTooltip(link);
+
+    // if source couldn't be found and tooltip not made, exit
+    if (!tooltip) return;
+
+    // make navbar elements
+    const navBar = makeNavBar(link);
+    if (navBar) tooltip.firstElementChild.appendChild(navBar);
+
+    // attach tooltip to page
+    document.body.appendChild(tooltip);
+
+    // position tooltip
+    const position = function () {
+      positionTooltip(link);
+    };
+    position();
+
+    // if tooltip contains images, position again after they've loaded
+    const imgs = tooltip.querySelectorAll("img");
+    for (const img of imgs) img.addEventListener("load", position);
+  }
+
+  // close (delete) tooltip
+  function closeTooltip() {
+    const tooltip = document.getElementById("tooltip");
+    if (tooltip) tooltip.remove();
+  }
+
+  // make tooltip
+  function makeTooltip(link) {
+    // get target element that link points to
+    const source = getSource(link);
+
+    // if source can't be found, exit
+    if (!source) return;
+
+    // create new tooltip
+    const tooltip = document.createElement("div");
+    tooltip.id = "tooltip";
+    const tooltipContent = document.createElement("div");
+    tooltipContent.id = "tooltip_content";
+    tooltip.appendChild(tooltipContent);
+
+    // make copy of source node and put in tooltip
+    const sourceCopy = makeCopy(source);
+    tooltipContent.appendChild(sourceCopy);
+
+    // attach mouse event listeners
+    tooltip.addEventListener("click", onTooltipClick);
+    tooltip.addEventListener("mousedown", onTooltipClick);
+    tooltip.addEventListener("touchstart", onTooltipClick);
+    tooltip.addEventListener("mouseleave", onTooltipUnhover);
+
+    // (for interaction with lightbox plugin)
+    // transfer click on tooltip copied img to original img
+    const sourceImg = source.querySelector("img");
+    const sourceCopyImg = sourceCopy.querySelector("img");
+    if (sourceImg && sourceCopyImg) {
+      const clickImg = function () {
+        sourceImg.click();
+        closeTooltip();
+      };
+      sourceCopyImg.addEventListener("click", clickImg);
+    }
+
+    return tooltip;
+  }
+
+  // make carbon copy of html dom element
+  function makeCopy(source) {
+    const sourceCopy = source.cloneNode(true);
+
+    // delete elements marked with ignore (eg anchor and jump buttons)
+    const deleteFromCopy = sourceCopy.querySelectorAll('[data-ignore="true"]');
+    for (const element of deleteFromCopy) element.remove();
+
+    // delete certain element attributes
+    const attributes = [
+      "id",
+      "data-collapsed",
+      "data-selected",
+      "data-highlighted",
+      "data-glow",
+    ];
+    for (const attribute of attributes) {
+      sourceCopy.removeAttribute(attribute);
+      const elements = sourceCopy.querySelectorAll("[" + attribute + "]");
+      for (const element of elements) element.removeAttribute(attribute);
+    }
+
+    return sourceCopy;
+  }
+
+  // when tooltip is clicked
+  function onTooltipClick(event) {
+    // when user clicks on tooltip, stop click from transferring
+    // outside of tooltip (eg, click off to close tooltip, or eg click
+    // off to unhighlight same refs)
+    event.stopPropagation();
+  }
+
+  // when tooltip is unhovered
+  function onTooltipUnhover(event) {
+    if (clickClose === "true") return;
+
+    // make sure new mouse/touch/focus no longer over tooltip or any
+    // element within it
+    const tooltip = document.getElementById("tooltip");
+    if (!tooltip) return;
+    if (this.contains(event.relatedTarget)) return;
+
+    closeTooltip();
+  }
+
+  // make nav bar to go betwen prev/next instances of same reference
+  function makeNavBar(link) {
+    // find other links to the same source
+    const sameLinks = getSameLinks(link);
+
+    // don't show nav bar when singular reference
+    if (sameLinks.total <= 1) return;
+
+    // find prev/next links with same target
+    const prevLink = getPrevLink(link, sameLinks);
+    const nextLink = getNextLink(link, sameLinks);
+
+    // create nav bar
+    const navBar = document.createElement("div");
+    navBar.id = "tooltip_nav_bar";
+    const text = sameLinks.index + 1 + " of " + sameLinks.total;
+
+    // create nav bar prev/next buttons
+    const prevButton = document.createElement("button");
+    const nextButton = document.createElement("button");
+    prevButton.id = "tooltip_prev_button";
+    nextButton.id = "tooltip_next_button";
+    prevButton.title =
+      "Jump to the previous occurence of this item in the document [←]";
+    nextButton.title =
+      "Jump to the next occurence of this item in the document [→]";
+    prevButton.classList.add("icon_button");
+    nextButton.classList.add("icon_button");
+    prevButton.innerHTML = document.querySelector(".icon_caret_left").innerHTML;
+    nextButton.innerHTML = document.querySelector(
+      ".icon_caret_right"
+    ).innerHTML;
+    navBar.appendChild(prevButton);
+    navBar.appendChild(document.createTextNode(text));
+    navBar.appendChild(nextButton);
+
+    // attach click listeners to buttons
+    prevButton.addEventListener("click", function () {
+      onPrevNextClick(link, prevLink);
+    });
+    nextButton.addEventListener("click", function () {
+      onPrevNextClick(link, nextLink);
+    });
+
+    return navBar;
+  }
+
+  // get previous link with same target
+  function getPrevLink(link, sameLinks) {
+    if (!sameLinks) sameLinks = getSameLinks(link);
+    // wrap index to other side if < 1
+    let index;
+    if (sameLinks.index - 1 >= 0) index = sameLinks.index - 1;
+    else index = sameLinks.total - 1;
+    return sameLinks.elements[index];
+  }
+
+  // get next link with same target
+  function getNextLink(link, sameLinks) {
+    if (!sameLinks) sameLinks = getSameLinks(link);
+    // wrap index to other side if > total
+    let index;
+    if (sameLinks.index + 1 <= sameLinks.total - 1) index = sameLinks.index + 1;
+    else index = 0;
+    return sameLinks.elements[index];
+  }
+
+  // get element that is target of link or url hash
+  function getSource(link) {
+    const hash = link ? link.hash : window.location.hash;
+    const id = hash.slice(1);
+    let target = document.querySelector('[id="' + id + '"]');
+    if (!target) return;
+
+    // if ref or figure, modify target to get expected element
+    if (id.indexOf("ref-") === 0) target = target.querySelector("p");
+    else if (id.indexOf("fig:") === 0) target = target.querySelector("figure");
+
+    return target;
+  }
+
+  // when prev/next arrow button is clicked
+  function onPrevNextClick(link, prevNextLink) {
+    if (link && prevNextLink)
+      goToElement(prevNextLink, window.innerHeight * 0.5);
+  }
+
+  // scroll to and focus element
+  function goToElement(element, offset) {
+    // expand accordion section if collapsed
+    expandElement(element);
+    const y =
+      getRectInView(element).top -
+      getRectInView(document.documentElement).top -
+      (offset || 0);
+    // trigger any function listening for "onscroll" event
+    window.dispatchEvent(new Event("scroll"));
+    window.scrollTo(0, y);
+    document.activeElement.blur();
+    element.focus();
+  }
+
+  // determine position to place tooltip based on link position in
+  // viewport and tooltip size
+  function positionTooltip(link, left, top) {
+    const tooltipElement = document.getElementById("tooltip");
+    if (!tooltipElement) return;
+
+    // get convenient vars for position/dimensions of
+    // link/tooltip/page/view
+    link = getRectInPage(link);
+    const tooltip = getRectInPage(tooltipElement);
+    const view = getRectInPage();
+
+    // horizontal positioning
+    if (left)
+      // use explicit value
+      left = left;
+    else if (link.left + tooltip.width < view.right)
+      // fit tooltip to right of link
+      left = link.left;
+    else if (link.right - tooltip.width > view.left)
+      // fit tooltip to left of link
+      left = link.right - tooltip.width;
+    // center tooltip in view
+    else left = (view.right - view.left) / 2 - tooltip.width / 2;
+
+    // vertical positioning
+    if (top)
+      // use explicit value
+      top = top;
+    else if (link.top - tooltip.height > view.top)
+      // fit tooltip above link
+      top = link.top - tooltip.height;
+    else if (link.bottom + tooltip.height < view.bottom)
+      // fit tooltip below link
+      top = link.bottom;
+    else {
+      // center tooltip in view
+      top = view.top + view.height / 2 - tooltip.height / 2;
+      // nudge off of link to left/right if possible
+      if (link.right + tooltip.width < view.right) left = link.right;
+      else if (link.left - tooltip.width > view.left)
+        left = link.left - tooltip.width;
+    }
+
+    tooltipElement.style.left = left + "px";
+    tooltipElement.style.top = top + "px";
+  }
+
+  // start script when document is finished loading
+  window.addEventListener("load", start);
 </script>
 
 <!-- caret left icon -->
 
 <template class="icon_caret_left">
-    <!-- modified from: https://fontawesome.com/icons/caret-left -->
-    <svg width="16" height="16" viewBox="0 0 192 512">
-        <path
-            fill="currentColor"
-            d="M192 127.338v257.324c0 17.818-21.543 26.741-34.142 14.142L29.196 270.142c-7.81-7.81-7.81-20.474 0-28.284l128.662-128.662c12.599-12.6 34.142-3.676 34.142 14.142z"
-        ></path>
-    </svg>
+  <!-- modified from: https://fontawesome.com/icons/caret-left -->
+  <svg width="16" height="16" viewBox="0 0 192 512">
+    <path
+      fill="currentColor"
+      d="M192 127.338v257.324c0 17.818-21.543 26.741-34.142 14.142L29.196 270.142c-7.81-7.81-7.81-20.474 0-28.284l128.662-128.662c12.599-12.6 34.142-3.676 34.142 14.142z"
+    ></path>
+  </svg>
 </template>
 
 <!-- caret right icon -->
 
 <template class="icon_caret_right">
-    <!-- modified from: https://fontawesome.com/icons/caret-right -->
-    <svg width="16" height="16" viewBox="0 0 192 512">
-        <path
-            fill="currentColor"
-            d="M0 384.662V127.338c0-17.818 21.543-26.741 34.142-14.142l128.662 128.662c7.81 7.81 7.81 20.474 0 28.284L34.142 398.804C21.543 411.404 0 402.48 0 384.662z"
-        ></path>
-    </svg>
+  <!-- modified from: https://fontawesome.com/icons/caret-right -->
+  <svg width="16" height="16" viewBox="0 0 192 512">
+    <path
+      fill="currentColor"
+      d="M0 384.662V127.338c0-17.818 21.543-26.741 34.142-14.142l128.662 128.662c7.81 7.81 7.81 20.474 0 28.284L34.142 398.804C21.543 411.404 0 402.48 0 384.662z"
+    ></path>
+  </svg>
 </template>
+
+<style>
+  @media only screen {
+    /* tooltip container */
+    #tooltip {
+      position: absolute;
+      width: 50%;
+      min-width: 240px;
+      max-width: 75%;
+      z-index: 1;
+    }
+
+    /* tooltip content */
+    #tooltip_content {
+      margin-bottom: 5px;
+      padding: 20px;
+      border-radius: 5px;
+      border: solid 1px #bdbdbd;
+      box-shadow: 0 0 20px rgba(0, 0, 0, 0.05);
+      background: #ffffff;
+      overflow-wrap: break-word;
+    }
+
+    /* tooltip copy of paragraphs and figures */
+    #tooltip_content > p,
+    #tooltip_content > figure {
+      margin: 0;
+      max-height: 320px;
+      overflow-y: auto;
+    }
+
+    /* tooltip copy of <img> */
+    #tooltip_content > figure > img,
+    #tooltip_content > figure > svg {
+      max-height: 260px;
+    }
+
+    /* navigation bar */
+    #tooltip_nav_bar {
+      margin-top: 10px;
+      text-align: center;
+    }
+
+    /* navigation bar previous/next buton */
+    #tooltip_nav_bar > .icon_button {
+      position: relative;
+      top: 3px;
+    }
+
+    /* navigation bar previous button */
+    #tooltip_nav_bar > .icon_button:first-of-type {
+      margin-right: 5px;
+    }
+
+    /* navigation bar next button */
+    #tooltip_nav_bar > .icon_button:last-of-type {
+      margin-left: 5px;
+    }
+  }
+
+  /* always hide tooltip on print */
+  @media only print {
+    #tooltip {
+      display: none;
+    }
+  }
+</style>
diff --git a/build/themes/default.html b/build/themes/default.html
index 4022f31..2396cc4 100644
--- a/build/themes/default.html
+++ b/build/themes/default.html
@@ -1,60 +1,525 @@
 <!-- default theme -->
 
 <style>
-    /* import google fonts */
-    @import url("https://fonts.googleapis.com/css?family=Open+Sans:400,600,700");
-    @import url("https://fonts.googleapis.com/css?family=Source+Code+Pro");
-
-    /* -------------------------------------------------- */
-    /* global */
-    /* -------------------------------------------------- */
-
-    /* all elements */
-    * {
-        /* force sans-serif font unless specified otherwise */
-        font-family: "Open Sans", "Helvetica", sans-serif;
-
-        /* prevent text inflation on some mobile browsers */
-        -webkit-text-size-adjust: none !important;
-        -moz-text-size-adjust: none !important;
-        -o-text-size-adjust: none !important;
-        text-size-adjust: none !important;
+  /* import google fonts */
+  @import url("https://fonts.googleapis.com/css?family=Open+Sans:400,600,700");
+  @import url("https://fonts.googleapis.com/css?family=Source+Code+Pro");
+
+  /* -------------------------------------------------- */
+  /* global */
+  /* -------------------------------------------------- */
+
+  /* all elements */
+  * {
+    /* force sans-serif font unless specified otherwise */
+    font-family: "Open Sans", "Helvetica", sans-serif;
+
+    /* prevent text inflation on some mobile browsers */
+    -webkit-text-size-adjust: none !important;
+    -moz-text-size-adjust: none !important;
+    -o-text-size-adjust: none !important;
+    text-size-adjust: none !important;
+  }
+
+  @media only screen {
+    /* "page" element */
+    body {
+      position: relative;
+      box-sizing: border-box;
+      font-size: 12pt;
+      line-height: 1.5;
+      max-width: 8.5in;
+      margin: 20px auto;
+      padding: 40px;
+      border-radius: 5px;
+      border: solid 1px #bdbdbd;
+      box-shadow: 0 0 20px rgba(0, 0, 0, 0.05);
+      background: #ffffff;
+    }
+  }
+
+  /* when on screen < 8.5in wide */
+  @media only screen and (max-width: 8.5in) {
+    /* "page" element */
+    body {
+      padding: 20px;
+      margin: 0;
+      border-radius: 0;
+      border: none;
+      box-shadow: 0 0 20px rgba(0, 0, 0, 0.05) inset;
+      background: none;
+    }
+  }
+
+  /* -------------------------------------------------- */
+  /* headings */
+  /* -------------------------------------------------- */
+
+  /* all headings */
+  h1,
+  h2,
+  h3,
+  h4,
+  h5,
+  h6 {
+    margin: 20px 0;
+    padding: 0;
+    font-weight: bold;
+  }
+
+  /* biggest heading */
+  h1 {
+    margin: 40px 0;
+    text-align: center;
+  }
+
+  /* second biggest heading */
+  h2 {
+    margin-top: 30px;
+    padding-bottom: 5px;
+    border-bottom: solid 1px #bdbdbd;
+  }
+
+  /* heading font sizes */
+  h1 {
+    font-size: 2em;
+  }
+  h2 {
+    font-size: 1.5em;
+  }
+  h3 {
+    font-size: 1.35em;
+  }
+  h4 {
+    font-size: 1.25em;
+  }
+  h5 {
+    font-size: 1.15em;
+  }
+  h6 {
+    font-size: 1em;
+  }
+
+  /* -------------------------------------------------- */
+  /* manuscript header */
+  /* -------------------------------------------------- */
+
+  /* manuscript title */
+  header > h1 {
+    margin: 0;
+  }
+
+  /* manuscript title caption text (ie "automatically generated on") */
+  header + p {
+    text-align: center;
+    margin-top: 10px;
+  }
+
+  /* -------------------------------------------------- */
+  /* text elements */
+  /* -------------------------------------------------- */
+
+  /* links */
+  a {
+    color: #2196f3;
+    overflow-wrap: break-word;
+  }
+
+  /* superscripts and subscripts */
+  sub,
+  sup {
+    /* prevent from affecting line height */
+    line-height: 0;
+  }
+
+  /* unordered and ordered lists*/
+  ul,
+  ol {
+    padding-left: 20px;
+  }
+
+  /* class for styling text semibold */
+  .semibold {
+    font-weight: 600;
+  }
+
+  /* class for styling elements horizontally left aligned */
+  .left {
+    display: block;
+    text-align: left;
+    margin-left: auto;
+    margin-right: 0;
+    justify-content: left;
+  }
+
+  /* class for styling elements horizontally centered */
+  .center {
+    display: block;
+    text-align: center;
+    margin-left: auto;
+    margin-right: auto;
+    justify-content: center;
+  }
+
+  /* class for styling elements horizontally right aligned */
+  .right {
+    display: block;
+    text-align: right;
+    margin-left: 0;
+    margin-right: auto;
+    justify-content: right;
+  }
+
+  /* -------------------------------------------------- */
+  /* section elements */
+  /* -------------------------------------------------- */
+
+  /* horizontal divider line */
+  hr {
+    border: none;
+    height: 1px;
+    background: #bdbdbd;
+  }
+
+  /* paragraphs, horizontal dividers, figures, tables, code */
+  p,
+  hr,
+  figure,
+  table,
+  pre {
+    /* treat all as "paragraphs", with consistent vertical margins */
+    margin-top: 20px;
+    margin-bottom: 20px;
+  }
+
+  /* -------------------------------------------------- */
+  /* figures */
+  /* -------------------------------------------------- */
+
+  /* figure */
+  figure {
+    max-width: 100%;
+    margin-left: auto;
+    margin-right: auto;
+  }
+
+  /* figure caption */
+  figcaption {
+    padding: 0;
+    padding-top: 10px;
+  }
+
+  /* figure image element */
+  figure > img,
+  figure > svg {
+    max-width: 100%;
+    display: block;
+    margin-left: auto;
+    margin-right: auto;
+  }
+
+  /* figure auto-number */
+  img + figcaption > span:first-of-type,
+  svg + figcaption > span:first-of-type {
+    font-weight: bold;
+    margin-right: 5px;
+  }
+
+  /* -------------------------------------------------- */
+  /* tables */
+  /* -------------------------------------------------- */
+
+  /* table */
+  table {
+    border-collapse: collapse;
+    border-spacing: 0;
+    width: 100%;
+    margin-left: auto;
+    margin-right: auto;
+  }
+
+  /* table cells */
+  th,
+  td {
+    border: solid 1px #bdbdbd;
+    padding: 10px;
+    /* squash table if too wide for page by forcing line breaks */
+    overflow-wrap: break-word;
+    word-break: break-word;
+  }
+
+  /* header row and even rows */
+  th,
+  tr:nth-child(2n) {
+    background-color: #fafafa;
+  }
+
+  /* odd rows */
+  tr:nth-child(2n + 1) {
+    background-color: #ffffff;
+  }
+
+  /* table caption */
+  caption {
+    text-align: left;
+    padding: 0;
+    padding-bottom: 10px;
+  }
+
+  /* table auto-number */
+  table > caption > span:first-of-type,
+  div.table_wrapper > table > caption > span:first-of-type {
+    font-weight: bold;
+    margin-right: 5px;
+  }
+
+  /* -------------------------------------------------- */
+  /* code */
+  /* -------------------------------------------------- */
+
+  /* multi-line code block */
+  pre {
+    padding: 10px;
+    background-color: #eeeeee;
+    color: #000000;
+    border-radius: 5px;
+    break-inside: avoid;
+    text-align: left;
+  }
+
+  /* inline code, ie code within normal text */
+  :not(pre) > code {
+    padding: 0 4px;
+    background-color: #eeeeee;
+    color: #000000;
+    border-radius: 5px;
+  }
+
+  /* code text */
+  /* apply all children, to reach syntax highlighting sub-elements */
+  code,
+  code * {
+    /* force monospace font */
+    font-family: "Source Code Pro", "Courier New", monospace;
+  }
+
+  /* -------------------------------------------------- */
+  /* quotes */
+  /* -------------------------------------------------- */
+
+  /* quoted text */
+  blockquote {
+    margin: 0;
+    padding: 0;
+    border-left: 4px solid #bdbdbd;
+    padding-left: 16px;
+    break-inside: avoid;
+  }
+
+  /* -------------------------------------------------- */
+  /* banners */
+  /* -------------------------------------------------- */
+
+  /* info banners */
+  .banner {
+    box-sizing: border-box;
+    display: block;
+    position: relative;
+    width: 100%;
+    margin-top: 20px;
+    margin-bottom: 20px;
+    padding: 20px;
+    text-align: center;
+  }
+
+  /* paragraph in banner */
+  .banner > p {
+    margin: 0;
+  }
+
+  /* -------------------------------------------------- */
+  /* highlight colors */
+  /* -------------------------------------------------- */
+
+  .white {
+    background: #ffffff;
+  }
+  .lightgrey {
+    background: #eeeeee;
+  }
+  .grey {
+    background: #757575;
+  }
+  .darkgrey {
+    background: #424242;
+  }
+  .black {
+    background: #000000;
+  }
+  .lightred {
+    background: #ffcdd2;
+  }
+  .lightyellow {
+    background: #ffecb3;
+  }
+  .lightgreen {
+    background: #dcedc8;
+  }
+  .lightblue {
+    background: #e3f2fd;
+  }
+  .lightpurple {
+    background: #f3e5f5;
+  }
+  .red {
+    background: #f44336;
+  }
+  .orange {
+    background: #ff9800;
+  }
+  .yellow {
+    background: #ffeb3b;
+  }
+  .green {
+    background: #4caf50;
+  }
+  .blue {
+    background: #2196f3;
+  }
+  .purple {
+    background: #9c27b0;
+  }
+  .white,
+  .lightgrey,
+  .lightred,
+  .lightyellow,
+  .lightgreen,
+  .lightblue,
+  .lightpurple,
+  .orange,
+  .yellow,
+  .white a,
+  .lightgrey a,
+  .lightred a,
+  .lightyellow a,
+  .lightgreen a,
+  .lightblue a,
+  .lightpurple a,
+  .orange a,
+  .yellow a {
+    color: #000000;
+  }
+  .grey,
+  .darkgrey,
+  .black,
+  .red,
+  .green,
+  .blue,
+  .purple,
+  .grey a,
+  .darkgrey a,
+  .black a,
+  .red a,
+  .green a,
+  .blue a,
+  .purple a {
+    color: #ffffff;
+  }
+
+  /* -------------------------------------------------- */
+  /* buttons */
+  /* -------------------------------------------------- */
+
+  /* class for styling links like buttons */
+  .button {
+    display: inline-flex;
+    justify-content: center;
+    align-items: center;
+    margin: 5px;
+    padding: 10px 20px;
+    font-size: 0.75em;
+    font-weight: 600;
+    text-transform: uppercase;
+    text-decoration: none;
+    letter-spacing: 1px;
+    background: none;
+    color: #2196f3;
+    border: solid 1px #bdbdbd;
+    border-radius: 5px;
+  }
+
+  /* buttons when hovered */
+  .button:hover:not([disabled]),
+  .icon_button:hover:not([disabled]) {
+    cursor: pointer;
+    background: #f5f5f5;
+  }
+
+  /* buttons when disabled */
+  .button[disabled],
+  .icon_button[disabled] {
+    opacity: 0.35;
+    pointer-events: none;
+  }
+
+  /* class for styling buttons containg only single icon */
+  .icon_button {
+    display: inline-flex;
+    justify-content: center;
+    align-items: center;
+    text-decoration: none;
+    margin: 0;
+    padding: 0;
+    background: none;
+    border-radius: 5px;
+    border: none;
+    width: 20px;
+    height: 20px;
+    min-width: 20px;
+    min-height: 20px;
+  }
+
+  /* icon button inner svg image */
+  .icon_button > svg {
+    height: 16px;
+  }
+
+  /* -------------------------------------------------- */
+  /* icons */
+  /* -------------------------------------------------- */
+
+  /* class for styling icons inline with text */
+  .inline_icon {
+    height: 1em;
+    position: relative;
+    top: 0.125em;
+  }
+
+  /* -------------------------------------------------- */
+  /* print control */
+  /* -------------------------------------------------- */
+
+  @media print {
+    @page {
+      /* suggested printing margin */
+      margin: 0.5in;
+    }
+
+    /* document and "page" elements */
+    html,
+    body {
+      margin: 0;
+      padding: 0;
+      width: 100%;
+      height: 100%;
+    }
+
+    /* "page" element */
+    body {
+      font-size: 11pt !important;
+      line-height: 1.35;
     }
 
-    @media only screen {
-        /* "page" element */
-        body {
-            position: relative;
-            box-sizing: border-box;
-            font-size: 12pt;
-            line-height: 1.5;
-            max-width: 8.5in;
-            margin: 20px auto;
-            padding: 40px;
-            border-radius: 5px;
-            border: solid 1px #bdbdbd;
-            box-shadow: 0 0 20px rgba(0, 0, 0, 0.05);
-            background: #ffffff;
-        }
-    }
-
-    /* when on screen < 8.5in wide */
-    @media only screen and (max-width: 8.5in) {
-        /* "page" element */
-        body {
-            padding: 20px;
-            margin: 0;
-            border-radius: 0;
-            border: none;
-            box-shadow: 0 0 20px rgba(0, 0, 0, 0.05) inset;
-            background: none;
-        }
-    }
-
-    /* -------------------------------------------------- */
-    /* headings */
-    /* -------------------------------------------------- */
-
     /* all headings */
     h1,
     h2,
@@ -62,1195 +527,133 @@
     h4,
     h5,
     h6 {
-        margin: 20px 0;
-        padding: 0;
-        font-weight: bold;
-    }
-
-    /* biggest heading */
-    h1 {
-        margin: 40px 0;
-        text-align: center;
-    }
-
-    /* second biggest heading */
-    h2 {
-        margin-top: 30px;
-        padding-bottom: 5px;
-        border-bottom: solid 1px #bdbdbd;
-    }
-
-    /* heading font sizes */
-    h1 {
-        font-size: 2em;
-    }
-    h2 {
-        font-size: 1.5em;
-    }
-    h3{
-        font-size: 1.35em;
-    }
-    h4 {
-        font-size: 1.25em;
-    }
-    h5 {
-        font-size: 1.15em;
-    }
-    h6 {
-        font-size: 1em;
-    }
-
-    /* -------------------------------------------------- */
-    /* manuscript header */
-    /* -------------------------------------------------- */
-
-    /* manuscript title */
-    header > h1 {
-        margin: 0;
-    }
-
-    /* manuscript title caption text (ie "automatically generated on") */
-    header + p {
-        text-align: center;
-        margin-top: 10px;
-    }
-
-    /* -------------------------------------------------- */
-    /* text elements */
-    /* -------------------------------------------------- */
-
-    /* links */
-    a {
-        color: #2196f3;
-        overflow-wrap: break-word;
-    }
-
-    /* normal links (not empty, not button link, not syntax highlighting link) */
-    a:not(:empty):not(.button):not(.sourceLine) {
-        padding-left: 1px;
-        padding-right: 1px;
-    }
-
-    /* superscripts and subscripts */
-    sub,
-    sup {
-        /* prevent from affecting line height */
-        line-height: 0;
-    }
-
-    /* unordered and ordered lists*/
-    ul,
-    ol {
-        padding-left: 20px;
-    }
-
-    /* class for styling text semibold */
-    .semibold {
-        font-weight: 600;
-    }
-
-    /* class for styling elements horizontally left aligned */
-    .left {
-        display: block;
-        text-align: left;
-        margin-left: auto;
-        margin-right: 0;
-        justify-content: left;
-    }
-
-    /* class for styling elements horizontally centered */
-    .center {
-        display: block;
-        text-align: center;
-        margin-left: auto;
-        margin-right: auto;
-        justify-content: center;
-    }
-
-    /* class for styling elements horizontally right aligned */
-    .right {
-        display: block;
-        text-align: right;
-        margin-left: 0;
-        margin-right: auto;
-        justify-content: right;
+      margin: 15px 0;
     }
 
-    /* -------------------------------------------------- */
-    /* section elements */
-    /* -------------------------------------------------- */
-
-    /* horizontal divider line */
-    hr {
-        border: none;
-        height: 1px;
-        background: #bdbdbd;
-    }
-
-    /* paragraphs, horizontal dividers, figures, tables, code */
-    p,
-    hr,
+    /* figures and tables */
     figure,
-    table,
-    pre {
-        /* treat all as "paragraphs", with consistent vertical margins */
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
-
-    /* -------------------------------------------------- */
-    /* figures */
-    /* -------------------------------------------------- */
-
-    /* figure */
-    figure {
-        max-width: 100%;
-        margin-left: auto;
-        margin-right: auto;
-    }
-
-    /* figure caption */
-    figcaption {
-        padding: 0;
-        padding-top: 10px;
-    }
-
-    /* figure image element */
-    figure > img,
-    figure > svg {
-        max-width: 100%;
-        display: block;
-        margin-left: auto;
-        margin-right: auto;
-    }
-
-    /* figure auto-number */
-    img + figcaption > span:first-of-type,
-    svg + figcaption > span:first-of-type {
-        font-weight: bold;
-        margin-right: 5px;
-    }
-
-    /* -------------------------------------------------- */
-    /* tables */
-    /* -------------------------------------------------- */
-
-    /* table */
     table {
-        border-collapse: collapse;
-        border-spacing: 0;
-        width: 100%;
-        margin-left: auto;
-        margin-right: auto;
+      font-size: 0.85em;
     }
 
     /* table cells */
     th,
     td {
-        border: solid 1px #bdbdbd;
-        padding: 10px;
-        /* squash table if too wide for page by forcing line breaks */
-        overflow-wrap: break-word;
-        word-break: break-word;
-    }
-
-    /* header row and even rows */
-    th,
-    tr:nth-child(2n) {
-        background-color: #fafafa;
-    }
-
-    /* odd rows */
-    tr:nth-child(2n + 1) {
-        background-color: #ffffff;
+      padding: 5px;
     }
 
-    /* table caption */
-    caption {
-        text-align: left;
-        padding: 0;
-        padding-bottom: 10px;
+    /* shrink font awesome icons */
+    i.fas,
+    i.fab,
+    i.far,
+    i.fal {
+      transform: scale(0.85);
     }
 
-    /* table auto-number */
-    table > caption > span:first-of-type,
-    div.table_wrapper > table > caption > span:first-of-type {
-        font-weight: bold;
-        margin-right: 5px;
-    }
-
-    /* -------------------------------------------------- */
-    /* code */
-    /* -------------------------------------------------- */
-
-    /* multi-line code block */
-    pre {
-        padding: 10px;
-        background-color: #eeeeee;
-        color: #000000;
-        border-radius: 5px;
-        break-inside: avoid;
-        text-align: left;
-    }
-
-    /* inline code, ie code within normal text */
-    :not(pre) > code {
-        padding: 0 4px;
-        background-color: #eeeeee;
-        color: #000000;
-        border-radius: 5px;
-    }
-
-    /* code text */
-    /* apply all children, to reach syntax highlighting sub-elements */
-    code,
-    code * {
-        /* force monospace font */
-        font-family: "Source Code Pro", "Courier New", monospace;
-    }
-
-    /* -------------------------------------------------- */
-    /* quotes */
-    /* -------------------------------------------------- */
-
-    /* quoted text */
-    blockquote {
-        margin: 0;
-        padding: 0;
-        border-left: 4px solid #bdbdbd;
-        padding-left: 16px;
-        break-inside: avoid;
-    }
-
-    /* -------------------------------------------------- */
-    /* banners */
-    /* -------------------------------------------------- */
-
-    /* info banners */
+    /* decrease banner margins */
     .banner {
-        box-sizing: border-box;
-        display: block;
-        position: relative;
-        width: 100%;
-        margin-top: 20px;
-        margin-bottom: 20px;
-        padding: 20px;
-        text-align: center;
+      margin-top: 15px;
+      margin-bottom: 15px;
+      padding: 15px;
     }
 
-    /* paragraph in banner */
-    .banner > p {
-        margin: 0;
+    /* class for centering an element vertically on its own page */
+    .page_center {
+      margin: auto;
+      width: 100%;
+      height: 100%;
+      display: flex;
+      align-items: center;
+      vertical-align: middle;
+      break-before: page;
+      break-after: page;
     }
 
-    /* -------------------------------------------------- */
-    /* highlight colors */
-    /* -------------------------------------------------- */
-
-    .white {
-        background: #ffffff;
-    }
-    .lightgrey {
-        background: #eeeeee;
-    }
-    .grey {
-        background: #757575;
-    }
-    .darkgrey {
-        background: #424242;
-    }
-    .black {
-        background: #000000;
-    }
-    .lightred {
-        background: #ffcdd2;
-    }
-    .lightyellow {
-        background: #ffecb3;
-    }
-    .lightgreen {
-        background: #dcedc8;
-    }
-    .lightblue {
-        background: #e3f2fd;
-    }
-    .lightpurple {
-        background: #f3e5f5;
-    }
-    .red {
-        background: #f44336;
-    }
-    .orange {
-        background: #ff9800;
-    }
-    .yellow {
-        background: #ffeb3b;
-    }
-    .green {
-        background: #4caf50;
-    }
-    .blue {
-        background: #2196f3;
-    }
-    .purple {
-        background: #9c27b0;
-    }
-    .white,
-    .lightgrey,
-    .lightred,
-    .lightyellow,
-    .lightgreen,
-    .lightblue,
-    .lightpurple,
-    .orange,
-    .yellow,
-    .white a,
-    .lightgrey a,
-    .lightred a,
-    .lightyellow a,
-    .lightgreen a,
-    .lightblue a,
-    .lightpurple a,
-    .orange a,
-    .yellow a {
-        color: #000000;
-    }
-    .grey,
-    .darkgrey,
-    .black,
-    .red,
-    .green,
-    .blue,
-    .purple,
-    .grey a,
-    .darkgrey a,
-    .black a,
-    .red a,
-    .green a,
-    .blue a,
-    .purple a {
-        color: #ffffff;
+    /* always insert a page break before the element */
+    .page_break_before {
+      break-before: page;
     }
 
-    /* -------------------------------------------------- */
-    /* buttons */
-    /* -------------------------------------------------- */
-
-    /* class for styling links like buttons */
-    .button {
-        display: inline-flex;
-        justify-content: center;
-        align-items: center;
-        margin: 5px;
-        padding: 10px 20px;
-        font-size: 0.75em;
-        font-weight: 600;
-        text-transform: uppercase;
-        text-decoration: none;
-        letter-spacing: 1px;
-        background: none;
-        color: #2196f3;
-        border: solid 1px #bdbdbd;
-        border-radius: 5px;
+    /* always insert a page break after the element */
+    .page_break_after {
+      break-after: page;
     }
 
-    /* buttons when hovered */
-    .button:hover:not([disabled]),
-    .icon_button:hover:not([disabled]) {
-        cursor: pointer;
-        background: #f5f5f5;
+    /* avoid page break before the element */
+    .page_break_before_avoid {
+      break-before: avoid;
     }
 
-    /* buttons when disabled */
-    .button[disabled],
-    .icon_button[disabled] {
-        opacity: 0.35;
-        pointer-events: none;
+    /* avoid page break after the element */
+    .page_break_after_avoid {
+      break-after: avoid;
     }
 
-    /* class for styling buttons containg only single icon */
-    .icon_button {
-        display: inline-flex;
-        justify-content: center;
-        align-items: center;
-        text-decoration: none;
-        margin: 0;
-        padding: 0;
-        background: none;
-        border-radius: 5px;
-        border: none;
-        width: 20px;
-        height: 20px;
-        min-width: 20px;
-        min-height: 20px;
+    /* avoid page break inside the element */
+    .page_break_inside_avoid {
+      break-inside: avoid;
     }
+  }
 
-    /* icon button inner svg image */
-    .icon_button > svg {
-        height: 16px;
-    }
-
-    /* -------------------------------------------------- */
-    /* icons */
-    /* -------------------------------------------------- */
+  /* -------------------------------------------------- */
+  /* override pandoc css quirks */
+  /* -------------------------------------------------- */
 
-    /* class for styling icons inline with text */
-    .inline_icon {
-        height: 1em;
-        position: relative;
-        top: 0.125em;
-    }
-
-    /* -------------------------------------------------- */
-    /* print control */
-    /* -------------------------------------------------- */
-
-    @media print {
-        @page {
-            /* suggested printing margin */
-            margin: 0.5in;
-        }
-
-        /* document and "page" elements */
-        html, body {
-            margin: 0;
-            padding: 0;
-            width: 100%;
-            height: 100%;
-        }
-
-        /* "page" element */
-        body {
-            font-size: 11pt !important;
-            line-height: 1.35;
-        }
-
-        /* all headings */
-        h1,
-        h2,
-        h3,
-        h4,
-        h5,
-        h6 {
-            margin: 15px 0;
-        }
-
-        /* figures and tables */
-        figure, table {
-            font-size: 0.85em;
-        }
-
-        /* table cells */
-        th,
-        td {
-            padding: 5px;
-        }
-
-        /* shrink font awesome icons */
-        i.fas,
-        i.fab,
-        i.far,
-        i.fal {
-            transform: scale(0.85);
-        }
-
-        /* decrease banner margins */
-        .banner {
-            margin-top: 15px;
-            margin-bottom: 15px;
-            padding: 15px;
-        }
-
-        /* class for centering an element vertically on its own page */
-        .page_center {
-            margin: auto;
-            width: 100%;
-            height: 100%;
-            display: flex;
-            align-items: center;
-            vertical-align: middle;
-            break-before: page;
-            break-after: page;
-        }
-
-        /* always insert a page break before the element */
-        .page_break_before {
-            break-before: page;
-        }
-
-        /* always insert a page break after the element */
-        .page_break_after {
-            break-after: page;
-        }
-
-        /* avoid page break before the element */
-        .page_break_before_avoid {
-            break-before: avoid;
-        }
-
-        /* avoid page break after the element */
-        .page_break_after_avoid {
-            break-after: avoid;
-        }
-
-        /* avoid page break inside the element */
-        .page_break_inside_avoid {
-            break-inside: avoid;
-        }
-    }
+  .sourceCode {
+    /* prevent unsightly overflow in wide code blocks */
+    overflow: auto !important;
+  }
 
-    /* -------------------------------------------------- */
-    /* override pandoc css quirks */
-    /* -------------------------------------------------- */
+  div.sourceCode {
+    /* prevent background fill on top-most code block  container */
+    background: none !important;
+  }
 
-    .sourceCode {
-        /* prevent unsightly overflow in wide code blocks */
-        overflow: auto !important;
-    }
+  .sourceCode * {
+    /* force consistent line spacing */
+    line-height: 1.5 !important;
+  }
 
-    div.sourceCode {
-        /* prevent background fill on top-most code block  container */
-        background: none !important;
-    }
+  div.sourceCode {
+    /* style code block margins same as <pre> element */
+    margin-top: 20px;
+    margin-bottom: 20px;
+  }
 
-    .sourceCode * {
-        /* force consistent line spacing */
-        line-height: 1.5 !important;
-    }
+  /* -------------------------------------------------- */
+  /* tablenos */
+  /* -------------------------------------------------- */
 
-    div.sourceCode {
-        /* style code block margins same as <pre> element */
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
+  /* tablenos wrapper */
+  .tablenos {
+    /* show scrollbar on tables if necessary to prevent overflow */
+    width: 100%;
+    margin: 20px 0;
+  }
 
-    /* -------------------------------------------------- */
-    /* tablenos */
-    /* -------------------------------------------------- */
+  .tablenos > table {
+    /* move margins from table to table_wrapper to allow margin collapsing */
+    margin: 0;
+  }
 
+  @media only screen {
     /* tablenos wrapper */
     .tablenos {
-        /* show scrollbar on tables if necessary to prevent overflow */
-        width: 100%;
-        margin: 20px 0;
-    }
-
-    .tablenos > table {
-        /* move margins from table to table_wrapper to allow margin collapsing */
-        margin: 0;
-    }
-
-    @media only screen {
-        /* tablenos wrapper */
-        .tablenos {
-            /* show scrollbar on tables if necessary to prevent overflow */
-            overflow-x: auto !important;
-        }
-
-        .tablenos th,
-        .tablenos td {
-            overflow-wrap: unset !important;
-            word-break: unset !important;
-        }
-
-        /* table in wrapper */
-        .tablenos table,
-        .tablenos table * {
-            /* don't break table words */
-            overflow-wrap: normal !important;
-        }
-    }
-
-    /* -------------------------------------------------- */
-    /* mathjax */
-    /* -------------------------------------------------- */
-
-    /* mathjax containers */
-    .math.display > span:not(.MathJax_Preview) {
-        /* turn inline element (no dimensions) into block (allows fixed width and thus scrolling) */
-        display: flex !important;
-        overflow-x: auto !important;
-        overflow-y: hidden !important;
-        justify-content: center;
-        align-items: center;
-        margin: 0 !important;
-    }
-
-    /* right click menu */
-    .MathJax_Menu {
-        border-radius: 5px !important;
-        border: solid 1px #bdbdbd !important;
-        box-shadow: none !important;
-    }
-
-    /* equation auto-number */
-    span[id^="eq:"] > span.math.display + span {
-        font-weight: 600;
-    }
-
-    /* equation */
-    span[id^="eq:"] > span.math.display > span {
-        /* nudge to make room for equation auto-number and anchor */
-        margin-right: 60px !important;
-    }
-
-    /* -------------------------------------------------- */
-    /* anchors plugin */
-    /* -------------------------------------------------- */
-
-    @media only screen {
-        /* anchor button */
-        .anchor {
-            opacity: 0;
-            margin-left: 5px;
-        }
-
-        /* anchor buttons within <h2>'s */
-        h2 .anchor {
-            margin-left: 10px;
-        }
-
-        /* anchor buttons when hovered/focused and anything containing an anchor button when hovered */
-        *:hover > .anchor,
-        .anchor:hover,
-        .anchor:focus {
-            opacity: 1;
-        }
-
-        /* anchor button when hovered */
-        .anchor:hover {
-            cursor: pointer;
-        }
-    }
-
-    /* always show anchor button on devices with no mouse/hover ability */
-    @media (hover: none) {
-        .anchor {
-            opacity: 1;
-        }
-    }
-
-    /* always hide anchor button on print */
-    @media only print {
-        .anchor {
-            display: none;
-        }
-    }
-
-    /* -------------------------------------------------- */
-    /* accordion plugin */
-    /* -------------------------------------------------- */
-
-    @media only screen {
-        /* accordion arrow button */
-        .accordion_arrow {
-            margin-right: 10px;
-        }
-
-        /* arrow icon when <h2> data-collapsed attribute true */
-        h2[data-collapsed="true"] > .accordion_arrow > svg {
-            transform: rotate(-90deg);
-        }
-
-        /* all elements (except <h2>'s) when data-collapsed attribute true */
-        *:not(h2)[data-collapsed="true"] {
-            display: none;
-        }
-
-        /* accordion arrow button when hovered and <h2>'s when hovered */
-        .accordion_arrow:hover,
-        h2[data-collapsed="true"]:hover,
-        h2[data-collapsed="false"]:hover {
-            cursor: pointer;
-        }
+      /* show scrollbar on tables if necessary to prevent overflow */
+      overflow-x: auto !important;
     }
 
-    /* always hide accordion arrow button on print */
-    @media only print {
-        .accordion_arrow {
-            display: none;
-        }
+    .tablenos th,
+    .tablenos td {
+      overflow-wrap: unset !important;
+      word-break: unset !important;
     }
 
-    /* -------------------------------------------------- */
-    /* tooltips plugin */
-    /* -------------------------------------------------- */
-
-    @media only screen {
-        /* tooltip container */
-        #tooltip {
-            position: absolute;
-            width: 50%;
-            min-width: 240px;
-            max-width: 75%;
-            z-index: 1;
-        }
-
-        /* tooltip content */
-        #tooltip_content {
-            margin-bottom: 5px;
-            padding: 20px;
-            border-radius: 5px;
-            border: solid 1px #bdbdbd;
-            box-shadow: 0 0 20px rgba(0, 0, 0, 0.05);
-            background: #ffffff;
-            overflow-wrap: break-word;
-        }
-
-        /* tooltip copy of paragraphs and figures */
-        #tooltip_content > p,
-        #tooltip_content > figure {
-            margin: 0;
-            max-height: 320px;
-            overflow-y: auto;
-        }
-
-        /* tooltip copy of <img> */
-        #tooltip_content > figure > img,
-        #tooltip_content > figure > svg {
-            max-height: 260px;
-        }
-
-        /* navigation bar */
-        #tooltip_nav_bar {
-            margin-top: 10px;
-            text-align: center;
-        }
-
-        /* navigation bar previous/next buton */
-        #tooltip_nav_bar > .icon_button {
-            position: relative;
-            top: 3px;
-        }
-
-        /* navigation bar previous button */
-        #tooltip_nav_bar > .icon_button:first-of-type {
-            margin-right: 5px;
-        }
-
-        /* navigation bar next button */
-        #tooltip_nav_bar > .icon_button:last-of-type {
-            margin-left: 5px;
-        }
-    }
-
-    /* always hide tooltip on print */
-    @media only print {
-        #tooltip {
-            display: none;
-        }
-    }
-
-    /* -------------------------------------------------- */
-    /* jump to first plugin */
-    /* -------------------------------------------------- */
-
-    @media only screen {
-        /* jump button */
-        .jump_arrow {
-            position: relative;
-            top: 0.125em;
-            margin-right: 5px;
-        }
-    }
-
-    /* always hide jump button on print */
-    @media only print {
-        .jump_arrow {
-            display: none;
-        }
-    }
-
-    /* -------------------------------------------------- */
-    /* link highlight plugin */
-    /* -------------------------------------------------- */
-
-    @media only screen {
-        /* anything with data-highlighted attribute true */
-        [data-highlighted="true"] {
-            background: #ffeb3b;
-        }
-
-        /* anything with data-selected attribute true */
-        [data-selected="true"] {
-            background: #ff8a65 !important;
-        }
-
-        /* animation definition for glow */
-        @keyframes highlight_glow {
-            0% {
-                background: none;
-            }
-            10% {
-                background: #bbdefb;
-            }
-            100% {
-                background: none;
-            }
-        }
-
-        /* anything with data-glow attribute true */
-        [data-glow="true"] {
-            animation: highlight_glow 2s;
-        }
-    }
-
-    /* -------------------------------------------------- */
-    /* table of contents plugin */
-    /* -------------------------------------------------- */
-
-    @media only screen {
-        /* toc panel */
-        #toc_panel {
-            box-sizing: border-box;
-            position: fixed;
-            top: 0;
-            left: 0;
-            background: #ffffff;
-            box-shadow: 0 0 20px rgba(0, 0, 0, 0.05);
-            z-index: 2;
-        }
-
-        /* toc panel when closed */
-        #toc_panel[data-open="false"] {
-            min-width: 60px;
-            width: 60px;
-            height: 60px;
-            border-right: solid 1px #bdbdbd;
-            border-bottom: solid 1px #bdbdbd;
-        }
-
-        /* toc panel when open */
-        #toc_panel[data-open="true"] {
-            min-width: 260px;
-            max-width: 480px;
-            /* keep panel edge consistent distance away from "page" edge */
-            width: calc(((100vw - 8.5in) / 2) - 30px - 40px);
-            bottom: 0;
-            border-right: solid 1px #bdbdbd;
-        }
-
-        /* toc panel header */
-        #toc_header {
-            box-sizing: border-box;
-            display: flex;
-            flex-direction: row;
-            align-items: center;
-            height: 60px;
-            margin: 0;
-            padding: 20px;
-        }
-
-        /* toc panel header when hovered */
-        #toc_header:hover {
-            cursor: pointer;
-        }
-
-        /* toc panel header when panel open */
-        #toc_panel[data-open="true"] > #toc_header {
-            border-bottom: solid 1px #bdbdbd;
-        }
-
-        /* toc open/close header button */
-        #toc_button {
-            margin-right: 20px;
-        }
-
-        /* hide toc list and header text when closed */
-        #toc_panel[data-open="false"] > #toc_header > *:not(#toc_button),
-        #toc_panel[data-open="false"] > #toc_list {
-            display: none;
-        }
-
-        /* toc list of entries */
-        #toc_list {
-            box-sizing: border-box;
-            width: 100%;
-            padding: 20px;
-            position: absolute;
-            top: calc(60px + 1px);
-            bottom: 0;
-            overflow: auto;
-        }
-
-        /* toc entry, link to section in document */
-        .toc_link {
-            display: block;
-            padding: 5px;
-            position: relative;
-            font-weight: 600;
-            text-decoration: none;
-        }
-
-        /* toc entry when hovered or when "viewed" */
-        .toc_link:hover,
-        .toc_link[data-viewing="true"] {
-            background: #f5f5f5;
-        }
-
-        /* toc entry, level 1 indentation */
-        .toc_link[data-level="1"] {
-            margin-left: 0;
-        }
-
-        /* toc entry, level 2 indentation */
-        .toc_link[data-level="2"] {
-            margin-left: 20px;
-        }
-
-        /* toc entry, level 3 indentation */
-        .toc_link[data-level="3"] {
-            margin-left: 40px;
-        }
-
-        /* toc entry, level 4 indentation */
-        .toc_link[data-level="4"] {
-            margin-left: 60px;
-        }
-
-        /* toc entry bullets */
-        #toc_panel[data-bullets="true"] .toc_link[data-level]:before {
-            position: absolute;
-            left: -15px;
-            top: -1px;
-            font-size: 1.5em;
-        }
-
-        /* toc entry, level 2 bullet */
-        #toc_panel[data-bullets="true"] .toc_link[data-level="2"]:before {
-            content: "\2022";
-        }
-
-        /* toc entry, level 3 bullet */
-        #toc_panel[data-bullets="true"] .toc_link[data-level="3"]:before {
-            content: "\25AB";
-        }
-
-        /* toc entry, level 4 bullet */
-        #toc_panel[data-bullets="true"] .toc_link[data-level="4"]:before {
-            content: "-";
-        }
-    }
-
-    /* when on screen < 8.5in wide */
-    @media only screen and (max-width: 8.5in) {
-        /* push <body> ("page") element down to make room for toc icon */
-        .toc_body_nudge {
-            padding-top: 60px;
-        }
-
-        /* toc icon when panel closed and not hovered */
-        #toc_panel[data-open="false"]:not(:hover) {
-            background: rgba(255, 255, 255, 0.75);
-        }
-    }
-
-    /* always hide toc panel on print */
-    @media only print {
-        #toc_panel {
-            display: none;
-        }
-    }
-
-    /* -------------------------------------------------- */
-    /* lightbox plugin */
-    /* -------------------------------------------------- */
-
-    @media only screen {
-        /* regular <img> in document when hovered */
-        img.lightbox_document_img:hover {
-            cursor: pointer;
-        }
-
-        .body_no_scroll {
-            overflow: hidden !important;
-        }
-
-        /* screen overlay */
-        #lightbox_overlay {
-            display: flex;
-            flex-direction: column;
-            position: fixed;
-            left: 0;
-            top: 0;
-            right: 0;
-            bottom: 0;
-            background: rgba(0, 0, 0, 0.75);
-            z-index: 3;
-        }
-
-        /* middle area containing lightbox image */
-        #lightbox_image_container {
-            flex-grow: 1;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            overflow: hidden;
-            position: relative;
-            padding: 20px;
-        }
-
-        /* bottom area containing caption */
-        #lightbox_bottom_container {
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            height: 100px;
-            min-height: 100px;
-            max-height: 100px;
-            background: rgba(0, 0, 0, 0.5);
-        }
-
-        /* image number info text box */
-        #lightbox_number_info {
-            position: absolute;
-            color: #ffffff;
-            font-weight: 600;
-            left: 2px;
-            top: 0;
-            z-index: 4;
-        }
-
-        /* zoom info text box */
-        #lightbox_zoom_info {
-            position: absolute;
-            color: #ffffff;
-            font-weight: 600;
-            right: 2px;
-            top: 0;
-            z-index: 4;
-        }
-
-        /* copy of image caption */
-        #lightbox_caption {
-            box-sizing: border-box;
-            display: inline-block;
-            width: 100%;
-            max-height: 100%;
-            padding: 10px 0;
-            text-align: center;
-            overflow-y: auto;
-            color: #ffffff;
-        }
-
-        /* navigation previous/next button */
-        .lightbox_button {
-            width: 100px;
-            height: 100%;
-            min-width: 100px;
-            min-height: 100%;
-            color: #ffffff;
-        }
-
-        /* navigation previous/next button when hovered */
-        .lightbox_button:hover {
-            background: none !important;
-        }
-
-        /* navigation button icon */
-        .lightbox_button > svg {
-            height: 25px;
-        }
-
-        /* figure auto-number */
-        #lightbox_caption > span:first-of-type {
-            font-weight: bold;
-            margin-right: 5px;
-        }
-
-        /* lightbox image when hovered */
-        #lightbox_img:hover {
-            cursor: grab;
-        }
-
-        /* lightbox image when grabbed */
-        #lightbox_img:active {
-            cursor: grabbing;
-        }
-    }
-
-    /* when on screen < 480px wide */
-    @media only screen and (max-width: 480px) {
-        /* make navigation buttons skinnier on small screens to make more room for caption text */
-        .lightbox_button {
-            width: 50px;
-            min-width: 50px;
-        }
-    }
-
-    /* always hide lightbox on print */
-    @media only print {
-        #lightbox_overlay {
-            display: none;
-        }
-    }
-
-    /* -------------------------------------------------- */
-    /* hypothesis (annotations) plugin */
-    /* -------------------------------------------------- */
-
-    /* hypothesis activation button */
-    #hypothesis_button {
-        box-sizing: border-box;
-        position: fixed;
-        top: 0;
-        right: 0;
-        width: 60px;
-        height: 60px;
-        background: #ffffff;
-        border-radius: 0;
-        border-left: solid 1px #bdbdbd;
-        border-bottom: solid 1px #bdbdbd;
-        box-shadow: 0 0 20px rgba(0, 0, 0, 0.05);
-        z-index: 2;
-    }
-
-    /* hypothesis button svg */
-    #hypothesis_button > svg {
-        position: relative;
-        top: -4px;
-    }
-
-    /* hypothesis annotation count */
-    #hypothesis_count {
-        position: absolute;
-        left: 0;
-        right: 0;
-        bottom: 5px;
-    }
-
-    /* side panel */
-    .annotator-frame {
-        width: 280px !important;
-    }
-
-    /* match highlight color to rest of theme */
-    .annotator-highlights-always-on .annotator-hl {
-        background-color: #ffeb3b !important;
-    }
-
-    /* match focused color to rest of theme */
-    .annotator-hl.annotator-hl-focused {
-        background-color: #ff8a65 !important;
-    }
-
-    /* match bucket bar color to rest of theme */
-    .annotator-bucket-bar {
-        background: #f5f5f5 !important;
-    }
-
-    /* always hide button, toolbar, and tooltip on print */
-    @media only print {
-        #hypothesis_button {
-            display: none;
-        }
-
-        .annotator-frame {
-            display: none !important;
-        }
-
-        hypothesis-adder {
-            display: none !important;
-        }
+    /* table in wrapper */
+    .tablenos table,
+    .tablenos table * {
+      /* don't break table words */
+      overflow-wrap: normal !important;
     }
+  }
 </style>

From 52ab9dc8bba4d0c6cee348fa9d7b0b764a89ffcf Mon Sep 17 00:00:00 2001
From: Vincent Rubinetti <vince.rubinetti@gmail.com>
Date: Fri, 12 Feb 2021 10:49:07 -0500
Subject: [PATCH 03/54] Update scite plugin

merges https://github.com/manubot/rootstock/pull/415
---
 build/plugins/scite.html | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/build/plugins/scite.html b/build/plugins/scite.html
index d01fe51..4d62049 100644
--- a/build/plugins/scite.html
+++ b/build/plugins/scite.html
@@ -5,11 +5,6 @@
   See https://scite.ai/.
 -->
 
-<link
-  rel="stylesheet"
-  type="text/css"
-  href="https://cdn.scite.ai/badge/scite-badge-latest.min.css"
-/>
 <script
   async
   type="application/javascript"
@@ -19,13 +14,13 @@
 <script>
   // start script
   function start() {
+    // if printing, exit and don't run badges
+    if (window.matchMedia("print").matches) return;
+
     // get citation elements
     const query = ".references div[id*='ref-']";
     const elements = document.querySelectorAll(query);
     for (const element of elements) addBadge(element);
-
-    // attach scroll listener to window
-    window.addEventListener("scroll", onScroll);
   }
 
   // add badge in citation element
@@ -58,4 +53,10 @@
     text-indent: 0;
     margin-top: 10px;
   }
+
+  @media print {
+    .scite-badge {
+      display: none;
+    }
+  }
 </style>

From f09ce13278540620afe5a67840ef23284d4d83f9 Mon Sep 17 00:00:00 2001
From: nfry321 <58332182+nfry321@users.noreply.github.com>
Date: Sun, 21 Mar 2021 12:55:32 +0000
Subject: [PATCH 04/54] setup.bash: interactive script to guide setup

merges https://github.com/manubot/rootstock/pull/417
closes https://github.com/manubot/rootstock/issues/401
---
 SETUP.md   |  30 ++++++-
 setup.bash | 230 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 258 insertions(+), 2 deletions(-)
 create mode 100755 setup.bash

diff --git a/SETUP.md b/SETUP.md
index fa83e0b..cacd6a7 100644
--- a/SETUP.md
+++ b/SETUP.md
@@ -1,7 +1,8 @@
 # Table of contents
 
 - [Creating a new manuscript](#creating-a-new-manuscript)
-  * [Configuration](#configuration)
+  * [Using setup script](#using-setup-script)
+  * [Manual configuration](#manual-configuration)
   * [Create repository](#create-repository)
   * [Continuous integration](#continuous-integration)
     + [GitHub Actions](#github-actions)
@@ -27,8 +28,33 @@ These steps should be performed in a command-line shell (terminal), starting in
 Setup is supported on Linux, macOS, and Windows.
 Windows setup requires [Git Bash](https://gitforwindows.org/) or [Windows Subsystem for Linux](https://docs.microsoft.com/en-us/windows/wsl/faq).
 
-## Configuration
+## Using setup script
+Creating a new manuscript using GitHub actions, the recommended default CI service (see below), can be achieved easily using the [setup script](https://github.com/manubot/rootstock/blob/main/setup.bash).
+This simply runs the steps detailed below in the manual configuration.
 
+Use the command below to copy `setup.bash` and run it.
+You can check the code that will be executed [here](https://github.com/manubot/rootstock/blob/main/setup.bash).
+
+````sh
+bash <( curl --location https://github.com/manubot/rootstock/raw/main/setup.bash )
+````
+The script will then take you through the process of cloning the rootstock repo, make the changes required to use GitHub actions, edit the README to point to your repo and commit the changes.
+Your new manuscript repo is then ready for you to start adding your own content.
+
+This script does not not create the remote repo for you, so you will be prompted to manually create an empty GitHub repository at <https://github.com/new>.
+Do not initialize the repository, other than optionally adding a description.
+
+### CLI
+There is also a command line interface for users who want to create manuscripts at scale and in an automated way.
+See the help for details.
+
+````sh
+bash setup.bash --help
+````
+
+## Manual configuration
+
+If you do not wish to use the above setup script to configure your new manuscript repository, you can instead execute the steps manually.
 First, you must configure two environment variables (`OWNER` and `REPO`).
 These variables specify the GitHub repository for the manuscript (i.e. `https://github.com/OWNER/REPO`).
 Make sure that the case of `OWNER` matches how your username is displayed on GitHub.
diff --git a/setup.bash b/setup.bash
new file mode 100755
index 0000000..3d45a08
--- /dev/null
+++ b/setup.bash
@@ -0,0 +1,230 @@
+#!/bin/bash
+# Setup Manubot
+# Based on https://github.com/manubot/rootstock/blob/main/SETUP.md
+# This is designed to be run from the bash terminal
+
+# Stop on first error.
+set -e
+
+usage() {
+echo "Usage: $0 [--owner text] [--repo text] [--yes]"
+echo "Guides the user through the creation of a new Manubot repository for their manuscript."
+echo
+echo "If no options are supplied a fully interactive process is used."
+echo "OWNER and REPO refer to the details of your manuscript repo location:"
+echo "i.e. https://github.com/OWNER/REPO."
+echo
+echo "Options:"
+echo "  -o --owner   GitHub user or organisation name."
+echo "  -r --repo    Name of the repository for your new manuscript."
+echo "  -y --yes     Non-interactive mode. Continue script without asking for confirmation that the repo exists."
+echo "  -s --ssh     Use SSH to authenticate GitHub account. HTTPS is used by default."
+echo "               Option only effective if --yes is also set, otherwise answer given in user interaction takes precedence."
+echo "  -h --help    Display usage information."
+1>&2; exit 1; }
+
+# Check if to continue
+check(){
+while true
+do
+ echo "Once you have created your repo press enter to continue setup,"
+ read -r -p "or type exit to quit now: " input
+
+ case $input in
+   "")
+     echo
+     echo "Continuing Setup..."
+     echo
+     break
+     ;;
+  [eE][xX][iI][tT])
+     exit 1
+     ;;
+  *)
+     echo
+     echo "Invalid input, try again..."
+     echo
+     ;;
+ esac
+done
+}
+
+# Option strings
+SHORT=o:r:hys
+LONG=owner:,repo:,help,yes,ssh
+
+YES=0  # continue when prompted
+AUTH=0 # used https or ssh auth
+
+# read the options
+OPTS=$(getopt --options $SHORT --long $LONG --name "$0" -- "$@")
+
+if [ $? != 0 ] ; then echo "Failed to parse options...exiting." >&2 ; exit 1 ; fi
+
+eval set -- "$OPTS"
+
+# extract options and their arguments into variables.
+while true ; do
+  case "$1" in
+    -o | --owner )
+      shift;
+      OWNER=$1
+      shift
+      ;;
+    -r | --repo )
+      REPO="$2"
+      shift 2
+      ;;
+    -y | --yes )
+      YES=1
+      shift
+      ;;
+    -s | --ssh )
+      AUTH=1;
+      shift
+      ;;
+    -- )
+      shift
+      break
+      ;;
+    -h | --help )
+      shift
+      usage
+      exit 1
+      ;;
+    *)
+      echo "Internal error!"
+      exit 1
+      ;;
+  esac
+done
+
+if [ -z "${OWNER}" ] || [ -z "${REPO}" ]; then
+  echo "This script will take you through the setup process for Manubot."
+  echo "First, we need to specify where to create the GitHub repo for your manuscript."
+  echo
+  echo "The URL will take this format: https://github.com/OWNER/REPO."
+  echo "OWNER is your username or organisation"
+  echo "REPO is the name of your repository"
+  echo
+  read -r -p "Type in the OWNER now:" input
+  OWNER=$input
+  read -r -p "Type in the REPO now:" input
+  REPO=$input
+fi
+
+# If using interactive mode, check remote repo exists.
+if [[ "$YES" == '0' ]]; then
+  while true
+  do
+   echo
+   read -r -p "Have you manually created https://github.com/${OWNER}/${REPO}? [y/n] " input
+
+   case $input in
+     [yY][eE][sS]|[yY])
+
+       echo
+       echo "Continuing Setup..."
+       echo
+       break
+       ;;
+    [nN][oO]|[nN])
+       echo
+       echo "Go to https://github.com/new and create https://github.com/${OWNER}/${REPO}"
+       echo "Note: the new repo must be completely empty or the script will fail."
+       echo
+       check
+       break
+       ;;
+    *)
+       echo
+       echo "Invalid input, try again..."
+       echo
+       ;;
+   esac
+  done
+else
+  echo "Setting up https://github.com/${OWNER}/${REPO}"
+fi
+
+# Clone manubot/rootstock
+echo
+echo "Cloning Rootstock..."
+echo
+git clone --single-branch https://github.com/manubot/rootstock.git ${REPO}
+cd ${REPO}
+
+echo
+echo "Setup tracking of remote..."
+
+# Configure remotes
+git remote add rootstock https://github.com/manubot/rootstock.git
+
+# Check auth method
+if [[ "$YES" == '0' ]]; then
+  while true
+  do
+   echo
+   read -r -p "Would you like to use SSH to authenticate your GitHub account? [y/n] " input
+
+   case $input in
+     [yY][eE][sS]|[yY])
+       AUTH=1
+       break
+       ;;
+    [nN][oO]|[nN])
+       AUTH=0
+       break
+       ;;
+    *)
+       echo
+       echo "Invalid input, try again..."
+       echo
+       ;;
+   esac
+  done
+fi
+
+case $AUTH in
+  0)
+  echo
+  echo "Seting origin URL using its https web address"
+  echo
+  git remote set-url origin https://github.com/${OWNER}/${REPO}.git
+  ;;
+  1)
+  echo
+  echo "Seting origin URL using SSH"
+  echo
+  git remote set-url origin git@github.com:$OWNER/$REPO.git
+  ;;
+esac
+
+git push --set-upstream origin main
+
+# To use GitHub Actions only:
+echo "Setup for GitHub Actions ONLY..."
+# remove Travis CI config
+git rm .travis.yml
+# remove AppVeyor config
+git rm .appveyor.yml
+# remove ci/install.sh if using neither Travis CI nor AppVeyor
+git rm ci/install.sh
+
+# Update README
+echo "Updating README..."
+# Perform substitutions
+sed "s/manubot\/rootstock/${OWNER}\/${REPO}/g" README.md > tmp && mv -f tmp README.md
+sed "s/manubot\.github\.io\/rootstock/${OWNER}\.github\.io\/${REPO}/g" README.md > tmp && mv -f tmp README.md
+
+echo "Committing rebrand..."
+git add --update
+git commit --message "Brand repo to $OWNER/$REPO"
+git push origin main
+echo
+echo "Setup complete"
+echo
+echo "The new repo has been created at $(pwd)"
+echo
+echo "A good first step is to modify content/metadata.yaml with the relevant information for your manuscript."
+echo

From 99776841cd694c1c612060114ecc0f3e5f686e5f Mon Sep 17 00:00:00 2001
From: Tiago Lubiana <tiago.lubiana.alves@usp.br>
Date: Sat, 15 May 2021 17:23:42 -0300
Subject: [PATCH 05/54] Add "gh repo create" to SETUP.md

merges https://github.com/manubot/rootstock/pull/419
closes https://github.com/manubot/rootstock/issues/418

Co-authored-by: Daniel Himmelstein <daniel.himmelstein@gmail.com>
Co-authored-by: Anthony Gitter <agitter@users.noreply.github.com>
---
 SETUP.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/SETUP.md b/SETUP.md
index cacd6a7..33ccbf2 100644
--- a/SETUP.md
+++ b/SETUP.md
@@ -89,7 +89,8 @@ git remote set-url origin https://github.com/$OWNER/$REPO.git
 git remote set-url origin git@github.com:$OWNER/$REPO.git
 ```
 
-Next, you must manually create an empty GitHub repository at <https://github.com/new>.
+Then create an empty repository on GitHub. 
+You can do this at <https://github.com/new> or via the [GitHub command line interface](https://github.com/cli/cli) (if installed) with `gh repo create`.
 Make sure to use the same "Owner" and "Repository name" specified above.
 Do not initialize the repository, other than optionally adding a Description.
 Next, push your cloned manuscript:

From d63edeeccd7eb73ba72e6a9231549e580da52f3d Mon Sep 17 00:00:00 2001
From: mariojmdavid <mariojmdavid@gmail.com>
Date: Thu, 20 May 2021 18:12:27 +0100
Subject: [PATCH 06/54] annex writing, work in progress

---
 content/08.annex.md       |  13 +++++++++++++
 content/images/devops.png | Bin 0 -> 106102 bytes
 2 files changed, 13 insertions(+)
 create mode 100644 content/08.annex.md
 create mode 100644 content/images/devops.png

diff --git a/content/08.annex.md b/content/08.annex.md
new file mode 100644
index 0000000..870665b
--- /dev/null
+++ b/content/08.annex.md
@@ -0,0 +1,13 @@
+## Annex
+
+The Quality Criteria described in this document is abstract, as such the choice of tools and services to implement
+their verification is up to the team or community developing and/or using a given software.
+
+The annex describes the implementation of how the Quality Criteria detailed in this document can be verified, as been used
+in several European projects. It details the code workflow, the tools and services used to achieve the verification of the Criteria.
+
+### Code workflow
+
+This section describes the code workflow shown in Figure 1
+
+![](images/devops.png){height="500px"}
diff --git a/content/images/devops.png b/content/images/devops.png
new file mode 100644
index 0000000000000000000000000000000000000000..3bed43b4b14745e47d4810fd5615186fd3855726
GIT binary patch
literal 106102
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

literal 0
HcmV?d00001


From 95bf5b230344996762e383bb37c0198b18d9c38e Mon Sep 17 00:00:00 2001
From: Daniel Himmelstein <daniel.himmelstein@gmail.com>
Date: Sat, 29 May 2021 17:30:35 -0400
Subject: [PATCH 07/54] BUILD_LATEX for basic LaTeX manuscript

merges https://github.com/manubot/rootstock/pull/384
refs https://github.com/manubot/rootstock/issues/249
---
 build/build.sh                   | 9 +++++++++
 build/pandoc/defaults/latex.yaml | 4 ++++
 2 files changed, 13 insertions(+)
 create mode 100644 build/pandoc/defaults/latex.yaml

diff --git a/build/build.sh b/build/build.sh
index 9d0b4e0..5cebfc5 100755
--- a/build/build.sh
+++ b/build/build.sh
@@ -85,6 +85,15 @@ if [ "${BUILD_DOCX:-}" = "true" ]; then
     --defaults=docx.yaml
 fi
 
+# Create LaTeX output (if BUILD_LATEX environment variable equals "true")
+if [ "${BUILD_LATEX:-}" = "true" ]; then
+  echo >&2 "Exporting LaTeX manuscript"
+  pandoc \
+    --data-dir="$PANDOC_DATA_DIR" \
+    --defaults=common.yaml \
+    --defaults=latex.yaml
+fi
+
 # Spellcheck
 if [ "${SPELLCHECK:-}" = "true" ]; then
   export ASPELL_CONF="add-extra-dicts $(pwd)/build/assets/custom-dictionary.txt; ignore-case true"
diff --git a/build/pandoc/defaults/latex.yaml b/build/pandoc/defaults/latex.yaml
new file mode 100644
index 0000000..481302d
--- /dev/null
+++ b/build/pandoc/defaults/latex.yaml
@@ -0,0 +1,4 @@
+# Pandoc --defaults for LaTeX output.
+# Load on top of common defaults.
+to: latex
+output-file: output/manuscript.tex

From defe787b0ad8a21a745cc82c3117770896caaf8b Mon Sep 17 00:00:00 2001
From: Vincent Rubinetti <vince.rubinetti@gmail.com>
Date: Thu, 10 Jun 2021 19:18:11 -0400
Subject: [PATCH 08/54] Pandoc 2.14: update HTML plugins, CSL style, citekey
 syntax

merges https://github.com/manubot/rootstock/pull/427

Co-authored-by: Daniel Himmelstein <daniel.himmelstein@gmail.com>
Co-authored-by: Anthony Gitter <agitter@users.noreply.github.com>
---
 USAGE.md                          | 25 +++++++++++++++++--------
 build/assets/style.csl            |  2 +-
 build/environment.yml             | 16 ++++++++--------
 build/pandoc/defaults/common.yaml |  2 +-
 build/pandoc/defaults/html.yaml   |  1 +
 build/plugins/anchors.html        |  3 ++-
 build/plugins/jump-to-first.html  | 10 ++++++----
 build/plugins/tooltips.html       |  8 ++++----
 build/themes/default.html         | 13 ++++++++++---
 content/02.delete-me.md           |  2 +-
 10 files changed, 51 insertions(+), 31 deletions(-)

diff --git a/USAGE.md b/USAGE.md
index 5bd004a..0b2ee47 100644
--- a/USAGE.md
+++ b/USAGE.md
@@ -133,14 +133,23 @@ Note that multiple citations must be semicolon separated.
 Be careful not to cite the same study using identifiers from multiple sources.
 For example, the following citations all refer to the same study, but will be treated as separate references: `[@doi:10.7717/peerj.705; @pmc:PMC4304851; @pubmed:25648772]`.
 
-Citation keys must adhere to the syntax described in the [Pandoc manual](https://pandoc.org/MANUAL.html#citations):
-
-> The citation key must begin with a letter, digit, or `_`, and may contain alphanumerics, `_`, and internal punctuation characters (`:.#$%&-+?<>~/`).
-
-To evaluate whether a citation key fully matches this syntax, try [this online regex](https://regex101.com/r/mXZyY2/latest).
-If the citation key is not valid, use the [citation aliases](#citation-aliases) workaround below.
-This is required for citation keys that contain forbidden characters such as `;` or `=` or end with a non-alphanumeric character such as `/`.
-<!-- See [jgm/pandoc#6026](https://github.com/jgm/pandoc/issues/6026) for progress on a more flexible Markdown citation key syntax. -->
+The citation key syntax is described in the [Pandoc manual](https://pandoc.org/MANUAL.html#citation-syntax):
+
+> Unless a citation key start with a letter, digit, or `_`,
+> and contains only alphanumerics and internal punctuation characters (`:.#$%&-+?<>~/`),
+> it must be surrounded by curly braces,
+> which are not considered part of the key.
+> In `@Foo_bar.baz.`, the key is `Foo_bar.baz`.
+> The final period is not *internal* punctuation,
+> so it is not included in the key.
+> In `@{Foo_bar.baz.}`, the key is `Foo_bar.baz.`, including the final period.
+> The curly braces are recommended if you use URLs as keys:
+> `[@{https://example.com/bib?name=foobar&date=2000}, p. 33]`.
+
+If a citation key does not fully match [this online regex](https://regex101.com/r/mXZyY2/latest)
+(for example, contains characters such as `;` or `=` or end with a non-alphanumeric character such as `/`),
+make sure to surround it with curly braces or use the [citation aliases](#citation-aliases) workaround below.
+<!-- See [jgm/pandoc#6026](https://github.com/jgm/pandoc/issues/6026) on the curly-brace syntax for Markdown citation keys, which was introduced in Pandoc 2.14. -->
 
 Prior to Rootstock commit [`6636b91`](https://github.com/manubot/rootstock/commit/6636b912c6b41593acd2041d34cd4158c1b317fb) on 2020-01-14, Manubot processed citations separately from Pandoc.
 Switching to a Pandoc filter improved reliability on complex documents, but restricted the syntax of citation keys slightly.
diff --git a/build/assets/style.csl b/build/assets/style.csl
index 942a043..b836f7b 100644
--- a/build/assets/style.csl
+++ b/build/assets/style.csl
@@ -47,7 +47,7 @@
       <text variable="citation-number"/>
     </layout>
   </citation>
-  <bibliography hanging-indent="true" second-field-align="flush">
+  <bibliography second-field-align="flush">
     <layout>
       <text variable="citation-number" suffix=". "/>
       <group delimiter=" ">
diff --git a/build/environment.yml b/build/environment.yml
index abee7fb..40abf49 100644
--- a/build/environment.yml
+++ b/build/environment.yml
@@ -5,11 +5,10 @@ dependencies:
   - cairo=1.14.12
   - cairocffi=0.8.0
   - cffi=1.12.3
-  - ghp-import=0.5.5
+  - ghp-import=1.0.0
   - jinja2=2.11.2
   - jsonschema=3.2.0
-  - pandoc=2.9.2
-  - panflute=1.12.5
+  - pandoc=2.14
   - pango=1.40.14
   - pip=20.2
   - psutil=5.7.3
@@ -21,14 +20,15 @@ dependencies:
   - yamllint=1.25.0
   - pip:
     - errorhandler==2.0.1
-    - git+https://github.com/manubot/manubot@553090a16ac24a9fdc3f8df241a91b790c140865
+    - git+https://github.com/manubot/manubot@2c028a7a87be24a76e2dec3ac7db6e8754ae6d4a
     - isbnlib==3.10.3
     - opentimestamps-client==0.7.0
     - opentimestamps==0.4.1
-    - pandoc-eqnos==2.3.0
-    - pandoc-fignos==2.3.1
-    - pandoc-tablenos==2.2.2
-    - pandoc-xnos==2.4.3
+    - pandoc-eqnos==2.5.0
+    - pandoc-fignos==2.4.0
+    - pandoc-tablenos==2.3.0
+    - pandoc-xnos==2.5.0
+    - panflute==2.1.0
     - pybase62==0.4.3
     - pysha3==1.0.2
     - python-bitcoinlib==0.10.2
diff --git a/build/pandoc/defaults/common.yaml b/build/pandoc/defaults/common.yaml
index 12c0c34..bfa5d97 100644
--- a/build/pandoc/defaults/common.yaml
+++ b/build/pandoc/defaults/common.yaml
@@ -6,7 +6,7 @@ filters:
 - pandoc-eqnos
 - pandoc-tablenos
 - pandoc-manubot-cite
-- pandoc-citeproc
+- citeproc
 wrap: preserve
 metadata:
   csl: build/assets/style.csl
diff --git a/build/pandoc/defaults/html.yaml b/build/pandoc/defaults/html.yaml
index 50d2981..8aff336 100644
--- a/build/pandoc/defaults/html.yaml
+++ b/build/pandoc/defaults/html.yaml
@@ -25,6 +25,7 @@ include-after-body:
 - build/plugins/mathjax.html
 #- build/plugins/scite.html
 variables:
+  document-css: false
   math: ""
 html-math-method:
   method: mathjax
diff --git a/build/plugins/anchors.html b/build/plugins/anchors.html
index 68f1225..7149501 100644
--- a/build/plugins/anchors.html
+++ b/build/plugins/anchors.html
@@ -10,7 +10,8 @@
 <script type="module">
   // which types of elements to add anchors next to, in "document.querySelector"
   // format
-  const typesQuery = 'h1, h2, h3, [id^="fig:"], [id^="tbl:"], [id^="eq:"]';
+  const typesQuery =
+    'h1, h2, h3, div[id^="fig:"], div[id^="tbl:"], span[id^="eq:"]';
 
   // start script
   function start() {
diff --git a/build/plugins/jump-to-first.html b/build/plugins/jump-to-first.html
index d205093..da7df4a 100644
--- a/build/plugins/jump-to-first.html
+++ b/build/plugins/jump-to-first.html
@@ -15,9 +15,11 @@
 
   // start script
   function start() {
-    if (references !== "false") makeButtons("ref-", "p", "reference");
-    if (figures !== "false") makeButtons("fig:", "figcaption", "figure");
-    if (tables !== "false") makeButtons("tbl:", "caption", "table");
+    if (references !== "false")
+      makeButtons(`div[id^="ref-"]`, ".csl-left-margin", "reference");
+    if (figures !== "false")
+      makeButtons(`div[id^="fig:"]`, "figcaption", "figure");
+    if (tables !== "false") makeButtons(`div[id^="tbl:"]`, "caption", "table");
   }
 
   // when jump button clicked
@@ -45,7 +47,7 @@
 
   // add button next to each reference entry, figure, or table
   function makeButtons(query, containerQuery, subject) {
-    const elements = document.querySelectorAll(`[id^="${query}"`);
+    const elements = document.querySelectorAll(query);
     for (const element of elements) {
       const id = element.id;
       const buttonContainer = element.querySelector(containerQuery);
diff --git a/build/plugins/tooltips.html b/build/plugins/tooltips.html
index b6fc505..e023e3a 100644
--- a/build/plugins/tooltips.html
+++ b/build/plugins/tooltips.html
@@ -230,6 +230,7 @@
       "data-selected",
       "data-highlighted",
       "data-glow",
+      "class",
     ];
     for (const attribute of attributes) {
       sourceCopy.removeAttribute(attribute);
@@ -290,9 +291,8 @@
     prevButton.classList.add("icon_button");
     nextButton.classList.add("icon_button");
     prevButton.innerHTML = document.querySelector(".icon_caret_left").innerHTML;
-    nextButton.innerHTML = document.querySelector(
-      ".icon_caret_right"
-    ).innerHTML;
+    nextButton.innerHTML =
+      document.querySelector(".icon_caret_right").innerHTML;
     navBar.appendChild(prevButton);
     navBar.appendChild(document.createTextNode(text));
     navBar.appendChild(nextButton);
@@ -336,7 +336,7 @@
     if (!target) return;
 
     // if ref or figure, modify target to get expected element
-    if (id.indexOf("ref-") === 0) target = target.querySelector("p");
+    if (id.indexOf("ref-") === 0) target = target.querySelector(":nth-child(2)");
     else if (id.indexOf("fig:") === 0) target = target.querySelector("figure");
 
     return target;
diff --git a/build/themes/default.html b/build/themes/default.html
index 2396cc4..b3298fe 100644
--- a/build/themes/default.html
+++ b/build/themes/default.html
@@ -267,8 +267,7 @@
   }
 
   /* table auto-number */
-  table > caption > span:first-of-type,
-  div.table_wrapper > table > caption > span:first-of-type {
+  table > caption > span:first-of-type {
     font-weight: bold;
     margin-right: 5px;
   }
@@ -495,6 +494,15 @@
     top: 0.125em;
   }
 
+  /* -------------------------------------------------- */
+  /* references */
+  /* -------------------------------------------------- */
+
+  .csl-entry {
+    margin-top: 15px;
+    margin-bottom: 15px;
+  }
+
   /* -------------------------------------------------- */
   /* print control */
   /* -------------------------------------------------- */
@@ -626,7 +634,6 @@
 
   /* tablenos wrapper */
   .tablenos {
-    /* show scrollbar on tables if necessary to prevent overflow */
     width: 100%;
     margin: 20px 0;
   }
diff --git a/content/02.delete-me.md b/content/02.delete-me.md
index c2b1fd0..387c467 100644
--- a/content/02.delete-me.md
+++ b/content/02.delete-me.md
@@ -107,7 +107,7 @@ Citation by Wikidata ID [@wikidata:Q56458321].
 
 Citation by ISBN [@isbn:9780262517638].
 
-Citation by URL [@https://greenelab.github.io/meta-review/].
+Citation by URL [@{https://greenelab.github.io/meta-review/}].
 
 Citation by alias [@deep-review].
 

From 4c52f837f4bf8f1c876a989a1d07b87e122d8829 Mon Sep 17 00:00:00 2001
From: mariojmdavid <mariojmdavid@gmail.com>
Date: Tue, 29 Jun 2021 10:59:57 +0100
Subject: [PATCH 09/54] substitute deprecated author_info

---
 content/metadata.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/metadata.yaml b/content/metadata.yaml
index eeaa1c7..a69bec6 100644
--- a/content/metadata.yaml
+++ b/content/metadata.yaml
@@ -11,7 +11,7 @@ keywords:
   - software deployment
   - agile development
 lang: en-US
-author_info:
+authors:
   -
     github: orviz
     name: Pablo Orviz

From 86599900dbdd927cda520bd9b263b49e4744f7fc Mon Sep 17 00:00:00 2001
From: mariojmdavid <mariojmdavid@gmail.com>
Date: Tue, 29 Jun 2021 11:21:02 +0100
Subject: [PATCH 10/54] sections with numbered list

---
 content/03.intro.md                  |  2 +-
 content/04.goals.md                  |  2 +-
 content/05.notational_conventions.md |  2 +-
 content/06.quality_criteria.md       | 30 ++++++++++++++--------------
 content/08.annex.md                  |  4 ++--
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/content/03.intro.md b/content/03.intro.md
index 275d5df..103f0dc 100644
--- a/content/03.intro.md
+++ b/content/03.intro.md
@@ -1,4 +1,4 @@
-## Introduction and Purpose
+## 1. Introduction and Purpose
 
 This document has been tailored upon the recommendations and requirements found
 in the Initial Plan for Software Management and Pilot Services deliverable
diff --git a/content/04.goals.md b/content/04.goals.md
index 7b08122..41b263f 100644
--- a/content/04.goals.md
+++ b/content/04.goals.md
@@ -1,4 +1,4 @@
-## Goals
+## 2. Goals
 
 1. Set the base of minimum SQA criteria that a software developed within EOSC
 development project MUST fulfill.
diff --git a/content/05.notational_conventions.md b/content/05.notational_conventions.md
index ef994c2..db8cc49 100644
--- a/content/05.notational_conventions.md
+++ b/content/05.notational_conventions.md
@@ -1,4 +1,4 @@
-## Notational Conventions
+## 3. Notational Conventions
 
 The keywords “MUST”, “MUST NOT”, “REQUIRED”, “SHALL”, “SHALL NOT”, “SHOULD”,
 “SHOULD NOT”, “RECOMMENDED”, “MAY”, and “OPTIONAL” in this document are to be
diff --git a/content/06.quality_criteria.md b/content/06.quality_criteria.md
index c6d64ad..9f35674 100644
--- a/content/06.quality_criteria.md
+++ b/content/06.quality_criteria.md
@@ -1,4 +1,4 @@
-## Quality Criteria
+## 4. Quality Criteria
 
 The following sections describe the quality conventions and best practices that
 apply to the development phase of a software component within the EOSC
@@ -14,7 +14,7 @@ validate them before being added to the software component code base.
 Consequently, software components are more eligible for being deployed in
 production infrastructures, reducing the likelihood of service disruption.
 
-### Code Accessibility [QC.Acc]
+### 4.1. Code Accessibility [QC.Acc]
 
 * **[QC.Acc01]** Following the open-source model, the source code being produced MUST be open
   and publicly available to promote the adoption and augment the visibility of
@@ -26,7 +26,7 @@ production infrastructures, reducing the likelihood of service disruption.
   SHOULD reside in a common organization of a version control repository
   hosting service.
 
-### Licensing [QC.Lic]
+### 4.2. Licensing [QC.Lic]
 
 * **[QC.Lic01]** As open-source software, source code MUST adhere to an open-source license
   to be freely used, modified and distributed by others.
@@ -37,7 +37,7 @@ production infrastructures, reducing the likelihood of service disruption.
 * **[QC.Lic03]** Licenses MUST be physically present (e.g. as a LICENSE file) in the root of
   all the source code repositories related to the software component.
 
-### Code Workflow [QC.Wor]
+### 4.3. Code Workflow [QC.Wor]
 
 A change-based approach is accomplished with a branching model.
 
@@ -61,7 +61,7 @@ A change-based approach is accomplished with a branching model.
 * **[QC.Wor04]** Semantic Versioning [@https://semver.org] specification is RECOMMENDED for
   tagging the production releases.
 
-### Code Management [QC.Man]
+### 4.4. Code Management [QC.Man]
 
 * **[QC.Man01]** An issue tracking system facilitates structured software development. Leveraging
   issues to track down both new enhancements and defects (bugs or documentation typos) 
@@ -85,7 +85,7 @@ A change-based approach is accomplished with a branching model.
     description SHOULD make reference to the identifiers of the issues it is fixing 
     (to eventually close them, either manually or automatically).
 
-### Code Style [QC.Sty]
+### 4.5. Code Style [QC.Sty]
 
 Code style requirements pursue the correct maintenance of the source code by
 the common agreement of a series of style conventions. These vary based on the
@@ -107,7 +107,7 @@ programming language being used.
 * **[QC.Sty04]** Code style compliance testing MUST be automated and MUST be triggered for
   each candidate change in the source code.
 
-### Code metadata [QC.Met]
+### 4.6. Code metadata [QC.Met]
 
 Metadata for the software component provides a way to achieve its full identification,
 thus making software citation viable [@doi:10.7717/peerj-cs.86].
@@ -117,7 +117,7 @@ towards preservation, discovery, reuse, and attribution of the software componen
 * **[QC.Met01]** A metadata file SHOULD exist along side the code, under its VCS.
   The metadata file SHOULD be updated when needed, as is the case of a new version.
 
-### Unit Testing [QC.Uni]
+### 4.7. Unit Testing [QC.Uni]
 
 Unit testing evaluates all the possible flows in the internal design of the
 code, so that its behaviour becomes apparent. It is a key type of testing for
@@ -136,7 +136,7 @@ early detection of failures in the development cycle.
   * **[QC.Uni04.1]** When working on automated testing, the use of testing doubles is
     RECOMMENDED to mimic a simplistic behaviour of objects and procedures.
 
-### Integration Testing [QC.Int]
+### 4.8. Integration Testing [QC.Int]
 
 Integration testing refers to the evaluation of the interactions among coupled
 software components or parts of a system that cooperate to achieve a given
@@ -157,7 +157,7 @@ out-of-the-warranty services.
 * **[QC.Int05]** Integration testing MAY NOT be viable to be checked on change basis, as it
   is likely to involve complex scenarios.
 
-### Functional Testing [QC.Fun]
+### 4.9. Functional Testing [QC.Fun]
 
 Functional testing involves the verification of the software component’s
 identified functionality, based on requested requirements and agreed design
@@ -181,7 +181,7 @@ design analysis or side-effects to external systems.
 * **[QC.Fun07]** Functional and regression testing coverage MAY NOT be suitable for automated
   testing.
 
-### Test-Driven Development (TDD)
+### 4.10. Test-Driven Development (TDD)
 
 Test-Driven Development [@isbn:9780321146533], is a software development process relying on software
 requirements being converted to test cases before software is fully developed,
@@ -192,7 +192,7 @@ created later.
 * **[QC.Tdd01]** Software requirements SHOULD be converted to test cases, and these
   test cases SHOULD be checked automatically. 
 
-### Documentation [QC.Doc]
+### 4.11. Documentation [QC.Doc]
 
 * **[QC.Doc01]** Documentation MUST be treated as code.
   * **[QC.Doc01.1]** Version controlled, it MAY reside in the same repository where the source
@@ -245,7 +245,7 @@ created later.
     * Command-line (CLI) reference.
 * **[QC.Doc07]** Documentation MUST be checked on change basis.
 
-### Security [QC.Sec]
+### 4.12. Security [QC.Sec]
 
 * **[QC.Sec01]** Secure coding practices SHALL be applied into all the stages of a software
   component development lifecycle.
@@ -282,7 +282,7 @@ created later.
 * **[QC.Sec10]** The services delivered SHALL adhere to any extra security policies or
   requirements set at the operational level.
 
-### Code Review [QC.Rev]
+### 4.13. Code Review [QC.Rev]
 
 Code review implies the informal, non-automated, peer, human-based revision of
 any change in the source code
@@ -321,7 +321,7 @@ change has successfully passed over the required set of change-based tests.
   ensuring that the security model has not been downgraded or compromised by
   the changes.
 
-### Automated Deployment [QC.Aud]
+### 4.14. Automated Deployment [QC.Aud]
 
 * **[QC.Aud01]** Production-ready code SHALL be deployed as a workable system with the minimal
   user or system administrator interaction leveraging software configuration
diff --git a/content/08.annex.md b/content/08.annex.md
index 870665b..cced17f 100644
--- a/content/08.annex.md
+++ b/content/08.annex.md
@@ -1,4 +1,4 @@
-## Annex
+## A1. Annex
 
 The Quality Criteria described in this document is abstract, as such the choice of tools and services to implement
 their verification is up to the team or community developing and/or using a given software.
@@ -6,7 +6,7 @@ their verification is up to the team or community developing and/or using a give
 The annex describes the implementation of how the Quality Criteria detailed in this document can be verified, as been used
 in several European projects. It details the code workflow, the tools and services used to achieve the verification of the Criteria.
 
-### Code workflow
+### A1.1. Code workflow
 
 This section describes the code workflow shown in Figure 1
 

From b705635ae863261257788eae61268e27ee92624c Mon Sep 17 00:00:00 2001
From: mariojmdavid <mariojmdavid@gmail.com>
Date: Tue, 29 Jun 2021 11:22:06 +0100
Subject: [PATCH 11/54] number in section

---
 content/07.glossary.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/07.glossary.md b/content/07.glossary.md
index 07c9b48..f6e2fb5 100644
--- a/content/07.glossary.md
+++ b/content/07.glossary.md
@@ -1,4 +1,4 @@
-## Glossary
+## 5. Glossary
 
 __API__
 : Application Programming Interface

From 5f3c74bd18dc321d69829924b1f42fabc9dd3301 Mon Sep 17 00:00:00 2001
From: mariojmdavid <mariojmdavid@gmail.com>
Date: Tue, 29 Jun 2021 15:47:24 +0100
Subject: [PATCH 12/54] update annex

---
 content/08.annex.md | 35 ++++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/content/08.annex.md b/content/08.annex.md
index cced17f..81d1d79 100644
--- a/content/08.annex.md
+++ b/content/08.annex.md
@@ -1,13 +1,34 @@
 ## A1. Annex
 
-The Quality Criteria described in this document is abstract, as such the choice of tools and services to implement
-their verification is up to the team or community developing and/or using a given software.
+The Quality Criteria described in this document is abstract, as such the choice of tools
+and services to implement their verification is up to the team or community developing
+and/or using a given software.
 
-The annex describes the implementation of how the Quality Criteria detailed in this document can be verified, as been used
-in several European projects. It details the code workflow, the tools and services used to achieve the verification of the Criteria.
+The annex describes the implementation of how the Quality Criteria detailed in this
+document can be verified, and as has been used in several European projects. It details the
+code workflow, the tools and services used to achieve the verification of the Criteria.
 
-### A1.1. Code workflow
+### A1.1. List of tools and services
 
-This section describes the code workflow shown in Figure 1
+Table @tbl:services show the list of tools and services used to implement the verification of the
+Quality Criteria detailed in this document.
 
-![](images/devops.png){height="500px"}
+| Service/Tool | Usage | Criteria   | Comment |
+|:------------:|:-----:|:----------:|:-------:|
+| Github       | VCS | **QC.Acc** | Source code repository |
+|              | License             | **QC.Lic** | File present in VCS repository |
+|              | Code Workflow       | **QC.Wor** |   |
+|              | Issue tracker       | **QC.Man** | Track issues, bugs, new features, etc. |
+|              | Pull Requests (PR)  | **QC.Man** | Code review |
+|              | Code metadata       | **QC.Met** | JSON metadata file present in VCS repository |
+| Jenkins CI   | Pipelines of tests  |            | Service to execute Continuous Integration tests |
+| pylint, checkstyle | Check style   | **QC.Sty** | Continuous Integration |
+
+Table: Tools and services used to implement the QA criteria, also shown the criteria
+where applicable. {#tbl:services}
+
+### A1.2. Code workflow
+
+This section describes the code workflow shown in Figure @fig:workflow
+
+![Code workflow](images/devops.png){height="500px"}{#fig:workflow}

From f350923b21d9e384651fc4a8b081fb783fec5d7a Mon Sep 17 00:00:00 2001
From: mariojmdavid <mariojmdavid@gmail.com>
Date: Tue, 29 Jun 2021 16:32:42 +0100
Subject: [PATCH 13/54] update annex, insert code for TDD

---
 content/06.quality_criteria.md |  2 +-
 content/08.annex.md            | 23 +++++++++++++----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/content/06.quality_criteria.md b/content/06.quality_criteria.md
index 9f35674..16b3868 100644
--- a/content/06.quality_criteria.md
+++ b/content/06.quality_criteria.md
@@ -181,7 +181,7 @@ design analysis or side-effects to external systems.
 * **[QC.Fun07]** Functional and regression testing coverage MAY NOT be suitable for automated
   testing.
 
-### 4.10. Test-Driven Development (TDD)
+### 4.10. Test-Driven Development [QC.Tdd]
 
 Test-Driven Development [@isbn:9780321146533], is a software development process relying on software
 requirements being converted to test cases before software is fully developed,
diff --git a/content/08.annex.md b/content/08.annex.md
index 81d1d79..31c0b9c 100644
--- a/content/08.annex.md
+++ b/content/08.annex.md
@@ -13,16 +13,19 @@ code workflow, the tools and services used to achieve the verification of the Cr
 Table @tbl:services show the list of tools and services used to implement the verification of the
 Quality Criteria detailed in this document.
 
-| Service/Tool | Usage | Criteria   | Comment |
-|:------------:|:-----:|:----------:|:-------:|
-| Github       | VCS | **QC.Acc** | Source code repository |
-|              | License             | **QC.Lic** | File present in VCS repository |
-|              | Code Workflow       | **QC.Wor** |   |
-|              | Issue tracker       | **QC.Man** | Track issues, bugs, new features, etc. |
-|              | Pull Requests (PR)  | **QC.Man** | Code review |
-|              | Code metadata       | **QC.Met** | JSON metadata file present in VCS repository |
-| Jenkins CI   | Pipelines of tests  |            | Service to execute Continuous Integration tests |
-| pylint, checkstyle | Check style   | **QC.Sty** | Continuous Integration |
+| Service/Tool | Usage              | Criteria   | Comment |
+|:------------:|:------------------:|:----------:|:-------:|
+| Github       | VCS                | **QC.Acc** | Source code repository |
+|              | License            | **QC.Lic** | File present in VCS repository |
+|              | Code Workflow      | **QC.Wor** | |
+|              | Issue tracker      | **QC.Man** | Track issues, bugs, new features, etc. |
+|              | Pull Requests (PR) | **QC.Man**, **QC.Rev** | Code review |
+|              | Code metadata      | **QC.Met** | JSON metadata file present in VCS repository |
+|              | Documentation      | **QC.Doc** | Documentation present in VCS repository (markdown) |
+| Jenkins CI   | Pipelines of tests | **QC.Uni**, **QC.Int**, **QC.Fun**, **QC.Sec** | Service to manage CI tests |
+|              | Check style        | **QC.Sty** | pylint, checkstyle |
+| Docker, Dockerhub | Jenkins CI nodes | | Containers to execute CI tests |
+| Ansible, Galaxy   | Installation, Configuration | **QC.Aud** | Automated deployment and configuration |
 
 Table: Tools and services used to implement the QA criteria, also shown the criteria
 where applicable. {#tbl:services}

From bbecc1b3013f04f0d69b19af34119b06fbd98114 Mon Sep 17 00:00:00 2001
From: mariojmdavid <mariojmdavid@gmail.com>
Date: Wed, 22 Sep 2021 11:00:22 +0100
Subject: [PATCH 14/54] formating and spell checking

---
 content/02.0.copyright-ack.md  |   5 +-
 content/02.document-log.md     |   1 +
 content/04.goals.md            |  32 +++---
 content/06.quality_criteria.md | 196 ++++++++++++++++++---------------
 4 files changed, 127 insertions(+), 107 deletions(-)

diff --git a/content/02.0.copyright-ack.md b/content/02.0.copyright-ack.md
index a7bb926..8e50b20 100644
--- a/content/02.0.copyright-ack.md
+++ b/content/02.0.copyright-ack.md
@@ -6,9 +6,10 @@ DataCloud and EOSC-Synergy collaborations, 2015-2020.
 ## Acknowledgements
 
 The INDIGO-DataCloud, DEEP-Hybrid-DataCloud, eXtreme-DataCloud and
-EOSC-Synergy projects have received funding from the European Union’s 
-Horizon 2020 research and innovation programme under grant agreement 
+EOSC-Synergy projects have received funding from the European Union’s
+Horizon 2020 research and innovation programme under grant agreement
 number 653549, 777435, 777367 and 857647 respectively.
+
 <p align="center">
   <img src="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcT1WF4g5KH3PnQE_Ve10QFRS-gZ0NpCQ7Qr-_km1RqnOCEF1fQt">
 </p>
diff --git a/content/02.document-log.md b/content/02.document-log.md
index 1a8068a..02b6018 100644
--- a/content/02.document-log.md
+++ b/content/02.document-log.md
@@ -8,3 +8,4 @@
 | v3.1 | 05/03/2020 | Add tags/names for each criteria |
 | v3.2 | 23/04/2020 | Add EOSC-Synergy to copyright |
 | v3.3 | 15/10/2020 | Fix issues: #32, #46, #47, #48, #49, #51 |
+| v4.0 | 2021 | Add annex, spell check, Fix issues: # |
diff --git a/content/04.goals.md b/content/04.goals.md
index 41b263f..d29d981 100644
--- a/content/04.goals.md
+++ b/content/04.goals.md
@@ -1,21 +1,17 @@
 ## 2. Goals
 
-1. Set the base of minimum SQA criteria that a software developed within EOSC
-development project MUST fulfill.
-2. Enhance the visibility, accessibility and distribution of the produced
-source code through the alignment to the
-Open Source Definition [@https://opensource.org/osd].
-3. Promote code style standards to deliver good quality source code emphasizing
-its readability and reusability.
+1. Set the base of minimum SQA criteria that a software developed within EOSC development project
+   MUST fulfill.
+2. Enhance the visibility, accessibility and distribution of the produced source code through the
+   alignment to the Open Source Definition [@https://opensource.org/osd].
+3. Promote code style standards to deliver good quality source code emphasizing its readability and
+   reusability.
 4. Improve the quality and reliability of software by covering different
-testing methods at development and pre-production stages.
-5. Propose a change-based driven scenario where all new updates in the source
-code are continuously validated by the automated execution of the relevant
-tests.
-6. Adopt an agile approach to effectively produce timely and audience-specific
-documentation.
-7. Lower the barriers of software adoption by delivering quality documentation
-and the utilization of automated deployment solutions.
-8. Encourage secure coding practices and security static analysis at the
-development phase while providing recommendations on external security
-assessment.
+   testing methods at development and pre-production stages.
+5. Propose a change-based driven scenario where all new updates in the source code are continuously
+   validated by the automated execution of the relevant tests.
+6. Adopt an agile approach to effectively produce timely and audience-specific documentation.
+7. Lower the barriers of software adoption by delivering quality documentation and the utilization
+   of automated deployment solutions.
+8. Encourage secure coding practices and security static analysis at the development phase while
+   providing recommendations on external security assessment.
diff --git a/content/06.quality_criteria.md b/content/06.quality_criteria.md
index 16b3868..2ae0add 100644
--- a/content/06.quality_criteria.md
+++ b/content/06.quality_criteria.md
@@ -19,9 +19,11 @@ production infrastructures, reducing the likelihood of service disruption.
 * **[QC.Acc01]** Following the open-source model, the source code being produced MUST be open
   and publicly available to promote the adoption and augment the visibility of
   the software developments.
+
 * **[QC.Acc02]** Source code MUST use a Version Control System (VCS).
   * **[QC.Acc02.1]** It is RECOMMENDED that all software components delivered by the same
     project agree on a common VCS.
+
 * **[QC.Acc03]** Source code produced within the scope of a broader development project
   SHOULD reside in a common organization of a version control repository
   hosting service.
@@ -31,9 +33,11 @@ production infrastructures, reducing the likelihood of service disruption.
 * **[QC.Lic01]** As open-source software, source code MUST adhere to an open-source license
   to be freely used, modified and distributed by others.
   * **[QC.Lic01.1]** Non-licensed software is exclusive copyright by default.
+
 * **[QC.Lic02]** License MUST be compliant with the Open Source Definition [@https://opensource.org/osd].
   * **[QC.Lic02.1]** RECOMMENDED licenses are listed in the Open Source Initiative portal
     under the Popular Licenses category [@https://opensource.org/licenses].
+
 * **[QC.Lic03]** Licenses MUST be physically present (e.g. as a LICENSE file) in the root of
   all the source code repositories related to the software component.
 
@@ -44,13 +48,14 @@ A change-based approach is accomplished with a branching model.
 * **[QC.Wor01]** The main branch in the source code repository MUST maintain a working state
   version of the software component.
   * **[QC.Wor01.1]** Main branch SHOULD be protected to disallow force pushing, thus
-    preventing untested and unreviewed source code from entering the
-    production-ready version.
+    preventing untested and un-reviewed source code from entering the production-ready version.
   * **[QC.Wor01.2]** New features SHOULD only be merged in the main branch whenever the SQA
     criteria is fulfilled.
+
 * **[QC.Wor02]** New changes in the source code MUST be placed in individual branches.
   * **[QC.Wor02.1]** It is RECOMMENDED to agree on a branch nomenclature, usually by
     prefixing, to differentiate change types (e.g. feature, release, fix).
+
 * **[QC.Wor03]** The existence of a secondary long-term branch that contains the changes for
   the next release is RECOMMENDED.
   * **[QC.Wor03.1]** Next release changes come from the individual branches.
@@ -58,31 +63,33 @@ A change-based approach is accomplished with a branching model.
     merged into the main branch and versioned. At that point in time, main
     and secondary branches are aligned. This step SHOULD mark a production
     release.
+
 * **[QC.Wor04]** Semantic Versioning [@https://semver.org] specification is RECOMMENDED for
   tagging the production releases.
 
 ### 4.4. Code Management [QC.Man]
 
 * **[QC.Man01]** An issue tracking system facilitates structured software development. Leveraging
-  issues to track down both new enhancements and defects (bugs or documentation typos) 
+  issues to track down both new enhancements and defects (bugs or documentation typos)
   is RECOMMENDED.
-  * **[QC.Man01.1]** In addition to monitoring the internal development, issues are the best means for
-    supporting users. External users SHOULD be able to create incidences based on the
+  * **[QC.Man01.1]** In addition to monitoring the internal development, issues are the best
+    means for supporting users. External users SHOULD be able to create incidences based on the
     operational performance of the software.
-  * **[QC.Man01.2]** The description of an issue SHOULD be concise and state clearly the problem. It is 
-    RECOMMENDED to add any reference to the actual problem. In the case of bugs, the 
+  * **[QC.Man01.2]** The description of an issue SHOULD be concise and state clearly the problem.
+    It is RECOMMENDED to add any reference to the actual problem. In the case of bugs, the
     issue SHOULD be accompanied by the relevant debug information.
          * The usage of templates for the issue description is RECOMMENDED.
-* **[QC.Man02]** In social coding environments, pull requests represent the cornerstone of collaboration. 
-  A pull request provides a place for review and discussion of the changes proposed to be
-  part of an existing version of the code.
+
+* **[QC.Man02]** In social coding environments, pull requests represent the cornerstone of
+  collaboration. A pull request provides a place for review and discussion of the changes proposed
+  to be part of an existing version of the code.
   * **[QC.Man02.1]** Pull requests SHOULD be used for every change in the codebase.
   * **[QC.Man02.2]** A software project SHOULD be open to external collaboration through pull requests.
   * **[QC.Man02.3]** A pull request description SHOULD be concise and state clearly its purpose (e.g. if
     it is fixing an observed bug or adding a new feature)
-    * The usage of templates for the pull request's description is RECOMMENDED.
-  * **[QC.Man02.4]** It is RECOMMENDED to use pull requests to address open issues. The pull request 
-    description SHOULD make reference to the identifiers of the issues it is fixing 
+  * **[QC.Man02.4]** The usage of templates for the pull request's description is RECOMMENDED.
+  * **[QC.Man02.5]** It is RECOMMENDED to use pull requests to address open issues. The pull request
+    description SHOULD make reference to the identifiers of the issues it is fixing
     (to eventually close them, either manually or automatically).
 
 ### 4.5. Code Style [QC.Sty]
@@ -94,16 +101,18 @@ programming language being used.
 * **[QC.Sty01]** Each individual software product MUST comply with community-driven or de-facto
   code style standards for the programming languages being used.
   * **[QC.Sty01.1]** Compliance with multiple complementary standards MAY exist.
+
 * **[QC.Sty02]** Custom code style guidelines SHOULD be avoided, only considered in the
   hypothetical event of programming languages without existing community style
   standards.
   * **[QC.Sty02.1]** Custom styles MUST be documented by defining each convention and its
     expected output.
-  * **[QC.Sty02.2]** Custom styles SHOULD evolve over time towards a more consistent
-    definition.
+  * **[QC.Sty02.2]** Custom styles SHOULD evolve over time towards a more consistent definition.
+
 * **[QC.Sty03]** Exceptions of individual conventions from the main definition are allowed
-  but SHOULD bavoided
+  but SHOULD be avoided
   * **[QC.Sty03.1]** Absence of standard conventions SHOULD be justified and tracked.
+
 * **[QC.Sty04]** Code style compliance testing MUST be automated and MUST be triggered for
   each candidate change in the source code.
 
@@ -111,7 +120,7 @@ programming language being used.
 
 Metadata for the software component provides a way to achieve its full identification,
 thus making software citation viable [@doi:10.7717/peerj-cs.86].
-It allows the assignement of a Digital Object Identifier (DOI) and is key
+It allows the assignment of a Digital Object Identifier (DOI) and is key
 towards preservation, discovery, reuse, and attribution of the software component.
 
 * **[QC.Met01]** A metadata file SHOULD exist along side the code, under its VCS.
@@ -120,21 +129,22 @@ towards preservation, discovery, reuse, and attribution of the software componen
 ### 4.7. Unit Testing [QC.Uni]
 
 Unit testing evaluates all the possible flows in the internal design of the
-code, so that its behaviour becomes apparent. It is a key type of testing for
+code, so that its behavior becomes apparent. It is a key type of testing for
 early detection of failures in the development cycle.
 
 * **[QC.Uni01]** Minimum acceptable code coverage threshold SHOULD be 70%.
   * **[QC.Uni01.1]** Unit testing coverage SHOULD be higher for those sections of the code
-    identified as critical by the developers, such as units part of a
-    security module.
+    identified as critical by the developers, such as units part of a security module.
   * **[QC.Uni01.2]** Unit testing coverage MAY be lower for external libraries or pieces of
     code not maintained within the product’s code base.
-* **[QC.Uni02]** Units SHOULD reside in the repository code base but separated from the main
-  code.
+
+* **[QC.Uni02]** Units SHOULD reside in the repository code base but separated from the main code.
+
 * **[QC.Uni03]** Unit testing coverage MUST be checked on change basis.
+
 * **[QC.Uni04]** Unit testing coverage MUST be automated.
   * **[QC.Uni04.1]** When working on automated testing, the use of testing doubles is
-    RECOMMENDED to mimic a simplistic behaviour of objects and procedures.
+    RECOMMENDED to mimic a simplistic behavior of objects and procedures.
 
 ### 4.8. Integration Testing [QC.Int]
 
@@ -144,16 +154,17 @@ functionality.
 
 * **[QC.Int01]** Integration testing outcome MUST guarantee the overall operation of the
   software component whenever new functionality are involved.
-* **[QC.Int02]** Integration testing MAY be complemented with Acceptance and Scalability
-  testing.
-* **[QC.Int03]** Integration testing MUST NOT rely on non-operational or
-out-of-the-warranty services.
-  * **[QC.Int03.1]** On lack of automation, pilot service infrastructures or
-  local testbeds MAY be used.
-  * **[QC.Int03.2]** In the presence of CI environments, integration tests
-  SHOULD be suitable for the automated testing.
-* **[QC.Int04]** Ad-hoc pilot service infrastructures and/or local testbeds MAY be used to 
+
+* **[QC.Int02]** Integration testing MAY be complemented with Acceptance and Scalability testing.
+
+* **[QC.Int03]** Integration testing MUST NOT rely on non-operational or out-of-the-warranty services.
+  * **[QC.Int03.1]** On lack of automation, pilot service infrastructures or local testbeds MAY be used.
+  * **[QC.Int03.2]** In the presence of CI environments, integration tests SHOULD be suitable for
+    the automated testing.
+
+* **[QC.Int04]** Ad-hoc pilot service infrastructures and/or local testbeds MAY be used to
   cope with the integration testing requirements.
+
 * **[QC.Int05]** Integration testing MAY NOT be viable to be checked on change basis, as it
   is likely to involve complex scenarios.
 
@@ -167,19 +178,23 @@ design analysis or side-effects to external systems.
 
 * **[QC.Fun01]** Functional testing SHOULD tend to cover the full set of functionality that
   the software component claims to provide.
+
 * **[QC.Fun02]** Functional tests SHOULD be checked automatically with the exception of those
   functionality that require human interaction, such as Graphical User
   Interfaces (GUI).
+
 * **[QC.Fun03]** When working on automated testing, the use of testing doubles is RECOMMENDED
-  to mimic a simplistic behaviour of objects and procedures.
+  to mimic a simplistic behavior of objects and procedures.
+
 * **[QC.Fun04]** Functional tests SHOULD reside in the software component repository code
   base but separated from the main code.
+
 * **[QC.Fun05]** Regression testing, that checks the conformance with previous tests, is
-  covered at this stage by executing the complete set of functional tests
-  available.
+  covered at this stage by executing the complete set of functional tests available.
+
 * **[QC.Fun06]** Functional and regression testing MUST be checked on change basis.
-* **[QC.Fun07]** Functional and regression testing coverage MAY NOT be suitable for automated
-  testing.
+
+* **[QC.Fun07]** Functional and regression testing coverage MAY NOT be suitable for automated testing.
 
 ### 4.10. Test-Driven Development [QC.Tdd]
 
@@ -190,38 +205,40 @@ all test cases. This is opposed to software being developed first and test cases
 created later.
 
 * **[QC.Tdd01]** Software requirements SHOULD be converted to test cases, and these
-  test cases SHOULD be checked automatically. 
+  test cases SHOULD be checked automatically.
 
 ### 4.11. Documentation [QC.Doc]
 
 * **[QC.Doc01]** Documentation MUST be treated as code.
   * **[QC.Doc01.1]** Version controlled, it MAY reside in the same repository where the source
     code lies.
+
 * **[QC.Doc02]** Documentation MUST use plain text format using a markup language, such as
   Markdown or reStructuredText.
   * **[QC.Doc02.1]** It is RECOMMENDED that all software components delivered by the same
     project agree on a common markup language.
+
 * **[QC.Doc03]** Documentation MUST be online available in a documentation repository.
   * **[QC.Doc03.1]** Documentation SHOULD be rendered automatically.
+
 * **[QC.Doc04]** Documentation MUST be updated on new software versions involving any
-  substantial or minimal change in the behaviour of the application.
+  substantial or minimal change in the behavior of the application.
+
 * **[QC.Doc05]** Documentation MUST be updated whenever reported as inaccurate or unclear.
+
 * **[QC.Doc06]** Documentation MUST be produced according to the target audience, varying
   according to the software component specification. The identified types of
   documentation and their RECOMMENDED content are:
   * **[QC.Doc06.1]** README file
     * One-paragraph description of the application.
-    * A “Getting Started” step-by-step description on how to get a
-      development environment running (prerequisites, installation).
+    * A “Getting Started” step-by-step description on how to get a development environment running
+      (prerequisites, installation).
     * Automated test execution how-to.
-    * Links to the external documentation below (production deployment,
-      user guides).
-    * Contributing code of conduct (optionally linked to an external
-      CONTRIBUTING file)
+    * Links to the external documentation below (production deployment, user guides).
+    * Contributing code of conduct (optionally linked to an external CONTRIBUTING file)
     * Versioning specification.
     * Author list and contacts.
-    * License information, with a link to the detailed description in an
-      external LICENSE file.
+    * License information, with a link to the detailed description in an external LICENSE file.
     * Acknowledgments.
   * **[QC.Doc06.2]** Developer
     * Private API documentation.
@@ -243,52 +260,57 @@ created later.
   * **[QC.Doc06.4]** User
     * Public API documentation.
     * Command-line (CLI) reference.
+
 * **[QC.Doc07]** Documentation MUST be checked on change basis.
 
 ### 4.12. Security [QC.Sec]
 
 * **[QC.Sec01]** Secure coding practices SHALL be applied into all the stages of a software
   component development lifecycle.
-  * **[QC.Sec01.1]** Compliance with Open Web Application Security Project (OWASP) secure
-    coding guidelines
+  * **[QC.Sec01.1]** Compliance with Open Web Application Security Project (OWASP) secure coding guidelines
     [@https://owasp.org/www-project-secure-coding-practices-quick-reference-guide/migrated_content]
     is RECOMMENDED, even for non-web applications.
+
 * **[QC.Sec02]** Source code SHALL use automated linter tools to perform static application
   security testing (SAST) [@https://owasp.org/www-community/Source_Code_Analysis_Tools]
   that flag common suspicious constructs that may cause a bug or lead to a
   security risk (e.g. inconsistent data structure sizes or unused resources).
+
 * **[QC.Sec03]** Dynamic application security testing (DAST)
   [@https://www.owasp.org/index.php/Category:Vulnerability_Scanning_Tools]
-  SHALL be performed from the outside, to software components in an operating
-  state, to look for security vulnerabilities (e.g. SQL injection, cross-site
-  scripting).
+  SHALL be performed from the outside, to software components in an operating state, to look for
+  security vulnerabilities (e.g. SQL injection, cross-site scripting).
+
 * **[QC.Sec04]** Interactive Application Security Testing (IAST)
   [@https://www.veracode.com/security/interactive-application-security-testing-iast],
-  analyzes code for security vulnerabilities while the app is run by an automated test.
-  IAST SHOULD be performed to software components in an operating state, while Functional
-  Testing **[QC.Fun]**, is running.
-* **[QC.Sec05]** Manual penetration testing MAY be part of the application security
-  verification effort.
+  analyzes code for security vulnerabilities while the app is run by an automated test. IAST SHOULD
+  be performed to software components in an operating state, while Functional Testing **[QC.Fun]**,
+  is running.
+
+* **[QC.Sec05]** Manual penetration testing MAY be part of the application security verification effort.
+
 * **[QC.Sec06]** Security code reviews
   [@https://owasp.org/www-project-code-review-guide/migrated_content]
-  for certain vulnerabilities SHOULD be done as part
-  of the identification of potential security flaws in the code. Inputs SHOULD
-  come from automated linters and manual penetration testing results.
+  for certain vulnerabilities SHOULD be done as part of the identification of potential security
+  flaws in the code. Inputs SHOULD come from automated linters and manual penetration testing results.
+
 * **[QC.Sec07]** World-writable files or directories MUST NOT be present in the product’s
   configuration or logging locations.
+
 * **[QC.Sec08]** World-writable files SHOULD NOT be created while the service is in
   operation. Whenever they are required, the relevant files MUST be documented.
+
 * **[QC.Sec09]** World-readable files MUST NOT contain passwords.
+
 * **[QC.Sec10]** The services delivered SHALL adhere to any extra security policies or
   requirements set at the operational level.
 
 ### 4.13. Code Review [QC.Rev]
 
-Code review implies the informal, non-automated, peer, human-based revision of
-any change in the source code
-[@https://owasp.org/www-project-code-review-guide/migrated_content].
-It appears as the last step in the change management pipeline, once the candidate
-change has successfully passed over the required set of change-based tests.
+Code review implies the informal, non-automated, peer, human-based revision of any change in the
+source code [@https://owasp.org/www-project-code-review-guide/migrated_content]. It appears as the
+last step in the change management pipeline, once the candidate change has successfully passed over
+the required set of change-based tests.
 
 * **[QC.Rev01]** Code reviews MUST be done in the agreed peer review tool within the project,
   with the following RECOMMENDED functionality:
@@ -296,45 +318,45 @@ change has successfully passed over the required set of change-based tests.
     be reviewed.
   * **[QC.Rev01.2]** Shows the results of the required change-based test executions.
   * **[QC.Rev01.3]** Allows to prevent merges of the candidate change whenever not all the
-    required tests are successful.
-  Exceptions to this rule cover the third-party or upstream contributions
-  which MAY use the existing mechanisms or tools for code review provided by
-  the target software project. This exception MUST only be allowed whenever
-  the external revision lifecycle does not interfere with the project
-  deadlines.
-* **[QC.Rev02]** Code reviews MUST be open and collaborative, allowing external expert
-  revisions.
-* **[QC.Rev03]** Code reviews SHOULD be concise and use neutral language. The areas where the 
+    required tests are successful. Exceptions to this rule cover the third-party or upstream
+    contributions which MAY use the existing mechanisms or tools for code review provided by the
+    target software project. This exception MUST only be allowed whenever the external revision
+    lifecycle does not interfere with the project deadlines.
+
+* **[QC.Rev02]** Code reviews MUST be open and collaborative, allowing external expert revisions.
+
+* **[QC.Rev03]** Code reviews SHOULD be concise and use neutral language. The areas where the
   reviewers MAY focus are:
   * **[QC.Rev03.1]** Message description: commit message is clear, self-explanatory and
     describes precisely the objectives being addressed.
-  * **[QC.Rev03.2]** Goal or scope: change is needed and/or addresses/fixes the whole set of
-    objectives.
-  * **[QC.Rev03.3]** Code analysis: useless statements in the code, library or modules
-    imported but never used or code style suggestions.
-  * **[QC.Rev03.4]** Review of required tests: current battery of tests is sufficient for
-    validation.
+  * **[QC.Rev03.2]** Goal or scope: change is needed and/or addresses/fixes the whole set of objectives.
+  * **[QC.Rev03.3]** Code analysis: useless statements in the code, library or modules imported but
+    never used or code style suggestions.
+  * **[QC.Rev03.4]** Review of required tests: current battery of tests is sufficient for validation.
   * **[QC.Rev03.5]** Review of documentation: whether the change SHOULD bring along a
     corresponding update in the documentation.
+
 * **[QC.Rev04]** Code reviews MUST be checked on change basis.
+
 * **[QC.Rev05]** Code reviews SHOULD assess the inherent security risk of the changes,
-  ensuring that the security model has not been downgraded or compromised by
-  the changes.
+  ensuring that the security model has not been downgraded or compromised by the changes.
 
 ### 4.14. Automated Deployment [QC.Aud]
 
-* **[QC.Aud01]** Production-ready code SHALL be deployed as a workable system with the minimal
-  user or system administrator interaction leveraging software configuration
-  management (SCM) tools.
+* **[QC.Aud01]** Production-ready code SHALL be deployed as a workable system with the minimal user
+or system administrator interaction leveraging software configuration management (SCM) tools.
+
 * **[QC.Aud02]** A SCM module is treated as code.
   * **[QC.Aud02.1]** Version controlled, it SHOULD reside in a different repository than the
     source code to facilitate the distribution.
+
 * **[QC.Aud03]** It is RECOMMENDED that all software components delivered by the same project
   agree on a common SCM tool.
   * **[QC.Aud03.1]** However, software products are not restricted to provide a unique
     solution for the automated deployment.
+
 * **[QC.Aud04]** Any change affecting the application’s deployment or operation MUST be
   subsequently reflected in the relevant SCM modules.
+
 * **[QC.Aud05]** Official repositories provided by the manufacturer SHOULD be used to host
-  the SCM modules, thus augmenting the visibility and promote external
-  collaboration.
+  the SCM modules, thus augmenting the visibility and promote external collaboration.

From 0a43f6b31636a5206b0789b97defdcfa4d749de2 Mon Sep 17 00:00:00 2001
From: mariojmdavid <mariojmdavid@gmail.com>
Date: Wed, 22 Sep 2021 11:09:27 +0100
Subject: [PATCH 15/54] formating items

---
 content/06.quality_criteria.md | 42 ++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/content/06.quality_criteria.md b/content/06.quality_criteria.md
index 2ae0add..98465b6 100644
--- a/content/06.quality_criteria.md
+++ b/content/06.quality_criteria.md
@@ -21,6 +21,7 @@ production infrastructures, reducing the likelihood of service disruption.
   the software developments.
 
 * **[QC.Acc02]** Source code MUST use a Version Control System (VCS).
+
   * **[QC.Acc02.1]** It is RECOMMENDED that all software components delivered by the same
     project agree on a common VCS.
 
@@ -32,9 +33,11 @@ production infrastructures, reducing the likelihood of service disruption.
 
 * **[QC.Lic01]** As open-source software, source code MUST adhere to an open-source license
   to be freely used, modified and distributed by others.
+
   * **[QC.Lic01.1]** Non-licensed software is exclusive copyright by default.
 
 * **[QC.Lic02]** License MUST be compliant with the Open Source Definition [@https://opensource.org/osd].
+
   * **[QC.Lic02.1]** RECOMMENDED licenses are listed in the Open Source Initiative portal
     under the Popular Licenses category [@https://opensource.org/licenses].
 
@@ -47,18 +50,23 @@ A change-based approach is accomplished with a branching model.
 
 * **[QC.Wor01]** The main branch in the source code repository MUST maintain a working state
   version of the software component.
+
   * **[QC.Wor01.1]** Main branch SHOULD be protected to disallow force pushing, thus
     preventing untested and un-reviewed source code from entering the production-ready version.
+
   * **[QC.Wor01.2]** New features SHOULD only be merged in the main branch whenever the SQA
     criteria is fulfilled.
 
 * **[QC.Wor02]** New changes in the source code MUST be placed in individual branches.
+
   * **[QC.Wor02.1]** It is RECOMMENDED to agree on a branch nomenclature, usually by
     prefixing, to differentiate change types (e.g. feature, release, fix).
 
 * **[QC.Wor03]** The existence of a secondary long-term branch that contains the changes for
   the next release is RECOMMENDED.
+
   * **[QC.Wor03.1]** Next release changes come from the individual branches.
+
   * **[QC.Wor03.2]** Once ready for release, changes in the secondary long-term branch are
     merged into the main branch and versioned. At that point in time, main
     and secondary branches are aligned. This step SHOULD mark a production
@@ -72,9 +80,11 @@ A change-based approach is accomplished with a branching model.
 * **[QC.Man01]** An issue tracking system facilitates structured software development. Leveraging
   issues to track down both new enhancements and defects (bugs or documentation typos)
   is RECOMMENDED.
+
   * **[QC.Man01.1]** In addition to monitoring the internal development, issues are the best
     means for supporting users. External users SHOULD be able to create incidences based on the
     operational performance of the software.
+
   * **[QC.Man01.2]** The description of an issue SHOULD be concise and state clearly the problem.
     It is RECOMMENDED to add any reference to the actual problem. In the case of bugs, the
     issue SHOULD be accompanied by the relevant debug information.
@@ -83,11 +93,16 @@ A change-based approach is accomplished with a branching model.
 * **[QC.Man02]** In social coding environments, pull requests represent the cornerstone of
   collaboration. A pull request provides a place for review and discussion of the changes proposed
   to be part of an existing version of the code.
+
   * **[QC.Man02.1]** Pull requests SHOULD be used for every change in the codebase.
+
   * **[QC.Man02.2]** A software project SHOULD be open to external collaboration through pull requests.
+
   * **[QC.Man02.3]** A pull request description SHOULD be concise and state clearly its purpose (e.g. if
     it is fixing an observed bug or adding a new feature)
+
   * **[QC.Man02.4]** The usage of templates for the pull request's description is RECOMMENDED.
+
   * **[QC.Man02.5]** It is RECOMMENDED to use pull requests to address open issues. The pull request
     description SHOULD make reference to the identifiers of the issues it is fixing
     (to eventually close them, either manually or automatically).
@@ -100,17 +115,21 @@ programming language being used.
 
 * **[QC.Sty01]** Each individual software product MUST comply with community-driven or de-facto
   code style standards for the programming languages being used.
+
   * **[QC.Sty01.1]** Compliance with multiple complementary standards MAY exist.
 
 * **[QC.Sty02]** Custom code style guidelines SHOULD be avoided, only considered in the
   hypothetical event of programming languages without existing community style
   standards.
+
   * **[QC.Sty02.1]** Custom styles MUST be documented by defining each convention and its
     expected output.
+
   * **[QC.Sty02.2]** Custom styles SHOULD evolve over time towards a more consistent definition.
 
 * **[QC.Sty03]** Exceptions of individual conventions from the main definition are allowed
   but SHOULD be avoided
+
   * **[QC.Sty03.1]** Absence of standard conventions SHOULD be justified and tracked.
 
 * **[QC.Sty04]** Code style compliance testing MUST be automated and MUST be triggered for
@@ -133,8 +152,10 @@ code, so that its behavior becomes apparent. It is a key type of testing for
 early detection of failures in the development cycle.
 
 * **[QC.Uni01]** Minimum acceptable code coverage threshold SHOULD be 70%.
+
   * **[QC.Uni01.1]** Unit testing coverage SHOULD be higher for those sections of the code
     identified as critical by the developers, such as units part of a security module.
+
   * **[QC.Uni01.2]** Unit testing coverage MAY be lower for external libraries or pieces of
     code not maintained within the product’s code base.
 
@@ -143,6 +164,7 @@ early detection of failures in the development cycle.
 * **[QC.Uni03]** Unit testing coverage MUST be checked on change basis.
 
 * **[QC.Uni04]** Unit testing coverage MUST be automated.
+
   * **[QC.Uni04.1]** When working on automated testing, the use of testing doubles is
     RECOMMENDED to mimic a simplistic behavior of objects and procedures.
 
@@ -210,15 +232,18 @@ created later.
 ### 4.11. Documentation [QC.Doc]
 
 * **[QC.Doc01]** Documentation MUST be treated as code.
+
   * **[QC.Doc01.1]** Version controlled, it MAY reside in the same repository where the source
     code lies.
 
 * **[QC.Doc02]** Documentation MUST use plain text format using a markup language, such as
   Markdown or reStructuredText.
+
   * **[QC.Doc02.1]** It is RECOMMENDED that all software components delivered by the same
     project agree on a common markup language.
 
 * **[QC.Doc03]** Documentation MUST be online available in a documentation repository.
+
   * **[QC.Doc03.1]** Documentation SHOULD be rendered automatically.
 
 * **[QC.Doc04]** Documentation MUST be updated on new software versions involving any
@@ -229,7 +254,9 @@ created later.
 * **[QC.Doc06]** Documentation MUST be produced according to the target audience, varying
   according to the software component specification. The identified types of
   documentation and their RECOMMENDED content are:
+
   * **[QC.Doc06.1]** README file
+
     * One-paragraph description of the application.
     * A “Getting Started” step-by-step description on how to get a development environment running
       (prerequisites, installation).
@@ -240,11 +267,15 @@ created later.
     * Author list and contacts.
     * License information, with a link to the detailed description in an external LICENSE file.
     * Acknowledgments.
+
   * **[QC.Doc06.2]** Developer
+
     * Private API documentation.
     * Structure and interfaces.
     * Build documentation.
+
   * **[QC.Doc06.3]** Deployment and Administration
+
     * Installation and configuration guides.
     * Service Reference Card, with the following RECOMMENDED content:
     * Brief functional description.
@@ -257,7 +288,9 @@ created later.
     * List of cron jobs.
     * Security information.
     * FAQs and troubleshooting.
+
   * **[QC.Doc06.4]** User
+
     * Public API documentation.
     * Command-line (CLI) reference.
 
@@ -267,6 +300,7 @@ created later.
 
 * **[QC.Sec01]** Secure coding practices SHALL be applied into all the stages of a software
   component development lifecycle.
+
   * **[QC.Sec01.1]** Compliance with Open Web Application Security Project (OWASP) secure coding guidelines
     [@https://owasp.org/www-project-secure-coding-practices-quick-reference-guide/migrated_content]
     is RECOMMENDED, even for non-web applications.
@@ -314,9 +348,12 @@ the required set of change-based tests.
 
 * **[QC.Rev01]** Code reviews MUST be done in the agreed peer review tool within the project,
   with the following RECOMMENDED functionality:
+
   * **[QC.Rev01.1]** Allows general and specific comments on the line or lines that need to
     be reviewed.
+
   * **[QC.Rev01.2]** Shows the results of the required change-based test executions.
+
   * **[QC.Rev01.3]** Allows to prevent merges of the candidate change whenever not all the
     required tests are successful. Exceptions to this rule cover the third-party or upstream
     contributions which MAY use the existing mechanisms or tools for code review provided by the
@@ -327,12 +364,17 @@ the required set of change-based tests.
 
 * **[QC.Rev03]** Code reviews SHOULD be concise and use neutral language. The areas where the
   reviewers MAY focus are:
+
   * **[QC.Rev03.1]** Message description: commit message is clear, self-explanatory and
     describes precisely the objectives being addressed.
+
   * **[QC.Rev03.2]** Goal or scope: change is needed and/or addresses/fixes the whole set of objectives.
+
   * **[QC.Rev03.3]** Code analysis: useless statements in the code, library or modules imported but
     never used or code style suggestions.
+
   * **[QC.Rev03.4]** Review of required tests: current battery of tests is sufficient for validation.
+
   * **[QC.Rev03.5]** Review of documentation: whether the change SHOULD bring along a
     corresponding update in the documentation.
 

From 356a09330ae907d66977f530ee50108fbdad7af7 Mon Sep 17 00:00:00 2001
From: mariojmdavid <mariojmdavid@gmail.com>
Date: Wed, 22 Sep 2021 15:05:38 +0100
Subject: [PATCH 16/54] solves #60, #61, #62

---
 content/01.abstract.md               |  2 +-
 content/02.0.copyright-ack.md        |  4 +--
 content/02.document-log.md           |  2 +-
 content/03.intro.md                  |  2 +-
 content/04.goals.md                  |  9 ++++++-
 content/05.notational_conventions.md |  2 +-
 content/06.quality_criteria.md       | 37 +++++++++++++++++++++-------
 content/08.annex.md                  | 16 ++++++------
 8 files changed, 51 insertions(+), 23 deletions(-)

diff --git a/content/01.abstract.md b/content/01.abstract.md
index 3c5e0c0..9c86933 100644
--- a/content/01.abstract.md
+++ b/content/01.abstract.md
@@ -1,4 +1,4 @@
-## Abstract {.page_break_before}
+# Abstract {.page_break_before}
 
 The purpose of this document is to define a set of quality standards,
 procedures and best practices to conform a Software Quality Assurance plan to
diff --git a/content/02.0.copyright-ack.md b/content/02.0.copyright-ack.md
index 8e50b20..82b6c2d 100644
--- a/content/02.0.copyright-ack.md
+++ b/content/02.0.copyright-ack.md
@@ -1,9 +1,9 @@
-## Copyright Notice
+# Copyright Notice
 
 Copyright © Members of the INDIGO-DataCloud, DEEP Hybrid-DataCloud eXtreme
 DataCloud and EOSC-Synergy collaborations, 2015-2020.
 
-## Acknowledgements
+# Acknowledgements
 
 The INDIGO-DataCloud, DEEP-Hybrid-DataCloud, eXtreme-DataCloud and
 EOSC-Synergy projects have received funding from the European Union’s
diff --git a/content/02.document-log.md b/content/02.document-log.md
index 02b6018..e736008 100644
--- a/content/02.document-log.md
+++ b/content/02.document-log.md
@@ -1,4 +1,4 @@
-## Document Log
+# Document Log {.page_break_before}
 
 | Issue | Date | Comment |
 |-------|------|---------|
diff --git a/content/03.intro.md b/content/03.intro.md
index 103f0dc..c37b806 100644
--- a/content/03.intro.md
+++ b/content/03.intro.md
@@ -1,4 +1,4 @@
-## 1. Introduction and Purpose
+# 1. Introduction and Purpose {.page_break_before}
 
 This document has been tailored upon the recommendations and requirements found
 in the Initial Plan for Software Management and Pilot Services deliverable
diff --git a/content/04.goals.md b/content/04.goals.md
index d29d981..9eb7e41 100644
--- a/content/04.goals.md
+++ b/content/04.goals.md
@@ -1,17 +1,24 @@
-## 2. Goals
+# 2. Goals
 
 1. Set the base of minimum SQA criteria that a software developed within EOSC development project
    MUST fulfill.
+
 2. Enhance the visibility, accessibility and distribution of the produced source code through the
    alignment to the Open Source Definition [@https://opensource.org/osd].
+
 3. Promote code style standards to deliver good quality source code emphasizing its readability and
    reusability.
+
 4. Improve the quality and reliability of software by covering different
    testing methods at development and pre-production stages.
+
 5. Propose a change-based driven scenario where all new updates in the source code are continuously
    validated by the automated execution of the relevant tests.
+
 6. Adopt an agile approach to effectively produce timely and audience-specific documentation.
+
 7. Lower the barriers of software adoption by delivering quality documentation and the utilization
    of automated deployment solutions.
+
 8. Encourage secure coding practices and security static analysis at the development phase while
    providing recommendations on external security assessment.
diff --git a/content/05.notational_conventions.md b/content/05.notational_conventions.md
index db8cc49..1553dbc 100644
--- a/content/05.notational_conventions.md
+++ b/content/05.notational_conventions.md
@@ -1,4 +1,4 @@
-## 3. Notational Conventions
+# 3. Notational Conventions
 
 The keywords “MUST”, “MUST NOT”, “REQUIRED”, “SHALL”, “SHALL NOT”, “SHOULD”,
 “SHOULD NOT”, “RECOMMENDED”, “MAY”, and “OPTIONAL” in this document are to be
diff --git a/content/06.quality_criteria.md b/content/06.quality_criteria.md
index 98465b6..5d17852 100644
--- a/content/06.quality_criteria.md
+++ b/content/06.quality_criteria.md
@@ -1,4 +1,4 @@
-## 4. Quality Criteria
+# 4. Quality Criteria {.page_break_before}
 
 The following sections describe the quality conventions and best practices that
 apply to the development phase of a software component within the EOSC
@@ -14,6 +14,8 @@ validate them before being added to the software component code base.
 Consequently, software components are more eligible for being deployed in
 production infrastructures, reducing the likelihood of service disruption.
 
+## Manual Criteria
+
 ### 4.1. Code Accessibility [QC.Acc]
 
 * **[QC.Acc01]** Following the open-source model, the source code being produced MUST be open
@@ -107,6 +109,8 @@ A change-based approach is accomplished with a branching model.
     description SHOULD make reference to the identifiers of the issues it is fixing
     (to eventually close them, either manually or automatically).
 
+## Continuous Integration (CI)
+
 ### 4.5. Code Style [QC.Sty]
 
 Code style requirements pursue the correct maintenance of the source code by
@@ -383,22 +387,37 @@ the required set of change-based tests.
 * **[QC.Rev05]** Code reviews SHOULD assess the inherent security risk of the changes,
   ensuring that the security model has not been downgraded or compromised by the changes.
 
-### 4.14. Automated Deployment [QC.Aud]
+## Continuous Delivery, Continuous Deployment (CD)
+
+### 4.14. Automated Delivery [QC.Del]
+
+Automated delivery comprises the build of Software into an artifact, its upload/registration into
+a public repository of such artifacts and notification of successful process.
+
+* **[QC.Del01]** Production-ready code SHALL be built as an artifact that can be executed on a system.
+
+* **[QC.Del02]** The builded artifact SHALL be uploaded and registered into a public repository of
+  such artifacts.
+
+* **[QC.Del03]** Upon success of the previous (**QC.Del02**) process, a notification SHALL be sent
+  to pre-defined parties such as the main developer or team.
+
+### 4.15. Automated Deployment [QC.Dep]
 
-* **[QC.Aud01]** Production-ready code SHALL be deployed as a workable system with the minimal user
+* **[QC.Dep01]** Production-ready code SHALL be deployed as a workable system with the minimal user
 or system administrator interaction leveraging software configuration management (SCM) tools.
 
-* **[QC.Aud02]** A SCM module is treated as code.
-  * **[QC.Aud02.1]** Version controlled, it SHOULD reside in a different repository than the
+* **[QC.Dep02]** A SCM module is treated as code.
+  * **[QC.Dep02.1]** Version controlled, it SHOULD reside in a different repository than the
     source code to facilitate the distribution.
 
-* **[QC.Aud03]** It is RECOMMENDED that all software components delivered by the same project
+* **[QC.Dep03]** It is RECOMMENDED that all software components delivered by the same project
   agree on a common SCM tool.
-  * **[QC.Aud03.1]** However, software products are not restricted to provide a unique
+  * **[QC.Dep03.1]** However, software products are not restricted to provide a unique
     solution for the automated deployment.
 
-* **[QC.Aud04]** Any change affecting the application’s deployment or operation MUST be
+* **[QC.Dep04]** Any change affecting the application’s deployment or operation MUST be
   subsequently reflected in the relevant SCM modules.
 
-* **[QC.Aud05]** Official repositories provided by the manufacturer SHOULD be used to host
+* **[QC.Dep05]** Official repositories provided by the manufacturer SHOULD be used to host
   the SCM modules, thus augmenting the visibility and promote external collaboration.
diff --git a/content/08.annex.md b/content/08.annex.md
index 31c0b9c..b84eac4 100644
--- a/content/08.annex.md
+++ b/content/08.annex.md
@@ -15,21 +15,23 @@ Quality Criteria detailed in this document.
 
 | Service/Tool | Usage              | Criteria   | Comment |
 |:------------:|:------------------:|:----------:|:-------:|
-| Github       | VCS                | **QC.Acc** | Source code repository |
-|              | License            | **QC.Lic** | File present in VCS repository |
-|              | Code Workflow      | **QC.Wor** | |
+| Github       | VCS                | **QC.Acc** | Source code repository - git |
+|              | Code Workflow      | **QC.Wor** | git branching management and version tagging |
 |              | Issue tracker      | **QC.Man** | Track issues, bugs, new features, etc. |
-|              | Pull Requests (PR) | **QC.Man**, **QC.Rev** | Code review |
-|              | Code metadata      | **QC.Met** | JSON metadata file present in VCS repository |
+|              | Pull Requests (PR) | **QC.Man**, **QC.Rev** | Code review through PRs |
 |              | Documentation      | **QC.Doc** | Documentation present in VCS repository (markdown) |
-| Jenkins CI   | Pipelines of tests | **QC.Uni**, **QC.Int**, **QC.Fun**, **QC.Sec** | Service to manage CI tests |
-|              | Check style        | **QC.Sty** | pylint, checkstyle |
 | Docker, Dockerhub | Jenkins CI nodes | | Containers to execute CI tests |
 | Ansible, Galaxy   | Installation, Configuration | **QC.Aud** | Automated deployment and configuration |
 
 Table: Tools and services used to implement the QA criteria, also shown the criteria
 where applicable. {#tbl:services}
 
+| Service/Tool | Usage              | Criteria   | Comment |
+|:------------:|:------------------:|:----------:|:-------:|
+|              | License            | **QC.Lic** | File present in VCS repository |
+|              | Code metadata      | **QC.Met** | JSON metadata file present in VCS repository |
+| Jenkins CI   | Pipelines of tests | **QC.Lic**, **QC.Met**, **QC.Sty**, **QC.Uni**, **QC.Int**, **QC.Fun**, **QC.Sec**, **QC.Tdd** | Service to manage CI tests |
+
 ### A1.2. Code workflow
 
 This section describes the code workflow shown in Figure @fig:workflow

From 39362dfc2ee41c511b4fab27e4071d644a7e33f8 Mon Sep 17 00:00:00 2001
From: mariojmdavid <mariojmdavid@gmail.com>
Date: Wed, 22 Sep 2021 16:21:47 +0100
Subject: [PATCH 17/54] WIP annex

---
 content/07.glossary.md |  2 +-
 content/08.annex.md    | 56 ++++++++++++++++++++++++++++--------------
 2 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/content/07.glossary.md b/content/07.glossary.md
index f6e2fb5..007ed4a 100644
--- a/content/07.glossary.md
+++ b/content/07.glossary.md
@@ -1,4 +1,4 @@
-## 5. Glossary
+# 5. Glossary {.page_break_before}
 
 __API__
 : Application Programming Interface
diff --git a/content/08.annex.md b/content/08.annex.md
index b84eac4..bf02828 100644
--- a/content/08.annex.md
+++ b/content/08.annex.md
@@ -1,4 +1,4 @@
-## A1. Annex
+# A1. Annex {.page_break_before}
 
 The Quality Criteria described in this document is abstract, as such the choice of tools
 and services to implement their verification is up to the team or community developing
@@ -8,32 +8,52 @@ The annex describes the implementation of how the Quality Criteria detailed in t
 document can be verified, and as has been used in several European projects. It details the
 code workflow, the tools and services used to achieve the verification of the Criteria.
 
-### A1.1. List of tools and services
+## A1.1. List of tools and services
 
-Table @tbl:services show the list of tools and services used to implement the verification of the
-Quality Criteria detailed in this document.
+Table @tbl:services show the list of tools and services used for the source code management as well
+as to implement the verification of the Quality Criteria detailed in this document.
 
-| Service/Tool | Usage              | Criteria   | Comment |
-|:------------:|:------------------:|:----------:|:-------:|
-| Github       | VCS                | **QC.Acc** | Source code repository - git |
-|              | Code Workflow      | **QC.Wor** | git branching management and version tagging |
-|              | Issue tracker      | **QC.Man** | Track issues, bugs, new features, etc. |
-|              | Pull Requests (PR) | **QC.Man**, **QC.Rev** | Code review through PRs |
-|              | Documentation      | **QC.Doc** | Documentation present in VCS repository (markdown) |
-| Docker, Dockerhub | Jenkins CI nodes | | Containers to execute CI tests |
-| Ansible, Galaxy   | Installation, Configuration | **QC.Aud** | Automated deployment and configuration |
+The main service used for Software source code management has been Github. It is uses git as Version
+Control System, branching and tag management. Additionally has an issue tracker for bugs, requests
+and enhancements and the mechanism of Pull Requests for code review and discussion of changes.
+
+Ansible and Ansible-Galaxy are used in many software frameworks as deployment and configuration
+tools.
+
+The software is packed/built into executable artifacts that can be RPMs (case of RedHat and
+derivative OS), DEBs (case of Debian/Ubuntu and derivatives) and in many cases into docker images.
+
+The artifacts are provided, in general, by public repositories and most notably Dockerhub in the case
+of docker images. Other common repositories are PyPI for python SW or modules and Maven for Java.
+
+Regarding the CI/CD criteria, Jenkins CI tool is used and details are given in section A1.3.
+
+| Service/Tool    | Usage              | Criteria   | Comment                                      |
+|:---------------:|:------------------:|:----------:|:--------------------------------------------:|
+| Github          | VCS                | **QC.Acc** | Source code repository - git                 |
+|                 | Code Workflow      | **QC.Wor** | git branching management and version tagging |
+|                 | Issue tracker      | **QC.Man** | Track issues, bugs, new features, etc.       |
+|                 | Pull Requests (PR) | **QC.Man**, **QC.Rev** | Code review through PRs          |
+|                 | Documentation      | **QC.Doc** | Documentation present in VCS repository (markdown) |
+| Ansible, Galaxy | Install, Config    | **QC.Aud** | Automated deployment and configuration       |
 
 Table: Tools and services used to implement the QA criteria, also shown the criteria
 where applicable. {#tbl:services}
 
+
+## A1.2. Code workflow
+
+This section describes the code workflow shown in Figure @fig:workflow
+
+![Code workflow](images/devops.png){height="500px"}{#fig:workflow}
+
+## A1.3. Jenkins CI
+
+
 | Service/Tool | Usage              | Criteria   | Comment |
 |:------------:|:------------------:|:----------:|:-------:|
 |              | License            | **QC.Lic** | File present in VCS repository |
 |              | Code metadata      | **QC.Met** | JSON metadata file present in VCS repository |
 | Jenkins CI   | Pipelines of tests | **QC.Lic**, **QC.Met**, **QC.Sty**, **QC.Uni**, **QC.Int**, **QC.Fun**, **QC.Sec**, **QC.Tdd** | Service to manage CI tests |
+| Docker, Dockerhub | Jenkins CI nodes   |            | Containers to execute CI tests |
 
-### A1.2. Code workflow
-
-This section describes the code workflow shown in Figure @fig:workflow
-
-![Code workflow](images/devops.png){height="500px"}{#fig:workflow}

From 42c3a1e80720e66c77d8d9bec89d0c1db57ec709 Mon Sep 17 00:00:00 2001
From: mariojmdavid <mariojmdavid@gmail.com>
Date: Wed, 22 Sep 2021 16:41:56 +0100
Subject: [PATCH 18/54] wip annex 1.3

---
 content/08.annex.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/content/08.annex.md b/content/08.annex.md
index bf02828..947fc8f 100644
--- a/content/08.annex.md
+++ b/content/08.annex.md
@@ -49,6 +49,13 @@ This section describes the code workflow shown in Figure @fig:workflow
 
 ## A1.3. Jenkins CI
 
+This section details the tools being used (and planned) in the Jenkins CI pipelines, the criteria
+that it verifies, applicable programming language.
+
+| Tool | Criteria | Programming Language | Repo URL or documentation | Summary |
+|:----:|:--------:|:--------------------:|:-------------------------:|:-------:|
+| pylint | **QC.Sty** | Python         | <https://pylint.org/>   | Code style checking |
+
 
 | Service/Tool | Usage              | Criteria   | Comment |
 |:------------:|:------------------:|:----------:|:-------:|

From 25156acfcf6e7684db07909cdb5136aabcdaa11c Mon Sep 17 00:00:00 2001
From: mariojmdavid <mariojmdavid@gmail.com>
Date: Tue, 28 Sep 2021 16:09:57 +0100
Subject: [PATCH 19/54] add tool to annex

---
 content/08.annex.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/content/08.annex.md b/content/08.annex.md
index 947fc8f..0f96226 100644
--- a/content/08.annex.md
+++ b/content/08.annex.md
@@ -52,9 +52,10 @@ This section describes the code workflow shown in Figure @fig:workflow
 This section details the tools being used (and planned) in the Jenkins CI pipelines, the criteria
 that it verifies, applicable programming language.
 
-| Tool | Criteria | Programming Language | Repo URL or documentation | Summary |
-|:----:|:--------:|:--------------------:|:-------------------------:|:-------:|
-| pylint | **QC.Sty** | Python         | <https://pylint.org/>   | Code style checking |
+| Tool   | Criteria-- | Programming Language | Repo URL or documentation | Summary             |
+|:------:|:----------:|:--------------------:|:-------------------------:|:-------------------:|
+| pylint | **QC.Sty** | Python               | <https://pylint.org/>     | Code style checking |
+| hadolint | **QC.Sty** | Dockerfile | <https://github.com/hadolint/hadolint> | Code style checking |
 
 
 | Service/Tool | Usage              | Criteria   | Comment |

From e89eb0589ae0b3ca4e3efc434433dbcfce621f68 Mon Sep 17 00:00:00 2001
From: mariojmdavid <mariojmdavid@gmail.com>
Date: Tue, 2 Nov 2021 16:29:05 +0100
Subject: [PATCH 20/54] added tools to annex, text justified

---
 build/themes/default.html |  8 ++++++++
 content/08.annex.md       | 24 ++++++++++++------------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/build/themes/default.html b/build/themes/default.html
index b3298fe..7da007c 100644
--- a/build/themes/default.html
+++ b/build/themes/default.html
@@ -192,6 +192,14 @@
     margin-bottom: 20px;
   }
 
+p {
+  text-align: justify;
+}
+
+#refs p {
+  text-align: left;
+}
+
   /* -------------------------------------------------- */
   /* figures */
   /* -------------------------------------------------- */
diff --git a/content/08.annex.md b/content/08.annex.md
index 0f96226..619619f 100644
--- a/content/08.annex.md
+++ b/content/08.annex.md
@@ -52,16 +52,16 @@ This section describes the code workflow shown in Figure @fig:workflow
 This section details the tools being used (and planned) in the Jenkins CI pipelines, the criteria
 that it verifies, applicable programming language.
 
-| Tool   | Criteria-- | Programming Language | Repo URL or documentation | Summary             |
-|:------:|:----------:|:--------------------:|:-------------------------:|:-------------------:|
-| pylint | **QC.Sty** | Python               | <https://pylint.org/>     | Code style checking |
-| hadolint | **QC.Sty** | Dockerfile | <https://github.com/hadolint/hadolint> | Code style checking |
-
-
-| Service/Tool | Usage              | Criteria   | Comment |
-|:------------:|:------------------:|:----------:|:-------:|
-|              | License            | **QC.Lic** | File present in VCS repository |
-|              | Code metadata      | **QC.Met** | JSON metadata file present in VCS repository |
-| Jenkins CI   | Pipelines of tests | **QC.Lic**, **QC.Met**, **QC.Sty**, **QC.Uni**, **QC.Int**, **QC.Fun**, **QC.Sec**, **QC.Tdd** | Service to manage CI tests |
-| Docker, Dockerhub | Jenkins CI nodes   |            | Containers to execute CI tests |
+| Tool         | Criteria   | Programming Language | Repo URL or documentation | Summary           |
+|:------------:|:----------:|:--------------------:|:-------------------------:|:-----------------:|
+| pylint       | **QC.Sty** | Python     | <https://pylint.org/>                      | Code style |
+| hadolint     | **QC.Sty** | Dockerfile | <https://github.com/hadolint/hadolint>     | Code style |
+| checkstyle   | **QC.Sty** | Java       | <https://github.com/checkstyle/checkstyle> | Code style |
+| jsonlint     | **QC.Sty** | JSON       | <https://github.com/zaach/jsonlint>        | Code style |
+| bandit       | **QC.Sec** | Python     | <https://bandit.readthedocs.io/>           | Static security |
+| pycodestyle  | **QC.Sty** | Python     | <https://pycodestyle.pycqa.org/en/latest/> | Code style |
+| tox          | **QC.Sty**/**QC.Uni**/**QC.Fun**/**QC.Sec**/**QC.Doc** | Python     | <https://tox.wiki/en/latest/>              | Automated test framework |
+| licensee     | **QC.Lic** | Agnostic   | <https://github.com/licensee/licensee>     | Check license |
+| checkLicense | **QC.Lic** | Agnostic   | <https://github.com/EOSC-synergy/sqa-composer-templates/tree/main/QC.Lic> | Check license |
+| checkCitable | **QC.Acc** | Agnostic   | <https://github.com/EOSC-synergy/sqa-composer-templates/tree/main/QC.Acc> | Code metadata |
 

From f934c7616cc455d1914fd3a55d966b7a2051b4e2 Mon Sep 17 00:00:00 2001
From: mariojmdavid <mariojmdavid@gmail.com>
Date: Tue, 2 Nov 2021 17:44:00 +0100
Subject: [PATCH 21/54] update copyright year, doc log, enhance issue #62

---
 content/02.0.copyright-ack.md  |   2 +-
 content/02.document-log.md     |   2 +-
 content/06.quality_criteria.md | 150 ++++++++++++++++-----------------
 3 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/content/02.0.copyright-ack.md b/content/02.0.copyright-ack.md
index 82b6c2d..a6895db 100644
--- a/content/02.0.copyright-ack.md
+++ b/content/02.0.copyright-ack.md
@@ -1,7 +1,7 @@
 # Copyright Notice
 
 Copyright © Members of the INDIGO-DataCloud, DEEP Hybrid-DataCloud eXtreme
-DataCloud and EOSC-Synergy collaborations, 2015-2020.
+DataCloud and EOSC-Synergy collaborations, 2015-2021.
 
 # Acknowledgements
 
diff --git a/content/02.document-log.md b/content/02.document-log.md
index e736008..3eba366 100644
--- a/content/02.document-log.md
+++ b/content/02.document-log.md
@@ -8,4 +8,4 @@
 | v3.1 | 05/03/2020 | Add tags/names for each criteria |
 | v3.2 | 23/04/2020 | Add EOSC-Synergy to copyright |
 | v3.3 | 15/10/2020 | Fix issues: #32, #46, #47, #48, #49, #51 |
-| v4.0 | 2021 | Add annex, spell check, Fix issues: # |
+| v4.0 | 2021 | Add annex, spell check, Fix issues: #59, #60, #61, #62 |
diff --git a/content/06.quality_criteria.md b/content/06.quality_criteria.md
index 5d17852..c5fbe22 100644
--- a/content/06.quality_criteria.md
+++ b/content/06.quality_criteria.md
@@ -14,7 +14,7 @@ validate them before being added to the software component code base.
 Consequently, software components are more eligible for being deployed in
 production infrastructures, reducing the likelihood of service disruption.
 
-## Manual Criteria
+## Automated - Continuous Integration (CI)
 
 ### 4.1. Code Accessibility [QC.Acc]
 
@@ -46,72 +46,7 @@ production infrastructures, reducing the likelihood of service disruption.
 * **[QC.Lic03]** Licenses MUST be physically present (e.g. as a LICENSE file) in the root of
   all the source code repositories related to the software component.
 
-### 4.3. Code Workflow [QC.Wor]
-
-A change-based approach is accomplished with a branching model.
-
-* **[QC.Wor01]** The main branch in the source code repository MUST maintain a working state
-  version of the software component.
-
-  * **[QC.Wor01.1]** Main branch SHOULD be protected to disallow force pushing, thus
-    preventing untested and un-reviewed source code from entering the production-ready version.
-
-  * **[QC.Wor01.2]** New features SHOULD only be merged in the main branch whenever the SQA
-    criteria is fulfilled.
-
-* **[QC.Wor02]** New changes in the source code MUST be placed in individual branches.
-
-  * **[QC.Wor02.1]** It is RECOMMENDED to agree on a branch nomenclature, usually by
-    prefixing, to differentiate change types (e.g. feature, release, fix).
-
-* **[QC.Wor03]** The existence of a secondary long-term branch that contains the changes for
-  the next release is RECOMMENDED.
-
-  * **[QC.Wor03.1]** Next release changes come from the individual branches.
-
-  * **[QC.Wor03.2]** Once ready for release, changes in the secondary long-term branch are
-    merged into the main branch and versioned. At that point in time, main
-    and secondary branches are aligned. This step SHOULD mark a production
-    release.
-
-* **[QC.Wor04]** Semantic Versioning [@https://semver.org] specification is RECOMMENDED for
-  tagging the production releases.
-
-### 4.4. Code Management [QC.Man]
-
-* **[QC.Man01]** An issue tracking system facilitates structured software development. Leveraging
-  issues to track down both new enhancements and defects (bugs or documentation typos)
-  is RECOMMENDED.
-
-  * **[QC.Man01.1]** In addition to monitoring the internal development, issues are the best
-    means for supporting users. External users SHOULD be able to create incidences based on the
-    operational performance of the software.
-
-  * **[QC.Man01.2]** The description of an issue SHOULD be concise and state clearly the problem.
-    It is RECOMMENDED to add any reference to the actual problem. In the case of bugs, the
-    issue SHOULD be accompanied by the relevant debug information.
-         * The usage of templates for the issue description is RECOMMENDED.
-
-* **[QC.Man02]** In social coding environments, pull requests represent the cornerstone of
-  collaboration. A pull request provides a place for review and discussion of the changes proposed
-  to be part of an existing version of the code.
-
-  * **[QC.Man02.1]** Pull requests SHOULD be used for every change in the codebase.
-
-  * **[QC.Man02.2]** A software project SHOULD be open to external collaboration through pull requests.
-
-  * **[QC.Man02.3]** A pull request description SHOULD be concise and state clearly its purpose (e.g. if
-    it is fixing an observed bug or adding a new feature)
-
-  * **[QC.Man02.4]** The usage of templates for the pull request's description is RECOMMENDED.
-
-  * **[QC.Man02.5]** It is RECOMMENDED to use pull requests to address open issues. The pull request
-    description SHOULD make reference to the identifiers of the issues it is fixing
-    (to eventually close them, either manually or automatically).
-
-## Continuous Integration (CI)
-
-### 4.5. Code Style [QC.Sty]
+### 4.3. Code Style [QC.Sty]
 
 Code style requirements pursue the correct maintenance of the source code by
 the common agreement of a series of style conventions. These vary based on the
@@ -139,7 +74,7 @@ programming language being used.
 * **[QC.Sty04]** Code style compliance testing MUST be automated and MUST be triggered for
   each candidate change in the source code.
 
-### 4.6. Code metadata [QC.Met]
+### 4.4. Code metadata [QC.Met]
 
 Metadata for the software component provides a way to achieve its full identification,
 thus making software citation viable [@doi:10.7717/peerj-cs.86].
@@ -149,7 +84,7 @@ towards preservation, discovery, reuse, and attribution of the software componen
 * **[QC.Met01]** A metadata file SHOULD exist along side the code, under its VCS.
   The metadata file SHOULD be updated when needed, as is the case of a new version.
 
-### 4.7. Unit Testing [QC.Uni]
+### 4.5. Unit Testing [QC.Uni]
 
 Unit testing evaluates all the possible flows in the internal design of the
 code, so that its behavior becomes apparent. It is a key type of testing for
@@ -172,7 +107,7 @@ early detection of failures in the development cycle.
   * **[QC.Uni04.1]** When working on automated testing, the use of testing doubles is
     RECOMMENDED to mimic a simplistic behavior of objects and procedures.
 
-### 4.8. Integration Testing [QC.Int]
+### 4.6. Integration Testing [QC.Int]
 
 Integration testing refers to the evaluation of the interactions among coupled
 software components or parts of a system that cooperate to achieve a given
@@ -194,7 +129,7 @@ functionality.
 * **[QC.Int05]** Integration testing MAY NOT be viable to be checked on change basis, as it
   is likely to involve complex scenarios.
 
-### 4.9. Functional Testing [QC.Fun]
+### 4.7. Functional Testing [QC.Fun]
 
 Functional testing involves the verification of the software component’s
 identified functionality, based on requested requirements and agreed design
@@ -222,7 +157,7 @@ design analysis or side-effects to external systems.
 
 * **[QC.Fun07]** Functional and regression testing coverage MAY NOT be suitable for automated testing.
 
-### 4.10. Test-Driven Development [QC.Tdd]
+### 4.8. Test-Driven Development [QC.Tdd]
 
 Test-Driven Development [@isbn:9780321146533], is a software development process relying on software
 requirements being converted to test cases before software is fully developed,
@@ -233,7 +168,7 @@ created later.
 * **[QC.Tdd01]** Software requirements SHOULD be converted to test cases, and these
   test cases SHOULD be checked automatically.
 
-### 4.11. Documentation [QC.Doc]
+### 4.9. Documentation [QC.Doc]
 
 * **[QC.Doc01]** Documentation MUST be treated as code.
 
@@ -300,7 +235,7 @@ created later.
 
 * **[QC.Doc07]** Documentation MUST be checked on change basis.
 
-### 4.12. Security [QC.Sec]
+### 4.10. Security [QC.Sec]
 
 * **[QC.Sec01]** Secure coding practices SHALL be applied into all the stages of a software
   component development lifecycle.
@@ -343,6 +278,71 @@ created later.
 * **[QC.Sec10]** The services delivered SHALL adhere to any extra security policies or
   requirements set at the operational level.
 
+## Manual Criteria {.page_break_before}
+
+### 4.11. Code Workflow [QC.Wor]
+
+A change-based approach is accomplished with a branching model.
+
+* **[QC.Wor01]** The main branch in the source code repository MUST maintain a working state
+  version of the software component.
+
+  * **[QC.Wor01.1]** Main branch SHOULD be protected to disallow force pushing, thus
+    preventing untested and un-reviewed source code from entering the production-ready version.
+
+  * **[QC.Wor01.2]** New features SHOULD only be merged in the main branch whenever the SQA
+    criteria is fulfilled.
+
+* **[QC.Wor02]** New changes in the source code MUST be placed in individual branches.
+
+  * **[QC.Wor02.1]** It is RECOMMENDED to agree on a branch nomenclature, usually by
+    prefixing, to differentiate change types (e.g. feature, release, fix).
+
+* **[QC.Wor03]** The existence of a secondary long-term branch that contains the changes for
+  the next release is RECOMMENDED.
+
+  * **[QC.Wor03.1]** Next release changes come from the individual branches.
+
+  * **[QC.Wor03.2]** Once ready for release, changes in the secondary long-term branch are
+    merged into the main branch and versioned. At that point in time, main
+    and secondary branches are aligned. This step SHOULD mark a production
+    release.
+
+* **[QC.Wor04]** Semantic Versioning [@https://semver.org] specification is RECOMMENDED for
+  tagging the production releases.
+
+### 4.12. Code Management [QC.Man]
+
+* **[QC.Man01]** An issue tracking system facilitates structured software development. Leveraging
+  issues to track down both new enhancements and defects (bugs or documentation typos)
+  is RECOMMENDED.
+
+  * **[QC.Man01.1]** In addition to monitoring the internal development, issues are the best
+    means for supporting users. External users SHOULD be able to create incidences based on the
+    operational performance of the software.
+
+  * **[QC.Man01.2]** The description of an issue SHOULD be concise and state clearly the problem.
+    It is RECOMMENDED to add any reference to the actual problem. In the case of bugs, the
+    issue SHOULD be accompanied by the relevant debug information.
+         * The usage of templates for the issue description is RECOMMENDED.
+
+* **[QC.Man02]** In social coding environments, pull requests represent the cornerstone of
+  collaboration. A pull request provides a place for review and discussion of the changes proposed
+  to be part of an existing version of the code.
+
+  * **[QC.Man02.1]** Pull requests SHOULD be used for every change in the codebase.
+
+  * **[QC.Man02.2]** A software project SHOULD be open to external collaboration through pull requests.
+
+  * **[QC.Man02.3]** A pull request description SHOULD be concise and state clearly its purpose (e.g. if
+    it is fixing an observed bug or adding a new feature)
+
+  * **[QC.Man02.4]** The usage of templates for the pull request's description is RECOMMENDED.
+
+  * **[QC.Man02.5]** It is RECOMMENDED to use pull requests to address open issues. The pull request
+    description SHOULD make reference to the identifiers of the issues it is fixing
+    (to eventually close them, either manually or automatically).
+
 ### 4.13. Code Review [QC.Rev]
 
 Code review implies the informal, non-automated, peer, human-based revision of any change in the
@@ -387,7 +387,7 @@ the required set of change-based tests.
 * **[QC.Rev05]** Code reviews SHOULD assess the inherent security risk of the changes,
   ensuring that the security model has not been downgraded or compromised by the changes.
 
-## Continuous Delivery, Continuous Deployment (CD)
+## Automated - Continuous Delivery, Deployment (CDD) {.page_break_before}
 
 ### 4.14. Automated Delivery [QC.Del]
 

From f979c0901d6921ef3dd60583bb6442138378ed5c Mon Sep 17 00:00:00 2001
From: mariojmdavid <mariojmdavid@gmail.com>
Date: Tue, 2 Nov 2021 18:01:56 +0100
Subject: [PATCH 22/54] issue #57

---
 content/02.document-log.md | 2 +-
 content/03.intro.md        | 5 +++--
 content/08.annex.md        | 2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/content/02.document-log.md b/content/02.document-log.md
index 3eba366..ab5f7ed 100644
--- a/content/02.document-log.md
+++ b/content/02.document-log.md
@@ -8,4 +8,4 @@
 | v3.1 | 05/03/2020 | Add tags/names for each criteria |
 | v3.2 | 23/04/2020 | Add EOSC-Synergy to copyright |
 | v3.3 | 15/10/2020 | Fix issues: #32, #46, #47, #48, #49, #51 |
-| v4.0 | 2021 | Add annex, spell check, Fix issues: #59, #60, #61, #62 |
+| v4.0 | 2021 | Add annex, spell check, Fix issues: #57, #59, #60, #61, #62 |
diff --git a/content/03.intro.md b/content/03.intro.md
index c37b806..1b9c5d6 100644
--- a/content/03.intro.md
+++ b/content/03.intro.md
@@ -5,8 +5,9 @@ in the Initial Plan for Software Management and Pilot Services deliverable
 [@url:https://owncloud.indigo-datacloud.eu/index.php/s/yDklCrWjKnjutVA],
 produced by the INDIGO-DataCloud project. These guidelines evolved throughout
 the project’s lifetime and are being extended in the
-EOSC-Synergy, DEEP-Hybrid-DataCloud and eXtreme DataCloud subsequent projects. The result is
-a consolidated Software Quality Assurance (SQA) baseline criteria emanated
+EOSC-Synergy [@doi:10.20350/digitalCSIC/12607],
+as well as as the past DEEP-Hybrid-DataCloud and eXtreme DataCloud subsequent projects.
+The result is a consolidated Software Quality Assurance (SQA) baseline criteria emanated
 from the European Open Science Cloud (EOSC), which aims to outline the SQA
 principles to be considered in the upcoming software development efforts within
 the European research community, and continuously evolve in order to be aligned
diff --git a/content/08.annex.md b/content/08.annex.md
index 619619f..f1e8eb9 100644
--- a/content/08.annex.md
+++ b/content/08.annex.md
@@ -7,6 +7,8 @@ and/or using a given software.
 The annex describes the implementation of how the Quality Criteria detailed in this
 document can be verified, and as has been used in several European projects. It details the
 code workflow, the tools and services used to achieve the verification of the Criteria.
+This description is based on the work performed in the framework of the EOSC-Synergy project,
+in particular its Deliverable 3.2 [@doi:10.20350/digitalCSIC/12721]
 
 ## A1.1. List of tools and services
 

From d90bae4a29b578effcdcb6f74d4568e5ab8ee773 Mon Sep 17 00:00:00 2001
From: mariojmdavid <mariojmdavid@gmail.com>
Date: Wed, 3 Nov 2021 11:20:54 +0100
Subject: [PATCH 23/54] revert issue #62

---
 content/02.document-log.md     |  2 +-
 content/06.quality_criteria.md | 36 ++++++++++++++--------------------
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/content/02.document-log.md b/content/02.document-log.md
index ab5f7ed..6f74286 100644
--- a/content/02.document-log.md
+++ b/content/02.document-log.md
@@ -8,4 +8,4 @@
 | v3.1 | 05/03/2020 | Add tags/names for each criteria |
 | v3.2 | 23/04/2020 | Add EOSC-Synergy to copyright |
 | v3.3 | 15/10/2020 | Fix issues: #32, #46, #47, #48, #49, #51 |
-| v4.0 | 2021 | Add annex, spell check, Fix issues: #57, #59, #60, #61, #62 |
+| v4.0 | 2021 | Add annex, spell check, Fix issues: #57, #59, #60, #61 |
diff --git a/content/06.quality_criteria.md b/content/06.quality_criteria.md
index c5fbe22..25df764 100644
--- a/content/06.quality_criteria.md
+++ b/content/06.quality_criteria.md
@@ -14,9 +14,7 @@ validate them before being added to the software component code base.
 Consequently, software components are more eligible for being deployed in
 production infrastructures, reducing the likelihood of service disruption.
 
-## Automated - Continuous Integration (CI)
-
-### 4.1. Code Accessibility [QC.Acc]
+## 4.1. Code Accessibility [QC.Acc]
 
 * **[QC.Acc01]** Following the open-source model, the source code being produced MUST be open
   and publicly available to promote the adoption and augment the visibility of
@@ -31,7 +29,7 @@ production infrastructures, reducing the likelihood of service disruption.
   SHOULD reside in a common organization of a version control repository
   hosting service.
 
-### 4.2. Licensing [QC.Lic]
+## 4.2. Licensing [QC.Lic]
 
 * **[QC.Lic01]** As open-source software, source code MUST adhere to an open-source license
   to be freely used, modified and distributed by others.
@@ -46,7 +44,7 @@ production infrastructures, reducing the likelihood of service disruption.
 * **[QC.Lic03]** Licenses MUST be physically present (e.g. as a LICENSE file) in the root of
   all the source code repositories related to the software component.
 
-### 4.3. Code Style [QC.Sty]
+## 4.3. Code Style [QC.Sty]
 
 Code style requirements pursue the correct maintenance of the source code by
 the common agreement of a series of style conventions. These vary based on the
@@ -74,7 +72,7 @@ programming language being used.
 * **[QC.Sty04]** Code style compliance testing MUST be automated and MUST be triggered for
   each candidate change in the source code.
 
-### 4.4. Code metadata [QC.Met]
+## 4.4. Code metadata [QC.Met]
 
 Metadata for the software component provides a way to achieve its full identification,
 thus making software citation viable [@doi:10.7717/peerj-cs.86].
@@ -84,7 +82,7 @@ towards preservation, discovery, reuse, and attribution of the software componen
 * **[QC.Met01]** A metadata file SHOULD exist along side the code, under its VCS.
   The metadata file SHOULD be updated when needed, as is the case of a new version.
 
-### 4.5. Unit Testing [QC.Uni]
+## 4.5. Unit Testing [QC.Uni]
 
 Unit testing evaluates all the possible flows in the internal design of the
 code, so that its behavior becomes apparent. It is a key type of testing for
@@ -107,7 +105,7 @@ early detection of failures in the development cycle.
   * **[QC.Uni04.1]** When working on automated testing, the use of testing doubles is
     RECOMMENDED to mimic a simplistic behavior of objects and procedures.
 
-### 4.6. Integration Testing [QC.Int]
+## 4.6. Integration Testing [QC.Int]
 
 Integration testing refers to the evaluation of the interactions among coupled
 software components or parts of a system that cooperate to achieve a given
@@ -129,7 +127,7 @@ functionality.
 * **[QC.Int05]** Integration testing MAY NOT be viable to be checked on change basis, as it
   is likely to involve complex scenarios.
 
-### 4.7. Functional Testing [QC.Fun]
+## 4.7. Functional Testing [QC.Fun]
 
 Functional testing involves the verification of the software component’s
 identified functionality, based on requested requirements and agreed design
@@ -157,7 +155,7 @@ design analysis or side-effects to external systems.
 
 * **[QC.Fun07]** Functional and regression testing coverage MAY NOT be suitable for automated testing.
 
-### 4.8. Test-Driven Development [QC.Tdd]
+## 4.8. Test-Driven Development [QC.Tdd]
 
 Test-Driven Development [@isbn:9780321146533], is a software development process relying on software
 requirements being converted to test cases before software is fully developed,
@@ -168,7 +166,7 @@ created later.
 * **[QC.Tdd01]** Software requirements SHOULD be converted to test cases, and these
   test cases SHOULD be checked automatically.
 
-### 4.9. Documentation [QC.Doc]
+## 4.9. Documentation [QC.Doc]
 
 * **[QC.Doc01]** Documentation MUST be treated as code.
 
@@ -235,7 +233,7 @@ created later.
 
 * **[QC.Doc07]** Documentation MUST be checked on change basis.
 
-### 4.10. Security [QC.Sec]
+## 4.10. Security [QC.Sec]
 
 * **[QC.Sec01]** Secure coding practices SHALL be applied into all the stages of a software
   component development lifecycle.
@@ -278,9 +276,7 @@ created later.
 * **[QC.Sec10]** The services delivered SHALL adhere to any extra security policies or
   requirements set at the operational level.
 
-## Manual Criteria {.page_break_before}
-
-### 4.11. Code Workflow [QC.Wor]
+## 4.11. Code Workflow [QC.Wor]
 
 A change-based approach is accomplished with a branching model.
 
@@ -311,7 +307,7 @@ A change-based approach is accomplished with a branching model.
 * **[QC.Wor04]** Semantic Versioning [@https://semver.org] specification is RECOMMENDED for
   tagging the production releases.
 
-### 4.12. Code Management [QC.Man]
+## 4.12. Code Management [QC.Man]
 
 * **[QC.Man01]** An issue tracking system facilitates structured software development. Leveraging
   issues to track down both new enhancements and defects (bugs or documentation typos)
@@ -343,7 +339,7 @@ A change-based approach is accomplished with a branching model.
     description SHOULD make reference to the identifiers of the issues it is fixing
     (to eventually close them, either manually or automatically).
 
-### 4.13. Code Review [QC.Rev]
+## 4.13. Code Review [QC.Rev]
 
 Code review implies the informal, non-automated, peer, human-based revision of any change in the
 source code [@https://owasp.org/www-project-code-review-guide/migrated_content]. It appears as the
@@ -387,9 +383,7 @@ the required set of change-based tests.
 * **[QC.Rev05]** Code reviews SHOULD assess the inherent security risk of the changes,
   ensuring that the security model has not been downgraded or compromised by the changes.
 
-## Automated - Continuous Delivery, Deployment (CDD) {.page_break_before}
-
-### 4.14. Automated Delivery [QC.Del]
+## 4.14. Automated Delivery [QC.Del]
 
 Automated delivery comprises the build of Software into an artifact, its upload/registration into
 a public repository of such artifacts and notification of successful process.
@@ -402,7 +396,7 @@ a public repository of such artifacts and notification of successful process.
 * **[QC.Del03]** Upon success of the previous (**QC.Del02**) process, a notification SHALL be sent
   to pre-defined parties such as the main developer or team.
 
-### 4.15. Automated Deployment [QC.Dep]
+## 4.15. Automated Deployment [QC.Dep]
 
 * **[QC.Dep01]** Production-ready code SHALL be deployed as a workable system with the minimal user
 or system administrator interaction leveraging software configuration management (SCM) tools.

From b3ee071cb99085d6fb27f399bcd976ccd204f1a0 Mon Sep 17 00:00:00 2001
From: mariojmdavid <mariojmdavid@gmail.com>
Date: Wed, 3 Nov 2021 11:53:30 +0100
Subject: [PATCH 24/54] issue #58

---
 content/06.quality_criteria.md | 35 +++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/content/06.quality_criteria.md b/content/06.quality_criteria.md
index 25df764..f8f69ea 100644
--- a/content/06.quality_criteria.md
+++ b/content/06.quality_criteria.md
@@ -129,7 +129,8 @@ functionality.
 
 ## 4.7. Functional Testing [QC.Fun]
 
-Functional testing involves the verification of the software component’s
+Functional testing is a type of black-box testing.
+It involves the verification of the software component’s
 identified functionality, based on requested requirements and agreed design
 specifications. This type of software testing focus on the evaluation of the
 functionality that the software component exposes, leaving apart any internal
@@ -155,6 +156,38 @@ design analysis or side-effects to external systems.
 
 * **[QC.Fun07]** Functional and regression testing coverage MAY NOT be suitable for automated testing.
 
+## 4.8. API Testing [QC.Api]
+
+These tests only apply when the Software type is a service. API testing is a subset
+of functional tests.
+
+Web services commonly use application programming interfaces (APIs) to expose
+the available features to external consumers, which can be either oriented to
+the end-user or suitable for machine-to-machine communications.
+
+An accurate implementation of a publicly-accessible API is driven by a clearly
+defined specification. The OpenAPI Specification (OAS)
+[@url:https://www.openapis.org/] provides the most suitable way to describe,
+compose, consume and validate APIs. The following requirements assume the
+presence of such an API specification.
+
+* **[QC.Api01]** API testing MUST cover the validation of the features
+outlined in the specification (aka _contract testing_).
+
+  * **[QC.Api01.1]** Any change in the API not compliant with the OAS MUST
+  NOT pass contract testing.
+
+  * **[QC.Api01.2]** The use of OAS SHOULD narrow down the applicable set of
+  test cases to the features described in the specification, avoiding unnecessary
+  assertions.
+
+* **[QC.Api02]** API testing MUST include the assessment of the
+  security-related criteria outlined in **[QC.Sec]** section.
+
+* **[QC.Api03]** API testing SHOULD involve the use of test doubles, such
+as mock servers or stubs, that act as a validation layer for the incoming
+requests, as outlined in criteria **[QC.Fun03]**.
+
 ## 4.8. Test-Driven Development [QC.Tdd]
 
 Test-Driven Development [@isbn:9780321146533], is a software development process relying on software

From 712f7ee308fca41672fed80c87c651d07be68049 Mon Sep 17 00:00:00 2001
From: mariojmdavid <mariojmdavid@gmail.com>
Date: Wed, 3 Nov 2021 17:31:10 +0100
Subject: [PATCH 25/54] issues #7, #63, #64

---
 content/02.document-log.md |  2 +-
 content/08.annex.md        | 62 +++++++++++++++++++++++++-------------
 2 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/content/02.document-log.md b/content/02.document-log.md
index 6f74286..a313a22 100644
--- a/content/02.document-log.md
+++ b/content/02.document-log.md
@@ -8,4 +8,4 @@
 | v3.1 | 05/03/2020 | Add tags/names for each criteria |
 | v3.2 | 23/04/2020 | Add EOSC-Synergy to copyright |
 | v3.3 | 15/10/2020 | Fix issues: #32, #46, #47, #48, #49, #51 |
-| v4.0 | 2021 | Add annex, spell check, Fix issues: #57, #59, #60, #61 |
+| v4.0 | 2021 | Add annex, spell check, Fix issues: #7, #57, #59, #60, #61, #63, #64 |
diff --git a/content/08.annex.md b/content/08.annex.md
index f1e8eb9..0146a69 100644
--- a/content/08.annex.md
+++ b/content/08.annex.md
@@ -1,16 +1,39 @@
 # A1. Annex {.page_break_before}
 
 The Quality Criteria described in this document is abstract, as such the choice of tools
-and services to implement their verification is up to the team or community developing
-and/or using a given software.
+and services to implement their verification and the code workflow, is up to the team
+or community developing and/or using a given software.
 
 The annex describes the implementation of how the Quality Criteria detailed in this
-document can be verified, and as has been used in several European projects. It details the
-code workflow, the tools and services used to achieve the verification of the Criteria.
-This description is based on the work performed in the framework of the EOSC-Synergy project,
-in particular its Deliverable 3.2 [@doi:10.20350/digitalCSIC/12721]
+document can be verified. The technical implementation is achieved through the
+SQA as a Service (SQAaaS) platform, being developed in the framework of the EOSC-Synergy project
+described in Deliverable 3.2 [@doi:10.20350/digitalCSIC/12721]). It details the architecture
+and set of components of the platform.
 
-## A1.1. List of tools and services
+This annnex details the code workflow, the tools and services used to achieve the verification of
+the Criteria.
+
+## A1.1. Code workflow, tools and services
+
+The code workflow shown in Figure @fig:workflow. In this real case example, Github is used for
+several purposes that will be described below. The workflow start when the developer branches
+the code to implement a given new feature or fix, after the implementation the Pull Request triggers
+a CI pipeline in the Jenkins service.
+
+In the Jenkins service, several checks are performed, both on the code (static), such as code style
+linting, as well as dynamic tests such as unit and functional tests. To perform functional tests
+that may include API tests in case of a service, the packages will need to be built (delivery),
+and automatically deployed into a running state. In the case shown, the configuration is done with
+ansible roles and playbooks.
+
+The Pull Request is updated with the results of the tests, thus notifying the developer team that
+they can proceed with the review and, if approved, with the release process where the branch is
+merge into the main production branch. 
+
+The SQAaaS platform can be used to compose custom Jenkins pipelines in an easy way, in order to
+implement all necessary checks of the baseline criteria.
+
+![Code workflow](images/devops.png){height="500px"}{#fig:workflow}
 
 Table @tbl:services show the list of tools and services used for the source code management as well
 as to implement the verification of the Quality Criteria detailed in this document.
@@ -28,31 +51,30 @@ derivative OS), DEBs (case of Debian/Ubuntu and derivatives) and in many cases i
 The artifacts are provided, in general, by public repositories and most notably Dockerhub in the case
 of docker images. Other common repositories are PyPI for python SW or modules and Maven for Java.
 
-Regarding the CI/CD criteria, Jenkins CI tool is used and details are given in section A1.3.
+Regarding the CI/CD automation, Jenkins pipelines can be easily composed through the SQAaaS
+platform and put into the git repositories to be used by the Jenkins CI service to perform the
+tests. The tools used in the CI automation are shown in section A1.2.
 
 | Service/Tool    | Usage              | Criteria   | Comment                                      |
 |:---------------:|:------------------:|:----------:|:--------------------------------------------:|
 | Github          | VCS                | **QC.Acc** | Source code repository - git                 |
-|                 | Code Workflow      | **QC.Wor** | git branching management and version tagging |
+|                 | API                | **QC.Wor** | git branching management and version tagging |
 |                 | Issue tracker      | **QC.Man** | Track issues, bugs, new features, etc.       |
 |                 | Pull Requests (PR) | **QC.Man**, **QC.Rev** | Code review through PRs          |
 |                 | Documentation      | **QC.Doc** | Documentation present in VCS repository (markdown) |
 | Ansible, Galaxy | Install, Config    | **QC.Aud** | Automated deployment and configuration       |
+| SQAaaS platform | pipeline composition | N.A.     | Pipeline composition for automatic tests     |
+| Jenkins CI service | Automated tests | N.A.       | Execution of automatic tests     |
+| Dockerhub       | Docker images      | **QC.Del** | Public repository of docker images     |
 
 Table: Tools and services used to implement the QA criteria, also shown the criteria
 where applicable. {#tbl:services}
 
+## A1.2. Tools for CI/CDD automation
 
-## A1.2. Code workflow
-
-This section describes the code workflow shown in Figure @fig:workflow
-
-![Code workflow](images/devops.png){height="500px"}{#fig:workflow}
-
-## A1.3. Jenkins CI
-
-This section details the tools being used (and planned) in the Jenkins CI pipelines, the criteria
-that it verifies, applicable programming language.
+This section shows the tools being used in the CI pipelines, the criteria that it verifies,
+applicable programming language. This list is based on the template file in
+<https://github.com/EOSC-synergy/sqa-composer-templates/blob/main/tooling.json>.
 
 | Tool         | Criteria   | Programming Language | Repo URL or documentation | Summary           |
 |:------------:|:----------:|:--------------------:|:-------------------------:|:-----------------:|
@@ -64,6 +86,4 @@ that it verifies, applicable programming language.
 | pycodestyle  | **QC.Sty** | Python     | <https://pycodestyle.pycqa.org/en/latest/> | Code style |
 | tox          | **QC.Sty**/**QC.Uni**/**QC.Fun**/**QC.Sec**/**QC.Doc** | Python     | <https://tox.wiki/en/latest/>              | Automated test framework |
 | licensee     | **QC.Lic** | Agnostic   | <https://github.com/licensee/licensee>     | Check license |
-| checkLicense | **QC.Lic** | Agnostic   | <https://github.com/EOSC-synergy/sqa-composer-templates/tree/main/QC.Lic> | Check license |
-| checkCitable | **QC.Acc** | Agnostic   | <https://github.com/EOSC-synergy/sqa-composer-templates/tree/main/QC.Acc> | Code metadata |
 

From 4d5a67a3a23875d6493a38a82a5e4778c1a22cee Mon Sep 17 00:00:00 2001
From: mariojmdavid <mariojmdavid@gmail.com>
Date: Thu, 4 Nov 2021 10:44:37 +0100
Subject: [PATCH 26/54] update reference section

---
 content/90.back-matter.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/90.back-matter.md b/content/90.back-matter.md
index 339b33c..907573a 100644
--- a/content/90.back-matter.md
+++ b/content/90.back-matter.md
@@ -1,4 +1,4 @@
-## References {.page_break_before}
+# References {.page_break_before}
 
 <!-- Explicitly insert bibliography here -->
 <div id="refs"></div>

From b23d717751ca738397fe2755610cbb9c3b27af75 Mon Sep 17 00:00:00 2001
From: mariojmdavid <mariojmdavid@gmail.com>
Date: Mon, 22 Nov 2021 16:27:42 +0000
Subject: [PATCH 27/54] remove integration and API testing, now only in service
 QA baseline

---
 content/06.quality_criteria.md | 54 ----------------------------------
 1 file changed, 54 deletions(-)

diff --git a/content/06.quality_criteria.md b/content/06.quality_criteria.md
index f8f69ea..0da733c 100644
--- a/content/06.quality_criteria.md
+++ b/content/06.quality_criteria.md
@@ -105,28 +105,6 @@ early detection of failures in the development cycle.
   * **[QC.Uni04.1]** When working on automated testing, the use of testing doubles is
     RECOMMENDED to mimic a simplistic behavior of objects and procedures.
 
-## 4.6. Integration Testing [QC.Int]
-
-Integration testing refers to the evaluation of the interactions among coupled
-software components or parts of a system that cooperate to achieve a given
-functionality.
-
-* **[QC.Int01]** Integration testing outcome MUST guarantee the overall operation of the
-  software component whenever new functionality are involved.
-
-* **[QC.Int02]** Integration testing MAY be complemented with Acceptance and Scalability testing.
-
-* **[QC.Int03]** Integration testing MUST NOT rely on non-operational or out-of-the-warranty services.
-  * **[QC.Int03.1]** On lack of automation, pilot service infrastructures or local testbeds MAY be used.
-  * **[QC.Int03.2]** In the presence of CI environments, integration tests SHOULD be suitable for
-    the automated testing.
-
-* **[QC.Int04]** Ad-hoc pilot service infrastructures and/or local testbeds MAY be used to
-  cope with the integration testing requirements.
-
-* **[QC.Int05]** Integration testing MAY NOT be viable to be checked on change basis, as it
-  is likely to involve complex scenarios.
-
 ## 4.7. Functional Testing [QC.Fun]
 
 Functional testing is a type of black-box testing.
@@ -156,38 +134,6 @@ design analysis or side-effects to external systems.
 
 * **[QC.Fun07]** Functional and regression testing coverage MAY NOT be suitable for automated testing.
 
-## 4.8. API Testing [QC.Api]
-
-These tests only apply when the Software type is a service. API testing is a subset
-of functional tests.
-
-Web services commonly use application programming interfaces (APIs) to expose
-the available features to external consumers, which can be either oriented to
-the end-user or suitable for machine-to-machine communications.
-
-An accurate implementation of a publicly-accessible API is driven by a clearly
-defined specification. The OpenAPI Specification (OAS)
-[@url:https://www.openapis.org/] provides the most suitable way to describe,
-compose, consume and validate APIs. The following requirements assume the
-presence of such an API specification.
-
-* **[QC.Api01]** API testing MUST cover the validation of the features
-outlined in the specification (aka _contract testing_).
-
-  * **[QC.Api01.1]** Any change in the API not compliant with the OAS MUST
-  NOT pass contract testing.
-
-  * **[QC.Api01.2]** The use of OAS SHOULD narrow down the applicable set of
-  test cases to the features described in the specification, avoiding unnecessary
-  assertions.
-
-* **[QC.Api02]** API testing MUST include the assessment of the
-  security-related criteria outlined in **[QC.Sec]** section.
-
-* **[QC.Api03]** API testing SHOULD involve the use of test doubles, such
-as mock servers or stubs, that act as a validation layer for the incoming
-requests, as outlined in criteria **[QC.Fun03]**.
-
 ## 4.8. Test-Driven Development [QC.Tdd]
 
 Test-Driven Development [@isbn:9780321146533], is a software development process relying on software

From cdaec1c3cdbe8bc6dfafb02d106d78a74a99e210 Mon Sep 17 00:00:00 2001
From: mariojmdavid <mariojmdavid@gmail.com>
Date: Tue, 23 Nov 2021 14:39:20 +0000
Subject: [PATCH 28/54] add test harness/test doubles, functional test ot be
 removed, issues #35 , #65

---
 content/06.quality_criteria.md | 61 ++++++++++++++++++++++++++++++----
 1 file changed, 54 insertions(+), 7 deletions(-)

diff --git a/content/06.quality_criteria.md b/content/06.quality_criteria.md
index 0da733c..398a80e 100644
--- a/content/06.quality_criteria.md
+++ b/content/06.quality_criteria.md
@@ -105,7 +105,53 @@ early detection of failures in the development cycle.
   * **[QC.Uni04.1]** When working on automated testing, the use of testing doubles is
     RECOMMENDED to mimic a simplistic behavior of objects and procedures.
 
-## 4.7. Functional Testing [QC.Fun]
+## **PROPOSAL**
+
+## 4.6. Test Harness [QC.Har]
+
+In software development, a test harness
+[@url:https://searchsoftwarequality.techtarget.com/definition/test-harness],
+is a collection of software and test data used by developers to unit test software models during
+development. A test harness will specifically refer to test doubles, which are programs
+that interact with the software being tested. Once a test harness is used to execute a test, they
+can also utilize a test library to generate reports.
+
+It is also a simple form of Integration Testing, where interaction and integration with external
+components are substituted by a Double.
+
+Test Double is a generic term for any case where you replace a production object for testing
+purposes. There are various kinds of double [@isbn:9780131495050]:
+
+* Dummy objects are passed around but never actually used. Usually they are just used to fill
+  parameter lists.
+
+* Fake objects actually have working implementations, but usually take some shortcut which makes
+  them not suitable for production (an InMemoryTestDatabase is a good example).
+
+* Stubs provide canned answers to calls made during the test, usually not responding at all to
+  anything outside what's programmed in for the test.
+
+* Spies are stubs that also record some information based on how they were called. One form of this
+  might be an email service that records how many messages it was sent.
+
+* Mocks are pre-programmed with expectations which form a specification of the calls they are
+  expected to receive. They can throw an exception if they receive a call they don't expect and
+  are checked during verification to ensure they got all the calls they were expecting.
+
+As such the following criteria is defined for Test Harness:
+
+* **[QC.Har01]** When working on automated testing, the use of Test Doubles
+  is RECOMMENDED to mimic a simplistic behavior of objects and procedures.
+
+* **[QC.Har02]** Test Doubles SHOULD reside in the software component repository code
+  base but separated from the main code.
+
+* **[QC.Har03]** Regression testing, that checks the conformance with previous tests, is
+  covered at this stage by executing the complete set of Test Doubles available.
+
+* **[QC.Har04]** Test Doubles and regression, MUST be checked on change basis.
+
+## 4.XX. Functional Testing [QC.Fun] - **TO BE REMOVED**
 
 Functional testing is a type of black-box testing.
 It involves the verification of the software component’s
@@ -115,24 +161,25 @@ functionality that the software component exposes, leaving apart any internal
 design analysis or side-effects to external systems.
 
 * **[QC.Fun01]** Functional testing SHOULD tend to cover the full set of functionality that
-  the software component claims to provide.
+  the software component claims to provide. **[SvcQC.Fun01]**
 
 * **[QC.Fun02]** Functional tests SHOULD be checked automatically with the exception of those
   functionality that require human interaction, such as Graphical User
-  Interfaces (GUI).
+  Interfaces (GUI). **[SvcQC.Fun02]**
 
 * **[QC.Fun03]** When working on automated testing, the use of testing doubles is RECOMMENDED
   to mimic a simplistic behavior of objects and procedures.
+  **TEST HARNESS**
 
 * **[QC.Fun04]** Functional tests SHOULD reside in the software component repository code
-  base but separated from the main code.
+  base but separated from the main code. **[SvcQC.Fun03]** **TEST HARNESS**
 
 * **[QC.Fun05]** Regression testing, that checks the conformance with previous tests, is
-  covered at this stage by executing the complete set of functional tests available.
+  covered at this stage by executing the complete set of functional tests available. **TEST HARNESS**
 
-* **[QC.Fun06]** Functional and regression testing MUST be checked on change basis.
+* **[QC.Fun06]** Functional and regression testing MUST be checked on change basis. **TEST HARNESS**
 
-* **[QC.Fun07]** Functional and regression testing coverage MAY NOT be suitable for automated testing.
+* **[QC.Fun07]** Functional and regression testing coverage MAY NOT be suitable for automated testing. **REMOVE**
 
 ## 4.8. Test-Driven Development [QC.Tdd]
 

From a5102d1a0dca9c0460c5226fc148d4f72fa1fcba Mon Sep 17 00:00:00 2001
From: mariojmdavid <mariojmdavid@gmail.com>
Date: Tue, 23 Nov 2021 15:50:04 +0000
Subject: [PATCH 29/54] fixes issue #66, update section numbers

---
 content/06.quality_criteria.md | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/content/06.quality_criteria.md b/content/06.quality_criteria.md
index 398a80e..c1c9d5d 100644
--- a/content/06.quality_criteria.md
+++ b/content/06.quality_criteria.md
@@ -110,7 +110,7 @@ early detection of failures in the development cycle.
 ## 4.6. Test Harness [QC.Har]
 
 In software development, a test harness
-[@url:https://searchsoftwarequality.techtarget.com/definition/test-harness],
+[@https://searchsoftwarequality.techtarget.com/definition/test-harness],
 is a collection of software and test data used by developers to unit test software models during
 development. A test harness will specifically refer to test doubles, which are programs
 that interact with the software being tested. Once a test harness is used to execute a test, they
@@ -151,7 +151,7 @@ As such the following criteria is defined for Test Harness:
 
 * **[QC.Har04]** Test Doubles and regression, MUST be checked on change basis.
 
-## 4.XX. Functional Testing [QC.Fun] - **TO BE REMOVED**
+## 4.XX. Functional Testing [QC.Fun] - **TO BE REMOVED/CAN BE REMOVED**
 
 Functional testing is a type of black-box testing.
 It involves the verification of the software component’s
@@ -181,7 +181,7 @@ design analysis or side-effects to external systems.
 
 * **[QC.Fun07]** Functional and regression testing coverage MAY NOT be suitable for automated testing. **REMOVE**
 
-## 4.8. Test-Driven Development [QC.Tdd]
+## 4.7. Test-Driven Development [QC.Tdd]
 
 Test-Driven Development [@isbn:9780321146533], is a software development process relying on software
 requirements being converted to test cases before software is fully developed,
@@ -192,7 +192,7 @@ created later.
 * **[QC.Tdd01]** Software requirements SHOULD be converted to test cases, and these
   test cases SHOULD be checked automatically.
 
-## 4.9. Documentation [QC.Doc]
+## 4.8. Documentation [QC.Doc]
 
 * **[QC.Doc01]** Documentation MUST be treated as code.
 
@@ -259,7 +259,7 @@ created later.
 
 * **[QC.Doc07]** Documentation MUST be checked on change basis.
 
-## 4.10. Security [QC.Sec]
+## 4.9. Security [QC.Sec]
 
 * **[QC.Sec01]** Secure coding practices SHALL be applied into all the stages of a software
   component development lifecycle.
@@ -302,7 +302,7 @@ created later.
 * **[QC.Sec10]** The services delivered SHALL adhere to any extra security policies or
   requirements set at the operational level.
 
-## 4.11. Code Workflow [QC.Wor]
+## 4.10. Code Workflow [QC.Wor]
 
 A change-based approach is accomplished with a branching model.
 
@@ -330,7 +330,9 @@ A change-based approach is accomplished with a branching model.
     and secondary branches are aligned. This step SHOULD mark a production
     release.
 
-* **[QC.Wor04]** Semantic Versioning [@https://semver.org] specification is RECOMMENDED for
+## 4.11. Semantic Versioning [QC.Ver]
+
+* **[QC.Ver01]** Semantic Versioning [@https://semver.org] specification is RECOMMENDED for
   tagging the production releases.
 
 ## 4.12. Code Management [QC.Man]

From 3580d4f242ec3a7eee0092901ac42d1b9fbda09b Mon Sep 17 00:00:00 2001
From: mariojmdavid <mariojmdavid@gmail.com>
Date: Tue, 23 Nov 2021 16:18:00 +0000
Subject: [PATCH 30/54] update glossary, wip on issue #65

---
 content/06.quality_criteria.md | 36 ++++++++++++++++++++++------------
 content/07.glossary.md         |  6 ------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/content/06.quality_criteria.md b/content/06.quality_criteria.md
index c1c9d5d..d08abc9 100644
--- a/content/06.quality_criteria.md
+++ b/content/06.quality_criteria.md
@@ -261,17 +261,33 @@ created later.
 
 ## 4.9. Security [QC.Sec]
 
+Security assessment is essential for any production **Software**. An effective implementation of the
+security requirements applies to every stage in the software development life cycle (SDLC),
+especially effective at the source code level.
+
 * **[QC.Sec01]** Secure coding practices SHALL be applied into all the stages of a software
   component development lifecycle.
 
-  * **[QC.Sec01.1]** Compliance with Open Web Application Security Project (OWASP) secure coding guidelines
+  * **[QC.Sec01.1]** Compliance with Open Web Application Security Project (OWASP) secure coding
+    guidelines
     [@https://owasp.org/www-project-secure-coding-practices-quick-reference-guide/migrated_content]
     is RECOMMENDED, even for non-web applications.
 
-* **[QC.Sec02]** Source code SHALL use automated linter tools to perform static application
-  security testing (SAST) [@https://owasp.org/www-community/Source_Code_Analysis_Tools]
-  that flag common suspicious constructs that may cause a bug or lead to a
-  security risk (e.g. inconsistent data structure sizes or unused resources).
+* **[QC.Sec02]** Source code SHALL use automated linter tools to perform static application security
+  testing (SAST) [@https://owasp.org/www-community/Source_Code_Analysis_Tools] that flag common
+  suspicious constructs that may cause a bug or lead to a security risk (e.g. inconsistent data
+  structure sizes or unused resources).
+
+* **[QC.Sec03]** Security code reviews
+  [@https://owasp.org/www-project-code-review-guide/migrated_content]
+  for certain vulnerabilities SHOULD be done as part of the identification of potential security
+  flaws in the code. Inputs SHOULD come from automated linters and manual penetration testing results.
+
+* **[QC.Sec04]** World-writable files or directories MUST NOT be present in the product’s
+  configuration or logging locations.
+
+---
+**TO BE REMOVED - moved/added/adapted in the Service QA**
 
 * **[QC.Sec03]** Dynamic application security testing (DAST)
   [@https://www.owasp.org/index.php/Category:Vulnerability_Scanning_Tools]
@@ -286,14 +302,6 @@ created later.
 
 * **[QC.Sec05]** Manual penetration testing MAY be part of the application security verification effort.
 
-* **[QC.Sec06]** Security code reviews
-  [@https://owasp.org/www-project-code-review-guide/migrated_content]
-  for certain vulnerabilities SHOULD be done as part of the identification of potential security
-  flaws in the code. Inputs SHOULD come from automated linters and manual penetration testing results.
-
-* **[QC.Sec07]** World-writable files or directories MUST NOT be present in the product’s
-  configuration or logging locations.
-
 * **[QC.Sec08]** World-writable files SHOULD NOT be created while the service is in
   operation. Whenever they are required, the relevant files MUST be documented.
 
@@ -302,6 +310,8 @@ created later.
 * **[QC.Sec10]** The services delivered SHALL adhere to any extra security policies or
   requirements set at the operational level.
 
+---
+
 ## 4.10. Code Workflow [QC.Wor]
 
 A change-based approach is accomplished with a branching model.
diff --git a/content/07.glossary.md b/content/07.glossary.md
index 007ed4a..edb6f89 100644
--- a/content/07.glossary.md
+++ b/content/07.glossary.md
@@ -6,15 +6,9 @@ __API__
 __CLI__
 : Command Line Interface
 
-__DAST__
-: Dynamic Application Security Testing
-
 __EOSC__
 : European Open Science Cloud
 
-__IAST__
-: Interactive Application Security Testing
-
 __OWASP__
 : Open Web Application Security Project
 

From 93a67a1d5a9d8ed31b13912c178b627bdf357ecc Mon Sep 17 00:00:00 2001
From: mariojmdavid <mariojmdavid@gmail.com>
Date: Tue, 23 Nov 2021 18:15:14 +0000
Subject: [PATCH 31/54] small type corrections, markdown line format

---
 content/01.abstract.md               |   7 +-
 content/02.0.copyright-ack.md        |  11 +-
 content/02.document-log.md           |   2 +-
 content/03.intro.md                  |  26 +-
 content/04.goals.md                  |   4 +-
 content/05.notational_conventions.md |   6 +-
 content/06.quality_criteria.md       | 339 +++++++++++++--------------
 content/08.annex.md                  |  66 +++---
 8 files changed, 229 insertions(+), 232 deletions(-)

diff --git a/content/01.abstract.md b/content/01.abstract.md
index 9c86933..0ddf1c7 100644
--- a/content/01.abstract.md
+++ b/content/01.abstract.md
@@ -1,6 +1,5 @@
 # Abstract {.page_break_before}
 
-The purpose of this document is to define a set of quality standards,
-procedures and best practices to conform a Software Quality Assurance plan to
-serve as a reference within the European research ecosystem related projects
-for the adequate development and timely delivery of software products.
+The purpose of this document is to define a set of quality standards, procedures and best practices
+to conform a Software Quality Assurance plan to serve as a reference within the European research
+ecosystem related projects for the adequate development and timely delivery of software products.
diff --git a/content/02.0.copyright-ack.md b/content/02.0.copyright-ack.md
index a6895db..c43829f 100644
--- a/content/02.0.copyright-ack.md
+++ b/content/02.0.copyright-ack.md
@@ -1,14 +1,13 @@
 # Copyright Notice
 
-Copyright © Members of the INDIGO-DataCloud, DEEP Hybrid-DataCloud eXtreme
-DataCloud and EOSC-Synergy collaborations, 2015-2021.
+Copyright © Members of the INDIGO-DataCloud, DEEP Hybrid-DataCloud eXtreme DataCloud and
+EOSC-Synergy collaborations, 2015-2021.
 
 # Acknowledgements
 
-The INDIGO-DataCloud, DEEP-Hybrid-DataCloud, eXtreme-DataCloud and
-EOSC-Synergy projects have received funding from the European Union’s
-Horizon 2020 research and innovation programme under grant agreement
-number 653549, 777435, 777367 and 857647 respectively.
+The INDIGO-DataCloud, DEEP-Hybrid-DataCloud, eXtreme-DataCloud and EOSC-Synergy projects have
+received funding from the European Union’s Horizon 2020 research and innovation programme under
+grant agreement number 653549, 777435, 777367 and 857647 respectively.
 
 <p align="center">
   <img src="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcT1WF4g5KH3PnQE_Ve10QFRS-gZ0NpCQ7Qr-_km1RqnOCEF1fQt">
diff --git a/content/02.document-log.md b/content/02.document-log.md
index a313a22..c11dae6 100644
--- a/content/02.document-log.md
+++ b/content/02.document-log.md
@@ -8,4 +8,4 @@
 | v3.1 | 05/03/2020 | Add tags/names for each criteria |
 | v3.2 | 23/04/2020 | Add EOSC-Synergy to copyright |
 | v3.3 | 15/10/2020 | Fix issues: #32, #46, #47, #48, #49, #51 |
-| v4.0 | 2021 | Add annex, spell check, Fix issues: #7, #57, #59, #60, #61, #63, #64 |
+| v4.0 | 12/2021 | Add annex, spell check, Fix issues: #7, #35, #50, #57, #59, #60, #61, #63, #64, #65, #66 |
diff --git a/content/03.intro.md b/content/03.intro.md
index 1b9c5d6..dd0a074 100644
--- a/content/03.intro.md
+++ b/content/03.intro.md
@@ -1,14 +1,16 @@
 # 1. Introduction and Purpose {.page_break_before}
 
-This document has been tailored upon the recommendations and requirements found
-in the Initial Plan for Software Management and Pilot Services deliverable
-[@url:https://owncloud.indigo-datacloud.eu/index.php/s/yDklCrWjKnjutVA],
-produced by the INDIGO-DataCloud project. These guidelines evolved throughout
-the project’s lifetime and are being extended in the
-EOSC-Synergy [@doi:10.20350/digitalCSIC/12607],
-as well as as the past DEEP-Hybrid-DataCloud and eXtreme DataCloud subsequent projects.
-The result is a consolidated Software Quality Assurance (SQA) baseline criteria emanated
-from the European Open Science Cloud (EOSC), which aims to outline the SQA
-principles to be considered in the upcoming software development efforts within
-the European research community, and continuously evolve in order to be aligned
-with future software engineering practices and security recommendations.
+This document has been tailored upon the recommendations and requirements found in the Initial Plan
+for Software Management and Pilot Services deliverable
+[@url:https://owncloud.indigo-datacloud.eu/index.php/s/yDklCrWjKnjutVA], produced by the
+INDIGO-DataCloud project.
+
+These guidelines evolved throughout the project’s lifetime and are being extended in the
+EOSC-Synergy [@doi:10.20350/digitalCSIC/12607], as well as the past DEEP-Hybrid-DataCloud and
+eXtreme DataCloud subsequent projects.
+
+The result is a consolidated Software Quality Assurance (SQA) baseline criteria emanated from the
+European Open Science Cloud (EOSC), which aims to outline the SQA principles to be considered in the
+upcoming software development efforts within the European research community, and continuously
+evolve in order to be aligned with future software engineering practices and security
+recommendations.
diff --git a/content/04.goals.md b/content/04.goals.md
index 9eb7e41..cf02341 100644
--- a/content/04.goals.md
+++ b/content/04.goals.md
@@ -9,8 +9,8 @@
 3. Promote code style standards to deliver good quality source code emphasizing its readability and
    reusability.
 
-4. Improve the quality and reliability of software by covering different
-   testing methods at development and pre-production stages.
+4. Improve the quality and reliability of software by covering different testing methods at
+   development and pre-production stages.
 
 5. Propose a change-based driven scenario where all new updates in the source code are continuously
    validated by the automated execution of the relevant tests.
diff --git a/content/05.notational_conventions.md b/content/05.notational_conventions.md
index 1553dbc..34cfc9b 100644
--- a/content/05.notational_conventions.md
+++ b/content/05.notational_conventions.md
@@ -1,5 +1,5 @@
 # 3. Notational Conventions
 
-The keywords “MUST”, “MUST NOT”, “REQUIRED”, “SHALL”, “SHALL NOT”, “SHOULD”,
-“SHOULD NOT”, “RECOMMENDED”, “MAY”, and “OPTIONAL” in this document are to be
-interpreted as described in RFC 2119 [@https://www.rfc-editor.org/info/rfc2119].
+The keywords "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "SHOULD NOT",
+"RECOMMENDED", "MAY", and "OPTIONAL" in this document are to be interpreted as described in RFC 2119
+[@https://www.rfc-editor.org/info/rfc2119].
diff --git a/content/06.quality_criteria.md b/content/06.quality_criteria.md
index d08abc9..1d264fa 100644
--- a/content/06.quality_criteria.md
+++ b/content/06.quality_criteria.md
@@ -1,100 +1,96 @@
 # 4. Quality Criteria {.page_break_before}
 
-The following sections describe the quality conventions and best practices that
-apply to the development phase of a software component within the EOSC
-ecosystem. These guidelines ruled the software development process of the
-former European Commission-funded project INDIGO-DataCloud, where they have
-proved valuable for improving the reliability of software produced in the
-scientific European arena.
-
-The next sections describe the development process driven by a change-based
-strategy, followed by a continuous integration approach. Changes in the source
-code, trigger automated builds to analyze the new contributions in order to
-validate them before being added to the software component code base.
-Consequently, software components are more eligible for being deployed in
-production infrastructures, reducing the likelihood of service disruption.
+The following sections describe the quality conventions and best practices that apply to the
+development phase of a software component within the EOSC ecosystem. These guidelines ruled the
+software development process of the former European Commission-funded project INDIGO-DataCloud,
+where they have proved valuable for improving the reliability of software produced in the scientific
+European arena.
+
+The next sections describe the development process driven by a change-based strategy, followed by a
+continuous integration approach. Changes in the source code, trigger automated builds to analyze the
+new contributions in order to validate them before being added to the software component code base.
+Consequently, software components are more eligible for deployment in production infrastructures,
+reducing the likelihood of service disruption.
 
 ## 4.1. Code Accessibility [QC.Acc]
 
-* **[QC.Acc01]** Following the open-source model, the source code being produced MUST be open
-  and publicly available to promote the adoption and augment the visibility of
-  the software developments.
+* **[QC.Acc01]** Following the open-source model, the source code being produced MUST be open and
+  publicly available to promote the adoption and augment the visibility of the software
+  developments.
 
 * **[QC.Acc02]** Source code MUST use a Version Control System (VCS).
 
-  * **[QC.Acc02.1]** It is RECOMMENDED that all software components delivered by the same
-    project agree on a common VCS.
+  * **[QC.Acc02.1]** It is RECOMMENDED that all software components delivered by the same project
+    agree on a common VCS.
 
-* **[QC.Acc03]** Source code produced within the scope of a broader development project
-  SHOULD reside in a common organization of a version control repository
-  hosting service.
+* **[QC.Acc03]** Source code produced within the scope of a broader development project SHOULD
+  reside in a common organization of a version control repository hosting service.
 
 ## 4.2. Licensing [QC.Lic]
 
-* **[QC.Lic01]** As open-source software, source code MUST adhere to an open-source license
-  to be freely used, modified and distributed by others.
+* **[QC.Lic01]** As open-source software, source code MUST adhere to an open-source license to be
+  freely used, modified and distributed by others.
 
   * **[QC.Lic01.1]** Non-licensed software is exclusive copyright by default.
 
-* **[QC.Lic02]** License MUST be compliant with the Open Source Definition [@https://opensource.org/osd].
+* **[QC.Lic02]** License MUST be compliant with the Open Source Definition
+  [@https://opensource.org/osd].
 
-  * **[QC.Lic02.1]** RECOMMENDED licenses are listed in the Open Source Initiative portal
-    under the Popular Licenses category [@https://opensource.org/licenses].
+  * **[QC.Lic02.1]** RECOMMENDED licenses are listed in the Open Source Initiative portal under the
+    Popular Licenses category [@https://opensource.org/licenses].
 
-* **[QC.Lic03]** Licenses MUST be physically present (e.g. as a LICENSE file) in the root of
-  all the source code repositories related to the software component.
+* **[QC.Lic03]** Licenses MUST be physically present (e.g. as a LICENSE file) in the root of all the
+  source code repositories related to the software component.
 
 ## 4.3. Code Style [QC.Sty]
 
-Code style requirements pursue the correct maintenance of the source code by
-the common agreement of a series of style conventions. These vary based on the
-programming language being used.
+Code style requirements pursue the correct maintenance of the source code by the common agreement of
+a series of style conventions. These vary based on the programming language being used.
 
-* **[QC.Sty01]** Each individual software product MUST comply with community-driven or de-facto
-  code style standards for the programming languages being used.
+* **[QC.Sty01]** Each individual software product MUST comply with community-driven or de-facto code
+  style standards for the programming languages being used.
 
   * **[QC.Sty01.1]** Compliance with multiple complementary standards MAY exist.
 
-* **[QC.Sty02]** Custom code style guidelines SHOULD be avoided, only considered in the
-  hypothetical event of programming languages without existing community style
-  standards.
+* **[QC.Sty02]** Custom code style guidelines SHOULD be avoided, only considered in the hypothetical
+  event of programming languages without existing community style standards.
 
-  * **[QC.Sty02.1]** Custom styles MUST be documented by defining each convention and its
-    expected output.
+  * **[QC.Sty02.1]** Custom styles MUST be documented by defining each convention and its expected
+    output.
 
   * **[QC.Sty02.2]** Custom styles SHOULD evolve over time towards a more consistent definition.
 
-* **[QC.Sty03]** Exceptions of individual conventions from the main definition are allowed
-  but SHOULD be avoided
+* **[QC.Sty03]** Exceptions of individual conventions from the main definition are allowed but
+  SHOULD be avoided
 
   * **[QC.Sty03.1]** Absence of standard conventions SHOULD be justified and tracked.
 
-* **[QC.Sty04]** Code style compliance testing MUST be automated and MUST be triggered for
-  each candidate change in the source code.
+* **[QC.Sty04]** Code style compliance testing MUST be automated and MUST be triggered for each
+  candidate change in the source code.
 
 ## 4.4. Code metadata [QC.Met]
 
-Metadata for the software component provides a way to achieve its full identification,
-thus making software citation viable [@doi:10.7717/peerj-cs.86].
-It allows the assignment of a Digital Object Identifier (DOI) and is key
-towards preservation, discovery, reuse, and attribution of the software component.
+Metadata for the software component provides a way to achieve its full identification, thus making
+software citation viable [@doi:10.7717/peerj-cs.86]. It allows the assignment of a Digital Object
+Identifier (DOI) and is key towards preservation, discovery, reuse, and attribution of the software
+component.
 
-* **[QC.Met01]** A metadata file SHOULD exist along side the code, under its VCS.
-  The metadata file SHOULD be updated when needed, as is the case of a new version.
+* **[QC.Met01]** A metadata file SHOULD exist along side the code, under its VCS. The metadata file
+  SHOULD be updated when needed, as is the case of a new version.
 
 ## 4.5. Unit Testing [QC.Uni]
 
-Unit testing evaluates all the possible flows in the internal design of the
-code, so that its behavior becomes apparent. It is a key type of testing for
-early detection of failures in the development cycle.
+Unit testing evaluates all the possible flows in the internal design of the code, so that its
+behavior becomes apparent. It is a key type of testing for early detection of failures in the
+development cycle.
 
 * **[QC.Uni01]** Minimum acceptable code coverage threshold SHOULD be 70%.
 
   * **[QC.Uni01.1]** Unit testing coverage SHOULD be higher for those sections of the code
     identified as critical by the developers, such as units part of a security module.
 
-  * **[QC.Uni01.2]** Unit testing coverage MAY be lower for external libraries or pieces of
-    code not maintained within the product’s code base.
+  * **[QC.Uni01.2]** Unit testing coverage MAY be lower for external libraries or pieces of code not
+    maintained within the product’s code base.
 
 * **[QC.Uni02]** Units SHOULD reside in the repository code base but separated from the main code.
 
@@ -103,18 +99,18 @@ early detection of failures in the development cycle.
 * **[QC.Uni04]** Unit testing coverage MUST be automated.
 
   * **[QC.Uni04.1]** When working on automated testing, the use of testing doubles is
-    RECOMMENDED to mimic a simplistic behavior of objects and procedures.
+    RECOMMENDED to mimic a simplistic behavior of objects and procedures (c.f. section 4.6.).
 
 ## **PROPOSAL**
 
 ## 4.6. Test Harness [QC.Har]
 
 In software development, a test harness
-[@https://searchsoftwarequality.techtarget.com/definition/test-harness],
-is a collection of software and test data used by developers to unit test software models during
-development. A test harness will specifically refer to test doubles, which are programs
-that interact with the software being tested. Once a test harness is used to execute a test, they
-can also utilize a test library to generate reports.
+[@https://searchsoftwarequality.techtarget.com/definition/test-harness], is a collection of software
+and test data used by developers to unit test software models during development. A test harness
+will specifically refer to test doubles, which are programs that interact with the software being
+tested. Once a test harness is used to execute a test, they can also utilize a test library to
+generate reports.
 
 It is also a simple form of Integration Testing, where interaction and integration with external
 components are substituted by a Double.
@@ -122,32 +118,32 @@ components are substituted by a Double.
 Test Double is a generic term for any case where you replace a production object for testing
 purposes. There are various kinds of double [@isbn:9780131495050]:
 
-* Dummy objects are passed around but never actually used. Usually they are just used to fill
+* **Dummy objects** are passed around but never actually used. Usually they are just used to fill
   parameter lists.
 
-* Fake objects actually have working implementations, but usually take some shortcut which makes
-  them not suitable for production (an InMemoryTestDatabase is a good example).
+* **Fake objects** actually have working implementations, but usually take some shortcut which makes
+  them not suitable for production (such as an InMemoryTestDatabase).
 
-* Stubs provide canned answers to calls made during the test, usually not responding at all to
+* **Stubs** provide canned answers to calls made during the test, usually not responding at all to
   anything outside what's programmed in for the test.
 
-* Spies are stubs that also record some information based on how they were called. One form of this
-  might be an email service that records how many messages it was sent.
+* **Spies** are stubs that also record some information based on how they were called. One form of
+  this might be an email service that records how many messages where sent.
 
-* Mocks are pre-programmed with expectations which form a specification of the calls they are
-  expected to receive. They can throw an exception if they receive a call they don't expect and
-  are checked during verification to ensure they got all the calls they were expecting.
+* **Mocks** are pre-programmed with expectations which form a specification of the calls they are
+  expected to receive. They can throw an exception if they receive a call they don't expect and are
+  checked during verification to ensure they got all the calls they were expecting.
 
 As such the following criteria is defined for Test Harness:
 
-* **[QC.Har01]** When working on automated testing, the use of Test Doubles
-  is RECOMMENDED to mimic a simplistic behavior of objects and procedures.
+* **[QC.Har01]** When working on automated testing, the use of Test Doubles is RECOMMENDED to mimic
+  a simplistic behavior of objects and procedures.
 
-* **[QC.Har02]** Test Doubles SHOULD reside in the software component repository code
-  base but separated from the main code.
+* **[QC.Har02]** Test Doubles SHOULD reside in the software component repository code base but
+  separated from the main code.
 
-* **[QC.Har03]** Regression testing, that checks the conformance with previous tests, is
-  covered at this stage by executing the complete set of Test Doubles available.
+* **[QC.Har03]** Regression testing, that checks the conformance with previous tests, is covered at
+  this stage by executing the complete set of Test Doubles available.
 
 * **[QC.Har04]** Test Doubles and regression, MUST be checked on change basis.
 
@@ -184,44 +180,43 @@ design analysis or side-effects to external systems.
 ## 4.7. Test-Driven Development [QC.Tdd]
 
 Test-Driven Development [@isbn:9780321146533], is a software development process relying on software
-requirements being converted to test cases before software is fully developed,
-and tracking all software development by repeatedly testing the software against
-all test cases. This is opposed to software being developed first and test cases
-created later.
+requirements being converted to test cases before software is fully developed, and tracking all
+software development by repeatedly testing the software against all test cases. This is opposed to
+software being developed first and test cases created later.
 
-* **[QC.Tdd01]** Software requirements SHOULD be converted to test cases, and these
-  test cases SHOULD be checked automatically.
+* **[QC.Tdd01]** Software requirements SHOULD be converted to test cases, and these test cases
+  SHOULD be checked automatically.
 
 ## 4.8. Documentation [QC.Doc]
 
 * **[QC.Doc01]** Documentation MUST be treated as code.
 
-  * **[QC.Doc01.1]** Version controlled, it MAY reside in the same repository where the source
-    code lies.
+  * **[QC.Doc01.1]** Version controlled, it MAY reside in the same repository where the source code
+    lies.
 
-* **[QC.Doc02]** Documentation MUST use plain text format using a markup language, such as
-  Markdown or reStructuredText.
+* **[QC.Doc02]** Documentation MUST use plain text format using a markup language, such as Markdown
+  or reStructuredText.
 
-  * **[QC.Doc02.1]** It is RECOMMENDED that all software components delivered by the same
-    project agree on a common markup language.
+  * **[QC.Doc02.1]** It is RECOMMENDED that all software components delivered by the same project
+    agree on a common markup language.
 
-* **[QC.Doc03]** Documentation MUST be online available in a documentation repository.
+* **[QC.Doc03]** Documentation MUST be online and available in a documentation repository.
 
   * **[QC.Doc03.1]** Documentation SHOULD be rendered automatically.
 
-* **[QC.Doc04]** Documentation MUST be updated on new software versions involving any
-  substantial or minimal change in the behavior of the application.
+* **[QC.Doc04]** Documentation MUST be updated on new software versions involving any substantial or
+  minimal change in the behavior of the application.
 
 * **[QC.Doc05]** Documentation MUST be updated whenever reported as inaccurate or unclear.
 
-* **[QC.Doc06]** Documentation MUST be produced according to the target audience, varying
-  according to the software component specification. The identified types of
-  documentation and their RECOMMENDED content are:
+* **[QC.Doc06]** Documentation MUST be produced according to the target audience, varying according
+  to the software component specification. The identified types of documentation and their
+  RECOMMENDED content are:
 
   * **[QC.Doc06.1]** README file
 
     * One-paragraph description of the application.
-    * A “Getting Started” step-by-step description on how to get a development environment running
+    * A *"Getting Started"* step-by-step description on how to get a development environment running
       (prerequisites, installation).
     * Automated test execution how-to.
     * Links to the external documentation below (production deployment, user guides).
@@ -241,21 +236,21 @@ created later.
 
     * Installation and configuration guides.
     * Service Reference Card, with the following RECOMMENDED content:
-    * Brief functional description.
-    * List of processes or daemons.
-    * Init scripts and options.
-    * List of configuration files, location and example or template.
-    * Log files location and other useful audit information.
-    * List of ports.
-    * Service state information.
-    * List of cron jobs.
+      * Brief functional description.
+      * List of processes or daemons.
+      * Init scripts and options.
+      * List of configuration files, location and example or template.
+      * Log files location and other useful audit information.
+      * List of ports.
+      * Service state information.
+      * List of cron jobs.
     * Security information.
     * FAQs and troubleshooting.
 
   * **[QC.Doc06.4]** User
 
     * Public API documentation.
-    * Command-line (CLI) reference.
+    * Command Line Interface (CLI) reference.
 
 * **[QC.Doc07]** Documentation MUST be checked on change basis.
 
@@ -281,12 +276,12 @@ especially effective at the source code level.
 * **[QC.Sec03]** Security code reviews
   [@https://owasp.org/www-project-code-review-guide/migrated_content]
   for certain vulnerabilities SHOULD be done as part of the identification of potential security
-  flaws in the code. Inputs SHOULD come from automated linters and manual penetration testing results.
+  flaws in the code. Inputs SHOULD come from automated linters and manual penetration testing
+  results.
 
 * **[QC.Sec04]** World-writable files or directories MUST NOT be present in the product’s
   configuration or logging locations.
 
----
 **TO BE REMOVED - moved/added/adapted in the Service QA**
 
 * **[QC.Sec03]** Dynamic application security testing (DAST)
@@ -310,72 +305,69 @@ especially effective at the source code level.
 * **[QC.Sec10]** The services delivered SHALL adhere to any extra security policies or
   requirements set at the operational level.
 
----
-
 ## 4.10. Code Workflow [QC.Wor]
 
 A change-based approach is accomplished with a branching model.
 
-* **[QC.Wor01]** The main branch in the source code repository MUST maintain a working state
-  version of the software component.
+* **[QC.Wor01]** The main branch in the source code repository MUST maintain a working state version
+  of the software component.
 
-  * **[QC.Wor01.1]** Main branch SHOULD be protected to disallow force pushing, thus
-    preventing untested and un-reviewed source code from entering the production-ready version.
+  * **[QC.Wor01.1]** Main branch SHOULD be protected to disallow force pushing, thus preventing
+    untested and un-reviewed source code from entering the production-ready version.
 
-  * **[QC.Wor01.2]** New features SHOULD only be merged in the main branch whenever the SQA
-    criteria is fulfilled.
+  * **[QC.Wor01.2]** New features SHOULD only be merged in the main branch whenever the SQA criteria
+    is fulfilled.
 
 * **[QC.Wor02]** New changes in the source code MUST be placed in individual branches.
 
-  * **[QC.Wor02.1]** It is RECOMMENDED to agree on a branch nomenclature, usually by
-    prefixing, to differentiate change types (e.g. feature, release, fix).
+  * **[QC.Wor02.1]** It is RECOMMENDED to agree on a branch nomenclature, usually by prefixing, to
+    differentiate change types (e.g. feature, release, fix).
 
-* **[QC.Wor03]** The existence of a secondary long-term branch that contains the changes for
-  the next release is RECOMMENDED.
+* **[QC.Wor03]** The existence of a secondary long-term branch that contains the changes for the
+  next release is RECOMMENDED.
 
   * **[QC.Wor03.1]** Next release changes come from the individual branches.
 
-  * **[QC.Wor03.2]** Once ready for release, changes in the secondary long-term branch are
-    merged into the main branch and versioned. At that point in time, main
-    and secondary branches are aligned. This step SHOULD mark a production
-    release.
+  * **[QC.Wor03.2]** Once ready for release, changes in the secondary long-term branch are merged
+    into the main branch and versioned. At that point in time, main and secondary branches are
+    aligned. This step SHOULD mark a production release.
 
 ## 4.11. Semantic Versioning [QC.Ver]
 
-* **[QC.Ver01]** Semantic Versioning [@https://semver.org] specification is RECOMMENDED for
-  tagging the production releases.
+* **[QC.Ver01]** Semantic Versioning [@https://semver.org] specification is RECOMMENDED for tagging
+  the production releases.
 
 ## 4.12. Code Management [QC.Man]
 
 * **[QC.Man01]** An issue tracking system facilitates structured software development. Leveraging
-  issues to track down both new enhancements and defects (bugs or documentation typos)
-  is RECOMMENDED.
+  issues to track down both new enhancements and defects (bugs, documentation typos) is RECOMMENDED.
 
   * **[QC.Man01.1]** In addition to monitoring the internal development, issues are the best
-    means for supporting users. External users SHOULD be able to create incidences based on the
+    means for supporting users. External users SHOULD be able to create issues based on the
     operational performance of the software.
 
-  * **[QC.Man01.2]** The description of an issue SHOULD be concise and state clearly the problem.
-    It is RECOMMENDED to add any reference to the actual problem. In the case of bugs, the
-    issue SHOULD be accompanied by the relevant debug information.
+  * **[QC.Man01.2]** The description of an issue SHOULD be concise and state clearly the problem. It
+    is RECOMMENDED to add any reference to the actual problem. In the case of bugs, the issue SHOULD
+    be accompanied by the relevant debug information.
          * The usage of templates for the issue description is RECOMMENDED.
 
-* **[QC.Man02]** In social coding environments, pull requests represent the cornerstone of
-  collaboration. A pull request provides a place for review and discussion of the changes proposed
-  to be part of an existing version of the code.
+* **[QC.Man02]** In social coding environments, pull or merge requests represent the cornerstone of
+  collaboration. A pull or merge request provides a place for review and discussion of the changes
+  proposed to be part of an existing version of the code.
 
-  * **[QC.Man02.1]** Pull requests SHOULD be used for every change in the codebase.
+  * **[QC.Man02.1]** Pull/Merge requests SHOULD be used for every change in the codebase.
 
-  * **[QC.Man02.2]** A software project SHOULD be open to external collaboration through pull requests.
+  * **[QC.Man02.2]** A software project SHOULD be open to external collaboration through pull/merge
+    requests.
 
-  * **[QC.Man02.3]** A pull request description SHOULD be concise and state clearly its purpose (e.g. if
-    it is fixing an observed bug or adding a new feature)
+  * **[QC.Man02.3]** A pull/merge request description SHOULD be concise and state clearly its
+    purpose (e.g. if it is fixing an observed bug or adding a new feature).
 
-  * **[QC.Man02.4]** The usage of templates for the pull request's description is RECOMMENDED.
+  * **[QC.Man02.4]** The usage of templates for the pull/merge request's description is RECOMMENDED.
 
-  * **[QC.Man02.5]** It is RECOMMENDED to use pull requests to address open issues. The pull request
-    description SHOULD make reference to the identifiers of the issues it is fixing
-    (to eventually close them, either manually or automatically).
+  * **[QC.Man02.5]** It is RECOMMENDED to use pull/merge requests to address open issues. The
+    pull/merge request description SHOULD make reference to the identifiers of the issues it is
+    fixing (to eventually close them, either manually or automatically).
 
 ## 4.13. Code Review [QC.Rev]
 
@@ -384,49 +376,52 @@ source code [@https://owasp.org/www-project-code-review-guide/migrated_content].
 last step in the change management pipeline, once the candidate change has successfully passed over
 the required set of change-based tests.
 
-* **[QC.Rev01]** Code reviews MUST be done in the agreed peer review tool within the project,
-  with the following RECOMMENDED functionality:
+* **[QC.Rev01]** Code reviews MUST be done in the agreed peer review tool within the project, with
+  the following RECOMMENDED functionality:
 
-  * **[QC.Rev01.1]** Allows general and specific comments on the line or lines that need to
-    be reviewed.
+  * **[QC.Rev01.1]** Allows general and specific comments on the line or lines that need to be
+    reviewed.
 
   * **[QC.Rev01.2]** Shows the results of the required change-based test executions.
 
-  * **[QC.Rev01.3]** Allows to prevent merges of the candidate change whenever not all the
-    required tests are successful. Exceptions to this rule cover the third-party or upstream
-    contributions which MAY use the existing mechanisms or tools for code review provided by the
-    target software project. This exception MUST only be allowed whenever the external revision
-    lifecycle does not interfere with the project deadlines.
+  * **[QC.Rev01.3]** Allows to prevent merges of the candidate change whenever not all the required
+    tests are successful. Exceptions to this rule cover the third-party or upstream contributions
+    which MAY use the existing mechanisms or tools for code review provided by the target software
+    project. This exception MUST only be allowed whenever the external revision lifecycle does not
+    interfere with the project deadlines.
 
-* **[QC.Rev02]** Code reviews MUST be open and collaborative, allowing external expert revisions.
+* **[QC.Rev02]** Code reviews MUST be open and collaborative, allowing external experts revisions.
 
 * **[QC.Rev03]** Code reviews SHOULD be concise and use neutral language. The areas where the
   reviewers MAY focus are:
 
-  * **[QC.Rev03.1]** Message description: commit message is clear, self-explanatory and
-    describes precisely the objectives being addressed.
+  * **[QC.Rev03.1]** Message description: commit message is clear, self-explanatory and describes
+    precisely the objectives being addressed.
 
-  * **[QC.Rev03.2]** Goal or scope: change is needed and/or addresses/fixes the whole set of objectives.
+  * **[QC.Rev03.2]** Goal or scope: change is needed and/or addresses/fixes the whole set of
+    objectives.
 
   * **[QC.Rev03.3]** Code analysis: useless statements in the code, library or modules imported but
     never used or code style suggestions.
 
-  * **[QC.Rev03.4]** Review of required tests: current battery of tests is sufficient for validation.
+  * **[QC.Rev03.4]** Review of required tests: current battery of tests is sufficient for
+    validation.
 
-  * **[QC.Rev03.5]** Review of documentation: whether the change SHOULD bring along a
-    corresponding update in the documentation.
+  * **[QC.Rev03.5]** Review of documentation: whether the change SHOULD bring along a corresponding
+    update in the documentation.
 
 * **[QC.Rev04]** Code reviews MUST be checked on change basis.
 
-* **[QC.Rev05]** Code reviews SHOULD assess the inherent security risk of the changes,
-  ensuring that the security model has not been downgraded or compromised by the changes.
+* **[QC.Rev05]** Code reviews SHOULD assess the inherent security risk of the changes, ensuring that
+  the security model has not been downgraded or compromised by the changes.
 
 ## 4.14. Automated Delivery [QC.Del]
 
-Automated delivery comprises the build of Software into an artifact, its upload/registration into
-a public repository of such artifacts and notification of successful process.
+Automated delivery comprises the build of Software into an artifact, its upload/registration into a
+public repository of such artifacts and notification of the success of the process.
 
-* **[QC.Del01]** Production-ready code SHALL be built as an artifact that can be executed on a system.
+* **[QC.Del01]** Production-ready code SHALL be built as an artifact that can be executed on a
+  system.
 
 * **[QC.Del02]** The builded artifact SHALL be uploaded and registered into a public repository of
   such artifacts.
@@ -437,19 +432,21 @@ a public repository of such artifacts and notification of successful process.
 ## 4.15. Automated Deployment [QC.Dep]
 
 * **[QC.Dep01]** Production-ready code SHALL be deployed as a workable system with the minimal user
-or system administrator interaction leveraging software configuration management (SCM) tools.
+  or system administrator interaction leveraging software configuration management (SCM) tools.
 
 * **[QC.Dep02]** A SCM module is treated as code.
-  * **[QC.Dep02.1]** Version controlled, it SHOULD reside in a different repository than the
-    source code to facilitate the distribution.
 
-* **[QC.Dep03]** It is RECOMMENDED that all software components delivered by the same project
-  agree on a common SCM tool.
-  * **[QC.Dep03.1]** However, software products are not restricted to provide a unique
-    solution for the automated deployment.
+  * **[QC.Dep02.1]** Version controlled, it SHOULD reside in a different repository than the source
+    code to facilitate the distribution.
+
+* **[QC.Dep03]** It is RECOMMENDED that all software components delivered by the same project agree
+  on a common SCM tool.
+
+  * **[QC.Dep03.1]** However, software products are not restricted to provide a unique solution for
+    the automated deployment.
 
-* **[QC.Dep04]** Any change affecting the application’s deployment or operation MUST be
-  subsequently reflected in the relevant SCM modules.
+* **[QC.Dep04]** Any change affecting the application’s deployment or operation MUST be subsequently
+  reflected in the relevant SCM modules.
 
-* **[QC.Dep05]** Official repositories provided by the manufacturer SHOULD be used to host
-  the SCM modules, thus augmenting the visibility and promote external collaboration.
+* **[QC.Dep05]** Official repositories provided by the manufacturer SHOULD be used to host the SCM
+  modules, thus augmenting the visibility and promote external collaboration.
diff --git a/content/08.annex.md b/content/08.annex.md
index 0146a69..cbba5b7 100644
--- a/content/08.annex.md
+++ b/content/08.annex.md
@@ -1,41 +1,41 @@
 # A1. Annex {.page_break_before}
 
-The Quality Criteria described in this document is abstract, as such the choice of tools
-and services to implement their verification and the code workflow, is up to the team
-or community developing and/or using a given software.
+The Quality Criteria described in this document is abstract, as such the choice of tools and
+services to implement their verification and the code workflow, is up to the team or community
+developing and/or using a given software.
 
-The annex describes the implementation of how the Quality Criteria detailed in this
-document can be verified. The technical implementation is achieved through the
-SQA as a Service (SQAaaS) platform, being developed in the framework of the EOSC-Synergy project
-described in Deliverable 3.2 [@doi:10.20350/digitalCSIC/12721]). It details the architecture
-and set of components of the platform.
+The annex describes the implementation of how the Quality Criteria detailed in this document can be
+verified. The technical implementation is achieved through the SQA as a Service (SQAaaS) platform,
+being developed in the framework of the EOSC-Synergy project described in Deliverable 3.2
+[@doi:10.20350/digitalCSIC/12721]). It details the architecture and set of components of the
+platform.
 
 This annnex details the code workflow, the tools and services used to achieve the verification of
 the Criteria.
 
 ## A1.1. Code workflow, tools and services
 
-The code workflow shown in Figure @fig:workflow. In this real case example, Github is used for
-several purposes that will be described below. The workflow start when the developer branches
+The code workflow is shown in Figure @fig:workflow. It depicts a real case example, Github is used
+for several purposes that will be described below. The workflow start when the developer branches
 the code to implement a given new feature or fix, after the implementation the Pull Request triggers
 a CI pipeline in the Jenkins service.
 
 In the Jenkins service, several checks are performed, both on the code (static), such as code style
-linting, as well as dynamic tests such as unit and functional tests. To perform functional tests
-that may include API tests in case of a service, the packages will need to be built (delivery),
-and automatically deployed into a running state. In the case shown, the configuration is done with
+linting, as well as dynamic tests such as unit and harness tests. To perform functional tests that
+may include API tests in case of a service, the packages will need to be built (delivery), and
+automatically deployed into a running state. In the case shown, the configuration is done with
 ansible roles and playbooks.
 
 The Pull Request is updated with the results of the tests, thus notifying the developer team that
 they can proceed with the review and, if approved, with the release process where the branch is
-merge into the main production branch. 
+merge into the main production branch.
 
 The SQAaaS platform can be used to compose custom Jenkins pipelines in an easy way, in order to
 implement all necessary checks of the baseline criteria.
 
 ![Code workflow](images/devops.png){height="500px"}{#fig:workflow}
 
-Table @tbl:services show the list of tools and services used for the source code management as well
+Table @tbl:services shows the list of tools and services used for the source code management as well
 as to implement the verification of the Quality Criteria detailed in this document.
 
 The main service used for Software source code management has been Github. It is uses git as Version
@@ -48,12 +48,13 @@ tools.
 The software is packed/built into executable artifacts that can be RPMs (case of RedHat and
 derivative OS), DEBs (case of Debian/Ubuntu and derivatives) and in many cases into docker images.
 
-The artifacts are provided, in general, by public repositories and most notably Dockerhub in the case
-of docker images. Other common repositories are PyPI for python SW or modules and Maven for Java.
+The artifacts are provided, in general, by public repositories and most notably Dockerhub in the
+case of docker images. Other common repositories are PyPI for python SW or modules and Maven for
+Java.
 
-Regarding the CI/CD automation, Jenkins pipelines can be easily composed through the SQAaaS
-platform and put into the git repositories to be used by the Jenkins CI service to perform the
-tests. The tools used in the CI automation are shown in section A1.2.
+Regarding the CI/CD automation, Jenkins pipelines can be easily composed through the SQAaaS platform
+and put into the git repositories to be used by the Jenkins CI service to perform the tests. The
+tools used in the CI automation are shown in section A1.2.
 
 | Service/Tool    | Usage              | Criteria   | Comment                                      |
 |:---------------:|:------------------:|:----------:|:--------------------------------------------:|
@@ -66,9 +67,10 @@ tests. The tools used in the CI automation are shown in section A1.2.
 | SQAaaS platform | pipeline composition | N.A.     | Pipeline composition for automatic tests     |
 | Jenkins CI service | Automated tests | N.A.       | Execution of automatic tests     |
 | Dockerhub       | Docker images      | **QC.Del** | Public repository of docker images     |
+| tox             | | **QC.Sty**/**QC.Uni**/**QC.Fun**/**QC.Sec**/**QC.Doc** | Automated test framework |
 
-Table: Tools and services used to implement the QA criteria, also shown the criteria
-where applicable. {#tbl:services}
+Table: Tools and services used to implement the QA criteria, also shown the criteria where
+applicable. {#tbl:services}
 
 ## A1.2. Tools for CI/CDD automation
 
@@ -76,14 +78,12 @@ This section shows the tools being used in the CI pipelines, the criteria that i
 applicable programming language. This list is based on the template file in
 <https://github.com/EOSC-synergy/sqa-composer-templates/blob/main/tooling.json>.
 
-| Tool         | Criteria   | Programming Language | Repo URL or documentation | Summary           |
-|:------------:|:----------:|:--------------------:|:-------------------------:|:-----------------:|
-| pylint       | **QC.Sty** | Python     | <https://pylint.org/>                      | Code style |
-| hadolint     | **QC.Sty** | Dockerfile | <https://github.com/hadolint/hadolint>     | Code style |
-| checkstyle   | **QC.Sty** | Java       | <https://github.com/checkstyle/checkstyle> | Code style |
-| jsonlint     | **QC.Sty** | JSON       | <https://github.com/zaach/jsonlint>        | Code style |
-| bandit       | **QC.Sec** | Python     | <https://bandit.readthedocs.io/>           | Static security |
-| pycodestyle  | **QC.Sty** | Python     | <https://pycodestyle.pycqa.org/en/latest/> | Code style |
-| tox          | **QC.Sty**/**QC.Uni**/**QC.Fun**/**QC.Sec**/**QC.Doc** | Python     | <https://tox.wiki/en/latest/>              | Automated test framework |
-| licensee     | **QC.Lic** | Agnostic   | <https://github.com/licensee/licensee>     | Check license |
-
+| Tool        | Criteria   | Programming Language | Repo URL or documentation | Summary           |
+|:-----------:|:----------:|:--------------------:|:-------------------------:|:-----------------:|
+| pylint      | **QC.Sty** | Python     | <https://pylint.org/>                      | Code style |
+| hadolint    | **QC.Sty** | Dockerfile | <https://github.com/hadolint/hadolint>     | Code style |
+| checkstyle  | **QC.Sty** | Java       | <https://github.com/checkstyle/checkstyle> | Code style |
+| jsonlint    | **QC.Sty** | JSON       | <https://github.com/zaach/jsonlint>        | Code style |
+| bandit      | **QC.Sec** | Python     | <https://bandit.readthedocs.io/>           | Static security |
+| pycodestyle | **QC.Sty** | Python     | <https://pycodestyle.pycqa.org/en/latest/> | Code style |
+| licensee    | **QC.Lic** | Agnostic   | <https://github.com/licensee/licensee>     | Check license |

From 50f61b502bfe4118b33445cdd4c8c522d4da87f5 Mon Sep 17 00:00:00 2001
From: mariojmdavid <mariojmdavid@gmail.com>
Date: Wed, 24 Nov 2021 16:45:50 +0000
Subject: [PATCH 32/54] issue #67, substitute SHALL by MUST

---
 content/06.quality_criteria.md | 301 ++++++++++++++-------------------
 1 file changed, 125 insertions(+), 176 deletions(-)

diff --git a/content/06.quality_criteria.md b/content/06.quality_criteria.md
index 1d264fa..47307da 100644
--- a/content/06.quality_criteria.md
+++ b/content/06.quality_criteria.md
@@ -14,59 +14,59 @@ reducing the likelihood of service disruption.
 
 ## 4.1. Code Accessibility [QC.Acc]
 
-* **[QC.Acc01]** Following the open-source model, the source code being produced MUST be open and
-  publicly available to promote the adoption and augment the visibility of the software
+* **[QC.Acc01]** Following the open-source model, the source code being produced **MUST** be open
+  and publicly available to promote the adoption and augment the visibility of the software
   developments.
 
-* **[QC.Acc02]** Source code MUST use a Version Control System (VCS).
+* **[QC.Acc02]** Source code **MUST** use a Version Control System (VCS).
 
-  * **[QC.Acc02.1]** It is RECOMMENDED that all software components delivered by the same project
-    agree on a common VCS.
+  * **[QC.Acc02.1]** It is **RECOMMENDED** that all software components delivered by the same
+    project agree on a common VCS.
 
-* **[QC.Acc03]** Source code produced within the scope of a broader development project SHOULD
+* **[QC.Acc03]** Source code produced within the scope of a broader development project **SHOULD**
   reside in a common organization of a version control repository hosting service.
 
 ## 4.2. Licensing [QC.Lic]
 
-* **[QC.Lic01]** As open-source software, source code MUST adhere to an open-source license to be
-  freely used, modified and distributed by others.
+* **[QC.Lic01]** As open-source software, source code **MUST** adhere to an open-source license to
+  be freely used, modified and distributed by others.
 
   * **[QC.Lic01.1]** Non-licensed software is exclusive copyright by default.
 
-* **[QC.Lic02]** License MUST be compliant with the Open Source Definition
+* **[QC.Lic02]** License **MUST** be compliant with the Open Source Definition
   [@https://opensource.org/osd].
 
-  * **[QC.Lic02.1]** RECOMMENDED licenses are listed in the Open Source Initiative portal under the
-    Popular Licenses category [@https://opensource.org/licenses].
+  * **[QC.Lic02.1]** **RECOMMENDED** licenses are listed in the Open Source Initiative portal under
+    the Popular Licenses category [@https://opensource.org/licenses].
 
-* **[QC.Lic03]** Licenses MUST be physically present (e.g. as a LICENSE file) in the root of all the
-  source code repositories related to the software component.
+* **[QC.Lic03]** Licenses **MUST** be physically present (e.g. as a LICENSE file) in the root of all
+  the source code repositories related to the software component.
 
 ## 4.3. Code Style [QC.Sty]
 
 Code style requirements pursue the correct maintenance of the source code by the common agreement of
 a series of style conventions. These vary based on the programming language being used.
 
-* **[QC.Sty01]** Each individual software product MUST comply with community-driven or de-facto code
-  style standards for the programming languages being used.
+* **[QC.Sty01]** Each individual software product **MUST** comply with community-driven or de-facto
+  code style standards for the programming languages being used.
 
-  * **[QC.Sty01.1]** Compliance with multiple complementary standards MAY exist.
+  * **[QC.Sty01.1]** Compliance with multiple complementary standards **MAY** exist.
 
-* **[QC.Sty02]** Custom code style guidelines SHOULD be avoided, only considered in the hypothetical
-  event of programming languages without existing community style standards.
+* **[QC.Sty02]** Custom code style guidelines **SHOULD** be avoided, only considered in the
+  hypothetical event of programming languages without existing community style standards.
 
-  * **[QC.Sty02.1]** Custom styles MUST be documented by defining each convention and its expected
-    output.
+  * **[QC.Sty02.1]** Custom styles **MUST** be documented by defining each convention and its
+    expected output.
 
-  * **[QC.Sty02.2]** Custom styles SHOULD evolve over time towards a more consistent definition.
+  * **[QC.Sty02.2]** Custom styles **SHOULD** evolve over time towards a more consistent definition.
 
 * **[QC.Sty03]** Exceptions of individual conventions from the main definition are allowed but
-  SHOULD be avoided
+  **SHOULD** be avoided
 
-  * **[QC.Sty03.1]** Absence of standard conventions SHOULD be justified and tracked.
+  * **[QC.Sty03.1]** Absence of standard conventions **SHOULD** be justified and tracked.
 
-* **[QC.Sty04]** Code style compliance testing MUST be automated and MUST be triggered for each
-  candidate change in the source code.
+* **[QC.Sty04]** Code style compliance testing **MUST** be automated and **MUST** be triggered for
+  each candidate change in the source code.
 
 ## 4.4. Code metadata [QC.Met]
 
@@ -75,8 +75,8 @@ software citation viable [@doi:10.7717/peerj-cs.86]. It allows the assignment of
 Identifier (DOI) and is key towards preservation, discovery, reuse, and attribution of the software
 component.
 
-* **[QC.Met01]** A metadata file SHOULD exist along side the code, under its VCS. The metadata file
-  SHOULD be updated when needed, as is the case of a new version.
+* **[QC.Met01]** A metadata file **SHOULD** exist along side the code, under its VCS. The metadata
+  file **SHOULD** be updated when needed, as is the case of a new version.
 
 ## 4.5. Unit Testing [QC.Uni]
 
@@ -84,24 +84,22 @@ Unit testing evaluates all the possible flows in the internal design of the code
 behavior becomes apparent. It is a key type of testing for early detection of failures in the
 development cycle.
 
-* **[QC.Uni01]** Minimum acceptable code coverage threshold SHOULD be 70%.
+* **[QC.Uni01]** Minimum acceptable code coverage threshold **SHOULD** be 70%.
 
-  * **[QC.Uni01.1]** Unit testing coverage SHOULD be higher for those sections of the code
+  * **[QC.Uni01.1]** Unit testing coverage **SHOULD** be higher for those sections of the code
     identified as critical by the developers, such as units part of a security module.
 
-  * **[QC.Uni01.2]** Unit testing coverage MAY be lower for external libraries or pieces of code not
-    maintained within the product’s code base.
+  * **[QC.Uni01.2]** Unit testing coverage **MAY** be lower for external libraries or pieces of code
+    not maintained within the product’s code base.
 
-* **[QC.Uni02]** Units SHOULD reside in the repository code base but separated from the main code.
+* **[QC.Uni02]** Units **SHOULD** reside in the repository code but separated from the main code.
 
-* **[QC.Uni03]** Unit testing coverage MUST be checked on change basis.
+* **[QC.Uni03]** Unit testing coverage **MUST** be checked on change basis.
 
-* **[QC.Uni04]** Unit testing coverage MUST be automated.
+* **[QC.Uni04]** Unit testing coverage **MUST** be automated.
 
   * **[QC.Uni04.1]** When working on automated testing, the use of testing doubles is
-    RECOMMENDED to mimic a simplistic behavior of objects and procedures (c.f. section 4.6.).
-
-## **PROPOSAL**
+    **RECOMMENDED** to mimic a simplistic behavior of objects and procedures (c.f. section 4.6.).
 
 ## 4.6. Test Harness [QC.Har]
 
@@ -136,46 +134,16 @@ purposes. There are various kinds of double [@isbn:9780131495050]:
 
 As such the following criteria is defined for Test Harness:
 
-* **[QC.Har01]** When working on automated testing, the use of Test Doubles is RECOMMENDED to mimic
-  a simplistic behavior of objects and procedures.
+* **[QC.Har01]** When working on automated testing, the use of Test Doubles is **RECOMMENDED** to
+  mimic a simplistic behavior of objects and procedures.
 
-* **[QC.Har02]** Test Doubles SHOULD reside in the software component repository code base but
+* **[QC.Har02]** Test Doubles **SHOULD** reside in the software component repository code base but
   separated from the main code.
 
-* **[QC.Har03]** Regression testing, that checks the conformance with previous tests, is covered at
-  this stage by executing the complete set of Test Doubles available.
-
-* **[QC.Har04]** Test Doubles and regression, MUST be checked on change basis.
-
-## 4.XX. Functional Testing [QC.Fun] - **TO BE REMOVED/CAN BE REMOVED**
-
-Functional testing is a type of black-box testing.
-It involves the verification of the software component’s
-identified functionality, based on requested requirements and agreed design
-specifications. This type of software testing focus on the evaluation of the
-functionality that the software component exposes, leaving apart any internal
-design analysis or side-effects to external systems.
-
-* **[QC.Fun01]** Functional testing SHOULD tend to cover the full set of functionality that
-  the software component claims to provide. **[SvcQC.Fun01]**
-
-* **[QC.Fun02]** Functional tests SHOULD be checked automatically with the exception of those
-  functionality that require human interaction, such as Graphical User
-  Interfaces (GUI). **[SvcQC.Fun02]**
-
-* **[QC.Fun03]** When working on automated testing, the use of testing doubles is RECOMMENDED
-  to mimic a simplistic behavior of objects and procedures.
-  **TEST HARNESS**
-
-* **[QC.Fun04]** Functional tests SHOULD reside in the software component repository code
-  base but separated from the main code. **[SvcQC.Fun03]** **TEST HARNESS**
-
-* **[QC.Fun05]** Regression testing, that checks the conformance with previous tests, is
-  covered at this stage by executing the complete set of functional tests available. **TEST HARNESS**
+* **[QC.Har03]** Regression testing, that checks the conformance with previous tests, **SHOULD** be
+  covered at this stage by executing the complete set of Test Doubles available.
 
-* **[QC.Fun06]** Functional and regression testing MUST be checked on change basis. **TEST HARNESS**
-
-* **[QC.Fun07]** Functional and regression testing coverage MAY NOT be suitable for automated testing. **REMOVE**
+* **[QC.Har04]** Test Doubles and regression, **MUST** be checked on change basis.
 
 ## 4.7. Test-Driven Development [QC.Tdd]
 
@@ -184,33 +152,33 @@ requirements being converted to test cases before software is fully developed, a
 software development by repeatedly testing the software against all test cases. This is opposed to
 software being developed first and test cases created later.
 
-* **[QC.Tdd01]** Software requirements SHOULD be converted to test cases, and these test cases
-  SHOULD be checked automatically.
+* **[QC.Tdd01]** Software requirements **SHOULD** be converted to test cases, and these test cases
+  **SHOULD** be checked automatically.
 
 ## 4.8. Documentation [QC.Doc]
 
-* **[QC.Doc01]** Documentation MUST be treated as code.
+* **[QC.Doc01]** Documentation **MUST** be treated as code.
 
-  * **[QC.Doc01.1]** Version controlled, it MAY reside in the same repository where the source code
-    lies.
+  * **[QC.Doc01.1]** Version controlled, it **MAY** reside in the same repository where the source
+    code lies.
 
-* **[QC.Doc02]** Documentation MUST use plain text format using a markup language, such as Markdown
-  or reStructuredText.
+* **[QC.Doc02]** Documentation **MUST** use plain text format using a markup language, such as
+  Markdown or reStructuredText.
 
-  * **[QC.Doc02.1]** It is RECOMMENDED that all software components delivered by the same project
-    agree on a common markup language.
+  * **[QC.Doc02.1]** It is **RECOMMENDED** that all software components delivered by the same
+    project agree on a common markup language.
 
-* **[QC.Doc03]** Documentation MUST be online and available in a documentation repository.
+* **[QC.Doc03]** Documentation **MUST** be online and available in a documentation repository.
 
-  * **[QC.Doc03.1]** Documentation SHOULD be rendered automatically.
+  * **[QC.Doc03.1]** Documentation **SHOULD** be rendered automatically.
 
-* **[QC.Doc04]** Documentation MUST be updated on new software versions involving any substantial or
-  minimal change in the behavior of the application.
+* **[QC.Doc04]** Documentation **MUST** be updated on new software versions involving any
+  substantial or minimal change in the behavior of the application.
 
-* **[QC.Doc05]** Documentation MUST be updated whenever reported as inaccurate or unclear.
+* **[QC.Doc05]** Documentation **MUST** be updated whenever reported as inaccurate or unclear.
 
-* **[QC.Doc06]** Documentation MUST be produced according to the target audience, varying according
-  to the software component specification. The identified types of documentation and their
+* **[QC.Doc06]** Documentation **MUST** be produced according to the target audience, varying
+  according to the software component specification. The identified types of documentation and their
   RECOMMENDED content are:
 
   * **[QC.Doc06.1]** README file
@@ -252,7 +220,7 @@ software being developed first and test cases created later.
     * Public API documentation.
     * Command Line Interface (CLI) reference.
 
-* **[QC.Doc07]** Documentation MUST be checked on change basis.
+* **[QC.Doc07]** Documentation **MUST** be checked on change basis.
 
 ## 4.9. Security [QC.Sec]
 
@@ -260,114 +228,94 @@ Security assessment is essential for any production **Software**. An effective i
 security requirements applies to every stage in the software development life cycle (SDLC),
 especially effective at the source code level.
 
-* **[QC.Sec01]** Secure coding practices SHALL be applied into all the stages of a software
+* **[QC.Sec01]** Secure coding practices ****MUST**** be applied into all the stages of a software
   component development lifecycle.
 
   * **[QC.Sec01.1]** Compliance with Open Web Application Security Project (OWASP) secure coding
     guidelines
     [@https://owasp.org/www-project-secure-coding-practices-quick-reference-guide/migrated_content]
-    is RECOMMENDED, even for non-web applications.
+    is **RECOMMENDED**, even for non-web applications.
 
-* **[QC.Sec02]** Source code SHALL use automated linter tools to perform static application security
-  testing (SAST) [@https://owasp.org/www-community/Source_Code_Analysis_Tools] that flag common
-  suspicious constructs that may cause a bug or lead to a security risk (e.g. inconsistent data
-  structure sizes or unused resources).
+* **[QC.Sec02]** Source code ****MUST**** use automated linter tools to perform static application
+  security testing (SAST) [@https://owasp.org/www-community/Source_Code_Analysis_Tools] that flag
+  common suspicious constructs that may cause a bug or lead to a security risk (e.g. inconsistent
+  data structure sizes or unused resources).
 
 * **[QC.Sec03]** Security code reviews
   [@https://owasp.org/www-project-code-review-guide/migrated_content]
-  for certain vulnerabilities SHOULD be done as part of the identification of potential security
-  flaws in the code. Inputs SHOULD come from automated linters and manual penetration testing
+  for certain vulnerabilities **SHOULD** be done as part of the identification of potential security
+  flaws in the code. Inputs **SHOULD** come from automated linters and manual penetration testing
   results.
 
-* **[QC.Sec04]** World-writable files or directories MUST NOT be present in the product’s
+* **[QC.Sec04]** World-writable files or directories **MUST NOT** be present in the product’s
   configuration or logging locations.
 
-**TO BE REMOVED - moved/added/adapted in the Service QA**
-
-* **[QC.Sec03]** Dynamic application security testing (DAST)
-  [@https://www.owasp.org/index.php/Category:Vulnerability_Scanning_Tools]
-  SHALL be performed from the outside, to software components in an operating state, to look for
-  security vulnerabilities (e.g. SQL injection, cross-site scripting).
-
-* **[QC.Sec04]** Interactive Application Security Testing (IAST)
-  [@https://www.veracode.com/security/interactive-application-security-testing-iast],
-  analyzes code for security vulnerabilities while the app is run by an automated test. IAST SHOULD
-  be performed to software components in an operating state, while Functional Testing **[QC.Fun]**,
-  is running.
-
-* **[QC.Sec05]** Manual penetration testing MAY be part of the application security verification effort.
-
-* **[QC.Sec08]** World-writable files SHOULD NOT be created while the service is in
-  operation. Whenever they are required, the relevant files MUST be documented.
-
-* **[QC.Sec09]** World-readable files MUST NOT contain passwords.
-
-* **[QC.Sec10]** The services delivered SHALL adhere to any extra security policies or
-  requirements set at the operational level.
-
 ## 4.10. Code Workflow [QC.Wor]
 
 A change-based approach is accomplished with a branching model.
 
-* **[QC.Wor01]** The main branch in the source code repository MUST maintain a working state version
-  of the software component.
+* **[QC.Wor01]** The main branch in the source code repository **MUST** maintain a working state
+  version of the software component.
 
-  * **[QC.Wor01.1]** Main branch SHOULD be protected to disallow force pushing, thus preventing
+  * **[QC.Wor01.1]** Main branch **SHOULD** be protected to disallow force pushing, thus preventing
     untested and un-reviewed source code from entering the production-ready version.
 
-  * **[QC.Wor01.2]** New features SHOULD only be merged in the main branch whenever the SQA criteria
-    is fulfilled.
+  * **[QC.Wor01.2]** New features **SHOULD** only be merged in the main branch whenever the SQA
+    criteria is fulfilled.
 
-* **[QC.Wor02]** New changes in the source code MUST be placed in individual branches.
+* **[QC.Wor02]** New changes in the source code **MUST** be placed in individual branches.
 
-  * **[QC.Wor02.1]** It is RECOMMENDED to agree on a branch nomenclature, usually by prefixing, to
-    differentiate change types (e.g. feature, release, fix).
+  * **[QC.Wor02.1]** It is **RECOMMENDED** to agree on a branch nomenclature, usually by prefixing,
+    to differentiate change types (e.g. feature, release, fix).
 
 * **[QC.Wor03]** The existence of a secondary long-term branch that contains the changes for the
-  next release is RECOMMENDED.
+  next release is **RECOMMENDED**.
 
-  * **[QC.Wor03.1]** Next release changes come from the individual branches.
+  * **[QC.Wor03.1]** Next release changes **SHOULD** come from the individual branches.
 
   * **[QC.Wor03.2]** Once ready for release, changes in the secondary long-term branch are merged
     into the main branch and versioned. At that point in time, main and secondary branches are
-    aligned. This step SHOULD mark a production release.
+    aligned. This step **SHOULD** mark a production release.
 
 ## 4.11. Semantic Versioning [QC.Ver]
 
-* **[QC.Ver01]** Semantic Versioning [@https://semver.org] specification is RECOMMENDED for tagging
-  the production releases.
+* **[QC.Ver01]** Semantic Versioning [@https://semver.org] specification is **RECOMMENDED** for
+  tagging the production releases.
 
 ## 4.12. Code Management [QC.Man]
 
 * **[QC.Man01]** An issue tracking system facilitates structured software development. Leveraging
-  issues to track down both new enhancements and defects (bugs, documentation typos) is RECOMMENDED.
+  issues to track down both new enhancements and defects (bugs, documentation typos) is
+  **RECOMMENDED**.
 
   * **[QC.Man01.1]** In addition to monitoring the internal development, issues are the best
-    means for supporting users. External users SHOULD be able to create issues based on the
+    means for supporting users. External users **SHOULD** be able to create issues based on the
     operational performance of the software.
 
-  * **[QC.Man01.2]** The description of an issue SHOULD be concise and state clearly the problem. It
-    is RECOMMENDED to add any reference to the actual problem. In the case of bugs, the issue SHOULD
-    be accompanied by the relevant debug information.
-         * The usage of templates for the issue description is RECOMMENDED.
+  * **[QC.Man01.2]** The description of an issue **SHOULD** be concise and state clearly the
+   problem. It is RECOMMENDED to add any reference to the actual problem. In the case of bugs, the
+   issue **SHOULD** be accompanied by the relevant debug information.
+         * The usage of templates for the issue description is **RECOMMENDED**.
 
 * **[QC.Man02]** In social coding environments, pull or merge requests represent the cornerstone of
   collaboration. A pull or merge request provides a place for review and discussion of the changes
   proposed to be part of an existing version of the code.
 
-  * **[QC.Man02.1]** Pull/Merge requests SHOULD be used for every change in the codebase.
+  * **[QC.Man02.1]** Pull/Merge requests **SHOULD** be used for every change in the codebase.
 
-  * **[QC.Man02.2]** A software project SHOULD be open to external collaboration through pull/merge
-    requests.
+  * **[QC.Man02.2]** A software project **SHOULD** be open to external collaboration through
+    pull/merge requests.
 
-  * **[QC.Man02.3]** A pull/merge request description SHOULD be concise and state clearly its
+  * **[QC.Man02.3]** A pull/merge request description **SHOULD** be concise and state clearly its
     purpose (e.g. if it is fixing an observed bug or adding a new feature).
 
-  * **[QC.Man02.4]** The usage of templates for the pull/merge request's description is RECOMMENDED.
+  * **[QC.Man02.4]** The usage of templates for the pull/merge request's description is
+    **RECOMMENDED**.
+
+  * **[QC.Man02.5]** It is **RECOMMENDED** to use pull/merge requests to address open issues.
 
-  * **[QC.Man02.5]** It is RECOMMENDED to use pull/merge requests to address open issues. The
-    pull/merge request description SHOULD make reference to the identifiers of the issues it is
-    fixing (to eventually close them, either manually or automatically).
+  * **[QC.Man02.6]** The pull/merge request description **SHOULD** make reference to the identifiers
+    of the issues it is fixing (to eventually close them, either manually or automatically).
 
 ## 4.13. Code Review [QC.Rev]
 
@@ -376,8 +324,8 @@ source code [@https://owasp.org/www-project-code-review-guide/migrated_content].
 last step in the change management pipeline, once the candidate change has successfully passed over
 the required set of change-based tests.
 
-* **[QC.Rev01]** Code reviews MUST be done in the agreed peer review tool within the project, with
-  the following RECOMMENDED functionality:
+* **[QC.Rev01]** Code reviews **MUST** be done in the agreed peer review tool within the project,
+  with the following RECOMMENDED functionality:
 
   * **[QC.Rev01.1]** Allows general and specific comments on the line or lines that need to be
     reviewed.
@@ -387,12 +335,13 @@ the required set of change-based tests.
   * **[QC.Rev01.3]** Allows to prevent merges of the candidate change whenever not all the required
     tests are successful. Exceptions to this rule cover the third-party or upstream contributions
     which MAY use the existing mechanisms or tools for code review provided by the target software
-    project. This exception MUST only be allowed whenever the external revision lifecycle does not
-    interfere with the project deadlines.
+    project. This exception **MUST** only be allowed whenever the external revision lifecycle does
+    not interfere with the project deadlines.
 
-* **[QC.Rev02]** Code reviews MUST be open and collaborative, allowing external experts revisions.
+* **[QC.Rev02]** Code reviews **MUST** be open and collaborative, allowing external experts
+  revisions.
 
-* **[QC.Rev03]** Code reviews SHOULD be concise and use neutral language. The areas where the
+* **[QC.Rev03]** Code reviews **SHOULD** be concise and use neutral language. The areas where the
   reviewers MAY focus are:
 
   * **[QC.Rev03.1]** Message description: commit message is clear, self-explanatory and describes
@@ -407,46 +356,46 @@ the required set of change-based tests.
   * **[QC.Rev03.4]** Review of required tests: current battery of tests is sufficient for
     validation.
 
-  * **[QC.Rev03.5]** Review of documentation: whether the change SHOULD bring along a corresponding
-    update in the documentation.
+  * **[QC.Rev03.5]** Review of documentation: whether the change **SHOULD** bring along a
+    corresponding update in the documentation.
 
-* **[QC.Rev04]** Code reviews MUST be checked on change basis.
+* **[QC.Rev04]** Code reviews **MUST** be checked on change basis.
 
-* **[QC.Rev05]** Code reviews SHOULD assess the inherent security risk of the changes, ensuring that
-  the security model has not been downgraded or compromised by the changes.
+* **[QC.Rev05]** Code reviews **SHOULD** assess the inherent security risk of the changes, ensuring
+  that the security model has not been downgraded or compromised by the changes.
 
 ## 4.14. Automated Delivery [QC.Del]
 
 Automated delivery comprises the build of Software into an artifact, its upload/registration into a
 public repository of such artifacts and notification of the success of the process.
 
-* **[QC.Del01]** Production-ready code SHALL be built as an artifact that can be executed on a
+* **[QC.Del01]** Production-ready code **MUST** be built as an artifact that can be executed on a
   system.
 
-* **[QC.Del02]** The builded artifact SHALL be uploaded and registered into a public repository of
-  such artifacts.
+* **[QC.Del02]** The builded artifact **MUST** be uploaded and registered into a public repository
+  of such artifacts.
 
-* **[QC.Del03]** Upon success of the previous (**QC.Del02**) process, a notification SHALL be sent
-  to pre-defined parties such as the main developer or team.
+* **[QC.Del03]** Upon success of the previous (**QC.Del02**) process, a notification **MUST** be
+  sent to pre-defined parties such as the main developer or team.
 
 ## 4.15. Automated Deployment [QC.Dep]
 
-* **[QC.Dep01]** Production-ready code SHALL be deployed as a workable system with the minimal user
+* **[QC.Dep01]** Production-ready code **MUST** be deployed as a workable system with the minimal user
   or system administrator interaction leveraging software configuration management (SCM) tools.
 
 * **[QC.Dep02]** A SCM module is treated as code.
 
-  * **[QC.Dep02.1]** Version controlled, it SHOULD reside in a different repository than the source
-    code to facilitate the distribution.
+  * **[QC.Dep02.1]** Version controlled, it **SHOULD** reside in a different repository than the
+    source code to facilitate the distribution.
 
-* **[QC.Dep03]** It is RECOMMENDED that all software components delivered by the same project agree
-  on a common SCM tool.
+* **[QC.Dep03]** It is **RECOMMENDED** that all software components delivered by the same project
+  agree on a common SCM tool.
 
-  * **[QC.Dep03.1]** However, software products are not restricted to provide a unique solution for
-    the automated deployment.
+  * **[QC.Dep03.1]** However, software products **MAY** not be restricted to provide a unique
+    solution for the automated deployment.
 
-* **[QC.Dep04]** Any change affecting the application’s deployment or operation MUST be subsequently
-  reflected in the relevant SCM modules.
+* **[QC.Dep04]** Any change affecting the application’s deployment or operation **MUST** be
+  subsequently reflected in the relevant SCM modules.
 
-* **[QC.Dep05]** Official repositories provided by the manufacturer SHOULD be used to host the SCM
-  modules, thus augmenting the visibility and promote external collaboration.
+* **[QC.Dep05]** Official repositories provided by the manufacturer **SHOULD** be used to host the
+  SCM modules, thus augmenting the visibility and promote external collaboration.

From fe005464014526b869949d0a705971f84a880a04 Mon Sep 17 00:00:00 2001
From: mariojmdavid <mariojmdavid@gmail.com>
Date: Thu, 9 Dec 2021 12:33:50 +0000
Subject: [PATCH 33/54] solve issues #69 #70 #71 #72 #73 #75

---
 content/06.quality_criteria.md | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/content/06.quality_criteria.md b/content/06.quality_criteria.md
index 47307da..e73032a 100644
--- a/content/06.quality_criteria.md
+++ b/content/06.quality_criteria.md
@@ -220,15 +220,13 @@ software being developed first and test cases created later.
     * Public API documentation.
     * Command Line Interface (CLI) reference.
 
-* **[QC.Doc07]** Documentation **MUST** be checked on change basis.
-
 ## 4.9. Security [QC.Sec]
 
 Security assessment is essential for any production **Software**. An effective implementation of the
-security requirements applies to every stage in the software development life cycle (SDLC),
+security requirements applies to every stage in the Software Development Life Cycle (SDLC),
 especially effective at the source code level.
 
-* **[QC.Sec01]** Secure coding practices ****MUST**** be applied into all the stages of a software
+* **[QC.Sec01]** Secure coding practices **MUST** be applied into all the stages of a software
   component development lifecycle.
 
   * **[QC.Sec01.1]** Compliance with Open Web Application Security Project (OWASP) secure coding
@@ -236,7 +234,7 @@ especially effective at the source code level.
     [@https://owasp.org/www-project-secure-coding-practices-quick-reference-guide/migrated_content]
     is **RECOMMENDED**, even for non-web applications.
 
-* **[QC.Sec02]** Source code ****MUST**** use automated linter tools to perform static application
+* **[QC.Sec02]** Source code **MUST** use automated linter tools to perform static application
   security testing (SAST) [@https://owasp.org/www-community/Source_Code_Analysis_Tools] that flag
   common suspicious constructs that may cause a bug or lead to a security risk (e.g. inconsistent
   data structure sizes or unused resources).
@@ -244,8 +242,7 @@ especially effective at the source code level.
 * **[QC.Sec03]** Security code reviews
   [@https://owasp.org/www-project-code-review-guide/migrated_content]
   for certain vulnerabilities **SHOULD** be done as part of the identification of potential security
-  flaws in the code. Inputs **SHOULD** come from automated linters and manual penetration testing
-  results.
+  flaws in the code. Inputs **SHOULD** come from automated linters.
 
 * **[QC.Sec04]** World-writable files or directories **MUST NOT** be present in the product’s
   configuration or logging locations.
@@ -293,7 +290,7 @@ A change-based approach is accomplished with a branching model.
     operational performance of the software.
 
   * **[QC.Man01.2]** The description of an issue **SHOULD** be concise and state clearly the
-   problem. It is RECOMMENDED to add any reference to the actual problem. In the case of bugs, the
+   problem. It is **RECOMMENDED** to add any reference to the actual problem. In the case of bugs, the
    issue **SHOULD** be accompanied by the relevant debug information.
          * The usage of templates for the issue description is **RECOMMENDED**.
 
@@ -319,10 +316,10 @@ A change-based approach is accomplished with a branching model.
 
 ## 4.13. Code Review [QC.Rev]
 
-Code review implies the informal, non-automated, peer, human-based revision of any change in the
-source code [@https://owasp.org/www-project-code-review-guide/migrated_content]. It appears as the
-last step in the change management pipeline, once the candidate change has successfully passed over
-the required set of change-based tests.
+Code review implies the informal, non-automated, peer review of any change in the source code
+[@https://owasp.org/www-project-code-review-guide/migrated_content]. It appears as the last step in
+the change management pipeline, once the candidate change has successfully passed over the required
+set of change-based tests.
 
 * **[QC.Rev01]** Code reviews **MUST** be done in the agreed peer review tool within the project,
   with the following RECOMMENDED functionality:
@@ -369,8 +366,11 @@ the required set of change-based tests.
 Automated delivery comprises the build of Software into an artifact, its upload/registration into a
 public repository of such artifacts and notification of the success of the process.
 
-* **[QC.Del01]** Production-ready code **MUST** be built as an artifact that can be executed on a
-  system.
+* **[QC.Del01]** Production-ready code **MUST** be built as an artifact that can be efficiently
+  executed on a system.
+
+  * **[QC.Del01.1]** The built artifact **SHOULD** be as minimal as possible, including no more than
+    the precise runtime environment and dependencies required for the execution of the software.
 
 * **[QC.Del02]** The builded artifact **MUST** be uploaded and registered into a public repository
   of such artifacts.

From 92af1b13f1f5af3a9bca1ab82ee1c18438631a05 Mon Sep 17 00:00:00 2001
From: mariojmdavid <mariojmdavid@gmail.com>
Date: Wed, 2 Feb 2022 10:03:13 +0000
Subject: [PATCH 34/54] fix issue #78

---
 content/08.annex.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/08.annex.md b/content/08.annex.md
index cbba5b7..6ddd973 100644
--- a/content/08.annex.md
+++ b/content/08.annex.md
@@ -67,7 +67,6 @@ tools used in the CI automation are shown in section A1.2.
 | SQAaaS platform | pipeline composition | N.A.     | Pipeline composition for automatic tests     |
 | Jenkins CI service | Automated tests | N.A.       | Execution of automatic tests     |
 | Dockerhub       | Docker images      | **QC.Del** | Public repository of docker images     |
-| tox             | | **QC.Sty**/**QC.Uni**/**QC.Fun**/**QC.Sec**/**QC.Doc** | Automated test framework |
 
 Table: Tools and services used to implement the QA criteria, also shown the criteria where
 applicable. {#tbl:services}
@@ -87,3 +86,4 @@ applicable programming language. This list is based on the template file in
 | bandit      | **QC.Sec** | Python     | <https://bandit.readthedocs.io/>           | Static security |
 | pycodestyle | **QC.Sty** | Python     | <https://pycodestyle.pycqa.org/en/latest/> | Code style |
 | licensee    | **QC.Lic** | Agnostic   | <https://github.com/licensee/licensee>     | Check license |
+| tox             | | **QC.Sty**/**QC.Uni**/**QC.Fun**/**QC.Sec**/**QC.Doc** | Automated test framework |

From 529d7b3807d92e61280cea150d8c6626f58fb3d5 Mon Sep 17 00:00:00 2001
From: mariojmdavid <mariojmdavid@gmail.com>
Date: Wed, 2 Feb 2022 10:06:46 +0000
Subject: [PATCH 35/54] md table formating, add tox repo doc

---
 content/08.annex.md | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/content/08.annex.md b/content/08.annex.md
index 6ddd973..a001bdb 100644
--- a/content/08.annex.md
+++ b/content/08.annex.md
@@ -56,17 +56,17 @@ Regarding the CI/CD automation, Jenkins pipelines can be easily composed through
 and put into the git repositories to be used by the Jenkins CI service to perform the tests. The
 tools used in the CI automation are shown in section A1.2.
 
-| Service/Tool    | Usage              | Criteria   | Comment                                      |
-|:---------------:|:------------------:|:----------:|:--------------------------------------------:|
-| Github          | VCS                | **QC.Acc** | Source code repository - git                 |
-|                 | API                | **QC.Wor** | git branching management and version tagging |
-|                 | Issue tracker      | **QC.Man** | Track issues, bugs, new features, etc.       |
-|                 | Pull Requests (PR) | **QC.Man**, **QC.Rev** | Code review through PRs          |
-|                 | Documentation      | **QC.Doc** | Documentation present in VCS repository (markdown) |
-| Ansible, Galaxy | Install, Config    | **QC.Aud** | Automated deployment and configuration       |
-| SQAaaS platform | pipeline composition | N.A.     | Pipeline composition for automatic tests     |
-| Jenkins CI service | Automated tests | N.A.       | Execution of automatic tests     |
-| Dockerhub       | Docker images      | **QC.Del** | Public repository of docker images     |
+| Service/Tool       | Usage                | Criteria   | Comment                                      |
+|:------------------:|:--------------------:|:----------:|:--------------------------------------------:|
+| Github             | VCS                  | **QC.Acc** | Source code repository - git                 |
+|                    | API                  | **QC.Wor** | git branching management and version tagging |
+|                    | Issue tracker        | **QC.Man** | Track issues, bugs, new features, etc.       |
+|                    | Pull Requests (PR)   | **QC.Man**, **QC.Rev** | Code review through PRs          |
+|                    | Documentation        | **QC.Doc** | Documentation present in VCS repository (markdown) |
+| Ansible, Galaxy    | Install, Config      | **QC.Aud** | Automated deployment and configuration       |
+| SQAaaS platform    | pipeline composition | N.A.       | Pipeline composition for automatic tests     |
+| Jenkins CI service | Automated tests      | N.A.       | Execution of automatic tests                 |
+| Dockerhub          | Docker images        | **QC.Del** | Public repository of docker images           |
 
 Table: Tools and services used to implement the QA criteria, also shown the criteria where
 applicable. {#tbl:services}
@@ -86,4 +86,4 @@ applicable programming language. This list is based on the template file in
 | bandit      | **QC.Sec** | Python     | <https://bandit.readthedocs.io/>           | Static security |
 | pycodestyle | **QC.Sty** | Python     | <https://pycodestyle.pycqa.org/en/latest/> | Code style |
 | licensee    | **QC.Lic** | Agnostic   | <https://github.com/licensee/licensee>     | Check license |
-| tox             | | **QC.Sty**/**QC.Uni**/**QC.Fun**/**QC.Sec**/**QC.Doc** | Automated test framework |
+| tox         | **QC.Sty**/**QC.Uni**/**QC.Fun**/**QC.Sec**/**QC.Doc** | <https://tox.wiki/en/latest/> | Automated test framework |

From 64a193b0784ce0c057771592f1e196992ae05097 Mon Sep 17 00:00:00 2001
From: mariojmdavid <mariojmdavid@gmail.com>
Date: Wed, 2 Feb 2022 10:33:36 +0000
Subject: [PATCH 36/54] issue #77, spellcheck

---
 content/08.annex.md | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/content/08.annex.md b/content/08.annex.md
index a001bdb..272ac71 100644
--- a/content/08.annex.md
+++ b/content/08.annex.md
@@ -10,10 +10,10 @@ being developed in the framework of the EOSC-Synergy project described in Delive
 [@doi:10.20350/digitalCSIC/12721]). It details the architecture and set of components of the
 platform.
 
-This annnex details the code workflow, the tools and services used to achieve the verification of
+This annex details the code workflow, the tools and services used to achieve the verification of
 the Criteria.
 
-## A1.1. Code workflow, tools and services
+## A1.1. Code workflow
 
 The code workflow is shown in Figure @fig:workflow. It depicts a real case example, Github is used
 for several purposes that will be described below. The workflow start when the developer branches
@@ -30,11 +30,13 @@ The Pull Request is updated with the results of the tests, thus notifying the de
 they can proceed with the review and, if approved, with the release process where the branch is
 merge into the main production branch.
 
+![Code workflow](images/devops.png){height="500px"}{#fig:workflow}
+
+## A1.2. Services
+
 The SQAaaS platform can be used to compose custom Jenkins pipelines in an easy way, in order to
 implement all necessary checks of the baseline criteria.
 
-![Code workflow](images/devops.png){height="500px"}{#fig:workflow}
-
 Table @tbl:services shows the list of tools and services used for the source code management as well
 as to implement the verification of the Quality Criteria detailed in this document.
 
@@ -56,22 +58,22 @@ Regarding the CI/CD automation, Jenkins pipelines can be easily composed through
 and put into the git repositories to be used by the Jenkins CI service to perform the tests. The
 tools used in the CI automation are shown in section A1.2.
 
-| Service/Tool       | Usage                | Criteria   | Comment                                      |
-|:------------------:|:--------------------:|:----------:|:--------------------------------------------:|
-| Github             | VCS                  | **QC.Acc** | Source code repository - git                 |
-|                    | API                  | **QC.Wor** | git branching management and version tagging |
-|                    | Issue tracker        | **QC.Man** | Track issues, bugs, new features, etc.       |
-|                    | Pull Requests (PR)   | **QC.Man**, **QC.Rev** | Code review through PRs          |
-|                    | Documentation        | **QC.Doc** | Documentation present in VCS repository (markdown) |
-| Ansible, Galaxy    | Install, Config      | **QC.Aud** | Automated deployment and configuration       |
-| SQAaaS platform    | pipeline composition | N.A.       | Pipeline composition for automatic tests     |
-| Jenkins CI service | Automated tests      | N.A.       | Execution of automatic tests                 |
-| Dockerhub          | Docker images        | **QC.Del** | Public repository of docker images           |
+| Service            | Usage                | Criteria   |  Repo URL or documentation | Comment         |
+|:------------------:|:--------------------:|:----------:|:--------------------------:|:---------------:|
+| Github             | VCS                  | **QC.Acc** | <https://docs.github.com/> | Source code repository - git                 |
+|                    | API                  | **QC.Wor** | <https://docs.github.com/en/rest> | git branching management and version tagging |
+|                    | Issue tracker        | **QC.Man** | <https://docs.github.com/en/issues> | Track issues, bugs, new features, etc.       |
+|                    | Pull Requests (PR)   | **QC.Man**, **QC.Rev** | <https://docs.github.com/en/pull-requests> | Code review through PRs          |
+|                    | Documentation        | **QC.Doc** |  | Documentation present in VCS repository (markdown) |
+| Ansible, Galaxy    | Install, Config      | **QC.Aud** | <https://docs.ansible.com/> | Automated deployment and configuration       |
+| SQAaaS platform    | pipeline composition | N.A.       | <https://www.eosc-synergy.eu/home/software-services/> | Pipeline composition for automatic tests     |
+| Jenkins CI service | Automated tests      | N.A.       | <https://www.jenkins.io/> | Execution of automatic tests                 |
+| Dockerhub          | Docker images        | **QC.Del** | <https://hub.docker.com/> | Public repository of docker images           |
 
 Table: Tools and services used to implement the QA criteria, also shown the criteria where
 applicable. {#tbl:services}
 
-## A1.2. Tools for CI/CDD automation
+## A1.3. Tools for CI/CDD automation
 
 This section shows the tools being used in the CI pipelines, the criteria that it verifies,
 applicable programming language. This list is based on the template file in

From 54fc8d8df0a92ed5dfb3bc0a87d8a25a977459a0 Mon Sep 17 00:00:00 2001
From: mariojmdavid <mariojmdavid@gmail.com>
Date: Wed, 2 Feb 2022 10:53:08 +0000
Subject: [PATCH 37/54] issue #76

---
 content/08.annex.md | 45 ++++++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/content/08.annex.md b/content/08.annex.md
index 272ac71..5be975d 100644
--- a/content/08.annex.md
+++ b/content/08.annex.md
@@ -58,20 +58,23 @@ Regarding the CI/CD automation, Jenkins pipelines can be easily composed through
 and put into the git repositories to be used by the Jenkins CI service to perform the tests. The
 tools used in the CI automation are shown in section A1.2.
 
-| Service            | Usage                | Criteria   |  Repo URL or documentation | Comment         |
-|:------------------:|:--------------------:|:----------:|:--------------------------:|:---------------:|
-| Github             | VCS                  | **QC.Acc** | <https://docs.github.com/> | Source code repository - git                 |
-|                    | API                  | **QC.Wor** | <https://docs.github.com/en/rest> | git branching management and version tagging |
-|                    | Issue tracker        | **QC.Man** | <https://docs.github.com/en/issues> | Track issues, bugs, new features, etc.       |
-|                    | Pull Requests (PR)   | **QC.Man**, **QC.Rev** | <https://docs.github.com/en/pull-requests> | Code review through PRs          |
-|                    | Documentation        | **QC.Doc** |  | Documentation present in VCS repository (markdown) |
-| Ansible, Galaxy    | Install, Config      | **QC.Aud** | <https://docs.ansible.com/> | Automated deployment and configuration       |
-| SQAaaS platform    | pipeline composition | N.A.       | <https://www.eosc-synergy.eu/home/software-services/> | Pipeline composition for automatic tests     |
-| Jenkins CI service | Automated tests      | N.A.       | <https://www.jenkins.io/> | Execution of automatic tests                 |
-| Dockerhub          | Docker images        | **QC.Del** | <https://hub.docker.com/> | Public repository of docker images           |
+| Service            | Usage                 | Criteria   |  Repo URL or documentation                             | Comment                                      |
+|:------------------:|:---------------------:|:----------:|:------------------------------------------------------:|:--------------------------------------------:|
+| Github             | VCS                   | **QC.Acc** | <https://docs.github.com/>                             | Source code repository - git                 |
+| Github             | API                   | **QC.Wor** | <https://docs.github.com/en/rest>                      | git branching management and version tagging |
+| Github             | Issue tracker         | **QC.Man** | <https://docs.github.com/en/issues>                    | Track issues, bugs, new features, etc.       |
+| Github             | Pull Requests (PR)    | **QC.Man**, **QC.Rev** | <https://docs.github.com/en/pull-requests> | Code review through PRs                      |
+| Github             | Documentation         | **QC.Doc** |                                                        | Documentation present in VCS repository      |
+| Ansible, Galaxy    | Install, Config       | **QC.Aud** | <https://docs.ansible.com/>                            | Automated deployment and configuration       |
+| SQAaaS platform    | Pipeline composition  | **All** *  | <https://www.eosc-synergy.eu/home/software-services/>  | Pipeline composition for automatic tests     |
+| SQAaaS platform    | Assessment & awarding | **QC.Acc**, **QC.Doc**, **QC.Lic**, **QC.Met**  | <https://www.eosc-synergy.eu/eosc-synergy-quality-badges/>  | Bronze badge awarding |
+| Jenkins CI service | Automated tests       | **All** *  | <https://www.jenkins.io/>                              | Execution of automatic tests                 |
+| Dockerhub          | Docker images         | **QC.Del** | <https://hub.docker.com/>                              | Public repository of docker images           |
 
 Table: Tools and services used to implement the QA criteria, also shown the criteria where
-applicable. {#tbl:services}
+applicable. * All in the tooling;
+<https://github.com/EOSC-synergy/sqaaas-tooling/blob/staging/tooling.json#L305>. **QC.FAIR** -
+Criteria "FAIRness level of Digital Objects", are not covered in this document. {#tbl:services}
 
 ## A1.3. Tools for CI/CDD automation
 
@@ -79,13 +82,13 @@ This section shows the tools being used in the CI pipelines, the criteria that i
 applicable programming language. This list is based on the template file in
 <https://github.com/EOSC-synergy/sqa-composer-templates/blob/main/tooling.json>.
 
-| Tool        | Criteria   | Programming Language | Repo URL or documentation | Summary           |
-|:-----------:|:----------:|:--------------------:|:-------------------------:|:-----------------:|
-| pylint      | **QC.Sty** | Python     | <https://pylint.org/>                      | Code style |
-| hadolint    | **QC.Sty** | Dockerfile | <https://github.com/hadolint/hadolint>     | Code style |
-| checkstyle  | **QC.Sty** | Java       | <https://github.com/checkstyle/checkstyle> | Code style |
-| jsonlint    | **QC.Sty** | JSON       | <https://github.com/zaach/jsonlint>        | Code style |
-| bandit      | **QC.Sec** | Python     | <https://bandit.readthedocs.io/>           | Static security |
-| pycodestyle | **QC.Sty** | Python     | <https://pycodestyle.pycqa.org/en/latest/> | Code style |
-| licensee    | **QC.Lic** | Agnostic   | <https://github.com/licensee/licensee>     | Check license |
+| Tool        | Criteria   | Programming Language | Repo URL or documentation                  | Summary         |
+|:-----------:|:----------:|:--------------------:|:------------------------------------------:|:---------------:|
+| pylint      | **QC.Sty** | Python               | <https://pylint.org/>                      | Code style      |
+| hadolint    | **QC.Sty** | Dockerfile           | <https://github.com/hadolint/hadolint>     | Code style      |
+| checkstyle  | **QC.Sty** | Java                 | <https://github.com/checkstyle/checkstyle> | Code style      |
+| jsonlint    | **QC.Sty** | JSON                 | <https://github.com/zaach/jsonlint>        | Code style      |
+| bandit      | **QC.Sec** | Python               | <https://bandit.readthedocs.io/>           | Static security |
+| pycodestyle | **QC.Sty** | Python               | <https://pycodestyle.pycqa.org/en/latest/> | Code style      |
+| licensee    | **QC.Lic** | Agnostic             | <https://github.com/licensee/licensee>     | Check license   |
 | tox         | **QC.Sty**/**QC.Uni**/**QC.Fun**/**QC.Sec**/**QC.Doc** | <https://tox.wiki/en/latest/> | Automated test framework |

From 4e7330f6e6608969776e079b4d973a98bfee8775 Mon Sep 17 00:00:00 2001
From: mariojmdavid <mariojmdavid@gmail.com>
Date: Wed, 2 Feb 2022 11:45:19 +0000
Subject: [PATCH 38/54] update document log, issue #74

---
 content/02.document-log.md     | 2 +-
 content/06.quality_criteria.md | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/content/02.document-log.md b/content/02.document-log.md
index c11dae6..3f3ec7f 100644
--- a/content/02.document-log.md
+++ b/content/02.document-log.md
@@ -8,4 +8,4 @@
 | v3.1 | 05/03/2020 | Add tags/names for each criteria |
 | v3.2 | 23/04/2020 | Add EOSC-Synergy to copyright |
 | v3.3 | 15/10/2020 | Fix issues: #32, #46, #47, #48, #49, #51 |
-| v4.0 | 12/2021 | Add annex, spell check, Fix issues: #7, #35, #50, #57, #59, #60, #61, #63, #64, #65, #66 |
+| v4.0 | 02/02/2022 | Add annex, spell check, Fix issues: #7, #35, #50, #57, #59, #60, #61, #63, #64, #65, #66, #67, #69, #70, #71, #72, #73, #74, #75, #76, #77, #78 |
diff --git a/content/06.quality_criteria.md b/content/06.quality_criteria.md
index e73032a..c3e717f 100644
--- a/content/06.quality_criteria.md
+++ b/content/06.quality_criteria.md
@@ -350,8 +350,9 @@ set of change-based tests.
   * **[QC.Rev03.3]** Code analysis: useless statements in the code, library or modules imported but
     never used or code style suggestions.
 
-  * **[QC.Rev03.4]** Review of required tests: current battery of tests is sufficient for
-    validation.
+  * **[QC.Rev03.4]** Review of required tests: check if they include tests of the changes, such as
+    tests if new features or tests of bug fixing (regression tests), ensuring proper validation of
+    the changes.
 
   * **[QC.Rev03.5]** Review of documentation: whether the change **SHOULD** bring along a
     corresponding update in the documentation.

From 80ed2d62cd9b9663d93f1af505af70510240016c Mon Sep 17 00:00:00 2001
From: mariojmdavid <mariojmdavid@gmail.com>
Date: Wed, 2 Feb 2022 11:57:57 +0000
Subject: [PATCH 39/54] small fixes, spellcheck

---
 content/06.quality_criteria.md | 6 +++---
 content/08.annex.md            | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/content/06.quality_criteria.md b/content/06.quality_criteria.md
index c3e717f..4056c10 100644
--- a/content/06.quality_criteria.md
+++ b/content/06.quality_criteria.md
@@ -290,8 +290,8 @@ A change-based approach is accomplished with a branching model.
     operational performance of the software.
 
   * **[QC.Man01.2]** The description of an issue **SHOULD** be concise and state clearly the
-   problem. It is **RECOMMENDED** to add any reference to the actual problem. In the case of bugs, the
-   issue **SHOULD** be accompanied by the relevant debug information.
+   problem. It is **RECOMMENDED** to add any reference to the actual problem. In the case of bugs,
+   the issue **SHOULD** be accompanied by the relevant debug information.
          * The usage of templates for the issue description is **RECOMMENDED**.
 
 * **[QC.Man02]** In social coding environments, pull or merge requests represent the cornerstone of
@@ -351,7 +351,7 @@ set of change-based tests.
     never used or code style suggestions.
 
   * **[QC.Rev03.4]** Review of required tests: check if they include tests of the changes, such as
-    tests if new features or tests of bug fixing (regression tests), ensuring proper validation of
+    tests of new features, or tests of bug fixing (regression tests), ensuring proper validation of
     the changes.
 
   * **[QC.Rev03.5]** Review of documentation: whether the change **SHOULD** bring along a
diff --git a/content/08.annex.md b/content/08.annex.md
index 5be975d..86daeb4 100644
--- a/content/08.annex.md
+++ b/content/08.annex.md
@@ -91,4 +91,4 @@ applicable programming language. This list is based on the template file in
 | bandit      | **QC.Sec** | Python               | <https://bandit.readthedocs.io/>           | Static security |
 | pycodestyle | **QC.Sty** | Python               | <https://pycodestyle.pycqa.org/en/latest/> | Code style      |
 | licensee    | **QC.Lic** | Agnostic             | <https://github.com/licensee/licensee>     | Check license   |
-| tox         | **QC.Sty**/**QC.Uni**/**QC.Fun**/**QC.Sec**/**QC.Doc** | <https://tox.wiki/en/latest/> | Automated test framework |
+| tox         | **QC.Sty**, **QC.Uni**, **QC.Fun**, **QC.Sec**, **QC.Doc** | <https://tox.wiki/en/latest/> | Automated test framework |

From f7ce951f6aef292d5377bd3531e8de706b7b1c35 Mon Sep 17 00:00:00 2001
From: mariojmdavid <mariojmdavid@gmail.com>
Date: Wed, 2 Feb 2022 16:10:13 +0000
Subject: [PATCH 40/54] add authors

---
 content/metadata.yaml | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/content/metadata.yaml b/content/metadata.yaml
index a69bec6..378898e 100644
--- a/content/metadata.yaml
+++ b/content/metadata.yaml
@@ -20,6 +20,28 @@ authors:
     affiliations:
       - Spanish National Research Council (CSIC)
       - Institute of Physics of Cantabria (IFCA)
+  -
+    github: mariojmdavid
+    name: Mario David
+    orcid: 0000-0003-1802-5356
+    email: mario@lip.pt
+    affiliations:
+      - Laboratory of Instrumentation and Experimental Particle Physics (LIP)
+  -
+    name: Isabel Campos
+    github: isabel-campos-plasencia
+    orcid: 0000-0002-9350-0383
+    email: isabel@campos-it.es
+    affiliations:
+      - Spanish National Research Council (CSIC)
+      - Institute of Physics of Cantabria (IFCA)
+  -
+    name: Germán Moltó
+    github: gmolto
+    orcid: 0000-0002-8049-253X
+    email: gmolto@dsic.upv.es
+    affiliations:
+      - Universitat Politècnica de València (UPV)
   -
     github: alvaro.lopez
     name: Alvaro Lopez
@@ -35,13 +57,6 @@ authors:
     email: cristina.aiftimiei@cnaf.infn.it
     affiliations:
       -  National Institute of Nuclear Physics (INFN)
-  -
-    github: mariojmdavid
-    name: Mario David
-    orcid: 0000-0003-1802-5356
-    email: mario@lip.pt
-    affiliations:
-      - Laboratory of Instrumentation and Experimental Particle Physics (LIP)
   -
     github: jorge-lip
     name: Jorge Gomes

From f6c314173fcf71ba7dc2abacc025b7b717855c4e Mon Sep 17 00:00:00 2001
From: mariojmdavid <mariojmdavid@gmail.com>
Date: Wed, 2 Feb 2022 16:16:27 +0000
Subject: [PATCH 41/54] fix author email

---
 content/metadata.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/metadata.yaml b/content/metadata.yaml
index 378898e..b4ac9ff 100644
--- a/content/metadata.yaml
+++ b/content/metadata.yaml
@@ -24,7 +24,7 @@ authors:
     github: mariojmdavid
     name: Mario David
     orcid: 0000-0003-1802-5356
-    email: mario@lip.pt
+    email: david@lip.pt
     affiliations:
       - Laboratory of Instrumentation and Experimental Particle Physics (LIP)
   -

From 784bd851f0bd9bdc4143d0ac042e8681f53c61f9 Mon Sep 17 00:00:00 2001
From: mariojmdavid <mariojmdavid@gmail.com>
Date: Wed, 2 Feb 2022 16:19:07 +0000
Subject: [PATCH 42/54] fix in PR

---
 content/06.quality_criteria.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/06.quality_criteria.md b/content/06.quality_criteria.md
index 4056c10..44948f2 100644
--- a/content/06.quality_criteria.md
+++ b/content/06.quality_criteria.md
@@ -373,7 +373,7 @@ public repository of such artifacts and notification of the success of the proce
   * **[QC.Del01.1]** The built artifact **SHOULD** be as minimal as possible, including no more than
     the precise runtime environment and dependencies required for the execution of the software.
 
-* **[QC.Del02]** The builded artifact **MUST** be uploaded and registered into a public repository
+* **[QC.Del02]** The built artifact **MUST** be uploaded and registered into a public repository
   of such artifacts.
 
 * **[QC.Del03]** Upon success of the previous (**QC.Del02**) process, a notification **MUST** be

From d49693bc8e558b5b63d1638e77d155f978e8d814 Mon Sep 17 00:00:00 2001
From: mariojmdavid <mariojmdavid@gmail.com>
Date: Thu, 3 Feb 2022 08:38:05 +0000
Subject: [PATCH 43/54] add author

---
 content/metadata.yaml | 39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/content/metadata.yaml b/content/metadata.yaml
index b4ac9ff..d64c22c 100644
--- a/content/metadata.yaml
+++ b/content/metadata.yaml
@@ -13,16 +13,16 @@ keywords:
 lang: en-US
 authors:
   -
-    github: orviz
     name: Pablo Orviz
+    github: orviz
     orcid: 0000-0002-2473-6405
     email: orviz@ifca.unican.es
     affiliations:
       - Spanish National Research Council (CSIC)
       - Institute of Physics of Cantabria (IFCA)
   -
-    github: mariojmdavid
     name: Mario David
+    github: mariojmdavid
     orcid: 0000-0003-1802-5356
     email: david@lip.pt
     affiliations:
@@ -35,6 +35,13 @@ authors:
     affiliations:
       - Spanish National Research Council (CSIC)
       - Institute of Physics of Cantabria (IFCA)
+  -
+    name: Jorge Gomes
+    github: jorge-lip
+    orcid: 0000-0002-9142-2596
+    email: jorge@lip.pt
+    affiliations:
+      - Laboratory of Instrumentation and Experimental Particle Physics (LIP)
   -
     name: Germán Moltó
     github: gmolto
@@ -43,30 +50,30 @@ authors:
     affiliations:
       - Universitat Politècnica de València (UPV)
   -
-    github: alvaro.lopez
-    name: Alvaro Lopez
-    orcid: 0000-0002-0013-4602
-    email: aloga@ifca.unican.es
-    affiliations:
-      - Spanish National Research Council (CSIC)
-      - Institute of Physics of Cantabria (IFCA)
+    name: Vyacheslav Tykhonov
+    github: https://github.com/4tikhonov
+    orcid:  0000-0001-9447-9830 (https://orcid.org/0000-0001-9447-9830)
+    email: vyacheslav.tykhonov@dans.knaw.nl
+    affiliation:
+      - DANS-KNAW
   -
-    github: caifti
     name: Doina Cristina Duma
+    github: caifti
     orcid: 0000-0002-0124-4870
     email: cristina.aiftimiei@cnaf.infn.it
     affiliations:
       -  National Institute of Nuclear Physics (INFN)
   -
-    github: jorge-lip
-    name: Jorge Gomes
-    orcid: 0000-0002-9142-2596
-    email: jorge@lip.pt
+    name: Alvaro Lopez
+    github: alvaro.lopez
+    orcid: 0000-0002-0013-4602
+    email: aloga@ifca.unican.es
     affiliations:
-      - Laboratory of Instrumentation and Experimental Particle Physics (LIP)
+      - Spanish National Research Council (CSIC)
+      - Institute of Physics of Cantabria (IFCA)
   -
-    github:
     name: Giacinto Donvito
+    github:
     orcid: 0000-0002-0628-1080
     email: giacinto.donvito@ba.infn.it
     affiliations:

From f67f97cadb63ae8a606ab4fd60656aec24bc2654 Mon Sep 17 00:00:00 2001
From: mariojmdavid <mariojmdavid@gmail.com>
Date: Thu, 3 Feb 2022 08:40:30 +0000
Subject: [PATCH 44/54] fix author github username

---
 content/metadata.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/metadata.yaml b/content/metadata.yaml
index d64c22c..fd2a94f 100644
--- a/content/metadata.yaml
+++ b/content/metadata.yaml
@@ -51,8 +51,8 @@ authors:
       - Universitat Politècnica de València (UPV)
   -
     name: Vyacheslav Tykhonov
-    github: https://github.com/4tikhonov
-    orcid:  0000-0001-9447-9830 (https://orcid.org/0000-0001-9447-9830)
+    github: 4tikhonov
+    orcid:  0000-0001-9447-9830
     email: vyacheslav.tykhonov@dans.knaw.nl
     affiliation:
       - DANS-KNAW

From f7cde3e1f696c0ca57c96cfdd5f5eb66de9bda78 Mon Sep 17 00:00:00 2001
From: mariojmdavid <mariojmdavid@gmail.com>
Date: Thu, 3 Feb 2022 08:50:33 +0000
Subject: [PATCH 45/54] fix author affilitations

---
 content/metadata.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/metadata.yaml b/content/metadata.yaml
index fd2a94f..c0cc0aa 100644
--- a/content/metadata.yaml
+++ b/content/metadata.yaml
@@ -54,7 +54,7 @@ authors:
     github: 4tikhonov
     orcid:  0000-0001-9447-9830
     email: vyacheslav.tykhonov@dans.knaw.nl
-    affiliation:
+    affiliations:
       - DANS-KNAW
   -
     name: Doina Cristina Duma

From 2c45f7d3ca5f24dc75cbfa32aab6a25c4b500cf0 Mon Sep 17 00:00:00 2001
From: mariojmdavid <mariojmdavid@gmail.com>
Date: Thu, 3 Feb 2022 09:48:30 +0000
Subject: [PATCH 46/54] implement changes in PR

---
 content/08.annex.md | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/content/08.annex.md b/content/08.annex.md
index 86daeb4..130bf23 100644
--- a/content/08.annex.md
+++ b/content/08.annex.md
@@ -1,8 +1,8 @@
 # A1. Annex {.page_break_before}
 
-The Quality Criteria described in this document is abstract, as such the choice of tools and
-services to implement their verification and the code workflow, is up to the team or community
-developing and/or using a given software.
+The Quality Criteria described in this document follows a technology-agnostic approach, as such the
+choice of tools and services to implement their verification and the code workflow, is up to the
+team or community developing and/or using a given software.
 
 The annex describes the implementation of how the Quality Criteria detailed in this document can be
 verified. The technical implementation is achieved through the SQA as a Service (SQAaaS) platform,
@@ -40,7 +40,7 @@ implement all necessary checks of the baseline criteria.
 Table @tbl:services shows the list of tools and services used for the source code management as well
 as to implement the verification of the Quality Criteria detailed in this document.
 
-The main service used for Software source code management has been Github. It is uses git as Version
+The main service used for Software source code management has been Github. It uses git as Version
 Control System, branching and tag management. Additionally has an issue tracker for bugs, requests
 and enhancements and the mechanism of Pull Requests for code review and discussion of changes.
 
@@ -48,11 +48,12 @@ Ansible and Ansible-Galaxy are used in many software frameworks as deployment an
 tools.
 
 The software is packed/built into executable artifacts that can be RPMs (case of RedHat and
-derivative OS), DEBs (case of Debian/Ubuntu and derivatives) and in many cases into docker images.
+derivative OS), DEBs (case of Debian/Ubuntu and derivatives) and in many cases containers such as
+Docker images.
 
-The artifacts are provided, in general, by public repositories and most notably Dockerhub in the
-case of docker images. Other common repositories are PyPI for python SW or modules and Maven for
-Java.
+The artifacts are provided, in general, by public repositories and most notably Docker Hub
+[@url:https://hub.docker.com/] in the case of Docker images. Other common repositories are PyPI
+[@url:https://pypi.org/] for python SW and Maven [@url:https://maven.apache.org/] for Java.
 
 Regarding the CI/CD automation, Jenkins pipelines can be easily composed through the SQAaaS platform
 and put into the git repositories to be used by the Jenkins CI service to perform the tests. The
@@ -66,10 +67,10 @@ tools used in the CI automation are shown in section A1.2.
 | Github             | Pull Requests (PR)    | **QC.Man**, **QC.Rev** | <https://docs.github.com/en/pull-requests> | Code review through PRs                      |
 | Github             | Documentation         | **QC.Doc** |                                                        | Documentation present in VCS repository      |
 | Ansible, Galaxy    | Install, Config       | **QC.Aud** | <https://docs.ansible.com/>                            | Automated deployment and configuration       |
-| SQAaaS platform    | Pipeline composition  | **All** *  | <https://www.eosc-synergy.eu/home/software-services/>  | Pipeline composition for automatic tests     |
-| SQAaaS platform    | Assessment & awarding | **QC.Acc**, **QC.Doc**, **QC.Lic**, **QC.Met**  | <https://www.eosc-synergy.eu/eosc-synergy-quality-badges/>  | Bronze badge awarding |
+| SQAaaS platform    | Pipeline composition  | **All** *  | <https://sqaaas.eosc-synergy.eu>                       | Pipeline composition for automatic tests     |
+| SQAaaS platform    | Assessment & awarding | **QC.Acc**, **QC.Doc**, **QC.Lic**, **QC.Met** | <https://sqaaas.eosc-synergy.eu>  | Bronze badge awarding         |
 | Jenkins CI service | Automated tests       | **All** *  | <https://www.jenkins.io/>                              | Execution of automatic tests                 |
-| Dockerhub          | Docker images         | **QC.Del** | <https://hub.docker.com/>                              | Public repository of docker images           |
+| Dockerhub          | Docker images         | **QC.Del** | <https://hub.docker.com/>                              | Public repository of Docker images           |
 
 Table: Tools and services used to implement the QA criteria, also shown the criteria where
 applicable. * All in the tooling;

From 9d98333ffcbf7ebcb17ea4e213aaa62ec757adb2 Mon Sep 17 00:00:00 2001
From: mariojmdavid <mariojmdavid@gmail.com>
Date: Thu, 3 Feb 2022 10:27:34 +0000
Subject: [PATCH 47/54] issue #81

---
 content/02.document-log.md |  2 +-
 content/08.annex.md        | 27 +++++++++++++++++----------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/content/02.document-log.md b/content/02.document-log.md
index 3f3ec7f..f330772 100644
--- a/content/02.document-log.md
+++ b/content/02.document-log.md
@@ -8,4 +8,4 @@
 | v3.1 | 05/03/2020 | Add tags/names for each criteria |
 | v3.2 | 23/04/2020 | Add EOSC-Synergy to copyright |
 | v3.3 | 15/10/2020 | Fix issues: #32, #46, #47, #48, #49, #51 |
-| v4.0 | 02/02/2022 | Add annex, spell check, Fix issues: #7, #35, #50, #57, #59, #60, #61, #63, #64, #65, #66, #67, #69, #70, #71, #72, #73, #74, #75, #76, #77, #78 |
+| v4.0 | 02/02/2022 | Add annex, spell check, Fix issues: #7, #35, #50, #57, #59, #60, #61, #63, #64, #65, #66, #67, #69, #70, #71, #72, #73, #74, #75, #76, #77, #78, #81 |
diff --git a/content/08.annex.md b/content/08.annex.md
index 130bf23..6a71544 100644
--- a/content/08.annex.md
+++ b/content/08.annex.md
@@ -83,13 +83,20 @@ This section shows the tools being used in the CI pipelines, the criteria that i
 applicable programming language. This list is based on the template file in
 <https://github.com/EOSC-synergy/sqa-composer-templates/blob/main/tooling.json>.
 
-| Tool        | Criteria   | Programming Language | Repo URL or documentation                  | Summary         |
-|:-----------:|:----------:|:--------------------:|:------------------------------------------:|:---------------:|
-| pylint      | **QC.Sty** | Python               | <https://pylint.org/>                      | Code style      |
-| hadolint    | **QC.Sty** | Dockerfile           | <https://github.com/hadolint/hadolint>     | Code style      |
-| checkstyle  | **QC.Sty** | Java                 | <https://github.com/checkstyle/checkstyle> | Code style      |
-| jsonlint    | **QC.Sty** | JSON                 | <https://github.com/zaach/jsonlint>        | Code style      |
-| bandit      | **QC.Sec** | Python               | <https://bandit.readthedocs.io/>           | Static security |
-| pycodestyle | **QC.Sty** | Python               | <https://pycodestyle.pycqa.org/en/latest/> | Code style      |
-| licensee    | **QC.Lic** | Agnostic             | <https://github.com/licensee/licensee>     | Check license   |
-| tox         | **QC.Sty**, **QC.Uni**, **QC.Fun**, **QC.Sec**, **QC.Doc** | <https://tox.wiki/en/latest/> | Automated test framework |
+| Tool         | Criteria   | Programming Language | Repo URL or documentation                  | Summary         |
+|:------------:|:----------:|:--------------------:|:------------------------------------------:|:---------------:|
+| git          | **QC.Acc** | Agnostic             | <https://git-scm.com/>                     | Code Accessibility |
+| pylint       | **QC.Sty** | Python               | <https://pylint.org/>                      | Code style      |
+| hadolint     | **QC.Sty** | Dockerfile           | <https://github.com/hadolint/hadolint>     | Code style      |
+| checkstyle   | **QC.Sty** | Java                 | <https://github.com/checkstyle/checkstyle> | Code style      |
+| jsonlint     | **QC.Sty** | JSON                 | <https://github.com/zaach/jsonlint>        | Code style      |
+| bandit       | **QC.Sec** | Python               | <https://bandit.readthedocs.io/>           | Static security |
+| pycodestyle  | **QC.Sty** | Python               | <https://pycodestyle.pycqa.org/en/latest/> | Code style      |
+| tox          | **QC.Sty**, **QC.Uni**, **QC.Fun**, **QC.Sec**, **QC.Doc** | <https://tox.readthedocs.io/>         | Automated test framework |
+| licensee     | **QC.Lic** | Agnostic             | <https://github.com/licensee/licensee>     | Check license   |
+| checkLicense | **QC.Lic** | Agnostic             | <https://github.com/EOSC-synergy/sqa-composer-templates/tree/main/QC.Lic> | Check license |
+| cff-converter-python  | **QC.Met** | Agnostic     | <https://github.com/citation-file-format/cff-converter-python>            | Code metadata |
+| checkCitable | **QC.Met** | Agnostic             | <https://github.com/EOSC-synergy/sqa-composer-templates/tree/main/QC.Met> | Code metadata |
+| markdownlint | **QC.Doc** | Markdown             | <https://github.com/markdownlint/markdownlint> | Documentation |
+| restructuredtext-lint | **QC.Doc** | reStructuredText | <https://github.com/twolfson/restructuredtext-lint> | Documentation |
+| find_doc_files.py | **QC.Doc** | Agnostic     | <https://github.com/EOSC-synergy/sqa-composer-templates/tree/main/QC.Doc/find_doc_files.py> | Documentation |

From a6fe99b9c8f381c2f8b9b670f298d58614aa786b Mon Sep 17 00:00:00 2001
From: Pablo Orviz <orviz@ifca.unican.es>
Date: Thu, 3 Feb 2022 12:33:57 +0100
Subject: [PATCH 48/54] Add PyPI and Maven repos to the table

---
 content/08.annex.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/content/08.annex.md b/content/08.annex.md
index 86daeb4..39abb6f 100644
--- a/content/08.annex.md
+++ b/content/08.annex.md
@@ -70,6 +70,8 @@ tools used in the CI automation are shown in section A1.2.
 | SQAaaS platform    | Assessment & awarding | **QC.Acc**, **QC.Doc**, **QC.Lic**, **QC.Met**  | <https://www.eosc-synergy.eu/eosc-synergy-quality-badges/>  | Bronze badge awarding |
 | Jenkins CI service | Automated tests       | **All** *  | <https://www.jenkins.io/>                              | Execution of automatic tests                 |
 | Dockerhub          | Docker images         | **QC.Del** | <https://hub.docker.com/>                              | Public repository of docker images           |
+| PyPI               | Python packages       | **QC.Del** | <https://pypi.org/>                                    | Find, install & publish Python packages |
+| Maven              | Java artifacts        | **QC.Del** | <https://mvnrepository.com/>                           | Repository for Java dependencies |
 
 Table: Tools and services used to implement the QA criteria, also shown the criteria where
 applicable. * All in the tooling;

From 8667313ce761a1b6a95cb8c043e8338336ce7a34 Mon Sep 17 00:00:00 2001
From: Pablo Orviz <orviz@ifca.unican.es>
Date: Thu, 3 Feb 2022 12:38:04 +0100
Subject: [PATCH 49/54] Add a new section for V&V

---
 content/08.annex.md | 48 +++++++++++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/content/08.annex.md b/content/08.annex.md
index 39abb6f..3f4bafd 100644
--- a/content/08.annex.md
+++ b/content/08.annex.md
@@ -1,17 +1,11 @@
 # A1. Annex {.page_break_before}
 
 The Quality Criteria described in this document is abstract, as such the choice of tools and
-services to implement their verification and the code workflow, is up to the team or community
-developing and/or using a given software.
+services to implement the code workflow, followed by the verification & validation processes,
+is up to the team or community developing and/or using a given software.
 
-The annex describes the implementation of how the Quality Criteria detailed in this document can be
-verified. The technical implementation is achieved through the SQA as a Service (SQAaaS) platform,
-being developed in the framework of the EOSC-Synergy project described in Deliverable 3.2
-[@doi:10.20350/digitalCSIC/12721]). It details the architecture and set of components of the
-platform.
-
-This annex details the code workflow, the tools and services used to achieve the verification of
-the Criteria.
+This annex describes an implementation approach to help software developers cover the Quality
+Criteria detailed in this document.
 
 ## A1.1. Code workflow
 
@@ -32,17 +26,33 @@ merge into the main production branch.
 
 ![Code workflow](images/devops.png){height="500px"}{#fig:workflow}
 
-## A1.2. Services
+## A1.2. Verification & Validation (V&V)
+
+Once having the code workflow, the next step is to shape the V&V processes in order to ensure that
+the software does "the right things right". One way to address them is to rely on CI/CD pipelines
+that encompass the series of checks that will be executed automatically for each change done in
+the code, driven by the agreed code workflow (see A1.1).
+
+There are multiple technological solutions to compose CI/CD pipelines. The **SQA as a Service
+(SQAaaS)** platform[^1] aids developers in such task, with the additional benefit of being 100%
+aligned with the criteria being described in this document. The SQAaaS solution relies on Jenkins
+code pipelines [link] and allows developers to use either a graphical (web-based) or code-based
+approach to define the work to be performed in each stage of the CI/CD pipeline.
+
+[^1]: The SQAaaS platform is being developed in the framework of the EOSC-Synergy project described
+in Deliverable 3.2 [@doi:10.20350/digitalCSIC/12721]). It details the architecture and set of
+components of the platform.
 
-The SQAaaS platform can be used to compose custom Jenkins pipelines in an easy way, in order to
-implement all necessary checks of the baseline criteria.
+## A1.3. Services
 
-Table @tbl:services shows the list of tools and services used for the source code management as well
-as to implement the verification of the Quality Criteria detailed in this document.
+As it can be seen in Figure @fig:workflow, multiple services take part in the execution of the
+CI/CD pipelines. Table @tbl:services shows the list of services used for the source code management
+as well as to implement the V&V of the Quality Criteria detailed in this document.
 
-The main service used for Software source code management has been Github. It is uses git as Version
-Control System, branching and tag management. Additionally has an issue tracker for bugs, requests
-and enhancements and the mechanism of Pull Requests for code review and discussion of changes.
+One of the most popular services for Software source code management is Github. It is uses Git
+as the Version Control System, branching and tag management. Additionally has an issue tracker for
+bugs, requests and enhancements and the mechanism of Pull Requests for code review and discussion
+of changes.
 
 Ansible and Ansible-Galaxy are used in many software frameworks as deployment and configuration
 tools.
@@ -78,7 +88,7 @@ applicable. * All in the tooling;
 <https://github.com/EOSC-synergy/sqaaas-tooling/blob/staging/tooling.json#L305>. **QC.FAIR** -
 Criteria "FAIRness level of Digital Objects", are not covered in this document. {#tbl:services}
 
-## A1.3. Tools for CI/CDD automation
+## A1.4. Tools for CI/CDD automation
 
 This section shows the tools being used in the CI pipelines, the criteria that it verifies,
 applicable programming language. This list is based on the template file in

From 433e2ec817b3190f9ea152b9855ebabcaa626d79 Mon Sep 17 00:00:00 2001
From: Pablo Orviz <orviz@ifca.unican.es>
Date: Thu, 3 Feb 2022 12:38:51 +0100
Subject: [PATCH 50/54] CI/CD involves both deployment & delivery

---
 content/08.annex.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/08.annex.md b/content/08.annex.md
index 3f4bafd..aa79087 100644
--- a/content/08.annex.md
+++ b/content/08.annex.md
@@ -88,7 +88,7 @@ applicable. * All in the tooling;
 <https://github.com/EOSC-synergy/sqaaas-tooling/blob/staging/tooling.json#L305>. **QC.FAIR** -
 Criteria "FAIRness level of Digital Objects", are not covered in this document. {#tbl:services}
 
-## A1.4. Tools for CI/CDD automation
+## A1.4. Tools for CI/CD
 
 This section shows the tools being used in the CI pipelines, the criteria that it verifies,
 applicable programming language. This list is based on the template file in

From 40c7e8b9249b98a03d4c015751651cca355da434 Mon Sep 17 00:00:00 2001
From: mariojmdavid <mariojmdavid@gmail.com>
Date: Thu, 3 Feb 2022 15:33:09 +0000
Subject: [PATCH 51/54] issue #80

---
 content/06.quality_criteria.md | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/content/06.quality_criteria.md b/content/06.quality_criteria.md
index 44948f2..b6f2cec 100644
--- a/content/06.quality_criteria.md
+++ b/content/06.quality_criteria.md
@@ -181,26 +181,29 @@ software being developed first and test cases created later.
   according to the software component specification. The identified types of documentation and their
   RECOMMENDED content are:
 
-  * **[QC.Doc06.1]** README file
+  * **[QC.Doc06.1]** README file **MUST** be present:
 
     * One-paragraph description of the application.
     * A *"Getting Started"* step-by-step description on how to get a development environment running
       (prerequisites, installation).
     * Automated test execution how-to.
     * Links to the external documentation below (production deployment, user guides).
-    * Contributing code of conduct (optionally linked to an external CONTRIBUTING file)
     * Versioning specification.
     * Author list and contacts.
-    * License information, with a link to the detailed description in an external LICENSE file.
     * Acknowledgments.
 
-  * **[QC.Doc06.2]** Developer
+  * **[QC.Doc06.2]** CONTRIBUTING file **MUST** be present, details how external parties can
+    contribute to the code and the code of conduct.
+
+  * **[QC.Doc06.3]** LICENSE file **MUST** be present, License information with detailed description.
+
+  * **[QC.Doc06.4]** Developer
 
     * Private API documentation.
     * Structure and interfaces.
     * Build documentation.
 
-  * **[QC.Doc06.3]** Deployment and Administration
+  * **[QC.Doc06.5]** Deployment and Administration
 
     * Installation and configuration guides.
     * Service Reference Card, with the following RECOMMENDED content:
@@ -215,7 +218,7 @@ software being developed first and test cases created later.
     * Security information.
     * FAQs and troubleshooting.
 
-  * **[QC.Doc06.4]** User
+  * **[QC.Doc06.6]** User
 
     * Public API documentation.
     * Command Line Interface (CLI) reference.

From 8b6c327960cb69f5286afeff8ee37f27db96240d Mon Sep 17 00:00:00 2001
From: Pablo Orviz <orviz@ifca.unican.es>
Date: Thu, 3 Feb 2022 19:01:01 +0100
Subject: [PATCH 52/54] Minor fix

---
 content/08.annex.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/08.annex.md b/content/08.annex.md
index 076af4b..452430e 100644
--- a/content/08.annex.md
+++ b/content/08.annex.md
@@ -10,7 +10,7 @@ Criteria detailed in this document.
 ## A1.1. Code workflow
 
 The code workflow is shown in Figure @fig:workflow. It depicts a real case example, Github is used
-for several purposes that will be described below. The workflow start when the developer branches
+for several purposes that will be described below. The workflow starts when the developer branches
 the code to implement a given new feature or fix, after the implementation the Pull Request triggers
 a CI pipeline in the Jenkins service.
 

From d345015ca40511a1fd42714bb2b8e779364fc055 Mon Sep 17 00:00:00 2001
From: Pablo Orviz <orviz@ifca.unican.es>
Date: Thu, 3 Feb 2022 19:01:15 +0100
Subject: [PATCH 53/54] Add jenkins code pipelines link

---
 content/08.annex.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/content/08.annex.md b/content/08.annex.md
index 452430e..3173aa2 100644
--- a/content/08.annex.md
+++ b/content/08.annex.md
@@ -36,8 +36,9 @@ the code, driven by the agreed code workflow (see A1.1).
 There are multiple technological solutions to compose CI/CD pipelines. The **SQA as a Service
 (SQAaaS)** platform[^1] aids developers in such task, with the additional benefit of being 100%
 aligned with the criteria being described in this document. The SQAaaS solution relies on Jenkins
-code pipelines [link] and allows developers to use either a graphical (web-based) or code-based
-approach to define the work to be performed in each stage of the CI/CD pipeline.
+code pipelines [@url:https://www.jenkins.io/doc/book/pipeline/] and allows developers to use either
+a graphical (web-based) or code-based approach to define the work to be performed in each stage of
+the CI/CD pipeline.
 
 [^1]: The SQAaaS platform is being developed in the framework of the EOSC-Synergy project described
 in Deliverable 3.2 [@doi:10.20350/digitalCSIC/12721]). It details the architecture and set of

From e559356b572c58f236c5b80070f923e09e8b09a7 Mon Sep 17 00:00:00 2001
From: mariojmdavid <mariojmdavid@gmail.com>
Date: Fri, 4 Feb 2022 11:40:00 +0000
Subject: [PATCH 54/54] update document log

---
 content/02.document-log.md | 2 +-
 content/08.annex.md        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/content/02.document-log.md b/content/02.document-log.md
index f330772..c85b877 100644
--- a/content/02.document-log.md
+++ b/content/02.document-log.md
@@ -8,4 +8,4 @@
 | v3.1 | 05/03/2020 | Add tags/names for each criteria |
 | v3.2 | 23/04/2020 | Add EOSC-Synergy to copyright |
 | v3.3 | 15/10/2020 | Fix issues: #32, #46, #47, #48, #49, #51 |
-| v4.0 | 02/02/2022 | Add annex, spell check, Fix issues: #7, #35, #50, #57, #59, #60, #61, #63, #64, #65, #66, #67, #69, #70, #71, #72, #73, #74, #75, #76, #77, #78, #81 |
+| v4.0 | 02/02/2022 | Add annex, spell check, Fix issues: #7, #35, #50, #57, #59, #60, #61, #63, #64, #65, #66, #67, #69, #70, #71, #72, #73, #74, #75, #76, #77, #78, #80, #81 |
diff --git a/content/08.annex.md b/content/08.annex.md
index 3173aa2..05014e7 100644
--- a/content/08.annex.md
+++ b/content/08.annex.md
@@ -26,7 +26,7 @@ merge into the main production branch.
 
 ![Code workflow](images/devops.png){height="500px"}{#fig:workflow}
 
-## A1.2. Verification & Validation (V&V)
+## A1.2. Verification & Validation (V&V) {.page_break_before}
 
 Once having the code workflow, the next step is to shape the V&V processes in order to ensure that
 the software does "the right things right". One way to address them is to rely on CI/CD pipelines
@@ -71,7 +71,7 @@ and put into the git repositories to be used by the Jenkins CI service to perfor
 tools used in the CI automation are shown in section A1.2.
 
 | Service            | Usage                 | Criteria   |  Repo URL or documentation                             | Comment                                      |
-|:------------------:|:---------------------:|:----------:|:------------------------------------------------------:|:--------------------------------------------:|
+|--------------------|-----------------------|------------|--------------------------------------------------------|----------------------------------------------|
 | Github             | VCS                   | **QC.Acc** | <https://docs.github.com/>                             | Source code repository - git                 |
 | Github             | API                   | **QC.Wor** | <https://docs.github.com/en/rest>                      | git branching management and version tagging |
 | Github             | Issue tracker         | **QC.Man** | <https://docs.github.com/en/issues>                    | Track issues, bugs, new features, etc.       |
@@ -79,7 +79,7 @@ tools used in the CI automation are shown in section A1.2.
 | Github             | Documentation         | **QC.Doc** |                                                        | Documentation present in VCS repository      |
 | Ansible, Galaxy    | Install, Config       | **QC.Aud** | <https://docs.ansible.com/>                            | Automated deployment and configuration       |
 | SQAaaS platform    | Pipeline composition  | **All** *  | <https://sqaaas.eosc-synergy.eu>                       | Pipeline composition for automatic tests     |
-| SQAaaS platform    | Assessment & awarding | **QC.Acc**, **QC.Doc**, **QC.Lic**, **QC.Met** | <https://sqaaas.eosc-synergy.eu>  | Bronze badge awarding         |
+| SQAaaS platform    | Assessment & awarding | **QC.Acc**, **QC.Doc**, **QC.Lic**, **QC.Met** | <https://sqaaas.eosc-synergy.eu> | Bronze badge awarding         |
 | Jenkins CI service | Automated tests       | **All** *  | <https://www.jenkins.io/>                              | Execution of automatic tests                 |
 | Docker Hub         | Docker images         | **QC.Del** | <https://hub.docker.com/>                              | Public repository of Docker images           |
 | PyPI               | Python packages       | **QC.Del** | <https://pypi.org/>                                    | Find, install & publish Python packages |