5 files changed, 271 insertions, 254 deletions

diff --git a/textproc/xmlroff/Makefile b/textproc/xmlroff/Makefile
index d1c802411597..03f7b44ac330 100644
--- a/textproc/xmlroff/Makefile
+++ b/textproc/xmlroff/Makefile
@@ -6,22 +6,20 @@
 #
 
 PORTNAME=	xmlroff
-PORTVERSION=	0.3.9
-PORTREVISION=	1
+PORTVERSION=	0.5.0
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	http://xmlroff.org/download/
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	XSL formatter that produces PDF and PostScript
 
-LIB_DEPENDS=	pangoxsl-1.0.600:${PORTSDIR}/x11-toolkits/pangoxsl
+LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo
 
 USE_AUTOTOOLS=	libtool:15
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack gnometarget libgnomeprint libxslt
-INSTALLS_SHLIB=	yes
+USE_GNOME=	gnomehack gnometarget libgnomeprint libxslt \
+		libxml2 gtk20 glib20 pango
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc \
 		--with-html-dir=${PREFIX}/share/doc
diff --git a/textproc/xmlroff/distinfo b/textproc/xmlroff/distinfo
index e8de942c8c97..c9e21e3d6eb7 100644
--- a/textproc/xmlroff/distinfo
+++ b/textproc/xmlroff/distinfo
@@ -1,3 +1,3 @@
-MD5 (xmlroff-0.3.9.tar.gz) = d31609cd44b2acc02e69b03afb8028b1
-SHA256 (xmlroff-0.3.9.tar.gz) = c88f6a71469ffd4cd45613b43cfb9bb635450ce6d7f9390ade219da1525904ec
-SIZE (xmlroff-0.3.9.tar.gz) = 2501052
+MD5 (xmlroff-0.5.0.tar.gz) = 840efe684709b4af553d3cdab09f748d
+SHA256 (xmlroff-0.5.0.tar.gz) = 852e0b18b280c3ea6e99c074ff7c103523343a80f85e6e3f1ea14f26ce8e417d
+SIZE (xmlroff-0.5.0.tar.gz) = 2612439
diff --git a/textproc/xmlroff/files/patch-result-to-fo.c b/textproc/xmlroff/files/patch-fo-fo-fo.c
index eb370173aa7b..da4a101bb1e9 100644
--- a/textproc/xmlroff/files/patch-result-to-fo.c
+++ b/textproc/xmlroff/files/patch-fo-fo-fo.c
@@ -1,15 +1,15 @@
---- result-to-fo.c.orig	Mon Jan 10 14:56:38 2005
-+++ result-to-fo.c	Mon Jan 10 14:57:14 2005
-@@ -852,6 +852,8 @@
+--- fo/fo-fo.c.orig	Sat Aug 19 01:29:53 2006
++++ fo/fo-fo.c	Sat Aug 19 01:30:44 2006
+@@ -1213,6 +1213,8 @@
    while (iterator)
      {
        FoProperty *property = NULL;
 +      FoPropertyClass *property_class = NULL;
 +      FoTypeFunc type_func;
  
+       /* Skip processing attributes that have already been handled. */
        if (strcmp (xslAttrListIteratorName (iterator), "font-size") == 0 ||
- 	  (FO_IS_TABLE_CELL (fo_fo) &&
-@@ -872,8 +874,8 @@
+@@ -1234,8 +1236,8 @@
  	    }
  	}
  
diff --git a/textproc/xmlroff/files/patch-libfo::fo-doc-gp.c b/textproc/xmlroff/files/patch-libfo::fo-doc-gp.c
index 39368fbac1e3..d22088db10ae 100644
--- a/textproc/xmlroff/files/patch-libfo::fo-doc-gp.c
+++ b/textproc/xmlroff/files/patch-libfo::fo-doc-gp.c
@@ -1,14 +1,14 @@
---- libfo/fo-doc-gp.c.orig	Thu Mar 31 16:36:10 2005
-+++ libfo/fo-doc-gp.c	Tue Jun 14 21:11:30 2005
-@@ -1143,6 +1143,7 @@
- 			gint              y)
+--- libfo/fo-doc-gp.c.orig	Sun Jul 23 05:13:09 2006
++++ libfo/fo-doc-gp.c	Sat Aug 19 01:26:49 2006
+@@ -1237,6 +1237,7 @@
+ 			gint               y)
  {
    PangoLayoutIter *iter;
 +  gint line_number = -1;
    
    g_return_if_fail (context != NULL);
    g_return_if_fail (PANGO_IS_LAYOUT (layout));
-@@ -1152,7 +1153,6 @@
+@@ -1245,7 +1246,6 @@
  
    iter = pango_layout_get_iter (layout);
  
@@ -16,41 +16,41 @@
    do
      {
        PangoRectangle   logical_rect;
-@@ -1202,6 +1202,9 @@
- 			       gfloat   x,
- 			       gfloat   y)
+@@ -1296,6 +1296,9 @@
+ 			       gdouble   x,
+ 			       gdouble   y)
  {
-+  gfloat x1, x2, y1, y2;
-+  gint line_first, line_last;
++  gdouble x1, x2, y1, y2;
++  guint line_first, line_last;
 +
    g_return_if_fail (FO_IS_DOC_GP (fo_doc));
    g_return_if_fail (FO_DOC_GP (fo_doc)->context != NULL);
    g_return_if_fail (FO_IS_AREA_LAYOUT (area_layout));
-@@ -1213,9 +1216,9 @@
+@@ -1307,9 +1310,9 @@
     * lines that are to be rendered.
     */
  
--  gfloat y1 = y;
+-  gdouble y1 = y;
 +  y1 = y;
  
--  gint line_first = fo_area_layout_get_line_first (area_layout);
+-  guint line_first = fo_area_layout_get_line_first (area_layout);
 +  line_first = fo_area_layout_get_line_first (area_layout);
    if (line_first > 0)
      {
        y1 =
-@@ -1223,12 +1226,12 @@
+@@ -1317,12 +1320,12 @@
  					    line_first - 1);
      }
  
--  gint line_last = fo_area_layout_get_line_last (area_layout);
--  gfloat y2 =
+-  guint line_last = fo_area_layout_get_line_last (area_layout);
+-  gdouble y2 =
 +  line_last = fo_area_layout_get_line_last (area_layout);
 +  y2 =
        y1 - fo_area_layout_get_line_height (area_layout,
  					   line_last);
  
--  gfloat x2 =
+-  gdouble x2 =
 +  x2 =
        x + fo_area_area_get_width (area_layout);
  
-   gnome_print_gsave (FO_DOC_GP(fo_doc)->context);
+ #if ENABLE_CLIP
diff --git a/textproc/xmlroff/pkg-plist b/textproc/xmlroff/pkg-plist
index 73bd5c7259ab..90b1f01e60d2 100644
--- a/textproc/xmlroff/pkg-plist
+++ b/textproc/xmlroff/pkg-plist
@@ -1,40 +1,47 @@
 @comment $FreeBSD$
 bin/xmlroff
-include/libfo-0.3/area/fo-area.h
-include/libfo-0.3/datatype/fo-datatype.h
-include/libfo-0.3/datatype/fo-enum.h
-include/libfo-0.3/fo-context.h
-include/libfo-0.3/fo-node.h
-include/libfo-0.3/fo-object.h
-include/libfo-0.3/fo/fo-fo.h
-include/libfo-0.3/libfo/fo-doc-gp-private.h
-include/libfo-0.3/libfo/fo-doc-gp.h
-include/libfo-0.3/libfo/fo-doc-private.h
-include/libfo-0.3/libfo/fo-doc.h
-include/libfo-0.3/libfo/fo-font-desc-private.h
-include/libfo-0.3/libfo/fo-font-desc.h
-include/libfo-0.3/libfo/fo-layout-gp-private.h
-include/libfo-0.3/libfo/fo-layout-gp.h
-include/libfo-0.3/libfo/fo-layout-private.h
-include/libfo-0.3/libfo/fo-layout.h
-include/libfo-0.3/libfo/fo-libfo-basic.h
-include/libfo-0.3/libfo/fo-libfo-context.h
-include/libfo-0.3/libfo/fo-libfo.h
-include/libfo-0.3/libfo/fo-utils.h
-include/libfo-0.3/libfo/fo-xml-doc-private.h
-include/libfo-0.3/libfo/fo-xml-doc.h
-include/libfo-0.3/libfo/fo-xsl-formatter.c
-include/libfo-0.3/libfo/fo-xsl-formatter.h
-include/libfo-0.3/libfo/fo-xslt-transformer.h
-include/libfo-0.3/property/fo-property.h
-include/libfo-0.3/util/fo-hash-table.h
-include/libfo-0.3/util/fo-image.h
-include/libfo-0.3/util/fo-pixbuf.h
-lib/libfo-0.3.a
-lib/libfo-0.3.la
-lib/libfo-0.3.so
-lib/libfo-0.3.so.309
-libdata/pkgconfig/libfo-0.3.pc
+include/libfo-0.5/area/fo-area.h
+include/libfo-0.5/datatype/fo-datatype.h
+include/libfo-0.5/datatype/fo-enum.h
+include/libfo-0.5/fo-context.h
+include/libfo-0.5/fo-node.h
+include/libfo-0.5/fo-object.h
+include/libfo-0.5/fo/fo-fo.h
+include/libfo-0.5/libfo/fo-doc-cairo-private.h
+include/libfo-0.5/libfo/fo-doc-cairo.h
+include/libfo-0.5/libfo/fo-doc-gp-private.h
+include/libfo-0.5/libfo/fo-doc-gp.h
+include/libfo-0.5/libfo/fo-doc-private.h
+include/libfo-0.5/libfo/fo-doc.h
+include/libfo-0.5/libfo/fo-font-desc-private.h
+include/libfo-0.5/libfo/fo-font-desc.h
+include/libfo-0.5/libfo/fo-layout-cairo-private.h
+include/libfo-0.5/libfo/fo-layout-cairo.h
+include/libfo-0.5/libfo/fo-layout-gp-private.h
+include/libfo-0.5/libfo/fo-layout-gp.h
+include/libfo-0.5/libfo/fo-layout-private.h
+include/libfo-0.5/libfo/fo-layout.h
+include/libfo-0.5/libfo/fo-libfo-basic.h
+include/libfo-0.5/libfo/fo-libfo-context.h
+include/libfo-0.5/libfo/fo-libfo.h
+include/libfo-0.5/libfo/fo-utils.h
+include/libfo-0.5/libfo/fo-xml-doc-private.h
+include/libfo-0.5/libfo/fo-xml-doc.h
+include/libfo-0.5/libfo/fo-xml-node-private.h
+include/libfo-0.5/libfo/fo-xml-node.h
+include/libfo-0.5/libfo/fo-xsl-formatter.c
+include/libfo-0.5/libfo/fo-xsl-formatter.h
+include/libfo-0.5/libfo/fo-xslt-transformer.h
+include/libfo-0.5/libfo/libfo-compat.h
+include/libfo-0.5/property/fo-property.h
+include/libfo-0.5/util/fo-hash-table.h
+include/libfo-0.5/util/fo-image.h
+include/libfo-0.5/util/fo-pixbuf.h
+lib/libfo-0.5.a
+lib/libfo-0.5.la
+lib/libfo-0.5.so
+lib/libfo-0.5.so.500
+libdata/pkgconfig/libfo-0.5.pc
 %%DOCSDIR%%/FoArea.html
 %%DOCSDIR%%/FoAreaArea.html
 %%DOCSDIR%%/FoAreaLayout.html
@@ -82,9 +89,11 @@ libdata/pkgconfig/libfo-0.3.pc
 %%DOCSDIR%%/FoObject.html
 %%DOCSDIR%%/FoPercentage.html
 %%DOCSDIR%%/FoProperty.html
+%%DOCSDIR%%/FoPropertyTextPropertyIface.html
 %%DOCSDIR%%/FoSpace.html
 %%DOCSDIR%%/FoString.html
 %%DOCSDIR%%/FoTableBorderFoIface.html
+%%DOCSDIR%%/FoTablePart.html
 %%DOCSDIR%%/FoText.html
 %%DOCSDIR%%/FoTree.html
 %%DOCSDIR%%/FoUnknown.html
@@ -92,284 +101,294 @@ libdata/pkgconfig/libfo-0.3.pc
 %%DOCSDIR%%/FoWrapperBlock.html
 %%DOCSDIR%%/FoWrapperInline.html
 %%DOCSDIR%%/FoWrapperWhitespace.html
-%%DOCSDIR%%/alignment-adjust.html
-%%DOCSDIR%%/alignment-baseline.html
 %%DOCSDIR%%/areas.html
-%%DOCSDIR%%/background-color.html
-%%DOCSDIR%%/baseline-shift.html
+%%DOCSDIR%%/backends.html
 %%DOCSDIR%%/basic-interface.html
-%%DOCSDIR%%/basic-link.html
-%%DOCSDIR%%/bidi-override.html
-%%DOCSDIR%%/block-container.html
-%%DOCSDIR%%/block-progression-dimension.html
 %%DOCSDIR%%/block.html
-%%DOCSDIR%%/border-after-color.html
-%%DOCSDIR%%/border-after-precedence.html
-%%DOCSDIR%%/border-after-style.html
-%%DOCSDIR%%/border-after-width.html
-%%DOCSDIR%%/border-before-color.html
-%%DOCSDIR%%/border-before-precedence.html
-%%DOCSDIR%%/border-before-style.html
-%%DOCSDIR%%/border-before-width.html
-%%DOCSDIR%%/border-bottom-color.html
-%%DOCSDIR%%/border-bottom-style.html
-%%DOCSDIR%%/border-bottom-width.html
-%%DOCSDIR%%/border-collapse.html
-%%DOCSDIR%%/border-end-color.html
-%%DOCSDIR%%/border-end-precedence.html
-%%DOCSDIR%%/border-end-style.html
-%%DOCSDIR%%/border-end-width.html
-%%DOCSDIR%%/border-left-color.html
-%%DOCSDIR%%/border-left-style.html
-%%DOCSDIR%%/border-left-width.html
-%%DOCSDIR%%/border-right-color.html
-%%DOCSDIR%%/border-right-style.html
-%%DOCSDIR%%/border-right-width.html
-%%DOCSDIR%%/border-separation.html
-%%DOCSDIR%%/border-start-color.html
-%%DOCSDIR%%/border-start-precedence.html
-%%DOCSDIR%%/border-start-style.html
-%%DOCSDIR%%/border-start-width.html
-%%DOCSDIR%%/border-top-color.html
-%%DOCSDIR%%/border-top-style.html
-%%DOCSDIR%%/border-top-width.html
-%%DOCSDIR%%/border.html
-%%DOCSDIR%%/break-after.html
-%%DOCSDIR%%/break-before.html
 %%DOCSDIR%%/ch02.html
-%%DOCSDIR%%/character.html
-%%DOCSDIR%%/clip.html
-%%DOCSDIR%%/color-profile.html
-%%DOCSDIR%%/color.html
-%%DOCSDIR%%/column-number.html
-%%DOCSDIR%%/column-width.html
-%%DOCSDIR%%/conditional-page-master-reference.html
 %%DOCSDIR%%/conformance.html
-%%DOCSDIR%%/content-height.html
-%%DOCSDIR%%/content-type.html
-%%DOCSDIR%%/content-width.html
 %%DOCSDIR%%/context.html
 %%DOCSDIR%%/datatypes.html
 %%DOCSDIR%%/debugging.html
-%%DOCSDIR%%/declarations.html
-%%DOCSDIR%%/direction.html
 %%DOCSDIR%%/directory-structure.html
-%%DOCSDIR%%/display-align.html
-%%DOCSDIR%%/dominant-baseline.html
-%%DOCSDIR%%/end-indent.html
-%%DOCSDIR%%/external-graphic.html
-%%DOCSDIR%%/flow-name.html
-%%DOCSDIR%%/flow.html
+%%DOCSDIR%%/fo-area-c-file.html
 %%DOCSDIR%%/fo-c-file.html
-%%DOCSDIR%%/font-family.html
-%%DOCSDIR%%/font-size.html
-%%DOCSDIR%%/font-stretch.html
-%%DOCSDIR%%/font-style.html
-%%DOCSDIR%%/font-variant.html
-%%DOCSDIR%%/font-weight.html
-%%DOCSDIR%%/footnote-body.html
-%%DOCSDIR%%/format.html
+%%DOCSDIR%%/fo-h-file.html
 %%DOCSDIR%%/formatting-objects.html
 %%DOCSDIR%%/generating-source.html
-%%DOCSDIR%%/grouping-separator.html
-%%DOCSDIR%%/grouping-size.html
-%%DOCSDIR%%/height.html
 %%DOCSDIR%%/home.png
 %%DOCSDIR%%/index.html
 %%DOCSDIR%%/index.sgml
-%%DOCSDIR%%/initial-property-set.html
-%%DOCSDIR%%/inline-container.html
-%%DOCSDIR%%/inline-progression-dimension.html
-%%DOCSDIR%%/inline.html
-%%DOCSDIR%%/instream-foreign-object.html
 %%DOCSDIR%%/interfaces.html
 %%DOCSDIR%%/introduction.html
-%%DOCSDIR%%/keep-together.html
-%%DOCSDIR%%/keep-with-next.html
-%%DOCSDIR%%/keep-with-previous.html
-%%DOCSDIR%%/layout-master-set.html
-%%DOCSDIR%%/leader.html
 %%DOCSDIR%%/left.png
-%%DOCSDIR%%/letter-value.html
-%%DOCSDIR%%/line-height.html
-%%DOCSDIR%%/line-stacking-strategy.html
-%%DOCSDIR%%/list-block.html
-%%DOCSDIR%%/list-item-body.html
-%%DOCSDIR%%/list-item-label.html
-%%DOCSDIR%%/list-item.html
-%%DOCSDIR%%/margin-bottom.html
-%%DOCSDIR%%/margin-left.html
-%%DOCSDIR%%/margin-right.html
-%%DOCSDIR%%/margin-top.html
-%%DOCSDIR%%/margin.html
-%%DOCSDIR%%/master-name.html
-%%DOCSDIR%%/master-reference.html
-%%DOCSDIR%%/media-usage.html
-%%DOCSDIR%%/multi-case.html
-%%DOCSDIR%%/multi-switch.html
-%%DOCSDIR%%/multi-properties.html
-%%DOCSDIR%%/multi-property-set.html
-%%DOCSDIR%%/multi-toggle.html
 %%DOCSDIR%%/node.html
-%%DOCSDIR%%/number-columns-repeated.html
-%%DOCSDIR%%/number-columns-spanned.html
-%%DOCSDIR%%/number-rows-spanned.html
 %%DOCSDIR%%/object.html
-%%DOCSDIR%%/orphans.html
 %%DOCSDIR%%/other-objects.html
-%%DOCSDIR%%/overflow.html
-%%DOCSDIR%%/padding-after.html
-%%DOCSDIR%%/padding-before.html
-%%DOCSDIR%%/padding-bottom.html
-%%DOCSDIR%%/padding-end.html
-%%DOCSDIR%%/padding-left.html
-%%DOCSDIR%%/padding-right.html
-%%DOCSDIR%%/padding-start.html
-%%DOCSDIR%%/padding-top.html
-%%DOCSDIR%%/padding.html
-%%DOCSDIR%%/page-height.html
-%%DOCSDIR%%/page-number-citation.html
-%%DOCSDIR%%/page-number.html
-%%DOCSDIR%%/page-sequence-master.html
-%%DOCSDIR%%/page-sequence.html
-%%DOCSDIR%%/page-width.html
 %%DOCSDIR%%/properties.html
-%%DOCSDIR%%/provisional-distance-between-starts.html
-%%DOCSDIR%%/provisional-label-separation.html
-%%DOCSDIR%%/region-after.html
-%%DOCSDIR%%/region-before.html
-%%DOCSDIR%%/region-body.html
-%%DOCSDIR%%/region-end.html
-%%DOCSDIR%%/region-name.html
-%%DOCSDIR%%/region-start.html
-%%DOCSDIR%%/repeatable-page-master-alternatives.html
-%%DOCSDIR%%/repeatable-page-master-reference.html
 %%DOCSDIR%%/right.png
-%%DOCSDIR%%/role.html
-%%DOCSDIR%%/root.html
-%%DOCSDIR%%/scaling-method.html
-%%DOCSDIR%%/scaling.html
-%%DOCSDIR%%/score-spaces.html
-%%DOCSDIR%%/simple-page-master.html
-%%DOCSDIR%%/single-page-master-reference.html
-%%DOCSDIR%%/source-document.html
-%%DOCSDIR%%/space-after.html
-%%DOCSDIR%%/space-before.html
-%%DOCSDIR%%/space-end.html
-%%DOCSDIR%%/space-start.html
-%%DOCSDIR%%/src.html
-%%DOCSDIR%%/start-indent.html
-%%DOCSDIR%%/static-content.html
-%%DOCSDIR%%/table-and-caption.html
-%%DOCSDIR%%/table-body.html
-%%DOCSDIR%%/table-caption.html
-%%DOCSDIR%%/table-cell.html
-%%DOCSDIR%%/table-column.html
-%%DOCSDIR%%/table-footer.html
-%%DOCSDIR%%/table-header.html
-%%DOCSDIR%%/table-layout.html
-%%DOCSDIR%%/table-row.html
-%%DOCSDIR%%/table.html
-%%DOCSDIR%%/text-align.html
-%%DOCSDIR%%/text-indent.html
-%%DOCSDIR%%/title.html
-%%DOCSDIR%%/unicode-bidi.html
+%%DOCSDIR%%/style.css
 %%DOCSDIR%%/up.png
+%%DOCSDIR%%/utility-modules.html
 %%DOCSDIR%%/utility-objects.html
-%%DOCSDIR%%/widows.html
-%%DOCSDIR%%/width.html
-%%DOCSDIR%%/wrap-option.html
-%%DOCSDIR%%/writing-mode.html
+%%DOCSDIR%%/xmlroff-Additional-Pango-attributes-needed-by-LibFO.html
 %%DOCSDIR%%/xmlroff-FoCharacter.html
 %%DOCSDIR%%/xmlroff-FoDoc.html
+%%DOCSDIR%%/xmlroff-FoDocCairo.html
 %%DOCSDIR%%/xmlroff-FoDocGP.html
 %%DOCSDIR%%/xmlroff-FoError.html
 %%DOCSDIR%%/xmlroff-FoFontDesc.html
 %%DOCSDIR%%/xmlroff-FoImage.html
 %%DOCSDIR%%/xmlroff-FoLayout.html
+%%DOCSDIR%%/xmlroff-FoLayoutCairo.html
 %%DOCSDIR%%/xmlroff-FoLibfoContext.html
 %%DOCSDIR%%/xmlroff-FoNeutralFoIface.html
 %%DOCSDIR%%/xmlroff-FoPcw.html
 %%DOCSDIR%%/xmlroff-FoPixbuf.html
 %%DOCSDIR%%/xmlroff-FoTblr.html
 %%DOCSDIR%%/xmlroff-FoWrapper.html
+%%DOCSDIR%%/xmlroff-FoWrapperInlineEmpty.html
 %%DOCSDIR%%/xmlroff-FoWsc.html
 %%DOCSDIR%%/xmlroff-FoXmlDoc.html
+%%DOCSDIR%%/xmlroff-FoXmlNode.html
 %%DOCSDIR%%/xmlroff-FoXslFormatter.html
 %%DOCSDIR%%/xmlroff-FoXsltTransformer.html
+%%DOCSDIR%%/xmlroff-LibFO-compatibility-stylesheet.html
+%%DOCSDIR%%/xmlroff-alignment-adjust.html
+%%DOCSDIR%%/xmlroff-alignment-baseline.html
+%%DOCSDIR%%/xmlroff-background-color.html
 %%DOCSDIR%%/xmlroff-background-image.html
+%%DOCSDIR%%/xmlroff-baseline-shift.html
+%%DOCSDIR%%/xmlroff-basic-link.html
+%%DOCSDIR%%/xmlroff-bidi-override.html
+%%DOCSDIR%%/xmlroff-block-container.html
+%%DOCSDIR%%/xmlroff-block-progression-dimension.html
 %%DOCSDIR%%/xmlroff-block-progression-dimensionmaximum.html
 %%DOCSDIR%%/xmlroff-block-progression-dimensionminimum.html
 %%DOCSDIR%%/xmlroff-block-progression-dimensionoptimum.html
+%%DOCSDIR%%/xmlroff-border-after-color.html
+%%DOCSDIR%%/xmlroff-border-after-precedence.html
+%%DOCSDIR%%/xmlroff-border-after-style.html
+%%DOCSDIR%%/xmlroff-border-after-width.html
+%%DOCSDIR%%/xmlroff-border-before-color.html
+%%DOCSDIR%%/xmlroff-border-before-precedence.html
+%%DOCSDIR%%/xmlroff-border-before-style.html
+%%DOCSDIR%%/xmlroff-border-before-width.html
+%%DOCSDIR%%/xmlroff-border-bottom-color.html
+%%DOCSDIR%%/xmlroff-border-bottom-style.html
+%%DOCSDIR%%/xmlroff-border-bottom-width.html
 %%DOCSDIR%%/xmlroff-border-bottom.html
+%%DOCSDIR%%/xmlroff-border-collapse.html
+%%DOCSDIR%%/xmlroff-border-end-color.html
+%%DOCSDIR%%/xmlroff-border-end-precedence.html
+%%DOCSDIR%%/xmlroff-border-end-style.html
+%%DOCSDIR%%/xmlroff-border-end-width.html
+%%DOCSDIR%%/xmlroff-border-left-color.html
+%%DOCSDIR%%/xmlroff-border-left-style.html
+%%DOCSDIR%%/xmlroff-border-left-width.html
 %%DOCSDIR%%/xmlroff-border-left.html
+%%DOCSDIR%%/xmlroff-border-right-color.html
+%%DOCSDIR%%/xmlroff-border-right-style.html
+%%DOCSDIR%%/xmlroff-border-right-width.html
 %%DOCSDIR%%/xmlroff-border-right.html
+%%DOCSDIR%%/xmlroff-border-separation.html
+%%DOCSDIR%%/xmlroff-border-start-color.html
+%%DOCSDIR%%/xmlroff-border-start-precedence.html
+%%DOCSDIR%%/xmlroff-border-start-style.html
+%%DOCSDIR%%/xmlroff-border-start-width.html
 %%DOCSDIR%%/xmlroff-border-style.html
+%%DOCSDIR%%/xmlroff-border-top-color.html
+%%DOCSDIR%%/xmlroff-border-top-style.html
+%%DOCSDIR%%/xmlroff-border-top-width.html
 %%DOCSDIR%%/xmlroff-border-top.html
 %%DOCSDIR%%/xmlroff-border-width.html
+%%DOCSDIR%%/xmlroff-border.html
+%%DOCSDIR%%/xmlroff-break-after.html
+%%DOCSDIR%%/xmlroff-break-before.html
+%%DOCSDIR%%/xmlroff-character.html
+%%DOCSDIR%%/xmlroff-clip.html
+%%DOCSDIR%%/xmlroff-color-profile.html
+%%DOCSDIR%%/xmlroff-color.html
+%%DOCSDIR%%/xmlroff-column-number.html
+%%DOCSDIR%%/xmlroff-column-width.html
+%%DOCSDIR%%/xmlroff-conditional-page-master-reference.html
+%%DOCSDIR%%/xmlroff-content-height.html
+%%DOCSDIR%%/xmlroff-content-type.html
+%%DOCSDIR%%/xmlroff-content-width.html
+%%DOCSDIR%%/xmlroff-declarations.html
+%%DOCSDIR%%/xmlroff-direction.html
+%%DOCSDIR%%/xmlroff-display-align.html
+%%DOCSDIR%%/xmlroff-dominant-baseline.html
+%%DOCSDIR%%/xmlroff-end-indent.html
 %%DOCSDIR%%/xmlroff-extent.html
+%%DOCSDIR%%/xmlroff-external-graphic.html
 %%DOCSDIR%%/xmlroff-float.html
-%%DOCSDIR%%/xmlroff-fo-block-area.html
-%%DOCSDIR%%/xmlroff-fo-block-block-area.html
-%%DOCSDIR%%/xmlroff-fo-flow-area.html
+%%DOCSDIR%%/xmlroff-flow-name.html
+%%DOCSDIR%%/xmlroff-flow.html
+%%DOCSDIR%%/xmlroff-fo-area-graphic.html
+%%DOCSDIR%%/xmlroff-fo-area-inline.html
+%%DOCSDIR%%/xmlroff-fo-doc-commands.html
 %%DOCSDIR%%/xmlroff-fo-layout-gp.html
 %%DOCSDIR%%/xmlroff-fo-libfo-basic.html
-%%DOCSDIR%%/xmlroff-fo-list-block-area.html
-%%DOCSDIR%%/xmlroff-fo-list-item-area.html
-%%DOCSDIR%%/xmlroff-fo-list-item-body-area.html
-%%DOCSDIR%%/xmlroff-fo-list-item-label-area.html
 %%DOCSDIR%%/xmlroff-fo-marker-parent.html
-%%DOCSDIR%%/xmlroff-fo-page-sequence-area.html
 %%DOCSDIR%%/xmlroff-fo-property-border-color.html
-%%DOCSDIR%%/xmlroff-fo-region-body-area.html
 %%DOCSDIR%%/xmlroff-fo-retrieve-marker.html
-%%DOCSDIR%%/xmlroff-fo-table-area.html
-%%DOCSDIR%%/xmlroff-fo-wrapper-block-area.html
+%%DOCSDIR%%/xmlroff-font-family.html
+%%DOCSDIR%%/xmlroff-font-size.html
+%%DOCSDIR%%/xmlroff-font-stretch.html
+%%DOCSDIR%%/xmlroff-font-style.html
+%%DOCSDIR%%/xmlroff-font-variant.html
+%%DOCSDIR%%/xmlroff-font-weight.html
+%%DOCSDIR%%/xmlroff-footnote-body.html
 %%DOCSDIR%%/xmlroff-footnote.html
+%%DOCSDIR%%/xmlroff-format.html
+%%DOCSDIR%%/xmlroff-grouping-separator.html
+%%DOCSDIR%%/xmlroff-grouping-size.html
+%%DOCSDIR%%/xmlroff-height.html
 %%DOCSDIR%%/xmlroff-id.html
+%%DOCSDIR%%/xmlroff-initial-property-set.html
+%%DOCSDIR%%/xmlroff-inline-container.html
+%%DOCSDIR%%/xmlroff-inline-progression-dimension.html
 %%DOCSDIR%%/xmlroff-inline-progression-dimensionmaximum.html
 %%DOCSDIR%%/xmlroff-inline-progression-dimensionminimum.html
 %%DOCSDIR%%/xmlroff-inline-progression-dimensionoptimum.html
+%%DOCSDIR%%/xmlroff-inline.html
+%%DOCSDIR%%/xmlroff-instream-foreign-object.html
+%%DOCSDIR%%/xmlroff-keep-together.html
 %%DOCSDIR%%/xmlroff-keep-togetherwithin-column.html
 %%DOCSDIR%%/xmlroff-keep-togetherwithin-line.html
 %%DOCSDIR%%/xmlroff-keep-togetherwithin-page.html
+%%DOCSDIR%%/xmlroff-keep-with-next.html
 %%DOCSDIR%%/xmlroff-keep-with-nextwithin-column.html
 %%DOCSDIR%%/xmlroff-keep-with-nextwithin-line.html
 %%DOCSDIR%%/xmlroff-keep-with-nextwithin-page.html
+%%DOCSDIR%%/xmlroff-keep-with-previous.html
 %%DOCSDIR%%/xmlroff-keep-with-previouswithin-column.html
 %%DOCSDIR%%/xmlroff-keep-with-previouswithin-line.html
 %%DOCSDIR%%/xmlroff-keep-with-previouswithin-page.html
+%%DOCSDIR%%/xmlroff-layout-master-set.html
+%%DOCSDIR%%/xmlroff-leader.html
+%%DOCSDIR%%/xmlroff-letter-value.html
+%%DOCSDIR%%/xmlroff-line-height.html
+%%DOCSDIR%%/xmlroff-line-stacking-strategy.html
+%%DOCSDIR%%/xmlroff-linefeed-treatment.html
+%%DOCSDIR%%/xmlroff-list-block.html
+%%DOCSDIR%%/xmlroff-list-item-body.html
+%%DOCSDIR%%/xmlroff-list-item-label.html
+%%DOCSDIR%%/xmlroff-list-item.html
+%%DOCSDIR%%/xmlroff-margin-bottom.html
+%%DOCSDIR%%/xmlroff-margin-left.html
+%%DOCSDIR%%/xmlroff-margin-right.html
+%%DOCSDIR%%/xmlroff-margin-top.html
+%%DOCSDIR%%/xmlroff-margin.html
 %%DOCSDIR%%/xmlroff-marker.html
+%%DOCSDIR%%/xmlroff-master-name.html
+%%DOCSDIR%%/xmlroff-master-reference.html
+%%DOCSDIR%%/xmlroff-media-usage.html
+%%DOCSDIR%%/xmlroff-multi-case.html
+%%DOCSDIR%%/xmlroff-multi-properties.html
+%%DOCSDIR%%/xmlroff-multi-property-set.html
+%%DOCSDIR%%/xmlroff-multi-switch.html
+%%DOCSDIR%%/xmlroff-multi-toggle.html
+%%DOCSDIR%%/xmlroff-number-columns-repeated.html
+%%DOCSDIR%%/xmlroff-number-columns-spanned.html
+%%DOCSDIR%%/xmlroff-number-rows-spanned.html
+%%DOCSDIR%%/xmlroff-orphans.html
+%%DOCSDIR%%/xmlroff-overflow.html
+%%DOCSDIR%%/xmlroff-padding-after.html
+%%DOCSDIR%%/xmlroff-padding-before.html
+%%DOCSDIR%%/xmlroff-padding-bottom.html
+%%DOCSDIR%%/xmlroff-padding-end.html
+%%DOCSDIR%%/xmlroff-padding-left.html
+%%DOCSDIR%%/xmlroff-padding-right.html
+%%DOCSDIR%%/xmlroff-padding-start.html
+%%DOCSDIR%%/xmlroff-padding-top.html
+%%DOCSDIR%%/xmlroff-padding.html
+%%DOCSDIR%%/xmlroff-page-height.html
+%%DOCSDIR%%/xmlroff-page-number-citation.html
+%%DOCSDIR%%/xmlroff-page-number.html
+%%DOCSDIR%%/xmlroff-page-sequence-master.html
+%%DOCSDIR%%/xmlroff-page-sequence.html
+%%DOCSDIR%%/xmlroff-page-width.html
+%%DOCSDIR%%/xmlroff-provisional-distance-between-starts.html
+%%DOCSDIR%%/xmlroff-provisional-label-separation.html
+%%DOCSDIR%%/xmlroff-ref-id.html
+%%DOCSDIR%%/xmlroff-region-after.html
+%%DOCSDIR%%/xmlroff-region-before.html
+%%DOCSDIR%%/xmlroff-region-body.html
+%%DOCSDIR%%/xmlroff-region-end.html
+%%DOCSDIR%%/xmlroff-region-name.html
+%%DOCSDIR%%/xmlroff-region-start.html
+%%DOCSDIR%%/xmlroff-repeatable-page-master-alternatives.html
+%%DOCSDIR%%/xmlroff-repeatable-page-master-reference.html
+%%DOCSDIR%%/xmlroff-role.html
+%%DOCSDIR%%/xmlroff-root.html
+%%DOCSDIR%%/xmlroff-scaling-method.html
+%%DOCSDIR%%/xmlroff-scaling.html
+%%DOCSDIR%%/xmlroff-score-spaces.html
+%%DOCSDIR%%/xmlroff-simple-page-master.html
+%%DOCSDIR%%/xmlroff-single-page-master-reference.html
+%%DOCSDIR%%/xmlroff-source-document.html
+%%DOCSDIR%%/xmlroff-space-after.html
 %%DOCSDIR%%/xmlroff-space-afterconditionality.html
 %%DOCSDIR%%/xmlroff-space-aftermaximum.html
 %%DOCSDIR%%/xmlroff-space-afterminimum.html
 %%DOCSDIR%%/xmlroff-space-afteroptimum.html
 %%DOCSDIR%%/xmlroff-space-afterprecedence.html
+%%DOCSDIR%%/xmlroff-space-before.html
 %%DOCSDIR%%/xmlroff-space-beforeconditionality.html
 %%DOCSDIR%%/xmlroff-space-beforemaximum.html
 %%DOCSDIR%%/xmlroff-space-beforeminimum.html
 %%DOCSDIR%%/xmlroff-space-beforeoptimum.html
 %%DOCSDIR%%/xmlroff-space-beforeprecedence.html
+%%DOCSDIR%%/xmlroff-space-end.html
 %%DOCSDIR%%/xmlroff-space-endconditionality.html
 %%DOCSDIR%%/xmlroff-space-endmaximum.html
 %%DOCSDIR%%/xmlroff-space-endminimum.html
 %%DOCSDIR%%/xmlroff-space-endoptimum.html
 %%DOCSDIR%%/xmlroff-space-endprecedence.html
+%%DOCSDIR%%/xmlroff-space-start.html
 %%DOCSDIR%%/xmlroff-space-startconditionality.html
 %%DOCSDIR%%/xmlroff-space-startmaximum.html
 %%DOCSDIR%%/xmlroff-space-startminimum.html
 %%DOCSDIR%%/xmlroff-space-startoptimum.html
 %%DOCSDIR%%/xmlroff-space-startprecedence.html
+%%DOCSDIR%%/xmlroff-span.html
+%%DOCSDIR%%/xmlroff-src.html
+%%DOCSDIR%%/xmlroff-start-indent.html
+%%DOCSDIR%%/xmlroff-static-content.html
+%%DOCSDIR%%/xmlroff-table-and-caption.html
+%%DOCSDIR%%/xmlroff-table-body.html
+%%DOCSDIR%%/xmlroff-table-caption.html
+%%DOCSDIR%%/xmlroff-table-cell.html
+%%DOCSDIR%%/xmlroff-table-column.html
+%%DOCSDIR%%/xmlroff-table-footer.html
+%%DOCSDIR%%/xmlroff-table-header.html
+%%DOCSDIR%%/xmlroff-table-layout.html
+%%DOCSDIR%%/xmlroff-table-row.html
+%%DOCSDIR%%/xmlroff-table.html
+%%DOCSDIR%%/xmlroff-text-align.html
+%%DOCSDIR%%/xmlroff-text-indent.html
+%%DOCSDIR%%/xmlroff-title.html
+%%DOCSDIR%%/xmlroff-unicode-bidi.html
+%%DOCSDIR%%/xmlroff-white-space-collapse.html
+%%DOCSDIR%%/xmlroff-white-space-treatment.html
+%%DOCSDIR%%/xmlroff-widows.html
+%%DOCSDIR%%/xmlroff-width.html
+%%DOCSDIR%%/xmlroff-wrap-option.html
+%%DOCSDIR%%/xmlroff-writing-mode.html
 %%DOCSDIR%%/xmlroff.devhelp
-share/xml/libfo-0.3.9/catalog.xml
-share/xml/libfo-0.3.9/libfo-compat.xsl
-share/xml/libfo-0.3.9/xmlroff.fo
-@dirrm share/xml/libfo-0.3.9
+%%DOCSDIR%%/xmlroff.devhelp2
+share/xml/libfo-0.5.0/catalog.xml
+share/xml/libfo-0.5.0/libfo-compat.xsl
+share/xml/libfo-0.5.0/xmlroff.fo
+share/xml/libfo-0.5.0/xmlroff.xml
+@dirrm share/xml/libfo-0.5.0
 @dirrm %%DOCSDIR%%
-@dirrm include/libfo-0.3/util
-@dirrm include/libfo-0.3/property
-@dirrm include/libfo-0.3/libfo
-@dirrm include/libfo-0.3/fo
-@dirrm include/libfo-0.3/datatype
-@dirrm include/libfo-0.3/area
-@dirrm include/libfo-0.3
+@dirrm include/libfo-0.5/util
+@dirrm include/libfo-0.5/property
+@dirrm include/libfo-0.5/libfo
+@dirrm include/libfo-0.5/fo
+@dirrm include/libfo-0.5/datatype
+@dirrm include/libfo-0.5/area
+@dirrm include/libfo-0.5