`, `` and `` tags. I tried to describe what was what and is now something else, but it became way too confusing. To keep it simple, just know this:
@@ -31,7 +55,7 @@ To have better compatibility with HTML and markdown-to-xml scripts, we have slim
January 12th, 2017
------------------
-###Pie charts
+### Pie charts
You can now generate pie charts for any countable data that might be in the report. You can do so using the element ``, where `x` is the attribute value of any element `y` in the document (useful charts would be `threatLevel` for `x` and `finding` for `y` to show a pie chart of the share of findings by threat level, or `type` for `x` and `finding` for `y` to show a pie chart of the share of findings by type). The height (and width) of the pie is set in the pieHeight attribute, where `z` is the height of the pie chart in px.
diff --git a/xml/dtd/common.xsd b/xml/dtd/common.xsd
index 44071e2..8b79b8d 100644
--- a/xml/dtd/common.xsd
+++ b/xml/dtd/common.xsd
@@ -99,6 +99,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -242,8 +261,11 @@
+
+
@@ -430,6 +452,16 @@
+
+
+
+
+
+
+
diff --git a/xml/dtd/invoice.xsd b/xml/dtd/invoice.xsd
index 71c7e27..d080f44 100644
--- a/xml/dtd/invoice.xsd
+++ b/xml/dtd/invoice.xsd
@@ -17,15 +17,7 @@
-
-
-
-
-
+
diff --git a/xml/dtd/ratecard.xsd b/xml/dtd/ratecard.xsd
new file mode 100644
index 0000000..ca664dd
--- /dev/null
+++ b/xml/dtd/ratecard.xsd
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/xml/source/client_info.xml b/xml/source/client_info.xml
index c09af69..e6b973a 100644
--- a/xml/source/client_info.xml
+++ b/xml/source/client_info.xml
@@ -7,24 +7,32 @@
- Sitting Duck B.V.
-
- Sitting Duck
-
- I.M. Portant
-
- B.I.G. Wig
-
- Sir Knowsalot
-
- Reed Street 42
- 0000
- Pond City
- Amazonia
- 9999999
-
- freemoney@sittingduck.com
- 0000000000B01
+ Sitting Duck B.V.
+
+ Sitting Duck
+
+ I.M. Portant
+
+ B.I.G. Wig
+
+ Sir Knowsalot
+
+ Reed Street 42
+ 0000
+ Pond City
+ Amazonia
+ 9999999
+
+ freemoney@sittingduck.com
+ 0000000000B01
+
+ 100
+ 125
+ 150
+ 1000
+ 100
+ 125
+
diff --git a/xml/source/snippets/company_info.xml b/xml/source/snippets/company_info.xml
index 0e7f2b7..42916ea 100644
--- a/xml/source/snippets/company_info.xml
+++ b/xml/source/snippets/company_info.xml
@@ -5,9 +5,9 @@
Melanie Rieback
Melanie Rieback
- Overdiemerweg 28
- 1111 PP
- Diemen
+ Zieseniskade 21
+ 1017 RT
+ Amsterdam
The Netherlands
+31 6 10 21 32 40
info@radicallyopensecurity.com
diff --git a/xml/xslt/att-set.xslt b/xml/xslt/att-set.xslt
index 603f416..f797e34 100644
--- a/xml/xslt/att-set.xslt
+++ b/xml/xslt/att-set.xslt
@@ -1,11 +1,14 @@
-
-
-
+ xmlns:xs="http://www.w3.org/2001/XMLSchema" exclude-result-prefixes="xs"
+ xmlns:fo="http://www.w3.org/1999/XSL/Format" version="2.0">
+
+
+
+
+
+
-
+
-
-
+
-
-
+
+
@@ -50,5 +53,5 @@
-
-
\ No newline at end of file
+
+
diff --git a/xml/xslt/auto.xslt b/xml/xslt/auto.xslt
index 4e3d6d0..dbcb76b 100644
--- a/xml/xslt/auto.xslt
+++ b/xml/xslt/auto.xslt
@@ -833,5 +833,22 @@
black
+
+
+
+ Generated average rate is based on 'juniorpentester' and 'mediorpentester' roles, which cannot be found in client_info.xml
+
+
+ -
+
+
diff --git a/xml/xslt/block.xslt b/xml/xslt/block.xslt
index 8c8e4b6..39f6f92 100644
--- a/xml/xslt/block.xslt
+++ b/xml/xslt/block.xslt
@@ -1,60 +1,61 @@
-
+ xmlns:xs="http://www.w3.org/2001/XMLSchema" exclude-result-prefixes="xs"
+ xmlns:fo="http://www.w3.org/1999/XSL/Format" version="2.0">
+
+ test="
+ (parent::section and not(following-sibling::*)) or
+ (parent::appendix and not(following-sibling::*)) or
+ (ancestor::section and not(following-sibling::*) and not(parent::*/following-sibling::*) and not(parent::div) and not(parent::li)) or
+ (ancestor::appendix and not(following-sibling::*) and not(parent::*/following-sibling::*) and not(parent::div) and not(parent::li)) or
+ (not(self::title) and following-sibling::*[1][self::section]) or
+ (not(self::title) and following-sibling::*[1][self::finding]) or
+ (not(self::title) and following-sibling::*[1][self::non-finding])">
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
+
-
-
\ No newline at end of file
+
+
diff --git a/xml/xslt/generate_ratecard.xsl b/xml/xslt/generate_ratecard.xsl
new file mode 100644
index 0000000..6204405
--- /dev/null
+++ b/xml/xslt/generate_ratecard.xsl
@@ -0,0 +1,170 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ €
+ £
+ $
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/xml/xslt/placeholders.xslt b/xml/xslt/placeholders.xslt
index 90d903e..059db2d 100644
--- a/xml/xslt/placeholders.xslt
+++ b/xml/xslt/placeholders.xslt
@@ -1,8 +1,7 @@
+ xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fo="http://www.w3.org/1999/XSL/Format"
+ xmlns:my="http://radical.sexy" exclude-result-prefixes="xs" version="2.0">
-
@@ -59,6 +57,13 @@
+
+
+
+
@@ -246,9 +251,9 @@
(
-
-
+
+
)
@@ -334,6 +339,12 @@
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -458,28 +486,28 @@
-
- 31
-
-
-
- 28
- 29
- 28
- 29
-
-
- 31
- 30
- 31
- 30
- 31
- 31
- 30
- 31
- 30
- 31
-
+
+ 31
+
+
+
+ 28
+ 29
+ 28
+ 29
+
+
+ 31
+ 30
+ 31
+ 30
+ 31
+ 31
+ 30
+ 31
+ 30
+ 31
+
@@ -525,8 +553,12 @@
-->
-
+
+
+
@@ -535,12 +567,15 @@
s
-
- and
-
-
- ,
-
+
+ and
+
+
+ ,
+
+
-
\ No newline at end of file
+
diff --git a/xml/xslt/styles.xslt b/xml/xslt/styles.xslt
index 1e3bac5..b4036f4 100644
--- a/xml/xslt/styles.xslt
+++ b/xml/xslt/styles.xslt
@@ -28,6 +28,7 @@
LiberationSansNarrow
12pt
black
+ disregard-shifts
+
+ 12pt
+
+
+ always
+ center
+ white
+ bold
+ uppercase
+
+
+
+
+
+
+ 0.5cm
+ 1.5cm
+ 1.5cm
+ 1.5cm
+ 29.7cm
+ 21.0cm
+
+
+ 3.6cm
+ 1cm
+
+
+ true
+ 2.7cm
+
+
+ true
+ 0.6cm
+ 0
+
+
+ 2cm
+ 1cm
+
+
+ true
+ 0.6cm
+
+
+ true
+ 0.6cm
+ 0
+
+
+ right
+ normal
+
+
+ center
+
+
+ 0cm
+ 0cm
+ url(../graphics/logo_alt.png)
+ 30mm
+ scale-to-fit
+ scale-to-fit
+ uniform
+
+
+ 18pt
+ #FF5C00
+ 1cm
+
+
+ normal
+ 18pt
+
+
+
+
+
+
+
+
+
+
+ separate
+ 5mm
+
+
+ 5pt
+
+
+ #EEEEEE
+
+
+ center
+ 16pt
+ 1cm
+ 1cm
+ bold
+
+
+
+
+
diff --git a/xml/xslt/table.xslt b/xml/xslt/table.xslt
index 278270b..72a28b2 100644
--- a/xml/xslt/table.xslt
+++ b/xml/xslt/table.xslt
@@ -5,7 +5,7 @@
version="2.0">
-
+