Skip to content

Commit 7d4621d

Browse files
tomschrtomschr
committed
Merge branch 'release/v0.8.0'
2 parents a951ece + b93bce3 commit 7d4621d

119 files changed

Lines changed: 7861 additions & 2044 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ syntax: glob
33
*.~
44
*~
55
*.bak
6-
6+
*-swp
77
# Temporary directories and files by Python
88
__pycache__
99
*.pyc
1010
*.pyo
1111
.tmp/
12-
12+
.sass-cache/
1313

1414
# Temporary files used by the vim editor.
1515
.*.swp

‎Changelog‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,30 @@
1+
-------------------------------------------------------------------
2+
Sun Jun 17 18:01:00 UTC 2018 - tom_schr@web.de
3+
4+
Version 0.8.0:
5+
6+
HTML:
7+
* New section about controlling the chunking process (issue #38)
8+
* New section: about `<?dbhtml?>` PI (issue #40)
9+
10+
FO/PDF:
11+
* New section: Inserting Graphics on Title Pages (#36, #37)
12+
13+
Bug fixes:
14+
* Correct canonical DocBook XSL URI (issue #27)
15+
* Fix old link from code.google.com (issue #26)
16+
* Add missing files in oXygen .xpr file (commit 948c127)
17+
* Correct version number in dbsaxon script (replace `hg log` with
18+
`git describe` (commit ee60c00)
19+
* Preserve some titles in `html2cleanup.xsl` (commit 2cbb20d)
20+
21+
Other changes:
22+
* Correct index.html, use GitHub logo instead of Bitbucket (commit e7ff831)
23+
* Remove section about Piwik (commit d59b667)
24+
* Update list of contributors (commit 1d2c90e)
25+
26+
Thanks to Peter Schmelzer for helping with some issues!
27+
128
-------------------------------------------------------------------
229
Mon May 14 08:40:00 UTC 2018 - tom_schr@web.de
330

‎DocBook-Cookbook.xpr‎

Lines changed: 42 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1594,27 +1594,65 @@
15941594
<file name="en/xml/DocBook-Cookbook.xml"/>
15951595
</folder>
15961596
<folder name="en">
1597+
<folder name="db">
1598+
<file name="en/xml/db/topic.acronym.xml"/>
1599+
<file name="en/xml/db/topic.citerefentry4manpages.xml"/>
1600+
<file name="en/xml/db/topic.extended-xlinks.xml"/>
1601+
<file name="en/xml/db/topic.glossary.xml"/>
1602+
<file name="en/xml/db/topic.link.xml"/>
1603+
<file name="en/xml/db/topic.lists.xml"/>
1604+
<file name="en/xml/db/topic.modularize.xml"/>
1605+
<file name="en/xml/db/topic.multiple-indices.xml"/>
1606+
<file name="en/xml/db/topic.programlistings-external.xml"/>
1607+
<file name="en/xml/db/topic.programlistings.xml"/>
1608+
<file name="en/xml/db/topic.quotes.xml"/>
1609+
<file name="en/xml/db/topic.remarks.xml"/>
1610+
<file name="en/xml/db/topic.section.vs.sectx.xml"/>
1611+
<file name="en/xml/db/topic.toplevel.xml"/>
1612+
<file name="en/xml/db/topic.xref-vs-link.xml"/>
1613+
<file name="en/xml/db/topic.xref.xml"/>
1614+
</folder>
15971615
<folder name="fo">
1616+
<file name="en/xml/fo/topic.design-titlepages.xml"/>
15981617
<file name="en/xml/fo/topic.empty-header-and-footer.xml"/>
15991618
<file name="en/xml/fo/topic.hyphenating-urls.xml"/>
16001619
<file name="en/xml/fo/topic.initials.xml"/>
16011620
<file name="en/xml/fo/topic.line-height.xml"/>
16021621
<file name="en/xml/fo/topic.number-titles.xml"/>
16031622
<file name="en/xml/fo/topic.pagedefs-with-inkscape.xml"/>
16041623
<file name="en/xml/fo/topic.sep-label-and-titles.xml"/>
1624+
<file name="en/xml/fo/topic.style-titlepages.xml"/>
1625+
<file name="en/xml/fo/typography-basics.xml"/>
16051626
</folder>
16061627
<folder name="html">
1628+
<file name="en/xml/html/topic.authors-in-toc.xml"/>
1629+
<file name="en/xml/html/topic.breadcrumbs.xml"/>
1630+
<file name="en/xml/common/topic.case.xml"/>
16071631
<file name="en/xml/html/topic.consistent-ids.xml"/>
1632+
<file name="en/xml/common/topic.dbtimestamp.xml"/>
1633+
<file name="en/xml/common/topic.dbxsl-customization.xml"/>
1634+
<file name="en/xml/common/topic.doctitle.xml"/>
1635+
<file name="en/xml/common/topic.enumerate-figures.xml"/>
1636+
<file name="en/xml/common/topic.fonts.xml"/>
1637+
<file name="en/xml/common/topic.get-lang.xml"/>
1638+
<file name="en/xml/common/topic.get-personname.xml"/>
1639+
<file name="en/xml/common/topic.l10n.xml"/>
1640+
<file name="en/xml/html/topic.movetoc.xml"/>
16081641
<file name="en/xml/html/topic.permalinks.xml"/>
1642+
<file name="en/xml/common/topic.pi.xml"/>
1643+
<file name="en/xml/html/topic.sh-google-code-prettify.xml"/>
16091644
<file name="en/xml/html/topic.simplenavig.xml"/>
1610-
</folder>
1611-
<folder name="markup">
1612-
<file name="en/xml/db/topic.lists.xml"/>
1613-
<file name="en/xml/db/topic.section.vs.sectx.xml"/>
1645+
<file name="en/xml/common/topic.splitheader-into-numbers-and-titles.xml"/>
1646+
<file name="en/xml/common/topic.titles.xml"/>
1647+
<file name="en/xml/common/topic.xpath.location.xml"/>
1648+
<file name="en/xml/common/topic.xref-suffix-or-prefix.xml"/>
16141649
</folder>
16151650
<folder name="structure">
1651+
<file name="en/xml/structure/topic.acronym-list.xml"/>
16161652
<file name="en/xml/structure/topic.adding-indexterms.xml"/>
1653+
<file name="en/xml/structure/topic.assemble-topics.xml"/>
16171654
<file name="en/xml/structure/topic.bridgehead-to-section.xml"/>
1655+
<file name="en/xml/structure/topic.create-assembly-file.xml"/>
16181656
<file name="en/xml/structure/topic.db4-to-db5.xml"/>
16191657
<file name="en/xml/structure/topic.db5-to-db4.xml"/>
16201658
<file name="en/xml/structure/topic.extract-element.xml"/>

‎README.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
===================================
22
Welcome to "The DoCookBook"
33
===================================
4-
:Info: See https://github/tomschr/dbcookbook
4+
:Info: See https://github.com/tomschr/dbcookbook
55
:Author: Thomas Schraitle <tom_schr AT web DOT de>
66
:Description: Cookbook for DocBook and DocBook XSL stylesheets
77
:HTML: http://doccookbook.sourceforge.net

‎bin/dbcookbook/dbcookbook.ini‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,11 @@ site=frs.sourceforge.net
4141
path=/home/frs/project/${project}
4242

4343
[Archive]
44-
zipfile=DBCookBook-@VERSION@-html.zip
45-
tarfile=DBCookBook-@VERSION@-html.tar.bz2
46-
pdffile=DBCookBook-@VERSION@.pdf
47-
root=DBCookBook-@VERSION@
44+
rootfile=DBCookBook-@VERSION@
45+
zipfile=${rootfile}-html.zip
46+
tarfile=${rootfile}-html.tar.bz2
47+
pdffile=${rootfile}.pdf
48+
4849

4950
[XSLT1]
5051
dir=${Common:basexslt1}

‎bin/dbcookbook/zip.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def createzip(parser, args=None):
2828
try:
2929
zipfilename = config.get('Archive', 'zipfile').replace("@VERSION@", version)
3030
tarfilename = config.get('Archive', 'tarfile').replace("@VERSION@", version)
31-
root = os.path.normpath(config.get('Archive', 'root')).replace("@VERSION@", version)
31+
root = os.path.normpath(config.get('Archive', 'rootfile')).replace("@VERSION@", version)
3232
htmldir = os.path.normpath(config.get('Common', 'htmldir'))
3333
except InterpolationMissingOptionError as error:
3434
logger.warning(error)

‎bin/dbsaxon‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,9 @@ function getofficialversion() {
4141
# Get the "official" public version (marked as a Mercurial tag)
4242
# The "last(tag(),1)" expression returns the last used tag
4343
#
44-
local version=$(hg log -r "last(tag(),1)" --template "{tags}")
44+
local version=$(git describe | tr '\n' ' ')
4545

4646
__logging "getofficialversion: Found public version '${version}'"
47-
4847
echo $version
4948
}
5049

@@ -77,7 +76,7 @@ function copyprettifier() {
7776
function updatereleaseinfo() {
7877
local xmlin=$1
7978
local version=$(getofficialversion)
80-
local changeweb=1
79+
local changeweb=0
8180

8281
__logging "updatereleaseinfo: Update releaseinfo for file '${xmlin}'"
8382

@@ -86,9 +85,9 @@ function updatereleaseinfo() {
8685
xmlin=${xmlin}.tmp
8786
fi
8887

89-
# Update releaseinfo[@role='draft'] with current version number
88+
# Update releaseinfo with current version number
9089
xml ed --inplace -N d=http://docbook.org/ns/docbook \
91-
--update "/d:book/d:info/d:releaseinfo[@role='draft'][1]" \
90+
--update "/d:book/d:info/d:releaseinfo[1]" \
9291
-v "${version}" "${xmlin}"
9392
__logging "updatereleaseinfo: Inserted version '${version}' in file '${xmlin}'"
9493

‎en/xml/DocBook-Cookbook.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<subtitle>Recipes for DocBook Developers</subtitle>
2424
<info>
2525
<pubdate role="currentdatetime"><?dbtimestamp ?></pubdate>
26-
<releaseinfo>0.7.4</releaseinfo>
26+
<releaseinfo>0.8.0</releaseinfo>
2727
<definitions definitionfile="defs.xml"/>
2828
<rdf:RDF
2929
xmlns="http://creativecommons.org/ns#"

‎en/xml/colophon.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
<colophon version="5.1" xml:id="colophon" status="draft"
33
xmlns="http://docbook.org/ns/docbook">
44
<title>Colophon</title>
5+
<!-- issue#12 -->
56
<para><remark>toms, 2012-05-17: FIXME</remark></para>
6-
</colophon>
7+
</colophon>

‎en/xml/common/enumerate/number.xsl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
55

66
<xsl:import
7-
href="http://docbook.sourceforge.net/release/xsl-ns/current/xhtml/docbook.xsl"/>
7+
href="https://cdn.docbook.org/release/xsl/current/xhtml/docbook.xsl"/>
88

99
<xsl:template match="d:figure|d:table|d:example" mode="label.markup">
1010
<xsl:choose>

0 commit comments

Comments
 (0)