From 276258e118c4cf7bbafa4c9c2a13793cb786608b Mon Sep 17 00:00:00 2001
From: skyanth <skyanth@gmail.com>
Date: Tue, 4 Jun 2019 14:57:50 +0200
Subject: [PATCH] added invalid link error message

---
 xml/xslt/fo_inline.xslt           | 377 ++++++++++++++++++++++++++++++
 xml/xslt/generate_html_report.xsl | 135 +----------
 xml/xslt/generate_report.xsl      |   2 +-
 xml/xslt/html_inline.xslt         | 148 ++++++++++++
 xml/xslt/inline.xslt              | 373 +----------------------------
 5 files changed, 535 insertions(+), 500 deletions(-)
 create mode 100644 xml/xslt/fo_inline.xslt
 create mode 100644 xml/xslt/html_inline.xslt

diff --git a/xml/xslt/fo_inline.xslt b/xml/xslt/fo_inline.xslt
new file mode 100644
index 0000000..15bea96
--- /dev/null
+++ b/xml/xslt/fo_inline.xslt
@@ -0,0 +1,377 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:fo="http://www.w3.org/1999/XSL/Format"
+    exclude-result-prefixes="xs"
+    version="2.0">
+    
+    <xsl:import href="inline.xslt"/>
+    
+        <xsl:template match="a">
+        <xsl:param name="execsummary" tunnel="yes"/>
+        <xsl:variable name="destination">
+            <xsl:choose>
+                <xsl:when test="starts-with(@href, '#')">
+                    <xsl:value-of select="substring(@href, 2)"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="@href"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:variable>
+        <xsl:call-template name="checkLinkValidity"/>
+        <xsl:choose>
+            <xsl:when test="starts-with(@href, '#') and not(//*[@id = $destination])">
+                <fo:inline xsl:use-attribute-sets="errortext">WARNING: LINK TARGET NOT FOUND IN
+                    DOCUMENT</fo:inline>
+            </xsl:when>
+            <xsl:when
+                test="(starts-with(@href, '#') and //*[@id = $destination][ancestor-or-self::*[@visibility = 'hidden']])">
+                <fo:inline xsl:use-attribute-sets="errortext">WARNING: LINK TARGET IS
+                    HIDDEN</fo:inline>
+            </xsl:when>
+            <xsl:when
+                test="starts-with(@href, '#') and $execsummary = true() and //*[@id = $destination][ancestor-or-self::*[not(@inexecsummary = 'yes')]]">
+                <!-- linking to something that is not in the exec summary -->
+                <xsl:value-of select="local-name(*[@id = $destination])"/>
+                <xsl:text> </xsl:text>
+                <xsl:call-template name="linkText">
+                    <xsl:with-param name="destination" select="$destination"/>
+                    <xsl:with-param name="execsummary_linking_to_content_not_in_report" select="true()"></xsl:with-param>
+                </xsl:call-template>
+            </xsl:when>
+            <xsl:otherwise>
+                <fo:basic-link xsl:use-attribute-sets="link">
+                    <xsl:choose>
+                        <xsl:when test="starts-with(@href, '#')">
+                            <xsl:attribute name="internal-destination">
+                                <xsl:value-of select="$destination"/>
+                            </xsl:attribute>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:attribute name="external-destination">
+                                <xsl:value-of select="$destination"/>
+                            </xsl:attribute>
+                        </xsl:otherwise>
+                    </xsl:choose>
+                    <xsl:call-template name="linkText">
+                        <xsl:with-param name="destination" select="$destination"/>
+                    </xsl:call-template>
+                </fo:basic-link>
+                <xsl:if test="starts-with(@href, '#')">
+                    <xsl:if test="not(@includepage = 'no')">
+                        <xsl:text> (page </xsl:text>
+                        <fo:page-number-citation ref-id="{substring(@href, 2)}"/>
+                        <xsl:text>)</xsl:text>
+                    </xsl:if>
+                </xsl:if>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+
+    <xsl:template name="linkText">
+        <xsl:param name="execsummary_linking_to_content_not_in_report" select="false()"/>
+        <xsl:param name="destination"/>
+        <xsl:choose>
+            <xsl:when test="starts-with(@href, '#') and not(text())">
+                <xsl:for-each select="key('rosid', $destination)">
+                    <xsl:choose>
+                    <xsl:when test="$execsummary_linking_to_content_not_in_report = false()">
+                    <xsl:if test="not(local-name() = 'appendix' or local-name() = 'finding')">
+                        <!-- appendix already has 'appendix' as part of its numbering, findings should not be prefixed with the word 'finding' -->
+                        <xsl:value-of select="local-name()"/>
+                        <xsl:text> </xsl:text>
+                    </xsl:if>
+                    <xsl:apply-templates select="." mode="number"/>
+                        </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:if test="not(local-name() = 'appendix')">
+                        <!-- appendix already has 'appendix' as part of its numbering, findings should not be prefixed with the word 'finding' -->
+                        <xsl:value-of select="local-name()"/>
+                        <xsl:text> </xsl:text>
+                    </xsl:if>
+                    <xsl:apply-templates select="." mode="number"/>
+                    </xsl:otherwise>
+                </xsl:choose>
+                </xsl:for-each>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:apply-templates select="* | text()"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+
+    <xsl:template match="a" mode="summarytable">
+        <xsl:variable name="destination">
+            <xsl:choose>
+                <xsl:when test="starts-with(@href, '#')">
+                    <xsl:value-of select="substring(@href, 2)"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="@href"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:variable>
+        <fo:basic-link xsl:use-attribute-sets="link">
+            <xsl:choose>
+                <xsl:when test="starts-with(@href, '#')">
+                    <xsl:attribute name="internal-destination">
+                        <xsl:value-of select="$destination"/>
+                    </xsl:attribute>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:attribute name="external-destination">
+                        <xsl:value-of select="$destination"/>
+                    </xsl:attribute>
+                </xsl:otherwise>
+            </xsl:choose>
+            <xsl:choose>
+                <xsl:when test="starts-with(@href, '#') and not(text())">
+                    <xsl:for-each select="key('rosid', $destination)">
+                        <xsl:if test="not(local-name() = 'appendix' or local-name() = 'finding')">
+                            <!-- appendix already has 'appendix' as part of its numbering, findings should not be prefixed with the word 'finding' -->
+                            <xsl:value-of select="local-name()"/>
+                            <xsl:text> </xsl:text>
+                        </xsl:if>
+                        <xsl:apply-templates select="." mode="number"/>
+                    </xsl:for-each>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:apply-templates select="* | text()"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </fo:basic-link>
+    </xsl:template>
+
+    <xsl:template match="b">
+        <fo:inline xsl:use-attribute-sets="bold">
+            <xsl:apply-templates/>
+        </fo:inline>
+    </xsl:template>
+
+    <xsl:template match="i">
+        <fo:inline xsl:use-attribute-sets="italic">
+            <xsl:apply-templates/>
+        </fo:inline>
+    </xsl:template>
+
+    <xsl:template match="u">
+        <fo:inline xsl:use-attribute-sets="underline">
+            <xsl:apply-templates/>
+        </fo:inline>
+    </xsl:template>
+
+    <xsl:template match="code">
+        <xsl:choose>
+            <xsl:when test="ancestor::title">
+                <fo:inline xsl:use-attribute-sets="code-title">
+                    <xsl:apply-templates/>
+                </fo:inline>
+            </xsl:when>
+            <xsl:when test="ancestor::pre">
+                <!-- <code> in <pre> is just <pre> -->
+                <xsl:apply-templates/>
+            </xsl:when>
+            <xsl:otherwise>
+                <fo:inline xsl:use-attribute-sets="code">
+                    <xsl:apply-templates/>
+                </fo:inline>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+
+    <xsl:template match="sup">
+        <fo:inline xsl:use-attribute-sets="sup">
+            <xsl:apply-templates/>
+        </fo:inline>
+    </xsl:template>
+
+    <xsl:template match="sub">
+        <fo:inline xsl:use-attribute-sets="sub">
+            <xsl:apply-templates/>
+        </fo:inline>
+    </xsl:template>
+
+    <xsl:template match="fnref">
+        <xsl:variable name="fnCount" select="count(preceding::fnref) + 1"/>
+        <fo:footnote>
+            <fo:inline xsl:use-attribute-sets="sup">
+                <xsl:value-of select="$fnCount"/>
+                <xsl:text>&#160;</xsl:text>
+            </fo:inline>
+            <fo:footnote-body xsl:use-attribute-sets="TinyFont">
+                <fo:block>
+                    <fo:inline xsl:use-attribute-sets="sup">
+                        <xsl:value-of select="$fnCount"/>
+                    </fo:inline>
+                    <xsl:apply-templates/>
+                </fo:block>
+            </fo:footnote-body>
+        </fo:footnote>
+    </xsl:template>
+
+    <xsl:template match="bibref">
+        <xsl:variable name="bibid" select="./@ref"/>
+        <xsl:variable name="bibCount" select="count(preceding::biblioentry[@id = $bibid]) + 1"/>
+        <xsl:choose>
+            <xsl:when test="starts-with(@href, '#') and not(//*[@id = $bibid])">
+                <fo:inline xsl:use-attribute-sets="errortext">WARNING: BIBLIOGRAPHY ENTRY NOT FOUND
+                    IN DOCUMENT</fo:inline>
+            </xsl:when>
+            <xsl:when
+                test="starts-with(@href, '#') and //*[@id = $bibid][ancestor-or-self::*[@visibility = 'hidden']]">
+                <fo:inline xsl:use-attribute-sets="errortext">WARNING: BIBLIOGRAPHY ENTRY IS
+                    HIDDEN</fo:inline>
+            </xsl:when>
+            <xsl:otherwise>
+                <fo:basic-link>
+                    <xsl:attribute name="internal-destination">
+                        <xsl:value-of select="$bibid"/>
+                    </xsl:attribute>
+                    <xsl:text>[</xsl:text>
+                    <xsl:for-each select="key('biblioid', $bibid)">
+                        <xsl:apply-templates select="." mode="number"/>
+                    </xsl:for-each>
+                    <xsl:text>]</xsl:text>
+                </fo:basic-link>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+
+    <xsl:template match="author">
+        <xsl:value-of select="firstname"/>
+        <xsl:text> </xsl:text>
+        <xsl:value-of select="surname"/>
+        <xsl:if test="org">
+            <xsl:if test="firstname | surname">
+                <xsl:text> (</xsl:text>
+            </xsl:if>
+            <xsl:value-of select="org"/>
+            <xsl:if test="firstname | surname">
+                <xsl:text>)</xsl:text>
+            </xsl:if>
+        </xsl:if>
+        <xsl:choose>
+            <xsl:when test="following-sibling::author">, </xsl:when>
+            <xsl:otherwise>
+                <xsl:text>. </xsl:text>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+
+    <xsl:template match="biblioentry/title">
+        <xsl:choose>
+            <xsl:when test="../@role = 'book'">
+                <fo:inline xsl:use-attribute-sets="title.book">
+                    <xsl:apply-templates/>
+                </fo:inline>
+            </xsl:when>
+            <xsl:when test="../@role = 'article'">
+                <fo:inline xsl:use-attribute-sets="title.article">
+                    <xsl:apply-templates/>
+                </fo:inline>
+            </xsl:when>
+        </xsl:choose>
+        <xsl:choose>
+            <xsl:when test="following-sibling::info">
+                <!-- we're getting something more, place a comma -->
+                <xsl:text>, </xsl:text>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:text>. </xsl:text>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+
+    <xsl:template match="journal">
+        <fo:inline xsl:use-attribute-sets="journal">
+            <xsl:apply-templates/>
+        </fo:inline>
+        <xsl:choose>
+            <xsl:when test="following-sibling::info or following-sibling::pubdate">
+                <!-- we're getting something more, place a comma -->
+                <xsl:text>, </xsl:text>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:text>. </xsl:text>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+
+    <xsl:template match="website">
+        <fo:inline xsl:use-attribute-sets="website">
+            <xsl:apply-templates/>
+        </fo:inline>
+        <xsl:choose>
+            <xsl:when test="following-sibling::info or following-sibling::pubdate">
+                <!-- we're getting something more, place a comma -->
+                <xsl:text>, </xsl:text>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:text>. </xsl:text>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+
+    <xsl:template match="info">
+        <fo:inline xsl:use-attribute-sets="info">
+            <xsl:apply-templates/>
+        </fo:inline>
+        <xsl:choose>
+            <xsl:when test="../@role = 'article' and following-sibling::pubdate">
+                <!-- we're getting something more, place a comma -->
+                <xsl:text>, </xsl:text>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:text>. </xsl:text>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+
+    <xsl:template match="publisher">
+        <fo:inline xsl:use-attribute-sets="publisher">
+            <xsl:apply-templates/>
+        </fo:inline>
+        <xsl:choose>
+            <xsl:when test="following-sibling::pubdate">
+                <!-- we're getting something more, place a comma -->
+                <xsl:text>, </xsl:text>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:text>. </xsl:text>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+
+    <xsl:template match="publisher/name">
+        <xsl:apply-templates/>
+        <xsl:if test="following-sibling::location">
+            <!-- we're getting something more, place a comma -->
+            <xsl:text>, </xsl:text>
+        </xsl:if>
+    </xsl:template>
+    <xsl:template match="publisher/location">
+        <xsl:apply-templates/>
+    </xsl:template>
+
+    <xsl:template match="pubdate">
+        <fo:inline xsl:use-attribute-sets="pubdate">
+            <xsl:apply-templates/>
+        </fo:inline>
+        <xsl:text>. </xsl:text>
+    </xsl:template>
+
+    <xsl:template match="link">
+        <xsl:apply-templates select="a"/>
+        <xsl:text>. </xsl:text>
+        <xsl:if test="accessed">
+            <xsl:apply-templates select="accessed"/>
+        </xsl:if>
+    </xsl:template>
+
+    <xsl:template match="accessed">
+        <xsl:text>Accessed: </xsl:text>
+        <xsl:apply-templates/>
+        <xsl:text>.</xsl:text>
+    </xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/xml/xslt/generate_html_report.xsl b/xml/xslt/generate_html_report.xsl
index 59d9ad1..65d0962 100644
--- a/xml/xslt/generate_html_report.xsl
+++ b/xml/xslt/generate_html_report.xsl
@@ -5,6 +5,7 @@
     exclude-result-prefixes="xs my" version="2.0">
 
 
+    <xsl:import href="html_inline.xslt"/>
     <xsl:import href="html_piecharts.xslt"/>
     <xsl:import href="html_placeholders.xslt"/>
     <xsl:import href="html_secrets.xslt"/>
@@ -596,139 +597,7 @@
         <xsl:apply-templates/>
     </xsl:template>
 
-    <xsl:template match="br | p | ul | ol | li | pre | div | img">
-        <xsl:copy copy-namespaces="no">
-            <xsl:apply-templates select="@* | node()"/>
-        </xsl:copy>
-    </xsl:template>
-
-    <xsl:template match="a">
-        <xsl:variable name="destination">
-            <xsl:choose>
-                <xsl:when test="starts-with(@href, '#')">
-                    <xsl:value-of select="substring(@href, 2)"/>
-                </xsl:when>
-                <xsl:otherwise>
-                    <xsl:value-of select="@href"/>
-                </xsl:otherwise>
-            </xsl:choose>
-        </xsl:variable>
-        <xsl:choose>
-            <xsl:when test="starts-with(@href, '#') and not(//*[@id = $destination])">
-                <span class="errortext">WARNING: LINK TARGET NOT FOUND IN DOCUMENT</span>
-            </xsl:when>
-            <xsl:when
-                test="(starts-with(@href, '#') and //*[@id = $destination][ancestor-or-self::*[@visibility = 'hidden']])">
-                <span class="errortext">WARNING: LINK TARGET IS HIDDEN</span>
-            </xsl:when>
-            <xsl:otherwise>
-                <a class="link" href="{@href}">
-                    <xsl:call-template name="linkText">
-                        <xsl:with-param name="destination" select="$destination"/>
-                    </xsl:call-template>
-                </a>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-    <xsl:template name="linkText">
-        <xsl:param name="destination"/>
-        <xsl:choose>
-            <xsl:when test="starts-with(@href, '#') and not(text())">
-                <xsl:for-each select="key('rosid', $destination)">
-                    <xsl:if test="not(local-name() = 'appendix' or local-name() = 'finding')">
-                        <!-- appendix already has 'appendix' as part of its numbering, findings should not be prefixed with the word 'finding' -->
-                        <xsl:value-of select="local-name()"/>
-                        <xsl:text> </xsl:text>
-                    </xsl:if>
-                    <xsl:apply-templates select="." mode="number"/>
-                </xsl:for-each>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:apply-templates select="* | text()"/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-    <xsl:template match="a" mode="summarytable">
-        <xsl:variable name="destination">
-            <xsl:choose>
-                <xsl:when test="starts-with(@href, '#')">
-                    <xsl:value-of select="substring(@href, 2)"/>
-                </xsl:when>
-                <xsl:otherwise>
-                    <xsl:value-of select="@href"/>
-                </xsl:otherwise>
-            </xsl:choose>
-        </xsl:variable>
-        <a class="link" href="{@href}">
-            <xsl:choose>
-                <xsl:when test="starts-with(@href, '#') and not(text())">
-                    <xsl:for-each select="key('rosid', $destination)">
-                        <xsl:if test="not(local-name() = 'appendix' or local-name() = 'finding')">
-                            <!-- appendix already has 'appendix' as part of its numbering, findings should not be prefixed with the word 'finding' -->
-                            <xsl:value-of select="local-name()"/>
-                            <xsl:text> </xsl:text>
-                        </xsl:if>
-                        <xsl:apply-templates select="." mode="number"/>
-                    </xsl:for-each>
-                </xsl:when>
-                <xsl:otherwise>
-                    <xsl:apply-templates select="* | text()"/>
-                </xsl:otherwise>
-            </xsl:choose>
-        </a>
-    </xsl:template>
-
-    <xsl:template match="b">
-        <strong>
-            <xsl:apply-templates/>
-        </strong>
-    </xsl:template>
-
-    <xsl:template match="i">
-        <em>
-            <xsl:apply-templates/>
-        </em>
-    </xsl:template>
-
-    <xsl:template match="u">
-        <xsl:copy>
-            <xsl:apply-templates/>
-        </xsl:copy>
-    </xsl:template>
-
-    <xsl:template match="code">
-        <xsl:choose>
-            <xsl:when test="ancestor::title">
-                <code>
-                    <xsl:apply-templates/>
-                </code>
-            </xsl:when>
-            <xsl:when test="ancestor::pre">
-                <!-- <code> in <pre> is just <pre> -->
-                <xsl:apply-templates/>
-            </xsl:when>
-            <xsl:otherwise>
-                <code>
-                    <xsl:apply-templates/>
-                </code>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-    <xsl:template match="sup">
-        <xsl:copy>
-            <xsl:apply-templates/>
-        </xsl:copy>
-    </xsl:template>
-
-    <xsl:template match="sub">
-        <xsl:copy>
-            <xsl:apply-templates/>
-        </xsl:copy>
-    </xsl:template>
-
+    
     <xsl:template match="finding" mode="meta">
         <xsl:variable name="status" select="@status"/>
         <xsl:variable name="prettyStatus">
diff --git a/xml/xslt/generate_report.xsl b/xml/xslt/generate_report.xsl
index ef9081c..3279242 100644
--- a/xml/xslt/generate_report.xsl
+++ b/xml/xslt/generate_report.xsl
@@ -14,7 +14,7 @@
     <xsl:import href="fo_piecharts.xslt"/>
     <xsl:import href="table.xslt"/>
     <xsl:import href="lists.xslt"/>
-    <xsl:import href="inline.xslt"/>
+    <xsl:import href="fo_inline.xslt"/>
     <xsl:import href="graphics.xslt"/>
     <xsl:import href="generic.xslt"/>
     <xsl:import href="numbering.xslt"/>
diff --git a/xml/xslt/html_inline.xslt b/xml/xslt/html_inline.xslt
new file mode 100644
index 0000000..4e4cd0e
--- /dev/null
+++ b/xml/xslt/html_inline.xslt
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    exclude-result-prefixes="xs"
+    version="2.0">
+    
+    <xsl:import href="inline.xslt"/>
+    
+    <xsl:template match="br | p | ul | ol | li | pre | div | img">
+        <xsl:copy copy-namespaces="no">
+            <xsl:apply-templates select="@* | node()"/>
+        </xsl:copy>
+    </xsl:template>
+    
+    <xsl:template match="a">
+        <xsl:variable name="destination">
+            <xsl:choose>
+                <xsl:when test="starts-with(@href, '#')">
+                    <xsl:value-of select="substring(@href, 2)"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="@href"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:variable>
+        <xsl:call-template name="checkLinkValidity"/>
+        <xsl:choose>
+            <xsl:when test="starts-with(@href, '#') and not(//*[@id = $destination])">
+                <xsl:call-template name="displayErrorText">
+                    <xsl:with-param name="string" select="'WARNING: LINK TARGET NOT FOUND IN DOCUMENT'"></xsl:with-param>
+                </xsl:call-template>
+            </xsl:when>
+            <xsl:when
+                test="(starts-with(@href, '#') and //*[@id = $destination][ancestor-or-self::*[@visibility = 'hidden']])">
+                <xsl:call-template name="displayErrorText">
+                    <xsl:with-param name="string" select="'WARNING: LINK TARGET NOT FOUND IN DOCUMENT'"></xsl:with-param>
+                </xsl:call-template>
+            </xsl:when>
+            <xsl:otherwise>
+                <a class="link" href="{@href}">
+                    <xsl:call-template name="linkText">
+                        <xsl:with-param name="destination" select="$destination"/>
+                    </xsl:call-template>
+                </a>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+    
+    
+
+    <xsl:template name="linkText">
+        <xsl:param name="destination"/>
+        <xsl:choose>
+            <xsl:when test="starts-with(@href, '#') and not(text())">
+                <xsl:for-each select="key('rosid', $destination)">
+                    <xsl:if test="not(local-name() = 'appendix' or local-name() = 'finding')">
+                        <!-- appendix already has 'appendix' as part of its numbering, findings should not be prefixed with the word 'finding' -->
+                        <xsl:value-of select="local-name()"/>
+                        <xsl:text> </xsl:text>
+                    </xsl:if>
+                    <xsl:apply-templates select="." mode="number"/>
+                </xsl:for-each>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:apply-templates select="* | text()"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+
+    <xsl:template match="a" mode="summarytable">
+        <xsl:variable name="destination">
+            <xsl:choose>
+                <xsl:when test="starts-with(@href, '#')">
+                    <xsl:value-of select="substring(@href, 2)"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="@href"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:variable>
+        <a class="link" href="{@href}">
+            <xsl:choose>
+                <xsl:when test="starts-with(@href, '#') and not(text())">
+                    <xsl:for-each select="key('rosid', $destination)">
+                        <xsl:if test="not(local-name() = 'appendix' or local-name() = 'finding')">
+                            <!-- appendix already has 'appendix' as part of its numbering, findings should not be prefixed with the word 'finding' -->
+                            <xsl:value-of select="local-name()"/>
+                            <xsl:text> </xsl:text>
+                        </xsl:if>
+                        <xsl:apply-templates select="." mode="number"/>
+                    </xsl:for-each>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:apply-templates select="* | text()"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </a>
+    </xsl:template>
+
+    <xsl:template match="b">
+        <strong>
+            <xsl:apply-templates/>
+        </strong>
+    </xsl:template>
+
+    <xsl:template match="i">
+        <em>
+            <xsl:apply-templates/>
+        </em>
+    </xsl:template>
+
+    <xsl:template match="u">
+        <xsl:copy>
+            <xsl:apply-templates/>
+        </xsl:copy>
+    </xsl:template>
+
+    <xsl:template match="code">
+        <xsl:choose>
+            <xsl:when test="ancestor::title">
+                <code>
+                    <xsl:apply-templates/>
+                </code>
+            </xsl:when>
+            <xsl:when test="ancestor::pre">
+                <!-- <code> in <pre> is just <pre> -->
+                <xsl:apply-templates/>
+            </xsl:when>
+            <xsl:otherwise>
+                <code>
+                    <xsl:apply-templates/>
+                </code>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+
+    <xsl:template match="sup">
+        <xsl:copy>
+            <xsl:apply-templates/>
+        </xsl:copy>
+    </xsl:template>
+
+    <xsl:template match="sub">
+        <xsl:copy>
+            <xsl:apply-templates/>
+        </xsl:copy>
+    </xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/xml/xslt/inline.xslt b/xml/xslt/inline.xslt
index b2365c9..88efd95 100644
--- a/xml/xslt/inline.xslt
+++ b/xml/xslt/inline.xslt
@@ -1,373 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema" exclude-result-prefixes="xs"
-    xmlns:fo="http://www.w3.org/1999/XSL/Format" version="2.0">
+    xmlns:xs="http://www.w3.org/2001/XMLSchema" exclude-result-prefixes="xs" version="2.0">
 
-    <xsl:template match="a">
-        <xsl:param name="execsummary" tunnel="yes"/>
-        <xsl:variable name="destination">
-            <xsl:choose>
-                <xsl:when test="starts-with(@href, '#')">
-                    <xsl:value-of select="substring(@href, 2)"/>
-                </xsl:when>
-                <xsl:otherwise>
-                    <xsl:value-of select="@href"/>
-                </xsl:otherwise>
-            </xsl:choose>
-        </xsl:variable>
-        <xsl:choose>
-            <xsl:when test="starts-with(@href, '#') and not(//*[@id = $destination])">
-                <fo:inline xsl:use-attribute-sets="errortext">WARNING: LINK TARGET NOT FOUND IN
-                    DOCUMENT</fo:inline>
-            </xsl:when>
-            <xsl:when
-                test="(starts-with(@href, '#') and //*[@id = $destination][ancestor-or-self::*[@visibility = 'hidden']])">
-                <fo:inline xsl:use-attribute-sets="errortext">WARNING: LINK TARGET IS
-                    HIDDEN</fo:inline>
-            </xsl:when>
-            <xsl:when
-                test="starts-with(@href, '#') and $execsummary = true() and //*[@id = $destination][ancestor-or-self::*[not(@inexecsummary = 'yes')]]">
-                <!-- linking to something that is not in the exec summary -->
-                <xsl:value-of select="local-name(*[@id = $destination])"/>
-                <xsl:text> </xsl:text>
-                <xsl:call-template name="linkText">
-                    <xsl:with-param name="destination" select="$destination"/>
-                    <xsl:with-param name="execsummary_linking_to_content_not_in_report" select="true()"></xsl:with-param>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-                <fo:basic-link xsl:use-attribute-sets="link">
-                    <xsl:choose>
-                        <xsl:when test="starts-with(@href, '#')">
-                            <xsl:attribute name="internal-destination">
-                                <xsl:value-of select="$destination"/>
-                            </xsl:attribute>
-                        </xsl:when>
-                        <xsl:otherwise>
-                            <xsl:attribute name="external-destination">
-                                <xsl:value-of select="$destination"/>
-                            </xsl:attribute>
-                        </xsl:otherwise>
-                    </xsl:choose>
-                    <xsl:call-template name="linkText">
-                        <xsl:with-param name="destination" select="$destination"/>
-                    </xsl:call-template>
-                </fo:basic-link>
-                <xsl:if test="starts-with(@href, '#')">
-                    <xsl:if test="not(@includepage = 'no')">
-                        <xsl:text> (page </xsl:text>
-                        <fo:page-number-citation ref-id="{substring(@href, 2)}"/>
-                        <xsl:text>)</xsl:text>
-                    </xsl:if>
-                </xsl:if>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-    <xsl:template name="linkText">
-        <xsl:param name="execsummary_linking_to_content_not_in_report" select="false()"/>
-        <xsl:param name="destination"/>
-        <xsl:choose>
-            <xsl:when test="starts-with(@href, '#') and not(text())">
-                <xsl:for-each select="key('rosid', $destination)">
-                    <xsl:choose>
-                    <xsl:when test="$execsummary_linking_to_content_not_in_report = false()">
-                    <xsl:if test="not(local-name() = 'appendix' or local-name() = 'finding')">
-                        <!-- appendix already has 'appendix' as part of its numbering, findings should not be prefixed with the word 'finding' -->
-                        <xsl:value-of select="local-name()"/>
-                        <xsl:text> </xsl:text>
-                    </xsl:if>
-                    <xsl:apply-templates select="." mode="number"/>
-                        </xsl:when>
-                    <xsl:otherwise>
-                        <xsl:if test="not(local-name() = 'appendix')">
-                        <!-- appendix already has 'appendix' as part of its numbering, findings should not be prefixed with the word 'finding' -->
-                        <xsl:value-of select="local-name()"/>
-                        <xsl:text> </xsl:text>
-                    </xsl:if>
-                    <xsl:apply-templates select="." mode="number"/>
-                    </xsl:otherwise>
-                </xsl:choose>
-                </xsl:for-each>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:apply-templates select="* | text()"/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-    <xsl:template match="a" mode="summarytable">
-        <xsl:variable name="destination">
-            <xsl:choose>
-                <xsl:when test="starts-with(@href, '#')">
-                    <xsl:value-of select="substring(@href, 2)"/>
-                </xsl:when>
-                <xsl:otherwise>
-                    <xsl:value-of select="@href"/>
-                </xsl:otherwise>
-            </xsl:choose>
-        </xsl:variable>
-        <fo:basic-link xsl:use-attribute-sets="link">
-            <xsl:choose>
-                <xsl:when test="starts-with(@href, '#')">
-                    <xsl:attribute name="internal-destination">
-                        <xsl:value-of select="$destination"/>
-                    </xsl:attribute>
-                </xsl:when>
-                <xsl:otherwise>
-                    <xsl:attribute name="external-destination">
-                        <xsl:value-of select="$destination"/>
-                    </xsl:attribute>
-                </xsl:otherwise>
-            </xsl:choose>
-            <xsl:choose>
-                <xsl:when test="starts-with(@href, '#') and not(text())">
-                    <xsl:for-each select="key('rosid', $destination)">
-                        <xsl:if test="not(local-name() = 'appendix' or local-name() = 'finding')">
-                            <!-- appendix already has 'appendix' as part of its numbering, findings should not be prefixed with the word 'finding' -->
-                            <xsl:value-of select="local-name()"/>
-                            <xsl:text> </xsl:text>
-                        </xsl:if>
-                        <xsl:apply-templates select="." mode="number"/>
-                    </xsl:for-each>
-                </xsl:when>
-                <xsl:otherwise>
-                    <xsl:apply-templates select="* | text()"/>
-                </xsl:otherwise>
-            </xsl:choose>
-        </fo:basic-link>
-    </xsl:template>
-
-    <xsl:template match="b">
-        <fo:inline xsl:use-attribute-sets="bold">
-            <xsl:apply-templates/>
-        </fo:inline>
-    </xsl:template>
-
-    <xsl:template match="i">
-        <fo:inline xsl:use-attribute-sets="italic">
-            <xsl:apply-templates/>
-        </fo:inline>
-    </xsl:template>
-
-    <xsl:template match="u">
-        <fo:inline xsl:use-attribute-sets="underline">
-            <xsl:apply-templates/>
-        </fo:inline>
-    </xsl:template>
-
-    <xsl:template match="code">
-        <xsl:choose>
-            <xsl:when test="ancestor::title">
-                <fo:inline xsl:use-attribute-sets="code-title">
-                    <xsl:apply-templates/>
-                </fo:inline>
-            </xsl:when>
-            <xsl:when test="ancestor::pre">
-                <!-- <code> in <pre> is just <pre> -->
-                <xsl:apply-templates/>
-            </xsl:when>
-            <xsl:otherwise>
-                <fo:inline xsl:use-attribute-sets="code">
-                    <xsl:apply-templates/>
-                </fo:inline>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-    <xsl:template match="sup">
-        <fo:inline xsl:use-attribute-sets="sup">
-            <xsl:apply-templates/>
-        </fo:inline>
-    </xsl:template>
-
-    <xsl:template match="sub">
-        <fo:inline xsl:use-attribute-sets="sub">
-            <xsl:apply-templates/>
-        </fo:inline>
-    </xsl:template>
-
-    <xsl:template match="fnref">
-        <xsl:variable name="fnCount" select="count(preceding::fnref) + 1"/>
-        <fo:footnote>
-            <fo:inline xsl:use-attribute-sets="sup">
-                <xsl:value-of select="$fnCount"/>
-                <xsl:text>&#160;</xsl:text>
-            </fo:inline>
-            <fo:footnote-body xsl:use-attribute-sets="TinyFont">
-                <fo:block>
-                    <fo:inline xsl:use-attribute-sets="sup">
-                        <xsl:value-of select="$fnCount"/>
-                    </fo:inline>
-                    <xsl:apply-templates/>
-                </fo:block>
-            </fo:footnote-body>
-        </fo:footnote>
-    </xsl:template>
-
-    <xsl:template match="bibref">
-        <xsl:variable name="bibid" select="./@ref"/>
-        <xsl:variable name="bibCount" select="count(preceding::biblioentry[@id = $bibid]) + 1"/>
-        <xsl:choose>
-            <xsl:when test="starts-with(@href, '#') and not(//*[@id = $bibid])">
-                <fo:inline xsl:use-attribute-sets="errortext">WARNING: BIBLIOGRAPHY ENTRY NOT FOUND
-                    IN DOCUMENT</fo:inline>
-            </xsl:when>
-            <xsl:when
-                test="starts-with(@href, '#') and //*[@id = $bibid][ancestor-or-self::*[@visibility = 'hidden']]">
-                <fo:inline xsl:use-attribute-sets="errortext">WARNING: BIBLIOGRAPHY ENTRY IS
-                    HIDDEN</fo:inline>
-            </xsl:when>
-            <xsl:otherwise>
-                <fo:basic-link>
-                    <xsl:attribute name="internal-destination">
-                        <xsl:value-of select="$bibid"/>
-                    </xsl:attribute>
-                    <xsl:text>[</xsl:text>
-                    <xsl:for-each select="key('biblioid', $bibid)">
-                        <xsl:apply-templates select="." mode="number"/>
-                    </xsl:for-each>
-                    <xsl:text>]</xsl:text>
-                </fo:basic-link>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-    <xsl:template match="author">
-        <xsl:value-of select="firstname"/>
-        <xsl:text> </xsl:text>
-        <xsl:value-of select="surname"/>
-        <xsl:if test="org">
-            <xsl:if test="firstname | surname">
-                <xsl:text> (</xsl:text>
-            </xsl:if>
-            <xsl:value-of select="org"/>
-            <xsl:if test="firstname | surname">
-                <xsl:text>)</xsl:text>
-            </xsl:if>
+    <xsl:template name="checkLinkValidity">
+        <xsl:if test="not(starts-with(@href, '#')) and not(contains(@href, '://'))">
+            <xsl:call-template name="displayErrorText">
+                <xsl:with-param name="string">[ Invalid link: use #[id] for internal links or a
+                    well-formed url for external ones ]</xsl:with-param>
+            </xsl:call-template>
         </xsl:if>
-        <xsl:choose>
-            <xsl:when test="following-sibling::author">, </xsl:when>
-            <xsl:otherwise>
-                <xsl:text>. </xsl:text>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-    <xsl:template match="biblioentry/title">
-        <xsl:choose>
-            <xsl:when test="../@role = 'book'">
-                <fo:inline xsl:use-attribute-sets="title.book">
-                    <xsl:apply-templates/>
-                </fo:inline>
-            </xsl:when>
-            <xsl:when test="../@role = 'article'">
-                <fo:inline xsl:use-attribute-sets="title.article">
-                    <xsl:apply-templates/>
-                </fo:inline>
-            </xsl:when>
-        </xsl:choose>
-        <xsl:choose>
-            <xsl:when test="following-sibling::info">
-                <!-- we're getting something more, place a comma -->
-                <xsl:text>, </xsl:text>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:text>. </xsl:text>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-    <xsl:template match="journal">
-        <fo:inline xsl:use-attribute-sets="journal">
-            <xsl:apply-templates/>
-        </fo:inline>
-        <xsl:choose>
-            <xsl:when test="following-sibling::info or following-sibling::pubdate">
-                <!-- we're getting something more, place a comma -->
-                <xsl:text>, </xsl:text>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:text>. </xsl:text>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-    <xsl:template match="website">
-        <fo:inline xsl:use-attribute-sets="website">
-            <xsl:apply-templates/>
-        </fo:inline>
-        <xsl:choose>
-            <xsl:when test="following-sibling::info or following-sibling::pubdate">
-                <!-- we're getting something more, place a comma -->
-                <xsl:text>, </xsl:text>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:text>. </xsl:text>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-    <xsl:template match="info">
-        <fo:inline xsl:use-attribute-sets="info">
-            <xsl:apply-templates/>
-        </fo:inline>
-        <xsl:choose>
-            <xsl:when test="../@role = 'article' and following-sibling::pubdate">
-                <!-- we're getting something more, place a comma -->
-                <xsl:text>, </xsl:text>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:text>. </xsl:text>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-    <xsl:template match="publisher">
-        <fo:inline xsl:use-attribute-sets="publisher">
-            <xsl:apply-templates/>
-        </fo:inline>
-        <xsl:choose>
-            <xsl:when test="following-sibling::pubdate">
-                <!-- we're getting something more, place a comma -->
-                <xsl:text>, </xsl:text>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:text>. </xsl:text>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-    <xsl:template match="publisher/name">
-        <xsl:apply-templates/>
-        <xsl:if test="following-sibling::location">
-            <!-- we're getting something more, place a comma -->
-            <xsl:text>, </xsl:text>
-        </xsl:if>
-    </xsl:template>
-    <xsl:template match="publisher/location">
-        <xsl:apply-templates/>
-    </xsl:template>
-
-    <xsl:template match="pubdate">
-        <fo:inline xsl:use-attribute-sets="pubdate">
-            <xsl:apply-templates/>
-        </fo:inline>
-        <xsl:text>. </xsl:text>
-    </xsl:template>
-
-    <xsl:template match="link">
-        <xsl:apply-templates select="a"/>
-        <xsl:text>. </xsl:text>
-        <xsl:if test="accessed">
-            <xsl:apply-templates select="accessed"/>
-        </xsl:if>
-    </xsl:template>
-
-    <xsl:template match="accessed">
-        <xsl:text>Accessed: </xsl:text>
-        <xsl:apply-templates/>
-        <xsl:text>.</xsl:text>
     </xsl:template>
 
 </xsl:stylesheet>