Fixed bug in implementation of skipThisElement

diff --git a/xsl/extensions/saxon61/com/nwalsh/saxon/NumberLinesEmitter.java b/xsl/extensions/saxon61/com/nwalsh/saxon/NumberLinesEmitter.java
index f8065e37074e227948deab35bad9ac14b1192ce7..6599ce7e8b93ca960ac308c65bef0ff8904d2ef6 100644 (file)
--- a/xsl/extensions/saxon61/com/nwalsh/saxon/NumberLinesEmitter.java
+++ b/xsl/extensions/saxon61/com/nwalsh/saxon/NumberLinesEmitter.java
@@ -265,13 +265,14 @@ public class NumberLinesEmitter extends CopyEmitter {
    */
   protected boolean skipThisElement(int nameCode) {
     if (firstElement) {
+      int thisFingerprint    = namePool.getFingerprint(nameCode);
       int foBlockFingerprint = namePool.getFingerprint(foURI, "block");
       int htmlPreFingerprint = namePool.getFingerprint("", "pre");
       int htmlDivFingerprint = namePool.getFingerprint("", "div");
 
-      if ((foStylesheet && nameCode == foBlockFingerprint)
-         || (!foStylesheet && (nameCode == htmlPreFingerprint
-                               || nameCode == htmlDivFingerprint))) {
+      if ((foStylesheet && thisFingerprint == foBlockFingerprint)
+         || (!foStylesheet && (thisFingerprint == htmlPreFingerprint
+                               || thisFingerprint == htmlDivFingerprint))) {
        // Don't push the outer-most wrapping div, pre, or fo:block
        return true;
       }

diff --git a/xsl/extensions/saxon63/com/nwalsh/saxon/NumberLinesEmitter.java b/xsl/extensions/saxon63/com/nwalsh/saxon/NumberLinesEmitter.java
index d2cc9333c15e468897444e1877453d69b9a468b8..c1656b1fbd226ab7f7735560deaeb7c583c7440e 100644 (file)
--- a/xsl/extensions/saxon63/com/nwalsh/saxon/NumberLinesEmitter.java
+++ b/xsl/extensions/saxon63/com/nwalsh/saxon/NumberLinesEmitter.java
@@ -263,13 +263,14 @@ public class NumberLinesEmitter extends CopyEmitter {
    */
   protected boolean skipThisElement(int nameCode) {
     if (firstElement) {
+      int thisFingerprint    = namePool.getFingerprint(nameCode);
       int foBlockFingerprint = namePool.getFingerprint(foURI, "block");
       int htmlPreFingerprint = namePool.getFingerprint("", "pre");
       int htmlDivFingerprint = namePool.getFingerprint("", "div");
 
-      if ((foStylesheet && nameCode == foBlockFingerprint)
-         || (!foStylesheet && (nameCode == htmlPreFingerprint
-                               || nameCode == htmlDivFingerprint))) {
+      if ((foStylesheet && thisFingerprint == foBlockFingerprint)
+         || (!foStylesheet && (thisFingerprint == htmlPreFingerprint
+                               || thisFingerprint == htmlDivFingerprint))) {
        // Don't push the outer-most wrapping div, pre, or fo:block
        return true;
       }