Update to 1.70.1. Make pkglint happy.

Release: 1.70.1

This is a stable release of the 1.70 stylesheets. It includes only a few small
changes from 1.70.0.

The following is a list of changes that have been made since the 1.70.0
release.

FO

The following changes have been made to the fo code since the 1.70.0 release.

  * Added three new attribute sets (revhistory.title.properties,
    revhistory.table.properties and revhistory.table.cell.properties) for
    controlling appearance of revhistory in FO output.

  * Support DBv5 revisions with full author name (not only authorinitials)

HTML

The following changes have been made to the html code since the 1.70.0
release.

  * Support DBv5 revisions with full author name (not only authorinitials)

HTMLHelp

The following changes have been made to the htmlhelp code since the 1.70.0
release.

  * htmlhelp.generate.index is now param, not variable. This means that you
    can override its setting from outside. This is useful when you generate
    indexterms on the fly (see
    http://www.xml.com/pub/a/2004/07/14/dbndx.html?page=3).

  * Support chunk.tocs.and.lots in HTML Help

Params

The following changes have been made to the params code since the 1.70.0
release.

  * Added three new attribute sets (revhistory.title.properties,
    revhistory.table.properties and revhistory.table.cell.properties) for
    controlling appearance of revhistory in FO output.

Release: 1.70.0

As with all DocBook Project dot-zero releases, this is an experimental
release. It will be followed shortly by a stable release.

This release adds a number of new features, including:

  * support for selecting alternative index-collation methods (in particular,
    support for using a collation library developed by Eliot Kimber)

  * improved handling of DocBook 5 document instances (through a
    namespace-stripping mechanism)

  * full support for CALS and HTML tables in manpages output

  * a mechanism for preserving relative URIs in documents that make use of
    XInclude

  * support for the "new" .90 version of FOP

  * enhanced capabilities for controlling formatting of lists in HTML and FO
    output

  * autogeneration of AUTHOR and COPYRIGHT sections in manpages output

  * support for generating crop marks in FO/PDF output

  * support for qandaset as a root element in FO output

  * support for floatstyle and orient on all table types

  * support for floatstyle in figure, and example

  * pgwide.properties attribute-set supports extending figure, example and
    table into the left indent area instead of spanning multiple columns.

The following is a detailed list of enhancements and API changes that have
been made since the 1.69.1 release.

Common

The following changes have been made to the common code since the 1.69.1
release.

  * Add the xsl:key for the kimber indexing method.

  * Add support for qandaset.

  * Support dbhtml/dbfo start PI for orderedlist numbering in both HTML and FO

  * Added CVS header.

  * Changed content model of text element to ANY rather than #PCDATA because
    they could contain markup.

  * Added refentry.meta.get.quietly param.

    If zero (the default), notes and warnings about "missing" markup are
    generated during gathering of refentry metadata. If non-zero, the metadata
    is gathered "quietly" -- that is, the notes and warnings are suppressed.

    NOTE: If you are processing a large amount of refentry content, you may be
    able to speed up processing significantly by setting a non-zero value for
    refentry.meta.get.quietly.

  * After namespace stripping, the source document is the temporary tree
    created by the stripping process and it has the wrong base URI for
    relative references. Earlier versions of this code used to try to fix that
    by patching the elements with relative @fileref attributes. That was
    inadequate because it calculated an absolute base URI without considering
    that there might be xml:base attributes already in effect. It seems
    obvious now that the right thing to do is simply to put the xml:base on
    the root of the document. And that seems to work.

  * Added support for "software" and "sectdesc" class values on refmiscinfo;
    "software" is treated identically to "source", and "setdesc" is treated
    identically to "manual".

  * Added support for DocBook 5 namespace-stripping in manpages stylesheet.
    Closes request #1210692.

  * Added <xsl:template match="/"> to make stripns.xsl usable as a standalone
    stylesheet for stripping out DocBook 5/NG to DocBook 4. Note that DocBook
    XSLT drivers that include this stylesheet all override the match="/"
    template.

  * Number figures, examples, and tables from book if there is no prefix (i.e.
    if chapter.autolabel is set to 0). This avoids having the list of figures
    where the figures mysteriously restart their numeration periodically when
    chapter.autolabel is set to 0.

  * Add task template in title.markup mode.

  * Add children (with ids) of formal objects to target data.

  * Added support for case when personname doesn't contain specific name
    markup (as allowed in DocBook 5.0)

Extensions

The following changes have been made to the extensions code since the 1.69.1
release.

  * Support Xalan 2.7

  * Handle the case where the imageFn is actually a URI. This still needs
    work.

FO

The following changes have been made to the fo code since the 1.69.1 release.

  * Adapted to the new indexing code. Now works just like a wrapper that calls
    kosek indexing method, originally implemented here.

  * Added parameters for header/footer table minimum height.

  * Add the index.method parameter.

  * Integrate support for three indexing methods: - the original English-only
    method. - Jirka Kosek's method using EXSLT extensions. - Eliot Kimber's
    method using Saxon extensions. Use the 'index.method' parameter to select.

  * Add support for TOC for qandaset in fo output.

  * Added parameter ulink.hyphenate.chars. Added parameter insert.link
    .page.number.

  * Implemented feature request #942524 to add insert.link.page.number to
    allow link element cross references to have a page number.

  * Add support for ulink.hyphenate.chars so more characters can be break
    points in urls.

  * Implemented patch #1075144 to make the url text in a ulink in FO output an
    active link as well.

  * table footnotes now have their own table.footnote.properties attribute
    set.

  * Add qandaset to root.elements.

  * Added mode="page.sequence" to make it easier to put content into a page
    sequence. First used for qandaset.

  * Implemented feature request #1434408 to support formatting of biblioentry.

  * Added biblioentry.properties.

  * Support PTC/Arbortext bookmarks

  * Added table.footnote.properties to permit table footnotes to format
    differently from regular footnotes.

  * Refactored table templates to unify their processing and support all
    options in all types. Now table and informaltable, in both Cals and Html
    markup, use the same templates where possible, and all support pgwide,
    rotation, and floats. There is also a placeholder table.container template
    to support wrapping a table in a layout table, so the XEP table title
    "continued" extension can be more easily implemented.

  * Added new attribute set toc.line.properties for controlling appearance of
    lines in ToC/LoT

  * Added support for float to example and equation. Added support for pgwide
    to figure, example, and equation (the latter two via a dbfo pgwide="1"
    processing instruction).

  * Add pgwide.properties attribute-set.

  * Added refclass.suppress param.

    If the value of refclass.suppress is non-zero, then display refclass
    contents is suppressed in output. Affects HTML and FO output only.

  * Improved support for task subelements

  * Adjusted spacing around K&R-formatted Funcdef and Paramdef output such
    that it can more easily be discerned where one ends and the other begins.
    Closes #1213264.

  * Made handling of paramdef/parameter in FO output consistent with that in
    HTML and manpages output. Closes #1213259.

  * Made handling of Refnamediv consistent with formatting in HTML and
    manpages output; specifically, changed so that Refname (comma-separated
    list of multiple instances found) is used (instead of Refentrytitle as
    previously), then em-dash, then the Refpurpose. Closes #1212562.

  * Added output of Releaseinfo to recto titlepage ("copyright" page) for Book
    in FO output. This makes it consistent with HTML output. Closes #1327034.
    Thanks to Paul DuBois for reporting.

  * Added condition for setting block-progression-dimension.minimum on
    table-row, instead of height, when fop1.extensions is non-zero. For an
    explanation of the reason for the change, see:
    http://wiki.apache.org/xmlgraphics-fop/Troubleshooting/CommonLogMessages

  * Added new refclass.suppress param for suppressing display of Refclass in
    HTML and FO output. Did not add it to manpages because manpages stylesheet
    is currently just silently ignoring Refclass anyway. Closes request
    #1461065. Thanks to Davor Ocelic (docelic) for reporting.

  * Add support for keep-together PI to informal objects.

  * Add support for fop1.extensions.

  * Add support for fop1 bookmarks.

  * Add fop1.extentions parameter to add support for fop development version.

  * Start supporting fop development version, which will become fop version 1.

  * Add template for task in mode="xref-to".

  * table footnotes now also get footnote.properties attribute-set.

  * Added index.separator named template to compute the separator punctuation
    based on locale.

  * Added support for link, olink, and xref within OO Classsynopsis and
    children. (Because DocBook NG/5 allows it).

  * Support date as an inline

  * Added new parameter keep.relative.image.uris

  * Map Unicode space characters U+2000-U+200A to fo:leaders.

  * Output a real em dash for em-dash dingbat (instead of two hypens).

  * Support default label width parameters for itemized and ordered lists

  * Generate localized title for Refsynopsisdiv if no appropriate Title
    descendant found in source. Closes #1212398. This change makes behavior
    for the Synopsis title consistent with the behavior of HTML and manpages
    output.

    Also, added xsl:use-attribute-sets="normal.para.spacing" to block
    generated for Cmdsynopsis output. Previously, that block had no spacing at
    all specified, which resulted it being crammed up to closely to the
    Synopsis head.

  * Added parameters to support localization of index item punctuation.

  * Added index.number.separator, index.range.separator, and
    index.term.separator parameters to support localization of punctuation in
    index entries.

  * Added "Cross References" section in HTML doc (for consistency with the FO
    doc). Also, moved the existing FO "Cross References" section to follow the
    "Linking" section.

  * Added ID attribues to all Reference elements (e.g., id="tables" for the
    doc for section on Table params). So pages for all subsections of ref docs
    now have stable filenames instead of arbitrary generated filenames.

  * Added two new parameters for handling of multi-term varlistentry elements:

    variablelist.term.break.after: When the variablelist.term.break.after is
    non-zero, it will generate a line break after each term multi-term
    varlistentry.

    variablelist.term.separator: When a varlistentry contains multiple term
    elements, the string specified in the value of the
    variablelist.term.separator parameter is placed after each term except the
    last. The default is ", " (a comma followed by a space). To suppress
    rendering of the separator, set the value of variablelist.term.separator
    to the empty string ("").

    These parameters are primarily intended to be useful if you have
    multi-term varlistentries that have long terms.

    Closes #1306676. Thanks to Sam Steingold for providing an example "lots of
    long terms" doc that demonstrated the value of having these options.

    Also, added normalize-space() call to processing of each term.

    This change affects all output formats (HTML, PDF, manpages). The default
    behavior should pretty much remain the same as before, but it is possible
    (as always) that the change may introduce some new bugginess.

  * Add sidebar titlepage placeholder attset for styles.

  * Add titlepage for sidebar.

  * Implemented RFE #1292615.

    Added bunch of new parameters (attribute sets) that affect list
    presentation: list.block.properties, itemizedlist.properties, orderedlist
    .properties, itemizedlist.label.properties and orderedlist.label
    .properties. Default behaviour of stylesheets has not been changed but
    further customizations will be much more easier.

  * Implemented RFE #1242092.

    You can enable crop marks in your document by setting crop.marks=1 and
    xep.extensions=1. Appearance of crop marks can be controlled by parameters
    crop.mark.bleed (6pt), crop.mark.offset (24pt) and crop.mark.width
    (0.5pt).

    Also there is new named template called user-xep-pis. You can overwrite it
    in order to produce some PIs that can control XEP as described in
    http://www.renderx.com/reference.html#Output_Formats

HTML

The following changes have been made to the html code since the 1.69.1
release.

  * implemented index.method parameter and three methods.

  * added index.method parameter to support 3 indexing methods.

  * Implemented feature request #1072510 as a processing instruction to permit
    including external HTML content into HTML output.

  * Added new parameter chunk.tocs.and.lots.has.title which controls presence
    of title in a separate chunk with ToC/LoT. Disabling title can be very
    useful if you are generating frameset output (well, yes those frames, but
    some customers really want them ;-).

  * Support dbhtml/dbfo start PI for orderedlist numbering in both HTML and FO

  * Allow ToC without title also for set and book.

  * Implemented floats uniformly for figure, example, equation and
    informalfigure, informalexample, and informalequation.

  * Added the autotoc.label.in.hyperlink param.

    If the value of autotoc.label.in.hyperlink is non-zero, labels are
    included in hyperlinked titles in the TOC. If it is instead zero, labels
    are still displayed prior to the hyperlinked titles, but are not
    hyperlinked along with the titles.

    Closes patch #1065868. Thanks to anatoly techtonik for the patch.

  * Added two new params: html.head.legalnotice.link.types and html.head.
    legalnotice.link.multiple.

    If the value of the generate.legalnotice.link is non-zero, then the
    stylesheet generates (in the head section of the HTML source) either a
    single HTML link element or, if the value of the html.head.legalnotice.
    link.multiple is non-zero, one link element for each link type specified.
    Each link has the following attributes:

    - a rel attribute whose value is derived from the value of html.head.
    legalnotice.link.types

    - an href attribute whose value is set to the URL of the file containing
    the legalnotice

    - a title attribute whose value is set to the title of the corresponding
    legalnotice (or a title programatically determined by the stylesheet)

    For example:

    <link rel="copyright" href="ln-id2524073.html" title="Legal Notice">

    Closes #1476450. Thanks to Sam Steingold.

  * Added refclass.suppress param.

    If the value of refclass.suppress is non-zero, then display refclass
    contents is suppressed in output. Affects HTML and FO output only.

  * Improved support for task subelements

  * Added new refclass.suppress param for suppressing display of Refclass in
    HTML and FO output. Did not add it to manpages because manpages stylesheet
    is currently just silently ignoring Refclass anyway. Closes request
    #1461065. Thanks to Davor Ocelic (docelic) for reporting.

  * Process alt text with normalize-space(). Replace tab indents with spaces.

  * Content of citation element is automatically linked to the bibliographic
    entry with the corresponding abbrev.

  * Add template for task in mode="xref-to".

  * Suppress ID warnings if the .warnings parameter is 0

  * Add support for floatstyle to figure.

  * Handling of xref to area/areaset need support in extensions code also. I
    currently have no time to touch extensions code, so code is here to be
    enabled when extension is fixed also.

  * Added 3 parameters for overriding gentext for index punctuation.

  * Added parameters to support localization of index item punctuation. Added
    index.separator named template to compute the separator punctuation based
    on locale.

  * Added a <div class="{$class}-contents"> wrapper around output of contents
    of all formal objects. Also, added an optional <br class="{class}-break"/>
    linebreak after all formal objects.

    WARNING: Because this change places an additional DIV between the DIV
    wrapper for the equation and the equation contents, it may break some
    existing CSS stylesheets that have been created with the assumption that
    there would never be an intervening DIV there.

    The following is an example of what Equation output looks like as a result
    of the changes described above.

    <div class="equation"> <a name="three" id="three"></a>

    <p class="title"><b>(1.3)</b></p>

    <div class="equation-contents"> <span class="mathphrase">1+1=3</span>
    </div> </div><br class="equation-break">

    Rationale: These changes allow CSS control of the placement of the
    formal-object title relative to the formal-object contents. For example,
    using the CSS "float" property enables the title and contents to be
    rendered on the same line. Example stylesheet:

    .equation { margin-top: 20px; margin-bottom: 20px; } .equation-contents {
    float: left; }

    .equation .title { margin-top: 0; float: right; margin-right: 200px; }

    .equation .title b { font-weight: normal; }

    .equation-break { clear: both; }

    Note that the purpose of the ".equation-break" class is to provide a way
    to clear off the floats.

    If you want to instead have the equation title rendered to the left of the
    equation contents, you can do something like this:

    .equation { margin-top: 20px; width: 300px; margin-bottom: 20px; }
    .equation-contents { float: right; }

    .equation .title { margin-top: 0; float: left; margin-right: 200px; }

    .equation .title b { font-weight: normal; }

    .equation-break { clear: both; }

  * Added a chunker.output.quiet top-level parameter so that the chunker can
    be made quiet by default

  * Added support for link, olink, and xref within OO Classsynopsis and
    children. (Because DocBook NG/5 allows it).

  * New parameter: id.warnings. If non-zero, warnings are generated for titled
    objects that don't have titles. True by default; I wonder if this will be
    too aggressive?

  * If the keep.relative.image.uris parameter is true, don't use the absolute
    URI (as calculated from xml:base) in the img src attribute, us the value
    the author specified. Note that we still have to calculate the absolute
    filename for use in the image intrinsics extension.

  * Support date as an inline

  * Added new parameter keep.relative.image.uris

  * Added two new parameters for handling of multi-term varlistentry elements:

    variablelist.term.break.after: When the variablelist.term.break.after is
    non-zero, it will generate a line break after each term multi-term
    varlistentry.

    variablelist.term.separator: When a varlistentry contains multiple term
    elements, the string specified in the value of the
    variablelist.term.separator parameter is placed after each term except the
    last. The default is ", " (a comma followed by a space). To suppress
    rendering of the separator, set the value of variablelist.term.separator
    to the empty string ("").

    These parameters are primarily intended to be useful if you have
    multi-term varlistentries that have long terms.

    Closes #1306676. Thanks to Sam Steingold for providing an example "lots of
    long terms" doc that demonstrated the value of having these options.

    Also, added normalize-space() call to processing of each term.

    This change affects all output formats (HTML, PDF, manpages). The default
    behavior should pretty much remain the same as before, but it is possible
    (as always) that the change may introduce some new bugginess.

  * Added "wrapper-name" param to inline.charseq named template, enabling it
    to output inlines other than just "span". Acronym and Abbrev templates now
    use inline.charseq to output HTML "acronym" and "abbr" elements (instead
    of "span"). Closes #1305468. Thanks to Sam Steingold for suggesting the
    change.

Manpages

The following changes have been made to the manpages code since the 1.69.1
release.

  * Added the following params:

    - man.indent.width (string-valued) - man.indent.refsect (boolean) -
    man.indent.blurbs (boolean) - man.indent.lists (boolean) -
    man.indent.verbatims (boolean)

    Note that in earlier snapshots, man.indent.width was named
    man.indentation.default.value and the boolean params had names like
    man.indentation.*.adjust. Also the man.indent.blurbs param was called
    man.indentation.authors.adjust (or something).

    The behavior now is: If the value of a particular man.indent.* boolean
    param is non-zero, the corresponding contents (refsect*, list items,
    authorblurb/personblurb, vervatims) are displayed with a left margin
    indented by a width equal to the value of man.indent.width.

  * Added man.table.footnotes.divider param.

    In each table that contains footenotes, the string specified by the man.
    table.footnotes.divider parameter is output before the list of footnotes
    for the table.

  * Added the man.output.in.separate.dir, man.output.base.dir, and
    man.output.subdirs.enabled parameters.

    The man.output.base.dir parameter specifies the base directory into which
    man-page files are output. The man.output.subdirs.enabled parameter
    controls whether the files are output in subdirectories within the base
    directory.

    The values of the man.output.base.dir and man.output.subdirs.enabled
    parameters are used only if the value of man.output.in.separate.dir
    parameter is non-zero. If the value of man.output.in.separate.dir is zero,
    man-page files are not output in a separate directory.

  * Added man.font.table.headings and man.font.table.title params, for
    controlling font in table headings and titles.

  * Added man.font.funcsynopsisinfo and man.font.funcprototype params, for
    specifying the roff font (for example, BI, B, I) for funcsynopsisinfo and
    funcprototype output.

  * Added man.segtitle.suppress param.

    If the value of man.segtitle.suppress is non-zero, then display of
    segtitle contents is suppressed in output.

  * Added man.output.manifest.enabled and man.output.manifest.filename params.

    If man.output.manifest.enabled is non-zero, a list of filenames for man
    pages generated by the stylesheet transformation is written to the file
    named by man.output.manifest.filename

  * Added refentry.meta.get.quietly param.

    If zero (the default), notes and warnings about "missing" markup are
    generated during gathering of refentry metadata. If non-zero, the metadata
    is gathered "quietly" -- that is, the notes and warnings are suppressed.

    NOTE: If you are processing a large amount of refentry content, you may be
    able to speed up processing significantly by setting a non-zero value for
    refentry.meta.get.quietly.

  * Changed names of all boolean indentation params to man.indent.* Also
    discarded individual man.indent.*.value params and switched to just using
    a common man.indent.width param (3n by default).

  * Added boolean man.output.in.separate.dir param, to control whether or not
    man files are output in separate directory.

  * Added options for controlling indentation of verbatim output. Controlled
    through the man.indentation.verbatims.adjust and
    man.indentation.verbatims.value params. Closes #1242997

  * Added options for controlling indentation in lists and in *blurb output in
    the AUTHORS section. Controlled through the man.indentation.lists.adjust,
    man.indentation.lists.value, man.indentation.authors.adjust, and
    man.indentation.authors.value parameters. Default is 3 characters (instead
    of the roff default of 8 characters). Closes #1449369.

    Also, removed the indent that was being set on informalexample outuput. I
    will instead add an option for indenting verbatims, which I think is what
    the informalexample indent was intended for originally.

  * Changed line-spacing call before synopfragment to use ".sp -1n" ("n" units
    specified) instead of plain ".sp -1"

  * Added support for writing man files into a specific output directory and
    into appropriate subdirectories within that output directory. Controlled
    through the man.base.dir parameter (similar to the base.dir support in the
    HTML stylesheet) and the man.subdirs.enabled parameter, which
    automatically determines the name of an appropriate subdir (for example,
    man/man7, man/man1, etc.) based on the section number/manvolnum of the
    source Refentry.

    Closes #1255036 and #1170317. Thanks to Denis Bradford for the original
    feature request, and to Costin Stroie for submitting a patch that was very
    helpful in implementing the support.

  * Refined XPath statements and notification messages for refentry metadata
    handling.

  * Added support for copyright and legalnotice. The manpages stylesheets now
    output a COPYRIGHT section, after the AUTHORS section, if a copyright or
    legalnotice is found in the source. The section contains the copyright
    contents followed by the legalnotice contents. Closes #1450209.

  * Drastically reworked all of the XPath expressions used in refentry
    metadata gathering -- completely removed $parentinfo and turned $info into
    a set of nodes that includes the *info contents of the Refentry plus the
    *info contents all all of its ancestor elements. The basic XPath
    expression now used throughout is (using the example of checking for a
    date):

    (($info[//date])[last()]/date)[1].

    That selects the "last" *info/date date in document order -- that is, the
    one eitther on the Refentry itself or on the closest ancestor to the
    Refentry.

    It's likely this change may break some things; may need to pick up some
    pieces later.

    Also, changed the default value for the man.th.extra2.max.length from 40
    to 30.

  * Added support for DocBook 5 namespace-stripping in manpages stylesheet.
    Closes request #1210692.

  * Fixed handling of table footnotes. With this checkin, the table support in
    the manpages stylesheet is now basically feature complete. So this change
    closes request #619532, "No support for tables" -- the oldest currently
    open manpages feature request, submitted by Ben Secrest (blsecres) on
    2002-10-07. Congratulations to me [patting myself on the back].

  * Added handling for table titles. Also fixed handling of nested tables;
    nest tables are now "extracted" and displayed just after their parent
    tables.

  * Added option for turning off bold formatting in Funcsynopsis. Boldface
    formatting in function synopsis is mandated in the man(7) man page and is
    used almost universally in existing man pages. Despite that, it really
    does look like crap to have an entire Funcsynopsis output in bold, so I
    added params for turning off the bold formatting and/or replacing it with
    a different roff special font (e.g., "RI" for alternating roman/italic
    instead of the default "BI" for alternating bold/italic). The new params
    are "man.funcprototype.font" and "man.funcsynopsisinfo.font". To be
    documented later.

    Closes #1452247. Thanks to Joe Orton for the feature request.

  * Use AUTHORS instead of AUTHOR if we have multiple people to attribute.
    Also, fixed checking such that we generate author section even if we don't
    have an author (as long as there is at least one other person/entity we
    can put in the section). Also adjusted assembly of content for Author
    metainfo field such that we now not only use author, but try to find a
    "best match" if we can't find an author name to put there.

    Closes #1233592. Thanks to Sam Steingold for the request.

  * Changes for request #1243027, "Impove handling of AUTHOR section." This
    adds support for Collab, Corpauthor, Corpcredt, Orgname, Publishername,
    and Publisher. Also adds support for output of Affiliation and its
    children, and support for using gentext strings for auto-attributing roles
    (Author, Editor, Publisher, Translator, etc.). Also did a lot of code
    cleanup and modularization of all the AUTHOR handling code. And fixed a
    bug that was causing Author info to not be picked up correctly for
    metainfo comment we embed in man-page source.

  * Support bold output for "emphasis remap='B'". (because Eric Raymond's
    doclifter(1) tool converts groff source marked up with ".B" request or
    "\fB" escapes to DocBook "emphasis remap='B'".)

  * Added support for Segmentedlist. Details: Output is tabular, with no
    option for "list" type output. Output for Segtitle elements can be
    supressed by setting man.segtitle.suppress. If Segtitle content is output,
    it is rendered in italic type (not bold because not all terminals support
    bold and so italic ensures the stand out on those terminals). Extra space
    (.sp line) at end of table code ensures that it gets handled correctly in
    the case where its source is the child of a Para. Closes feature-request
    #1400097. Thanks to Daniel Leidert for the patch and push, and to Alastair
    Rankine for filing the original feature request.

  * Improved handling or Author/Editor/Othercredit.

    Reworked content of (non-visible) comment added at top of each page
    (metadata stuff).

    Added support for generating a manifest file (useful for cleaning up after
    builds, etc.)

  * Added two new parameters for handling of multi-term varlistentry elements:

    variablelist.term.break.after: When the variablelist.term.break.after is
    non-zero, it will generate a line break after each term multi-term
    varlistentry.

    variablelist.term.separator: When a varlistentry contains multiple term
    elements, the string specified in the value of the
    variablelist.term.separator parameter is placed after each term except the
    last. The default is ", " (a comma followed by a space). To suppress
    rendering of the separator, set the value of variablelist.term.separator
    to the empty string ("").

    These parameters are primarily intended to be useful if you have
    multi-term varlistentries that have long terms.

    Closes #1306676. Thanks to Sam Steingold for providing an example "lots of
    long terms" doc that demonstrated the value of having these options.

    Also, added normalize-space() call to processing of each term.

    This change affects all output formats (HTML, PDF, manpages). The default
    behavior should pretty much remain the same as before, but it is possible
    (as always) that the change may introduce some new bugginess.

Params

The following changes have been made to the params code since the 1.69.1
release.

  * New parameters to set header/footer table minimum height.

  * Support multiple indexing methods for different languages.

  * Remove qandaset and qandadiv from generate.toc for fo output because
    formerly it wasn't working, but now it is and the default behavior should
    stay the same.

  * add support for page number references to link element too.

  * Add support for more characters to hyphen on when ulink.hyphenate is
    turned on.

  * New attribute-set to format biblioentry and bibliomixed.

  * Added new parameter chunk.tocs.and.lots.has.title which controls presence
    of title in a separate chunk with ToC/LoT. Disabling title can be very
    useful if you are generating frameset output (well, yes those frames, but
    some customers really want them ;-).

  * Added new attribute set toc.line.properties for controlling appearance of
    lines in ToC/LoT

  * Allow table footnotes to have different properties from regular footnotes.

  * Set properties for pgwide="1" objects.

  * Added the autotoc.label.in.hyperlink param.

    If the value of autotoc.label.in.hyperlink is non-zero, labels are
    included in hyperlinked titles in the TOC. If it is instead zero, labels
    are still displayed prior to the hyperlinked titles, but are not
    hyperlinked along with the titles.

    Closes patch #1065868. Thanks to anatoly techtonik for the patch.

  * Added two new params: html.head.legalnotice.link.types and html.head.
    legalnotice.link.multiple.

    If the value of the generate.legalnotice.link is non-zero, then the
    stylesheet generates (in the head section of the HTML source) either a
    single HTML link element or, if the value of the html.head.legalnotice.
    link.multiple is non-zero, one link element for each link type specified.
    Each link has the following attributes:

    - a rel attribute whose value is derived from the value of html.head.
    legalnotice.link.types

    - an href attribute whose value is set to the URL of the file containing
    the legalnotice

    - a title attribute whose value is set to the title of the corresponding
    legalnotice (or a title programatically determined by the stylesheet)

    For example:

    <link rel="copyright" href="ln-id2524073.html" title="Legal Notice">

    Closes #1476450. Thanks to Sam Steingold.

  * Added the following params:

    - man.indent.width (string-valued) - man.indent.refsect (boolean) -
    man.indent.blurbs (boolean) - man.indent.lists (boolean) -
    man.indent.verbatims (boolean)

    Note that in earlier snapshots, man.indent.width was named
    man.indentation.default.value and the boolean params had names like
    man.indentation.*.adjust. Also the man.indent.blurbs param was called
    man.indentation.authors.adjust (or something).

    The behavior now is: If the value of a particular man.indent.* boolean
    param is non-zero, the corresponding contents (refsect*, list items,
    authorblurb/personblurb, vervatims) are displayed with a left margin
    indented by a width equal to the value of man.indent.width.

  * Added man.table.footnotes.divider param.

    In each table that contains footenotes, the string specified by the man.
    table.footnotes.divider parameter is output before the list of footnotes
    for the table.

  * Added the man.output.in.separate.dir, man.output.base.dir, and
    man.output.subdirs.enabled parameters.

    The man.output.base.dir parameter specifies the base directory into which
    man-page files are output. The man.output.subdirs.enabled parameter
    controls whether the files are output in subdirectories within the base
    directory.

    The values of the man.output.base.dir and man.output.subdirs.enabled
    parameters are used only if the value of man.output.in.separate.dir
    parameter is non-zero. If the value of man.output.in.separate.dir is zero,
    man-page files are not output in a separate directory.

  * Added man.font.table.headings and man.font.table.title params, for
    controlling font in table headings and titles.

  * Added man.font.funcsynopsisinfo and man.font.funcprototype params, for
    specifying the roff font (for example, BI, B, I) for funcsynopsisinfo and
    funcprototype output.

  * Changed to select="0" in refclass.suppress (instead of ..>0</..)

  * Added man.segtitle.suppress param.

    If the value of man.segtitle.suppress is non-zero, then display of
    segtitle contents is suppressed in output.

  * Added man.output.manifest.enabled and man.output.manifest.filename params.

    If man.output.manifest.enabled is non-zero, a list of filenames for man
    pages generated by the stylesheet transformation is written to the file
    named by man.output.manifest.filename

  * Added refclass.suppress param.

    If the value of refclass.suppress is non-zero, then display refclass
    contents is suppressed in output. Affects HTML and FO output only.

  * Added refentry.meta.get.quietly param.

    If zero (the default), notes and warnings about "missing" markup are
    generated during gathering of refentry metadata. If non-zero, the metadata
    is gathered "quietly" -- that is, the notes and warnings are suppressed.

    NOTE: If you are processing a large amount of refentry content, you may be
    able to speed up processing significantly by setting a non-zero value for
    refentry.meta.get.quietly.

  * Added support for "software" and "sectdesc" class values on refmiscinfo;
    "software" is treated identically to "source", and "setdesc" is treated
    identically to "manual".

  * Drastically reworked all of the XPath expressions used in refentry
    metadata gathering -- completely removed $parentinfo and turned $info into
    a set of nodes that includes the *info contents of the Refentry plus the
    *info contents all all of its ancestor elements. The basic XPath
    expression now used throughout is (using the example of checking for a
    date):

    (($info[//date])[last()]/date)[1].

    That selects the "last" *info/date date in document order -- that is, the
    one eitther on the Refentry itself or on the closest ancestor to the
    Refentry.

    It's likely this change may break some things; may need to pick up some
    pieces later.

    Also, changed the default value for the man.th.extra2.max.length from 40
    to 30.

  * Added option for turning off bold formatting in Funcsynopsis. Boldface
    formatting in function synopsis is mandated in the man(7) man page and is
    used almost universally in existing man pages. Despite that, it really
    does look like crap to have an entire Funcsynopsis output in bold, so I
    added params for turning off the bold formatting and/or replacing it with
    a different roff special font (e.g., "RI" for alternating roman/italic
    instead of the default "BI" for alternating bold/italic). The new params
    are "man.funcprototype.font" and "man.funcsynopsisinfo.font". To be
    documented later.

    Closes #1452247. Thanks to Joe Orton for the feature request.

  * fop.extensions now only for FOP version 0.20.5 and earlier.

  * Support for fop1 different from fop 0.20.5 and earlier.

  * Reset default value to empty string so template uses gentext first, then
    the parameter value if not empty.

  * New parameter: id.warnings. If non-zero, warnings are generated for titled
    objects that don't have titles. True by default; I wonder if this will be
    too aggressive?

  * Added new parameter keep.relative.image.uris

  * Support default label width parameters for itemized and ordered lists

  * Added parameters to localize punctuation in indexes.

  * Added two new parameters for handling of multi-term varlistentry elements:

    variablelist.term.break.after: When the variablelist.term.break.after is
    non-zero, it will generate a line break after each term multi-term
    varlistentry.

    variablelist.term.separator: When a varlistentry contains multiple term
    elements, the string specified in the value of the
    variablelist.term.separator parameter is placed after each term except the
    last. The default is ", " (a comma followed by a space). To suppress
    rendering of the separator, set the value of variablelist.term.separator
    to the empty string ("").

    These parameters are primarily intended to be useful if you have
    multi-term varlistentries that have long terms.

    Closes #1306676. Thanks to Sam Steingold for providing an example "lots of
    long terms" doc that demonstrated the value of having these options.

    Also, added normalize-space() call to processing of each term.

    This change affects all output formats (HTML, PDF, manpages). The default
    behavior should pretty much remain the same as before, but it is possible
    (as always) that the change may introduce some new bugginess.

  * Convert 'no' to string in default value.

  * Implemented RFE #1292615.

    Added bunch of new parameters (attribute sets) that affect list
    presentation: list.block.properties, itemizedlist.properties, orderedlist
    .properties, itemizedlist.label.properties and orderedlist.label
    .properties. Default behaviour of stylesheets has not been changed but
    further customizations will be much more easier.

  * Implemented RFE #1242092.

    You can enable crop marks in your document by setting crop.marks=1 and
    xep.extensions=1. Appearance of crop marks can be controlled by parameters
    crop.mark.bleed (6pt), crop.mark.offset (24pt) and crop.mark.width
    (0.5pt).

    Also there is new named template called user-xep-pis. You can overwrite it
    in order to produce some PIs that can control XEP as described in
    http://www.renderx.com/reference.html#Output_Formats


  * Changed short descriptions in doc for *autolabel* params to match new
    autolabel behavior.

Profiling

The following changes have been made to the profiling code since the 1.69.1
release.

  * Profiling now works together with namespace stripping (V5 documents).
    Namespace striping should work with all stylesheets named profile-, even
    if they are not supporting namespace stripping in a non-profiling variant.

  * Moved profiling stage out of templates. This make possible to reuse
    profiled content by several templates and still maintaing node indentity
    (needed for example for HTML Help where content is processed multiple
    times).

    I don't know why this was not on the top level before. Maybe some XSLT
    processors choked on it. I hope this will be OK now.

Tools

The following changes have been made to the tools code since the 1.69.1
release.

  * Moved Makefile.DocBook from contrib module to xsl module.

WordML

The following changes have been made to the wordml code since the 1.69.1
release.

  * added contrib element, better handling of default paragraph style

  * added bridgehead

  * added blocks stylesheet to support bibliographies, glossaries and
    qandasets

  * added mediaobject caption

  * added callouts

  * added Word template file

  * added abstract, fixed itemizedlist, ulink

  * fixed Makefile added many features to Pages support added revhistory,
    inlines, highlights, abstract

  * fixed handling linebreaks when generating WordML added Apple Pages support

6 files changed, 101 insertions, 82 deletions

diff --git a/textproc/docbook-xsl/Makefile b/textproc/docbook-xsl/Makefile
index dd628467ece..33dc94b0505 100644
--- a/textproc/docbook-xsl/Makefile
+++ b/textproc/docbook-xsl/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2006/04/18 20:53:34 minskim Exp $
+# $NetBSD: Makefile,v 1.40 2006/05/30 22:13:52 wiz Exp $
 #
 
-DISTNAME=	docbook-xsl-1.69.1
-PKGREVISION=	6
+DISTNAME=	docbook-xsl-1.70.1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=docbook/}
 EXTRACT_SUFX=	.tar.bz2
@@ -19,7 +18,6 @@ NO_BUILD=	YES
 USE_TOOLS+=	perl:run
 REPLACE_PERL+=	fo/pdf2index
 
-DOCDIR=		${PREFIX}/share/doc/docbook-xsl
 EGDIR=		${PREFIX}/share/examples/docbook-xsl
 XSLDIR=		${PREFIX}/share/xsl/docbook
 XSLMODS=	common extensions fo html htmlhelp images javahelp \
@@ -33,7 +31,7 @@ do-install:
 	${INSTALL_DATA_DIR} ${XSLDIR}
 	${INSTALL_DATA} ${WRKSRC}/VERSION ${XSLDIR}
 	${INSTALL_DATA} ${WRKSRC}/catalog.xml ${XSLDIR}/catalog.xml
-	@for d in ${XSLMODS}; do \
+	for d in ${XSLMODS}; do \
 	    ${ECHO} "${INSTALL_DATA_DIR} ${XSLDIR}/$$d"; \
 	    ${ECHO} "cd ${WRKSRC} && ${PAX} -rw -pp -pm $$d ${XSLDIR}/"; \
 	    cd ${WRKSRC} && ${PAX} -rw -pp -pm $$d ${XSLDIR}/; \
diff --git a/textproc/docbook-xsl/PLIST b/textproc/docbook-xsl/PLIST
index fee0b986370..c1c1a45b849 100644
--- a/textproc/docbook-xsl/PLIST
+++ b/textproc/docbook-xsl/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2006/01/12 17:12:52 jmmv Exp $
-share/examples/docbook-xsl/ChangeLog
+@comment $NetBSD: PLIST,v 1.17 2006/05/30 22:13:52 wiz Exp $
 share/examples/docbook-xsl/README
 share/examples/docbook-xsl/biblioentry.xsl
 share/examples/docbook-xsl/testtemplate.xml
@@ -7,7 +6,6 @@ share/examples/docbook-xsl/titlepage.xsl
 @comment in xmlcatmgr: share/xml/catalog
 share/xsl/docbook/VERSION
 share/xsl/docbook/catalog.xml
-share/xsl/docbook/common/ChangeLog
 share/xsl/docbook/common/af.xml
 share/xsl/docbook/common/am.xml
 share/xsl/docbook/common/ar.xml
@@ -38,6 +36,7 @@ share/xsl/docbook/common/hi.xml
 share/xsl/docbook/common/hr.xml
 share/xsl/docbook/common/hu.xml
 share/xsl/docbook/common/id.xml
+share/xsl/docbook/common/insertfile.xsl
 share/xsl/docbook/common/it.xml
 share/xsl/docbook/common/ja.xml
 share/xsl/docbook/common/kn.xml
@@ -67,6 +66,7 @@ share/xsl/docbook/common/sl.xml
 share/xsl/docbook/common/sq.xml
 share/xsl/docbook/common/sr.xml
 share/xsl/docbook/common/sr_Latn.xml
+share/xsl/docbook/common/stripns.xsl
 share/xsl/docbook/common/subtitles.xsl
 share/xsl/docbook/common/sv.xml
 share/xsl/docbook/common/ta.xml
@@ -82,13 +82,11 @@ share/xsl/docbook/common/vi.xml
 share/xsl/docbook/common/xh.xml
 share/xsl/docbook/common/zh_cn.xml
 share/xsl/docbook/common/zh_tw.xml
-share/xsl/docbook/extensions/ChangeLog
+share/xsl/docbook/extensions/build.xml
 share/xsl/docbook/extensions/saxon643.jar
-share/xsl/docbook/extensions/saxon643/ChangeLog
 share/xsl/docbook/extensions/saxon643/com/nwalsh/saxon/CVS.java
 share/xsl/docbook/extensions/saxon643/com/nwalsh/saxon/Callout.java
 share/xsl/docbook/extensions/saxon643/com/nwalsh/saxon/CalloutEmitter.java
-share/xsl/docbook/extensions/saxon643/com/nwalsh/saxon/ChangeLog
 share/xsl/docbook/extensions/saxon643/com/nwalsh/saxon/ColumnScanEmitter.java
 share/xsl/docbook/extensions/saxon643/com/nwalsh/saxon/ColumnUpdateEmitter.java
 share/xsl/docbook/extensions/saxon643/com/nwalsh/saxon/CopyEmitter.java
@@ -112,10 +110,8 @@ share/xsl/docbook/extensions/saxon65.jar
 share/xsl/docbook/extensions/saxon651.jar
 share/xsl/docbook/extensions/saxon652.jar
 share/xsl/docbook/extensions/saxon653.jar
-share/xsl/docbook/extensions/xalan2/ChangeLog
 share/xsl/docbook/extensions/xalan2/com/nwalsh/xalan/CVS.java
 share/xsl/docbook/extensions/xalan2/com/nwalsh/xalan/Callout.java
-share/xsl/docbook/extensions/xalan2/com/nwalsh/xalan/ChangeLog
 share/xsl/docbook/extensions/xalan2/com/nwalsh/xalan/FormatCallout.java
 share/xsl/docbook/extensions/xalan2/com/nwalsh/xalan/FormatDingbatCallout.java
 share/xsl/docbook/extensions/xalan2/com/nwalsh/xalan/FormatGraphicCallout.java
@@ -129,7 +125,25 @@ share/xsl/docbook/extensions/xalan2/com/nwalsh/xalan/Text.java
 share/xsl/docbook/extensions/xalan2/com/nwalsh/xalan/Verbatim.java
 share/xsl/docbook/extensions/xalan2/com/nwalsh/xalan/package.html
 share/xsl/docbook/extensions/xalan25.jar
-share/xsl/docbook/fo/ChangeLog
+share/xsl/docbook/extensions/xalan27.jar
+share/xsl/docbook/extensions/xalan27/build.xml
+share/xsl/docbook/extensions/xalan27/nbproject/build-impl.xml
+share/xsl/docbook/extensions/xalan27/nbproject/genfiles.properties
+share/xsl/docbook/extensions/xalan27/nbproject/project.properties
+share/xsl/docbook/extensions/xalan27/nbproject/project.xml
+share/xsl/docbook/extensions/xalan27/src/com/nwalsh/xalan/CVS.java
+share/xsl/docbook/extensions/xalan27/src/com/nwalsh/xalan/Callout.java
+share/xsl/docbook/extensions/xalan27/src/com/nwalsh/xalan/FormatCallout.java
+share/xsl/docbook/extensions/xalan27/src/com/nwalsh/xalan/FormatDingbatCallout.java
+share/xsl/docbook/extensions/xalan27/src/com/nwalsh/xalan/FormatGraphicCallout.java
+share/xsl/docbook/extensions/xalan27/src/com/nwalsh/xalan/FormatTextCallout.java
+share/xsl/docbook/extensions/xalan27/src/com/nwalsh/xalan/FormatUnicodeCallout.java
+share/xsl/docbook/extensions/xalan27/src/com/nwalsh/xalan/Func.java
+share/xsl/docbook/extensions/xalan27/src/com/nwalsh/xalan/ImageIntrinsics.java
+share/xsl/docbook/extensions/xalan27/src/com/nwalsh/xalan/Params.java
+share/xsl/docbook/extensions/xalan27/src/com/nwalsh/xalan/Table.java
+share/xsl/docbook/extensions/xalan27/src/com/nwalsh/xalan/Text.java
+share/xsl/docbook/extensions/xalan27/src/com/nwalsh/xalan/Verbatim.java
 share/xsl/docbook/fo/admon.xsl
 share/xsl/docbook/fo/autoidx-ng.xsl
 share/xsl/docbook/fo/autoidx.xsl
@@ -148,6 +162,7 @@ share/xsl/docbook/fo/fo-rtf.xsl
 share/xsl/docbook/fo/fo.xsl
 share/xsl/docbook/fo/footnote.xsl
 share/xsl/docbook/fo/fop.xsl
+share/xsl/docbook/fo/fop1.xsl
 share/xsl/docbook/fo/formal.xsl
 share/xsl/docbook/fo/glossary.xsl
 share/xsl/docbook/fo/graphics.xsl
@@ -167,9 +182,11 @@ share/xsl/docbook/fo/passivetex.xsl
 share/xsl/docbook/fo/pdf2index
 share/xsl/docbook/fo/pi.xsl
 share/xsl/docbook/fo/profile-docbook.xsl
+share/xsl/docbook/fo/ptc.xsl
 share/xsl/docbook/fo/qandaset.xsl
 share/xsl/docbook/fo/refentry.xsl
 share/xsl/docbook/fo/sections.xsl
+share/xsl/docbook/fo/spaces.xsl
 share/xsl/docbook/fo/synop.xsl
 share/xsl/docbook/fo/table.xsl
 share/xsl/docbook/fo/task.xsl
@@ -180,7 +197,6 @@ share/xsl/docbook/fo/toc.xsl
 share/xsl/docbook/fo/verbatim.xsl
 share/xsl/docbook/fo/xep.xsl
 share/xsl/docbook/fo/xref.xsl
-share/xsl/docbook/html/ChangeLog
 share/xsl/docbook/html/admon.xsl
 share/xsl/docbook/html/annotations.xsl
 share/xsl/docbook/html/autoidx-ng.xsl
@@ -197,6 +213,7 @@ share/xsl/docbook/html/chunker.xsl
 share/xsl/docbook/html/chunkfast.xsl
 share/xsl/docbook/html/chunktoc.xsl
 share/xsl/docbook/html/component.xsl
+share/xsl/docbook/html/db5strip.xsl
 share/xsl/docbook/html/division.xsl
 share/xsl/docbook/html/docbook.xsl
 share/xsl/docbook/html/docbookng.xsl
@@ -239,12 +256,10 @@ share/xsl/docbook/html/titlepage.xsl
 share/xsl/docbook/html/toc.xsl
 share/xsl/docbook/html/verbatim.xsl
 share/xsl/docbook/html/xref.xsl
-share/xsl/docbook/htmlhelp/ChangeLog
 share/xsl/docbook/htmlhelp/htmlhelp-common.xsl
 share/xsl/docbook/htmlhelp/htmlhelp.xsl
 share/xsl/docbook/htmlhelp/profile-htmlhelp-common.xsl
 share/xsl/docbook/htmlhelp/profile-htmlhelp.xsl
-share/xsl/docbook/images/ChangeLog
 share/xsl/docbook/images/blank.png
 share/xsl/docbook/images/callouts/1.gif
 share/xsl/docbook/images/callouts/1.png
@@ -276,7 +291,6 @@ share/xsl/docbook/images/callouts/8.gif
 share/xsl/docbook/images/callouts/8.png
 share/xsl/docbook/images/callouts/9.gif
 share/xsl/docbook/images/callouts/9.png
-share/xsl/docbook/images/callouts/ChangeLog
 share/xsl/docbook/images/caution.gif
 share/xsl/docbook/images/caution.png
 share/xsl/docbook/images/caution.svg
@@ -313,19 +327,18 @@ share/xsl/docbook/images/warning.gif
 share/xsl/docbook/images/warning.png
 share/xsl/docbook/images/warning.svg
 share/xsl/docbook/images/warning.tif
-share/xsl/docbook/javahelp/ChangeLog
 share/xsl/docbook/javahelp/javahelp.xsl
 share/xsl/docbook/javahelp/profile-javahelp.xsl
-share/xsl/docbook/lib/ChangeLog
 share/xsl/docbook/lib/lib.xml
 share/xsl/docbook/lib/lib.xsl
 share/xsl/docbook/lib/lib.xweb
-share/xsl/docbook/manpages/ChangeLog
 share/xsl/docbook/manpages/ChangeLog.20020917
 share/xsl/docbook/manpages/README
 share/xsl/docbook/manpages/block.xsl
 share/xsl/docbook/manpages/charmap.groff.xsl
 share/xsl/docbook/manpages/docbook.xsl
+share/xsl/docbook/manpages/html-synop.xsl
+share/xsl/docbook/manpages/html2roff.xsl
 share/xsl/docbook/manpages/info.xsl
 share/xsl/docbook/manpages/inline.xsl
 share/xsl/docbook/manpages/links.xsl
@@ -336,10 +349,9 @@ share/xsl/docbook/manpages/param.xml
 share/xsl/docbook/manpages/param.xsl
 share/xsl/docbook/manpages/param.xweb
 share/xsl/docbook/manpages/refentry.xsl
-share/xsl/docbook/manpages/stripns.xsl
 share/xsl/docbook/manpages/synop.xsl
+share/xsl/docbook/manpages/table.xsl
 share/xsl/docbook/manpages/utility.xsl
-share/xsl/docbook/params/ChangeLog
 share/xsl/docbook/params/abstract.properties.xml
 share/xsl/docbook/params/abstract.title.properties.xml
 share/xsl/docbook/params/admon.graphics.extension.xml
@@ -360,10 +372,12 @@ share/xsl/docbook/params/appendix.autolabel.xml
 share/xsl/docbook/params/arbortext.extensions.xml
 share/xsl/docbook/params/article.appendix.title.properties.xml
 share/xsl/docbook/params/author.othername.in.middle.xml
+share/xsl/docbook/params/autotoc.label.in.hyperlink.xml
 share/xsl/docbook/params/autotoc.label.separator.xml
 share/xsl/docbook/params/axf.extensions.xml
 share/xsl/docbook/params/base.dir.xml
 share/xsl/docbook/params/biblioentry.item.separator.xml
+share/xsl/docbook/params/biblioentry.properties.xml
 share/xsl/docbook/params/bibliography.collection.xml
 share/xsl/docbook/params/bibliography.numbered.xml
 share/xsl/docbook/params/blockquote.properties.xml
@@ -393,6 +407,7 @@ share/xsl/docbook/params/chunk.section.depth.xml
 share/xsl/docbook/params/chunk.sections.xml
 share/xsl/docbook/params/chunk.separate.lots.xml
 share/xsl/docbook/params/chunk.toc.xml
+share/xsl/docbook/params/chunk.tocs.and.lots.has.title.xml
 share/xsl/docbook/params/chunk.tocs.and.lots.xml
 share/xsl/docbook/params/chunker.output.cdata-section-elements.xml
 share/xsl/docbook/params/chunker.output.doctype-public.xml
@@ -420,6 +435,10 @@ share/xsl/docbook/params/column.gap.titlepage.xml
 share/xsl/docbook/params/compact.list.item.spacing.xml
 share/xsl/docbook/params/component.label.includes.part.label.xml
 share/xsl/docbook/params/component.title.properties.xml
+share/xsl/docbook/params/crop.mark.bleed.xml
+share/xsl/docbook/params/crop.mark.offset.xml
+share/xsl/docbook/params/crop.mark.width.xml
+share/xsl/docbook/params/crop.marks.xml
 share/xsl/docbook/params/css.decoration.xml
 share/xsl/docbook/params/current.docid.xml
 share/xsl/docbook/params/default.float.class.xml
@@ -448,6 +467,7 @@ share/xsl/docbook/params/firstterm.only.link.xml
 share/xsl/docbook/params/footer.column.widths.xml
 share/xsl/docbook/params/footer.content.properties.xml
 share/xsl/docbook/params/footer.rule.xml
+share/xsl/docbook/params/footer.table.height.xml
 share/xsl/docbook/params/footers.on.blank.pages.xml
 share/xsl/docbook/params/footnote.font.size.xml
 share/xsl/docbook/params/footnote.mark.properties.xml
@@ -456,6 +476,7 @@ share/xsl/docbook/params/footnote.number.symbols.xml
 share/xsl/docbook/params/footnote.properties.xml
 share/xsl/docbook/params/footnote.sep.leader.properties.xml
 share/xsl/docbook/params/fop.extensions.xml
+share/xsl/docbook/params/fop1.extensions.xml
 share/xsl/docbook/params/formal.object.properties.xml
 share/xsl/docbook/params/formal.procedures.xml
 share/xsl/docbook/params/formal.title.placement.xml
@@ -486,6 +507,7 @@ share/xsl/docbook/params/graphicsize.use.img.src.path.xml
 share/xsl/docbook/params/header.column.widths.xml
 share/xsl/docbook/params/header.content.properties.xml
 share/xsl/docbook/params/header.rule.xml
+share/xsl/docbook/params/header.table.height.xml
 share/xsl/docbook/params/headers.on.blank.pages.xml
 share/xsl/docbook/params/html.base.xml
 share/xsl/docbook/params/html.cellpadding.xml
@@ -493,6 +515,8 @@ share/xsl/docbook/params/html.cellspacing.xml
 share/xsl/docbook/params/html.cleanup.xml
 share/xsl/docbook/params/html.ext.xml
 share/xsl/docbook/params/html.extra.head.links.xml
+share/xsl/docbook/params/html.head.legalnotice.link.multiple.xml
+share/xsl/docbook/params/html.head.legalnotice.link.types.xml
 share/xsl/docbook/params/html.longdesc.link.xml
 share/xsl/docbook/params/html.longdesc.xml
 share/xsl/docbook/params/html.stylesheet.type.xml
@@ -549,23 +573,33 @@ share/xsl/docbook/params/htmlhelp.window.geometry.xml
 share/xsl/docbook/params/hyphenate.verbatim.characters.xml
 share/xsl/docbook/params/hyphenate.verbatim.xml
 share/xsl/docbook/params/hyphenate.xml
+share/xsl/docbook/params/id.warnings.xml
 share/xsl/docbook/params/ignore.image.scaling.xml
 share/xsl/docbook/params/img.src.path.xml
 share/xsl/docbook/params/index.div.title.properties.xml
 share/xsl/docbook/params/index.entry.properties.xml
+share/xsl/docbook/params/index.method.xml
+share/xsl/docbook/params/index.number.separator.xml
 share/xsl/docbook/params/index.on.role.xml
 share/xsl/docbook/params/index.on.type.xml
 share/xsl/docbook/params/index.prefer.titleabbrev.xml
 share/xsl/docbook/params/index.preferred.page.properties.xml
+share/xsl/docbook/params/index.range.separator.xml
+share/xsl/docbook/params/index.term.separator.xml
 share/xsl/docbook/params/informal.object.properties.xml
 share/xsl/docbook/params/informalequation.properties.xml
 share/xsl/docbook/params/informalexample.properties.xml
 share/xsl/docbook/params/informalfigure.properties.xml
 share/xsl/docbook/params/informaltable.properties.xml
 share/xsl/docbook/params/inherit.keywords.xml
+share/xsl/docbook/params/insert.link.page.number.xml
 share/xsl/docbook/params/insert.olink.page.number.xml
 share/xsl/docbook/params/insert.olink.pdf.frag.xml
 share/xsl/docbook/params/insert.xref.page.number.xml
+share/xsl/docbook/params/itemizedlist.label.properties.xml
+share/xsl/docbook/params/itemizedlist.label.width.xml
+share/xsl/docbook/params/itemizedlist.properties.xml
+share/xsl/docbook/params/keep.relative.image.uris.xml
 share/xsl/docbook/params/l10n.gentext.default.language.xml
 share/xsl/docbook/params/l10n.gentext.language.xml
 share/xsl/docbook/params/l10n.gentext.use.xref.language.xml
@@ -577,6 +611,7 @@ share/xsl/docbook/params/linenumbering.extension.xml
 share/xsl/docbook/params/linenumbering.separator.xml
 share/xsl/docbook/params/linenumbering.width.xml
 share/xsl/docbook/params/link.mailto.url.xml
+share/xsl/docbook/params/list.block.properties.xml
 share/xsl/docbook/params/list.block.spacing.xml
 share/xsl/docbook/params/list.item.spacing.xml
 share/xsl/docbook/params/make.graphic.viewport.xml
@@ -589,20 +624,36 @@ share/xsl/docbook/params/man.charmap.enabled.xml
 share/xsl/docbook/params/man.charmap.subset.profile.xml
 share/xsl/docbook/params/man.charmap.uri.xml
 share/xsl/docbook/params/man.charmap.use.subset.xml
+share/xsl/docbook/params/man.font.funcprototype.xml
+share/xsl/docbook/params/man.font.funcsynopsisinfo.xml
+share/xsl/docbook/params/man.font.table.headings.xml
+share/xsl/docbook/params/man.font.table.title.xml
 share/xsl/docbook/params/man.hyphenate.computer.inlines.xml
 share/xsl/docbook/params/man.hyphenate.filenames.xml
 share/xsl/docbook/params/man.hyphenate.urls.xml
 share/xsl/docbook/params/man.hyphenate.xml
+share/xsl/docbook/params/man.indent.blurbs.xml
+share/xsl/docbook/params/man.indent.lists.xml
+share/xsl/docbook/params/man.indent.refsect.xml
+share/xsl/docbook/params/man.indent.verbatims.xml
+share/xsl/docbook/params/man.indent.width.xml
 share/xsl/docbook/params/man.justify.xml
 share/xsl/docbook/params/man.links.are.numbered.xml
 share/xsl/docbook/params/man.links.are.underlined.xml
 share/xsl/docbook/params/man.links.list.enabled.xml
 share/xsl/docbook/params/man.links.list.heading.xml
+share/xsl/docbook/params/man.output.base.dir.xml
 share/xsl/docbook/params/man.output.encoding.xml
+share/xsl/docbook/params/man.output.in.separate.dir.xml
+share/xsl/docbook/params/man.output.manifest.enabled.xml
+share/xsl/docbook/params/man.output.manifest.filename.xml
 share/xsl/docbook/params/man.output.quietly.xml
+share/xsl/docbook/params/man.output.subdirs.enabled.xml
+share/xsl/docbook/params/man.segtitle.suppress.xml
 share/xsl/docbook/params/man.string.subst.map.xml
 share/xsl/docbook/params/man.subheading.divider.enabled.xml
 share/xsl/docbook/params/man.subheading.divider.xml
+share/xsl/docbook/params/man.table.footnotes.divider.xml
 share/xsl/docbook/params/man.th.extra1.suppress.xml
 share/xsl/docbook/params/man.th.extra2.max.length.xml
 share/xsl/docbook/params/man.th.extra2.suppress.xml
@@ -641,6 +692,9 @@ share/xsl/docbook/params/olink.properties.xml
 share/xsl/docbook/params/olink.pubid.xml
 share/xsl/docbook/params/olink.resolver.xml
 share/xsl/docbook/params/olink.sysid.xml
+share/xsl/docbook/params/orderedlist.label.properties.xml
+share/xsl/docbook/params/orderedlist.label.width.xml
+share/xsl/docbook/params/orderedlist.properties.xml
 share/xsl/docbook/params/page.height.portrait.xml
 share/xsl/docbook/params/page.height.xml
 share/xsl/docbook/params/page.margin.bottom.xml
@@ -655,6 +709,7 @@ share/xsl/docbook/params/paper.type.xml
 share/xsl/docbook/params/para.propagates.style.xml
 share/xsl/docbook/params/part.autolabel.xml
 share/xsl/docbook/params/passivetex.extensions.xml
+share/xsl/docbook/params/pgwide.properties.xml
 share/xsl/docbook/params/phrase.propagates.style.xml
 share/xsl/docbook/params/pixels.per.inch.xml
 share/xsl/docbook/params/points.per.em.xml
@@ -689,6 +744,7 @@ share/xsl/docbook/params/qanda.title.level5.properties.xml
 share/xsl/docbook/params/qanda.title.level6.properties.xml
 share/xsl/docbook/params/qanda.title.properties.xml
 share/xsl/docbook/params/qandadiv.autolabel.xml
+share/xsl/docbook/params/refclass.suppress.xml
 share/xsl/docbook/params/refentry.date.profile.enabled.xml
 share/xsl/docbook/params/refentry.date.profile.xml
 share/xsl/docbook/params/refentry.generate.name.xml
@@ -696,6 +752,7 @@ share/xsl/docbook/params/refentry.generate.title.xml
 share/xsl/docbook/params/refentry.manual.fallback.profile.xml
 share/xsl/docbook/params/refentry.manual.profile.enabled.xml
 share/xsl/docbook/params/refentry.manual.profile.xml
+share/xsl/docbook/params/refentry.meta.get.quietly.xml
 share/xsl/docbook/params/refentry.pagebreak.xml
 share/xsl/docbook/params/refentry.separator.xml
 share/xsl/docbook/params/refentry.source.fallback.profile.xml
@@ -709,6 +766,9 @@ share/xsl/docbook/params/refentry.version.suppress.xml
 share/xsl/docbook/params/refentry.xref.manvolnum.xml
 share/xsl/docbook/params/region.after.extent.xml
 share/xsl/docbook/params/region.before.extent.xml
+share/xsl/docbook/params/revhistory.table.cell.properties.xml
+share/xsl/docbook/params/revhistory.table.properties.xml
+share/xsl/docbook/params/revhistory.title.properties.xml
 share/xsl/docbook/params/root.filename.xml
 share/xsl/docbook/params/root.properties.xml
 share/xsl/docbook/params/rootid.xml
@@ -762,6 +822,7 @@ share/xsl/docbook/params/table.cell.padding.xml
 share/xsl/docbook/params/table.entry.padding.xml
 share/xsl/docbook/params/table.footnote.number.format.xml
 share/xsl/docbook/params/table.footnote.number.symbols.xml
+share/xsl/docbook/params/table.footnote.properties.xml
 share/xsl/docbook/params/table.frame.border.color.xml
 share/xsl/docbook/params/table.frame.border.style.xml
 share/xsl/docbook/params/table.frame.border.thickness.xml
@@ -779,11 +840,13 @@ share/xsl/docbook/params/textinsert.extension.xml
 share/xsl/docbook/params/title.font.family.xml
 share/xsl/docbook/params/title.margin.left.xml
 share/xsl/docbook/params/toc.indent.width.xml
+share/xsl/docbook/params/toc.line.properties.xml
 share/xsl/docbook/params/toc.list.type.xml
 share/xsl/docbook/params/toc.margin.properties.xml
 share/xsl/docbook/params/toc.max.depth.xml
 share/xsl/docbook/params/toc.section.depth.xml
 share/xsl/docbook/params/ulink.footnotes.xml
+share/xsl/docbook/params/ulink.hyphenate.chars.xml
 share/xsl/docbook/params/ulink.hyphenate.xml
 share/xsl/docbook/params/ulink.show.xml
 share/xsl/docbook/params/ulink.target.xml
@@ -798,7 +861,10 @@ share/xsl/docbook/params/use.svg.xml
 share/xsl/docbook/params/variablelist.as.blocks.xml
 share/xsl/docbook/params/variablelist.as.table.xml
 share/xsl/docbook/params/variablelist.max.termlength.xml
+share/xsl/docbook/params/variablelist.term.break.after.xml
+share/xsl/docbook/params/variablelist.term.separator.xml
 share/xsl/docbook/params/verbatim.properties.xml
+share/xsl/docbook/params/wordml.template.xml
 share/xsl/docbook/params/xep.extensions.xml
 share/xsl/docbook/params/xep.index.item.properties.xml
 share/xsl/docbook/params/xref.label-page.separator.xml
@@ -806,12 +872,10 @@ share/xsl/docbook/params/xref.label-title.separator.xml
 share/xsl/docbook/params/xref.properties.xml
 share/xsl/docbook/params/xref.title-page.separator.xml
 share/xsl/docbook/params/xref.with.number.and.title.xml
-share/xsl/docbook/profiling/ChangeLog
 share/xsl/docbook/profiling/profile-mode.xsl
 share/xsl/docbook/profiling/profile.xsl
 share/xsl/docbook/profiling/strip-attributes.xsl
 share/xsl/docbook/profiling/xsl2profile.xsl
-share/xsl/docbook/xhtml/ChangeLog
 share/xsl/docbook/xhtml/admon.xsl
 share/xsl/docbook/xhtml/annotations.xsl
 share/xsl/docbook/xhtml/autoidx-ng.xsl
@@ -828,6 +892,7 @@ share/xsl/docbook/xhtml/chunker.xsl
 share/xsl/docbook/xhtml/chunkfast.xsl
 share/xsl/docbook/xhtml/chunktoc.xsl
 share/xsl/docbook/xhtml/component.xsl
+share/xsl/docbook/xhtml/db5strip.xsl
 share/xsl/docbook/xhtml/division.xsl
 share/xsl/docbook/xhtml/docbook.xsl
 share/xsl/docbook/xhtml/docbookng.xsl
@@ -878,6 +943,12 @@ share/xsl/docbook/xhtml/xref.xsl
 @dirrm share/xsl/docbook/htmlhelp
 @dirrm share/xsl/docbook/html
 @dirrm share/xsl/docbook/fo
+@dirrm share/xsl/docbook/extensions/xalan27/src/com/nwalsh/xalan
+@dirrm share/xsl/docbook/extensions/xalan27/src/com/nwalsh
+@dirrm share/xsl/docbook/extensions/xalan27/src/com
+@dirrm share/xsl/docbook/extensions/xalan27/src
+@dirrm share/xsl/docbook/extensions/xalan27/nbproject
+@dirrm share/xsl/docbook/extensions/xalan27
 @dirrm share/xsl/docbook/extensions/xalan2/com/nwalsh/xalan
 @dirrm share/xsl/docbook/extensions/xalan2/com/nwalsh
 @dirrm share/xsl/docbook/extensions/xalan2/com
@@ -886,9 +957,11 @@ share/xsl/docbook/xhtml/xref.xsl
 @dirrm share/xsl/docbook/extensions/saxon643/com/nwalsh
 @dirrm share/xsl/docbook/extensions/saxon643/com
 @dirrm share/xsl/docbook/extensions/saxon643
+@dirrm share/xsl/docbook/extensions/build2
+@dirrm share/xsl/docbook/extensions/build
 @dirrm share/xsl/docbook/extensions
 @dirrm share/xsl/docbook/common
 @dirrm share/xsl/docbook
 @unexec ${RMDIR} %D/share/xsl 2>/dev/null || ${TRUE}
-@comment in xmlcatmgr: @dirrm share/xml
 @dirrm share/examples/docbook-xsl
+@comment in xmlcatmgr: @dirrm share/xml
diff --git a/textproc/docbook-xsl/distinfo b/textproc/docbook-xsl/distinfo
index 8f6d0f3f176..ecf4020fffb 100644
--- a/textproc/docbook-xsl/distinfo
+++ b/textproc/docbook-xsl/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.16 2006/04/18 20:53:34 minskim Exp $
+$NetBSD: distinfo,v 1.17 2006/05/30 22:13:52 wiz Exp $
 
-SHA1 (docbook-xsl-1.69.1.tar.bz2) = aaabf0e274609134e187a6c36d2be23f3471f507
-RMD160 (docbook-xsl-1.69.1.tar.bz2) = 4cc1a26acdcbe7af8f037cfb261b5e9dca15938c
-Size (docbook-xsl-1.69.1.tar.bz2) = 1058962 bytes
-SHA1 (patch-aa) = faa2fce58198f3ffde4954aed80af262116b06b1
-SHA1 (patch-ab) = 8533b3fab66cfa366efcfc9b1d6199c506fb6482
-SHA1 (patch-ac) = 491378d7796d9c4e555904ea7a3445d188148dc1
+SHA1 (docbook-xsl-1.70.1.tar.bz2) = b3248d88d0d3986760c0790003d8570a9fc7e038
+RMD160 (docbook-xsl-1.70.1.tar.bz2) = 789070e60949f943cdff269dc1ae8fc7c69770ff
+Size (docbook-xsl-1.70.1.tar.bz2) = 1627881 bytes
diff --git a/textproc/docbook-xsl/patches/patch-aa b/textproc/docbook-xsl/patches/patch-aa
deleted file mode 100644
index 451f6792577..00000000000
--- a/textproc/docbook-xsl/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2005/09/10 12:38:30 jmmv Exp $
-
---- common/pi.xsl	2005-09-08 20:36:54.000000000 +0200
-+++ common/pi.xsl	2005-09-08 20:38:08.000000000 +0200
-@@ -105,7 +105,7 @@
-     <xsl:variable name="tokenized-format-string">
-       <xsl:call-template name="str.tokenize.keep.delimiters">
- 	<xsl:with-param name="string" select="$format-nbsp"/>
--	<xsl:with-param name="delimiters" select="'&#xa0;,./-()[]'"/>
-+	<xsl:with-param name="delimiters" select="'&#xa0;,./-:()[]'"/>
-       </xsl:call-template>
-     </xsl:variable>
- 
diff --git a/textproc/docbook-xsl/patches/patch-ab b/textproc/docbook-xsl/patches/patch-ab
deleted file mode 100644
index cd6fdefc90c..00000000000
--- a/textproc/docbook-xsl/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/01/12 17:12:52 jmmv Exp $
-
---- catalog.xml.orig	2005-04-21 02:04:24.000000000 +0200
-+++ catalog.xml
-@@ -7,6 +7,6 @@
-   <rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/current/" rewritePrefix="./"/>
- 
-   <rewriteURI uriStartString="http://docbook.sourceforge.net/release/xsl/1.69.0/" rewritePrefix="./"/>
--  <rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/1.69.0/" rewritePrefix="./"/>
-+  <rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/1.69.1/" rewritePrefix="./"/>
- 
- </catalog>
diff --git a/textproc/docbook-xsl/patches/patch-ac b/textproc/docbook-xsl/patches/patch-ac
deleted file mode 100644
index 483f562c0e4..00000000000
--- a/textproc/docbook-xsl/patches/patch-ac
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/04/18 20:53:34 minskim Exp $
-
-SourceForge Request 1472583
-
---- common/ko.xml.orig	2005-07-17 19:22:26.000000000 -0700
-+++ common/ko.xml
-@@ -277,7 +277,7 @@
-       <l:template name="sect5" text="%t"/>
-       <l:template name="section" text="%t"/>
-       <l:template name="simplesect" text="%t"/>
--      <l:template name="part" text="%t" lang="en"/>
-+      <l:template name="part" text="%t"/>
-    </l:context>
- 
-    <l:context name="title-numbered">
-@@ -292,7 +292,7 @@
-       <l:template name="sect5" text="%n. %t"/>
-       <l:template name="section" text="%n. %t"/>
-       <l:template name="simplesect" text="%n. %t"/>
--      <l:template name="part" text="&#48512;&#160;%n.&#160;%t" lang="en"/>
-+      <l:template name="part" text="%n&#48512;. %t"/>
-    </l:context>
- 
-    <l:context name="subtitle">