[docbook-checkins] CVS: xsl/extensions/saxon643/com/nwalsh/saxon CalloutEmitter.java,1.1,1.2 NumberLinesEmitter.java,1.1,1.2

[Norman W. <nw...@us...>]

Update of /cvsroot/docbook/xsl/extensions/saxon643/com/nwalsh/saxon
In directory usw-pr-cvs1:/tmp/cvs-serv17543/com/nwalsh/saxon

Modified Files:
	CalloutEmitter.java NumberLinesEmitter.java 
Log Message:
Fix nesting bug in XHTML

Index: CalloutEmitter.java
===================================================================
RCS file: /cvsroot/docbook/xsl/extensions/saxon643/com/nwalsh/saxon/CalloutEmitter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** CalloutEmitter.java	16 Jul 2001 21:23:57 -0000	1.1
--- CalloutEmitter.java	21 Mar 2002 13:27:51 -0000	1.2
***************
*** 58,61 ****
--- 58,64 ----
    protected static String foURI = "http://www.w3.org/1999/XSL/Format";
  
+   /** The XHTML namespace name. */
+   protected static String xhURI = "http://www.w3.org/1999/xhtml";
+ 
    /** The default column for callouts that specify only a line. */
    protected int defaultColumn = 60;
***************
*** 414,417 ****
--- 417,421 ----
     */
    protected boolean skipThisElement(int nameCode) {
+     // FIXME: This is such a gross hack...
      if (firstElement) {
        int thisFingerprint    = namePool.getFingerprint(nameCode);
***************
*** 419,426 ****
        int htmlPreFingerprint = namePool.getFingerprint("", "pre");
        int htmlDivFingerprint = namePool.getFingerprint("", "div");
  
        if ((foStylesheet && thisFingerprint == foBlockFingerprint)
  	  || (!foStylesheet && (thisFingerprint == htmlPreFingerprint
! 				|| thisFingerprint == htmlDivFingerprint))) {
  	// Don't push the outer-most wrapping div, pre, or fo:block
  	return true;
--- 423,434 ----
        int htmlPreFingerprint = namePool.getFingerprint("", "pre");
        int htmlDivFingerprint = namePool.getFingerprint("", "div");
+       int xhtmlPreFingerprint = namePool.getFingerprint(xhURI, "pre");
+       int xhtmlDivFingerprint = namePool.getFingerprint(xhURI, "div");
  
        if ((foStylesheet && thisFingerprint == foBlockFingerprint)
  	  || (!foStylesheet && (thisFingerprint == htmlPreFingerprint
! 				|| thisFingerprint == htmlDivFingerprint
! 				|| thisFingerprint == xhtmlPreFingerprint
! 				|| thisFingerprint == xhtmlDivFingerprint))) {
  	// Don't push the outer-most wrapping div, pre, or fo:block
  	return true;

Index: NumberLinesEmitter.java
===================================================================
RCS file: /cvsroot/docbook/xsl/extensions/saxon643/com/nwalsh/saxon/NumberLinesEmitter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** NumberLinesEmitter.java	16 Jul 2001 21:23:57 -0000	1.1
--- NumberLinesEmitter.java	21 Mar 2002 13:27:51 -0000	1.2
***************
*** 61,64 ****
--- 61,67 ----
    protected static String foURI = "http://www.w3.org/1999/XSL/Format";
  
+   /** The XHTML namespace name. */
+   protected static String xhURI = "http://www.w3.org/1999/xhtml";
+ 
    /** Every <code>modulus</code> line will be numbered. */
    protected int modulus = 5;
***************
*** 265,268 ****
--- 268,272 ----
     */
    protected boolean skipThisElement(int nameCode) {
+     // FIXME: This is such a gross hack...
      if (firstElement) {
        int thisFingerprint    = namePool.getFingerprint(nameCode);
***************
*** 270,277 ****
        int htmlPreFingerprint = namePool.getFingerprint("", "pre");
        int htmlDivFingerprint = namePool.getFingerprint("", "div");
  
        if ((foStylesheet && thisFingerprint == foBlockFingerprint)
  	  || (!foStylesheet && (thisFingerprint == htmlPreFingerprint
! 				|| thisFingerprint == htmlDivFingerprint))) {
  	// Don't push the outer-most wrapping div, pre, or fo:block
  	return true;
--- 274,285 ----
        int htmlPreFingerprint = namePool.getFingerprint("", "pre");
        int htmlDivFingerprint = namePool.getFingerprint("", "div");
+       int xhtmlPreFingerprint = namePool.getFingerprint(xhURI, "pre");
+       int xhtmlDivFingerprint = namePool.getFingerprint(xhURI, "div");
  
        if ((foStylesheet && thisFingerprint == foBlockFingerprint)
  	  || (!foStylesheet && (thisFingerprint == htmlPreFingerprint
! 				|| thisFingerprint == htmlDivFingerprint
! 				|| thisFingerprint == xhtmlPreFingerprint
! 				|| thisFingerprint == xhtmlDivFingerprint))) {
  	// Don't push the outer-most wrapping div, pre, or fo:block
  	return true;