summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/checksums.ini4
-rwxr-xr-xcontrib/angstrom/build-feeds.sh2
-rw-r--r--docs/usermanual/Makefile4
-rw-r--r--docs/usermanual/chunk-utf8.xsl52
4 files changed, 60 insertions, 2 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 646435045d..9d544054ca 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -13166,6 +13166,10 @@ sha256=83e82b9afe296584a6c9f1f8b3e3a70d324209021e0049f68d28bd1de8c18136
md5=4f75fc9901c724b712c371c9a1e782d3
sha256=912a1fdb12d31af757e7881db49321e5b5240bd8bd4199e9fb0ce16d66568160
+[ftp://ftp.uni-frankfurt.de/pub/Mirrors2/gentoo.org/distfiles/libsidplay-1.36.59.tgz]
+md5=37c51ba4bd57164b1b0bb7b43b9adece
+sha256=3da9b38d4eb5bf9e936b9604ba92da0594ef38047d50cf806a8e11c400008024
+
[http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/libsidplay-1.36.59.tgz]
md5=37c51ba4bd57164b1b0bb7b43b9adece
sha256=3da9b38d4eb5bf9e936b9604ba92da0594ef38047d50cf806a8e11c400008024
diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh
index 35ca932d6f..486015fab6 100755
--- a/contrib/angstrom/build-feeds.sh
+++ b/contrib/angstrom/build-feeds.sh
@@ -175,6 +175,7 @@ do
iptables \
irssi \
iscsi-target \
+ ivman \
jamvm \
kismet \
konqueror-embedded \
@@ -235,6 +236,7 @@ do
pipeman \
pkgconfig \
places \
+ pmount \
pocketcellar \
povray \
prboom \
diff --git a/docs/usermanual/Makefile b/docs/usermanual/Makefile
index 5649442ed5..305448af4f 100644
--- a/docs/usermanual/Makefile
+++ b/docs/usermanual/Makefile
@@ -6,7 +6,7 @@ types = $(xmltotypes) $(htmltypes) $(docbooktotypes)
xmltotypes =
docbooktotypes = dvi pdf ps rtf tex texi txt
htmltypes = html xhtml
-htmlxsl = $(if $(filter $@,$(foreach type,$(htmltypes),$(type)-nochunks)),docbook-utf8.xsl,http://docbook.sourceforge.net/release/xsl/current/$@/chunk.xsl)
+htmlxsl = $(if $(filter $@,$(foreach type,$(htmltypes),$(type)-nochunks)),docbook-utf8.xsl,chunk-utf8.xsl)
htmlcssfile = docbook.css
htmlcss = $(topdir)/html.css
# htmlcssfile =
@@ -20,7 +20,7 @@ endef
else
define command
@echo $(2) $(3) $(4)
- @$(1) >/dev/null
+ @$(1)
endef
endif
diff --git a/docs/usermanual/chunk-utf8.xsl b/docs/usermanual/chunk-utf8.xsl
new file mode 100644
index 0000000000..5d979ac711
--- /dev/null
+++ b/docs/usermanual/chunk-utf8.xsl
@@ -0,0 +1,52 @@
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:exsl="http://exslt.org/common"
+ version="1.0"
+ exclude-result-prefixes="exsl">
+
+<!-- ********************************************************************
+ $Id: chunk.xsl 6910 2007-06-28 23:23:30Z xmldoc $
+ ********************************************************************
+
+ This file is part of the XSL DocBook Stylesheet distribution.
+ See ../README or http://docbook.sf.net/release/xsl/current/ for
+ copyright and other information.
+
+ ******************************************************************** -->
+
+<!-- ==================================================================== -->
+
+<!-- First import the non-chunking templates that format elements
+ within each chunk file. In a customization, you should
+ create a separate non-chunking customization layer such
+ as mydocbook.xsl that imports the original docbook.xsl and
+ customizes any presentation templates. Then your chunking
+ customization should import mydocbook.xsl instead of
+ docbook.xsl. -->
+<xsl:import href="docbook-utf8.xsl"/>
+
+<!-- chunk-common.xsl contains all the named templates for chunking.
+ In a customization file, you import chunk-common.xsl, then
+ add any customized chunking templates of the same name.
+ They will have import precedence over the original
+ chunking templates in chunk-common.xsl. -->
+<xsl:import href="chunk-common.xsl"/>
+
+<!-- The manifest.xsl module is no longer imported because its
+ templates were moved into chunk-common and chunk-code -->
+
+<!-- chunk-code.xsl contains all the chunking templates that use
+ a match attribute. In a customization it should be referenced
+ using <xsl:include> instead of <xsl:import>, and then add
+ any customized chunking templates with match attributes. But be sure
+ to add a priority="1" to such customized templates to resolve
+ its conflict with the original, since they have the
+ same import precedence.
+
+ Using xsl:include prevents adding another layer
+ of import precedence, which would cause any
+ customizations that use xsl:apply-imports to wrongly
+ apply the chunking version instead of the original
+ non-chunking version to format an element. -->
+<xsl:include href="chunk-code.xsl"/>
+
+</xsl:stylesheet>