From 37bd041ab453914fe5e9346343d56a810f00c217 Mon Sep 17 00:00:00 2001
From: skyanth <skyanth@gmail.com>
Date: Fri, 24 Feb 2017 14:34:51 +0100
Subject: [PATCH] added @includepage for generated links

---
 xml/RELEASE_NOTES.md | 13 ++++++++++++
 xml/dtd/common.xsd   | 49 ++++++++++++++++++++++++++------------------
 xml/xslt/inline.xslt |  4 +++-
 3 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/xml/RELEASE_NOTES.md b/xml/RELEASE_NOTES.md
index 9e6b20e..9739b9a 100644
--- a/xml/RELEASE_NOTES.md
+++ b/xml/RELEASE_NOTES.md
@@ -1,6 +1,19 @@
 RELEASE NOTES
 =============
 
+February 24th, 2017
+-------------------
+
+###Pie chart linking
+
+All pie charts now show a finding count in the legend label.
+
+The threat level pie chart legend finding count now additionally links to the summary table.
+
+The summary table is now ordered on threat level severity and each finding ID in the table links to the actual finding.
+
+Generated links (e.g. `<a href="#finding1"/>`) now have an optional attribute `@includepage` which can be set to `yes` or `no` (default is `yes`). If set to `yes`, the link will be generated as it was up till now (e.g. "SID-001 (page 4)"); if set to `no`, the link will be generated without the page number in parenthesis.
+
 January 12th, 2017
 ------------------
 
diff --git a/xml/dtd/common.xsd b/xml/dtd/common.xsd
index cd6ce65..8e8057c 100644
--- a/xml/dtd/common.xsd
+++ b/xml/dtd/common.xsd
@@ -105,7 +105,7 @@
     </xs:complexType>
   </xs:element>
 
-<xs:element name="permission_parties">
+  <xs:element name="permission_parties">
     <xs:complexType>
       <xs:sequence>
         <xs:element maxOccurs="1" ref="client"/>
@@ -125,7 +125,7 @@
       <xs:attribute name="id" type="xs:ID"/>
     </xs:complexType>
   </xs:element>
-  
+
   <xs:element name="invoice_rep" type="xs:string"/>
   <xs:element name="invoice_mail" type="emailAddress"/>
 
@@ -242,7 +242,7 @@
       <xs:attribute ref="xml:base"/>
     </xs:complexType>
   </xs:element>
-  
+
   <xs:element name="version_history">
     <xs:complexType>
       <xs:sequence>
@@ -313,6 +313,15 @@
       <xs:simpleContent>
         <xs:extension base="xs:string">
           <xs:attribute name="href" use="required" type="xs:anyURI"/>
+          <xs:attribute name="includepage" use="optional">
+            <xs:simpleType>
+              <xs:restriction base="xs:string">
+                <xs:enumeration value="black-box"/>
+                <xs:enumeration value="crystal-box"/>
+                <xs:enumeration value="grey-box"/>
+              </xs:restriction>
+            </xs:simpleType>
+          </xs:attribute>
         </xs:extension>
       </xs:simpleContent>
     </xs:complexType>
@@ -390,15 +399,15 @@
       </xs:choice>
     </xs:complexType>
   </xs:element>
-  
+
   <xs:element name="biblioentries">
     <xs:complexType>
       <xs:sequence minOccurs="1" maxOccurs="unbounded">
-        <xs:element ref="biblioentry"></xs:element>
+        <xs:element ref="biblioentry"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  
+
   <xs:element name="biblioentry">
     <xs:complexType>
       <xs:sequence>
@@ -417,7 +426,7 @@
       <xs:attribute name="id" use="required" type="xs:ID"/>
     </xs:complexType>
   </xs:element>
-  
+
   <xs:attribute name="role">
     <xs:simpleType>
       <xs:restriction base="xs:string">
@@ -426,8 +435,8 @@
       </xs:restriction>
     </xs:simpleType>
   </xs:attribute>
-  
-    <xs:element name="author">
+
+  <xs:element name="author">
     <xs:complexType>
       <xs:sequence>
         <xs:element ref="surname" minOccurs="0" maxOccurs="1"/>
@@ -436,7 +445,7 @@
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  
+
   <xs:element name="publisher">
     <xs:complexType>
       <xs:sequence>
@@ -445,7 +454,7 @@
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  
+
   <xs:element name="link">
     <xs:complexType>
       <xs:sequence>
@@ -454,15 +463,15 @@
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  
-    <xs:element name="surname" type="xs:string"/>
-    <xs:element name="firstname" type="xs:string"/>
-    <xs:element name="org" type="xs:string"/>
-    <xs:element name="journal" type="xs:string"/>
-    <xs:element name="info" type="xs:string"/>
-    <xs:element name="location" type="xs:string"/>
-    <xs:element name="pubdate" type="xs:string"/>
-    <xs:element name="accessed" type="xs:date"/>
+
+  <xs:element name="surname" type="xs:string"/>
+  <xs:element name="firstname" type="xs:string"/>
+  <xs:element name="org" type="xs:string"/>
+  <xs:element name="journal" type="xs:string"/>
+  <xs:element name="info" type="xs:string"/>
+  <xs:element name="location" type="xs:string"/>
+  <xs:element name="pubdate" type="xs:string"/>
+  <xs:element name="accessed" type="xs:date"/>
 
   <!-- attributes -->
   <xs:attribute name="break">
diff --git a/xml/xslt/inline.xslt b/xml/xslt/inline.xslt
index 3e540cc..9931d14 100644
--- a/xml/xslt/inline.xslt
+++ b/xml/xslt/inline.xslt
@@ -56,9 +56,11 @@
                     </xsl:choose>
                 </fo:basic-link>
                 <xsl:if test="starts-with(@href, '#')">
-                    <xsl:text> (page </xsl:text>
+                    <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>