SF.net SVN: docbook:[8483] trunk/xsl-saxon/src/com/nwalsh/saxon

[<mz...@us...>]

Revision: 8483
          http://docbook.svn.sourceforge.net/docbook/?rev=8483&view=rev
Author:   mzjn
Date:     2009-07-13 20:33:56 +0000 (Mon, 13 Jul 2009)

Log Message:
-----------
Added fixes so that colgroups in the XHTML namespace are processed properly.

Modified Paths:
--------------
    trunk/xsl-saxon/src/com/nwalsh/saxon/ColumnScanEmitter.java
    trunk/xsl-saxon/src/com/nwalsh/saxon/ColumnUpdateEmitter.java

Modified: trunk/xsl-saxon/src/com/nwalsh/saxon/ColumnScanEmitter.java
===================================================================
--- trunk/xsl-saxon/src/com/nwalsh/saxon/ColumnScanEmitter.java	2009-07-13 20:18:56 UTC (rev 8482)
+++ trunk/xsl-saxon/src/com/nwalsh/saxon/ColumnScanEmitter.java	2009-07-13 20:33:56 UTC (rev 8483)
@@ -41,6 +41,8 @@
 
   /** The FO namespace name. */
   protected static String foURI = "http://www.w3.org/1999/XSL/Format";
+  /** The XHTML namespace name. */
+  protected static String xhtmlURI = "http://www.w3.org/1999/xhtml";
 
   /** Construct a new ColumnScanEmitter. */
   public ColumnScanEmitter(NamePool namePool) {
@@ -135,10 +137,11 @@
 
     int thisFingerprint = namePool.getFingerprint(nameCode);
     int colFingerprint = namePool.getFingerprint("", "col");
+    int XHTMLcolFingerprint = namePool.getFingerprint(xhtmlURI, "col");
     int foColFingerprint = namePool.getFingerprint(foURI, "table-column");
 
     if (thisFingerprint == colFingerprint
-	|| thisFingerprint == foColFingerprint) {
+	|| thisFingerprint == foColFingerprint || thisFingerprint == XHTMLcolFingerprint) {
       if (numColumns >= width.length) {
 	String newWidth[] = new String[width.length+10];
 	for (int count = 0; count < width.length; count++) {
@@ -147,7 +150,7 @@
 	width = newWidth;
       }
 
-      if (thisFingerprint == colFingerprint) {
+      if (thisFingerprint == colFingerprint || thisFingerprint == XHTMLcolFingerprint) {
 	if (attributes.getValue("width") == null) {
 	  width[numColumns++] = "1*";
 	} else {

Modified: trunk/xsl-saxon/src/com/nwalsh/saxon/ColumnUpdateEmitter.java
===================================================================
--- trunk/xsl-saxon/src/com/nwalsh/saxon/ColumnUpdateEmitter.java	2009-07-13 20:18:56 UTC (rev 8482)
+++ trunk/xsl-saxon/src/com/nwalsh/saxon/ColumnUpdateEmitter.java	2009-07-13 20:33:56 UTC (rev 8483)
@@ -44,6 +44,8 @@
 
   /** The FO namespace name. */
   protected static String foURI = "http://www.w3.org/1999/XSL/Format";
+  /** The XHTML namespace name. */
+  protected static String xhtmlURI = "http://www.w3.org/1999/xhtml";
 
   /** Construct a new ColumnUpdateEmitter. */
   public ColumnUpdateEmitter(Controller controller,
@@ -63,9 +65,10 @@
 
     int thisFingerprint = namePool.getFingerprint(nameCode);
     int colFingerprint = namePool.getFingerprint("", "col");
+    int XHTMLcolFingerprint = namePool.getFingerprint(xhtmlURI, "col");
     int foColFingerprint = namePool.getFingerprint(foURI, "table-column");
 
-    if (thisFingerprint == colFingerprint) {
+    if (thisFingerprint == colFingerprint || thisFingerprint == XHTMLcolFingerprint ) {
       AttributeCollection attr = new AttributeCollection(namePool, attributes);
       int widthFingerprint = namePool.getFingerprint("", "width");
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.