[xml/sgml-pkgs] Bug#710513: docbook-xsl: rountrip produce invalid wordml output
Mathieu Malaterre
malat at debian.org
Fri May 31 14:04:02 UTC 2013
Package: docbook-xsl
Version: 1.78.1+dfsg-1
Severity: normal
With the attached patch I can get the minimal support for wordml with roundtrip module. Please consider
Thanks
-- System Information:
Debian Release: 6.0.7
APT prefers oldstable-updates
APT policy: (500, 'oldstable-updates'), (500, 'oldstable'), (500, 'stable'), (200, 'testing'), (100, 'unstable')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-0.bpo.4-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages docbook-xsl depends on:
ii xml-core 0.13 XML infrastructure and XML catalog
Versions of packages docbook-xsl recommends:
ii docbook-xml 4.5-7 standard XML documentation system
Versions of packages docbook-xsl suggests:
pn dbtoepub <none> (no description available)
pn docbook-xsl-doc-ht <none> (no description available)
ii docbook-xsl-saxon 1.00.dfsg.1-4 Java extensions for use with DocBo
ii fop 1:1.0.dfsg2-6~bpo60+1 XML formatter driven by XSL Format
ii libsaxon-java 1:6.5.5-6 The Saxon XSLT Processor
ii libxalan2-java 2.7.1-5 XSL Transformations (XSLT) process
ii libxslthl-java 2.0.1-1 XSLT syntax highlighting
pn xalan <none> (no description available)
-- no debconf information
-------------- next part --------------
Description: <short summary of the patch>
TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.
.
docbook-xsl (1.78.1+dfsg-1) unstable; urgency=low
.
* New upstream release (closes: #696929).
- Fixes fo:* element sequences in FO output (closes: #605198).
- Removed passivetex extensions code (closes: #207601, #650786).
- XHTML conversion scripts have been fixed (closes: #654338).
- Handle book/info elements of DB5 correctly (closes: #666068).
- Fixed orientation of footnotes in blockquote (closes: #684381).
- Fixed manual page output (closes: #695742).
* debian/control: Added Multi-Arch: foreign. Dropped DM-Upload-Allowed.
(Uploaders): Fixed my address.
(Standards-Version): Bumped to 3.9.4.
* debian/docbook-xsl.install, debian/docbook-xsl-ns.install: Added new and
missing (VERSION.xsl) files.
* debian/get-orig-source.sh: Minor fixes after upstream changed to bzip.
* debian/rules: Install README files to documentation.
* debian/watch: Check for bzip2 archives too (closes: #703514).
* debian/patches/611924_html_same_ids_for_quote.patch: Dropped.
* debian/patches/605696_fix_section_name_for_lexgrog.patch: Ditto.
* debian/patches/577807_lang_spanish.patch: Added.
- Fix spanish template generated text (closes: #577807).
* debian/patches/638570_lang_russian.patch: Added.
- Fix two translations (closes: #638570).
* debian/patches/681116_multiarch_manpage_template.patch: Added.
- Offer a way to omit build-time outpout to manpages (closes: #681116).
* debian/patches/698962_fix_typo.patch: Added.
- Fix a few typos (closes: #698962).
* debian/patches/series: Adjusted.
Author: Daniel Leidert <dleidert at debian.org>
Bug-Debian: http://bugs.debian.org/207601
Bug-Debian: http://bugs.debian.org/577807
Bug-Debian: http://bugs.debian.org/605198
Bug-Debian: http://bugs.debian.org/638570
Bug-Debian: http://bugs.debian.org/650786
Bug-Debian: http://bugs.debian.org/654338
Bug-Debian: http://bugs.debian.org/666068
Bug-Debian: http://bugs.debian.org/681116
Bug-Debian: http://bugs.debian.org/684381
Bug-Debian: http://bugs.debian.org/695742
Bug-Debian: http://bugs.debian.org/696929
Bug-Debian: http://bugs.debian.org/698962
Bug-Debian: http://bugs.debian.org/703514
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
--- docbook-xsl-1.78.1+dfsg.orig/docbook-xsl-ns/roundtrip/dbk2wordml.xsl
+++ docbook-xsl-1.78.1+dfsg/docbook-xsl-ns/roundtrip/dbk2wordml.xsl
@@ -234,6 +234,7 @@ xmlns:w='http://schemas.microsoft.com/of
<xsl:apply-templates mode='doc:phrase'/>
</xsl:param>
+ <w:p>
<w:r>
<xsl:if test='$style != "" or
$bold = 1 or
@@ -255,6 +256,7 @@ xmlns:w='http://schemas.microsoft.com/of
<xsl:copy-of select='$content'/>
</w:t>
</w:r>
+ </w:p>
</xsl:template>
<xsl:template name='doc:make-hyperlink'>
--- docbook-xsl-1.78.1+dfsg.orig/docbook-xsl/roundtrip/dbk2wordml.xsl
+++ docbook-xsl-1.78.1+dfsg/docbook-xsl/roundtrip/dbk2wordml.xsl
@@ -233,6 +233,7 @@
<xsl:apply-templates mode='doc:phrase'/>
</xsl:param>
+ <w:p>
<w:r>
<xsl:if test='$style != "" or
$bold = 1 or
@@ -254,6 +255,7 @@
<xsl:copy-of select='$content'/>
</w:t>
</w:r>
+ </w:p>
</xsl:template>
<xsl:template name='doc:make-hyperlink'>
More information about the debian-xml-sgml-pkgs
mailing list