2003/11/19 02:38:49

[org.ibex.core.git] / src / org / xwt / Template.java

diff --git a/src/org/xwt/Template.java b/src/org/xwt/Template.java
index 56ca4d9..25159b4 100644 (file)
--- a/src/org/xwt/Template.java
+++ b/src/org/xwt/Template.java
@@ -47,7 +47,6 @@ public class Template {
 
     private StringBuffer content = null;   ///< during XML parsing, this holds partially-read character data; null otherwise
     private int content_start = 0;         ///< line number of the first line of <tt>content</tt>
-    private int content_lines = 0;         ///< number of lines in <tt>content</tt>
     private int startLine = -1;            ///< the line number that this element starts on
     private final Res r;                   ///< the resource we came from
 
@@ -211,7 +210,7 @@ public class Template {
             Hash h = new Hash(c.len * 2, 3);
             for(int i=0; i<c.len; i++) {
                 if (c.keys[i] == null) continue;
-                if (c.keys[i].equals("fill") || c.keys[i].equals("font")) c.vals[i] = c.uris[i] + "." + c.vals[i];
+                if (c.keys[i].equals("font")) c.vals[i] = c.uris[i] + "." + c.vals[i];
                 if (c.keys[i].equals("preapply")) {
                     String uri = c.uris[i];
                     StringTokenizer tok = new StringTokenizer(c.vals[i].toString(), " ");
@@ -284,7 +283,6 @@ public class Template {
             }
             t.content = null;
             t.content_start = 0;
-            t.content_lines = 0;
             return thisscript;
         }
 
@@ -305,6 +303,9 @@ public class Template {
                     t = (Template)nodeStack.lastElement();
                     nodeStack.setSize(nodeStack.size() - 1);
                     t.children.addElement(oldt);
+
+                    int oldt_lines = getLine() - oldt.startLine;
+                    for (int i=0; oldt_lines > i; i++) t.content.append('\n');
                 }
             }
          }
@@ -317,12 +318,10 @@ public class Template {
             if ("static".equals(nameOfHeaderNodeBeingProcessed) || state == STATE_IN_TEMPLATE_NODE) {
                 if (t.content == null) {
                     t.content_start = getLine();
-                    t.content_lines = 0;
                     t.content = new StringBuffer();
                 }
 
                 t.content.append(ch, start, length);
-                t.content_lines++;
 
             } else if (nameOfHeaderNodeBeingProcessed != null && state != STATE_FINISHED_TEMPLATE_NODE) {
                 throw new XML.SchemaException("header node <" + nameOfHeaderNodeBeingProcessed + "> cannot have text content");