Skip to content

Commit 41a1376

Browse files
ryanmeltryanmelt
authored
Merge pull request #1129 from BallAerospace/wkhtmltopdf_maint
Update wkhtmltopdf comment and make XST version 2
2 parents 6570779 + afc9ec6 commit 41a1376

File tree

3 files changed

+119
-119
lines changed

3 files changed

+119
-119
lines changed

‎demo/config/tools/handbook_creator/default_toc.xsl‎

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,59 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<xsl:stylesheet version="1.0"
3-
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
4-
xmlns:outline="http://code.google.com/p/wkhtmltopdf/outline"
5-
xmlns="http://www.w3.org/1999/xhtml">
6-
<xsl:output doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
7-
doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
8-
indent="yes" />
9-
<xsl:template match="outline:outline">
10-
<html>
11-
<head>
12-
<title>Table of Contents</title>
13-
<style>
14-
h1 {
15-
text-align: center;
16-
font-size: 20px;
17-
font-family: arial;
18-
}
19-
div {border-bottom: 1px dashed rgb(200,200,200);}
20-
span {float: right;}
21-
li {list-style: none;}
22-
ul {
23-
font-size: 20px;
24-
font-family: arial;
25-
}
26-
ul ul {font-size: 80%; }
27-
ul {padding-left: 0em;}
28-
ul ul {padding-left: 1em;}
29-
a {text-decoration:none; color: black;}
30-
</style>
31-
</head>
32-
<body>
33-
<h1>Table of Contents</h1>
34-
<ul><xsl:apply-templates select="outline:item/outline:item"/></ul>
35-
</body>
36-
</html>
37-
</xsl:template>
38-
<xsl:template match="outline:item">
39-
<li>
40-
<xsl:if test="@title!=''">
41-
<div>
42-
<a>
43-
<xsl:if test="@link">
44-
<xsl:attribute name="href"><xsl:value-of select="@link"/></xsl:attribute>
45-
</xsl:if>
46-
<xsl:if test="@backLink">
47-
<xsl:attribute name="name"><xsl:value-of select="@backLink"/></xsl:attribute>
48-
</xsl:if>
49-
<xsl:value-of select="@title" />
50-
</a>
51-
<span> <xsl:value-of select="@page" /> </span>
52-
</div>
53-
</xsl:if>
54-
<ul>
55-
<xsl:apply-templates select="outline:item"/>
56-
</ul>
57-
</li>
58-
</xsl:template>
59-
</xsl:stylesheet>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<xsl:stylesheet version="2.0"
3+
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
4+
xmlns:outline="http://code.google.com/p/wkhtmltopdf/outline"
5+
xmlns="http://www.w3.org/1999/xhtml">
6+
<xsl:output doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
7+
doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
8+
indent="yes" />
9+
<xsl:template match="outline:outline">
10+
<html>
11+
<head>
12+
<title>Table of Contents</title>
13+
<style>
14+
h1 {
15+
text-align: center;
16+
font-size: 20px;
17+
font-family: arial;
18+
}
19+
div {border-bottom: 1px dashed rgb(200,200,200);}
20+
span {float: right;}
21+
li {list-style: none;}
22+
ul {
23+
font-size: 20px;
24+
font-family: arial;
25+
}
26+
ul ul {font-size: 80%; }
27+
ul {padding-left: 0em;}
28+
ul ul {padding-left: 1em;}
29+
a {text-decoration:none; color: black;}
30+
</style>
31+
</head>
32+
<body>
33+
<h1>Table of Contents</h1>
34+
<ul><xsl:apply-templates select="outline:item/outline:item"/></ul>
35+
</body>
36+
</html>
37+
</xsl:template>
38+
<xsl:template match="outline:item">
39+
<li>
40+
<xsl:if test="@title!=''">
41+
<div>
42+
<a>
43+
<xsl:if test="@link">
44+
<xsl:attribute name="href"><xsl:value-of select="@link"/></xsl:attribute>
45+
</xsl:if>
46+
<xsl:if test="@backLink">
47+
<xsl:attribute name="name"><xsl:value-of select="@backLink"/></xsl:attribute>
48+
</xsl:if>
49+
<xsl:value-of select="@title" />
50+
</a>
51+
<span> <xsl:value-of select="@page" /> </span>
52+
</div>
53+
</xsl:if>
54+
<ul>
55+
<xsl:apply-templates select="outline:item"/>
56+
</ul>
57+
</li>
58+
</xsl:template>
59+
</xsl:stylesheet>

‎install/config/tools/handbook_creator/default_toc.xsl‎

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,59 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<xsl:stylesheet version="1.0"
3-
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
4-
xmlns:outline="http://code.google.com/p/wkhtmltopdf/outline"
5-
xmlns="http://www.w3.org/1999/xhtml">
6-
<xsl:output doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
7-
doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
8-
indent="yes" />
9-
<xsl:template match="outline:outline">
10-
<html>
11-
<head>
12-
<title>Table of Contents</title>
13-
<style>
14-
h1 {
15-
text-align: center;
16-
font-size: 20px;
17-
font-family: arial;
18-
}
19-
div {border-bottom: 1px dashed rgb(200,200,200);}
20-
span {float: right;}
21-
li {list-style: none;}
22-
ul {
23-
font-size: 20px;
24-
font-family: arial;
25-
}
26-
ul ul {font-size: 80%; }
27-
ul {padding-left: 0em;}
28-
ul ul {padding-left: 1em;}
29-
a {text-decoration:none; color: black;}
30-
</style>
31-
</head>
32-
<body>
33-
<h1>Table of Contents</h1>
34-
<ul><xsl:apply-templates select="outline:item/outline:item"/></ul>
35-
</body>
36-
</html>
37-
</xsl:template>
38-
<xsl:template match="outline:item">
39-
<li>
40-
<xsl:if test="@title!=''">
41-
<div>
42-
<a>
43-
<xsl:if test="@link">
44-
<xsl:attribute name="href"><xsl:value-of select="@link"/></xsl:attribute>
45-
</xsl:if>
46-
<xsl:if test="@backLink">
47-
<xsl:attribute name="name"><xsl:value-of select="@backLink"/></xsl:attribute>
48-
</xsl:if>
49-
<xsl:value-of select="@title" />
50-
</a>
51-
<span> <xsl:value-of select="@page" /> </span>
52-
</div>
53-
</xsl:if>
54-
<ul>
55-
<xsl:apply-templates select="outline:item"/>
56-
</ul>
57-
</li>
58-
</xsl:template>
59-
</xsl:stylesheet>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<xsl:stylesheet version="2.0"
3+
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
4+
xmlns:outline="http://code.google.com/p/wkhtmltopdf/outline"
5+
xmlns="http://www.w3.org/1999/xhtml">
6+
<xsl:output doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
7+
doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
8+
indent="yes" />
9+
<xsl:template match="outline:outline">
10+
<html>
11+
<head>
12+
<title>Table of Contents</title>
13+
<style>
14+
h1 {
15+
text-align: center;
16+
font-size: 20px;
17+
font-family: arial;
18+
}
19+
div {border-bottom: 1px dashed rgb(200,200,200);}
20+
span {float: right;}
21+
li {list-style: none;}
22+
ul {
23+
font-size: 20px;
24+
font-family: arial;
25+
}
26+
ul ul {font-size: 80%; }
27+
ul {padding-left: 0em;}
28+
ul ul {padding-left: 1em;}
29+
a {text-decoration:none; color: black;}
30+
</style>
31+
</head>
32+
<body>
33+
<h1>Table of Contents</h1>
34+
<ul><xsl:apply-templates select="outline:item/outline:item"/></ul>
35+
</body>
36+
</html>
37+
</xsl:template>
38+
<xsl:template match="outline:item">
39+
<li>
40+
<xsl:if test="@title!=''">
41+
<div>
42+
<a>
43+
<xsl:if test="@link">
44+
<xsl:attribute name="href"><xsl:value-of select="@link"/></xsl:attribute>
45+
</xsl:if>
46+
<xsl:if test="@backLink">
47+
<xsl:attribute name="name"><xsl:value-of select="@backLink"/></xsl:attribute>
48+
</xsl:if>
49+
<xsl:value-of select="@title" />
50+
</a>
51+
<span> <xsl:value-of select="@page" /> </span>
52+
</div>
53+
</xsl:if>
54+
<ul>
55+
<xsl:apply-templates select="outline:item"/>
56+
</ul>
57+
</li>
58+
</xsl:template>
59+
</xsl:stylesheet>

‎lib/cosmos/tools/handbook_creator/handbook_creator.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ def create_pdfs(both, hide_ignored)
156156
msg << "PDF Handbooks created successfully"
157157
progress_dialog.append_text(msg)
158158
else
159-
progress_dialog.append_text("\nPDF Handbooks could not be created.\n\nIs wkhtmltopdf in your PATH and are all existing pdfs closed?\n\nUsing version 0.11.0_rc1 of wkhtmltox is recommended which can be found at: http://download.gna.org/wkhtmltopdf/obsolete/\n\nVersion 0.12.x has shown issues with Handbook Creator's default templates.")
159+
progress_dialog.append_text("\nPDF Handbooks could not be created.\n\nIs wkhtmltopdf in your PATH and are all existing pdfs closed?\n\nwkhtmltopdf can be found at: https://wkhtmltopdf.org/downloads.html.")
160160
end
161161
rescue => error
162162
progress_dialog.append_text("\n\nError processing:\n#{error.formatted}")

0 commit comments

Comments
 (0)