From 3b8b2d1343be54861e73238254aafe7f77785bf4 Mon Sep 17 00:00:00 2001
From: skyanth <skyanth@gmail.com>
Date: Wed, 18 Dec 2019 13:43:11 +0100
Subject: [PATCH] added threshold to schema; fixed recommendation spacing in
 summary table

---
 xml/dtd/pentestreport.xsd | 2 ++
 xml/xslt/lists.xslt       | 2 +-
 xml/xslt/styles.xslt      | 8 ++++++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/xml/dtd/pentestreport.xsd b/xml/dtd/pentestreport.xsd
index a239a4d..37b247a 100644
--- a/xml/dtd/pentestreport.xsd
+++ b/xml/dtd/pentestreport.xsd
@@ -195,12 +195,14 @@
       <xs:attribute ref="pieAttr" use="required"/>
       <xs:attribute ref="pieElem" use="required"/>
       <xs:attribute ref="status" use="optional"/>
+      <xs:attribute ref="threshold" use="optional" default="2"/>
     </xs:complexType>
   </xs:element>
 
   <xs:attribute name="pieAttr" type="xs:string"/>
   <xs:attribute name="pieElem" type="xs:string"/>
   <xs:attribute name="status" type="xs:string"/>
+  <xs:attribute name="threshold" type="xs:integer"/>
 
   <xs:attribute name="inexecsummary">
     <xs:simpleType>
diff --git a/xml/xslt/lists.xslt b/xml/xslt/lists.xslt
index b697155..052b440 100644
--- a/xml/xslt/lists.xslt
+++ b/xml/xslt/lists.xslt
@@ -14,7 +14,7 @@
     
     <xsl:template match="ul" mode="summarytable">
         <!-- skip 'check if last' template -->
-        <fo:list-block xsl:use-attribute-sets="list">
+        <fo:list-block xsl:use-attribute-sets="list_summarytable">
             <xsl:call-template name="do_ul_summarytable"/>
         </fo:list-block>
     </xsl:template>
diff --git a/xml/xslt/styles.xslt b/xml/xslt/styles.xslt
index 2c2d193..82b57d1 100644
--- a/xml/xslt/styles.xslt
+++ b/xml/xslt/styles.xslt
@@ -134,8 +134,8 @@
             <xsl:value-of select="$very-large-space"/>
         </xsl:attribute>
     </xsl:attribute-set>
-    <xsl:attribute-set name="h2" use-attribute-sets="title-2"/>
-    <xsl:attribute-set name="h3" use-attribute-sets="title-3"/>
+    <xsl:attribute-set name="h2" use-attribute-sets="title-4"/>
+    <xsl:attribute-set name="h3" use-attribute-sets="title-4"/>
     <xsl:attribute-set name="h4" use-attribute-sets="title-4"/>
     <xsl:attribute-set name="bold">
         <xsl:attribute name="font-weight">bold</xsl:attribute>
@@ -384,10 +384,14 @@
         <xsl:attribute name="padding-top">0.2cm</xsl:attribute>
         <xsl:attribute name="padding-bottom">0.5cm</xsl:attribute>
     </xsl:attribute-set>
+    <xsl:attribute-set name="list_summarytable" use-attribute-sets="list">                  
+        <xsl:attribute name="padding-bottom">0.2cm</xsl:attribute>
+    </xsl:attribute-set>
     <xsl:attribute-set name="li">
         <xsl:attribute name="line-height">6.5mm</xsl:attribute>
         <xsl:attribute name="keep-together.within-page">always</xsl:attribute>
     </xsl:attribute-set>
+    
 
     <!-- ToC -->
     <xsl:attribute-set name="index">