changeset 3:a20217d78068

Tema current (imported from CVS).
author Mikhail Kryshen <mikhail@kryshen.net>
date Thu, 06 Nov 2008 23:30:18 +0300
parents 6c41a0b43e58
children 9f950416a439
files doc/manual/manual.tema nbproject/project.xml src/kryshen/tema/TemplateParser.java src/kryshen/tema/io/TemplateReader.java
diffstat 4 files changed, 15 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/doc/manual/manual.tema	Tue Feb 19 20:32:17 2008 +0300
+++ b/doc/manual/manual.tema	Thu Nov 06 23:30:18 2008 +0300
@@ -98,7 +98,8 @@
 %>
 
 <%function:define
-  arguments   <%:name, code%>
+  arguments   <%:name%>
+  input_data  <%:code%>
   description <%:\\
     Defines new function. 
     Use <%code:next_arg%>, <%code:data%>, and <%code:has_more_data%> 
@@ -248,6 +249,8 @@
   <%:<%code:-v, --version%> --- print the version information and exit.%>
 %>
 
+<%if:<%not embedded:%>
 <%section:Homepage%>
 
-<%par link:http://kryshen.pp.ru/tema/%>
+<%par link:http://kryshen.net/tema/%>
+%>
--- a/nbproject/project.xml	Tue Feb 19 20:32:17 2008 +0300
+++ b/nbproject/project.xml	Thu Nov 06 23:30:18 2008 +0300
@@ -4,7 +4,7 @@
     <configuration>
         <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
             <!-- Do not use Project Properties customizer when editing this file manually. -->
-            <name>TEMA</name>
+            <name>Tema</name>
             <properties/>
             <folders>
                 <source-folder>
--- a/src/kryshen/tema/TemplateParser.java	Tue Feb 19 20:32:17 2008 +0300
+++ b/src/kryshen/tema/TemplateParser.java	Thu Nov 06 23:30:18 2008 +0300
@@ -17,7 +17,7 @@
  *  GNU Lesser General Public License along with Tema.  
  *  If not, see <http://www.gnu.org/licenses/>.
  *
- *  $Id: TemplateParser.java,v 1.58 2008/02/19 00:20:48 mikhail Exp $
+ *  $Id: TemplateParser.java,v 1.59 2008/09/30 14:02:24 mikhail Exp $
  */
 
 package kryshen.tema;
@@ -236,7 +236,7 @@
             return false;
         
         // Put the matched characters back to the stream
-        in.unread(BRACKET_CLOSE[termBracket].toCharArray());
+        in.unread(BRACKET_CLOSE[termBracket]);
         
         return true;
     }
@@ -309,7 +309,7 @@
             
             if (!Character.isWhitespace(c)) {
                 in.unread(c);
-                in.unread(ESCAPE_WHITESPACE.toCharArray());
+                in.unread(ESCAPE_WHITESPACE);
                 return;
             }
             
--- a/src/kryshen/tema/io/TemplateReader.java	Tue Feb 19 20:32:17 2008 +0300
+++ b/src/kryshen/tema/io/TemplateReader.java	Thu Nov 06 23:30:18 2008 +0300
@@ -17,11 +17,12 @@
  *  GNU Lesser General Public License along with Tema.  
  *  If not, see <http://www.gnu.org/licenses/>.
  *
- *  $Id: TemplateReader.java,v 1.8 2008/02/19 00:20:48 mikhail Exp $
+ *  $Id: TemplateReader.java,v 1.9 2008/09/30 14:02:24 mikhail Exp $
  */
 
 package kryshen.tema.io;
 
+import java.io.IOException;
 import java.io.Reader;
 import java.io.LineNumberReader;
 import java.io.PushbackReader;
@@ -99,4 +100,8 @@
         
         return parentReader.getLineNumber();
     }
+    
+    public void unread(String s) throws IOException {
+        unread(s.toCharArray());
+    }
 }