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 diff
     1.1 --- a/doc/manual/manual.tema	Tue Feb 19 20:32:17 2008 +0300
     1.2 +++ b/doc/manual/manual.tema	Thu Nov 06 23:30:18 2008 +0300
     1.3 @@ -98,7 +98,8 @@
     1.4  %>
     1.5  
     1.6  <%function:define
     1.7 -  arguments   <%:name, code%>
     1.8 +  arguments   <%:name%>
     1.9 +  input_data  <%:code%>
    1.10    description <%:\\
    1.11      Defines new function. 
    1.12      Use <%code:next_arg%>, <%code:data%>, and <%code:has_more_data%> 
    1.13 @@ -248,6 +249,8 @@
    1.14    <%:<%code:-v, --version%> --- print the version information and exit.%>
    1.15  %>
    1.16  
    1.17 +<%if:<%not embedded:%>
    1.18  <%section:Homepage%>
    1.19  
    1.20 -<%par link:http://kryshen.pp.ru/tema/%>
    1.21 +<%par link:http://kryshen.net/tema/%>
    1.22 +%>
     2.1 --- a/nbproject/project.xml	Tue Feb 19 20:32:17 2008 +0300
     2.2 +++ b/nbproject/project.xml	Thu Nov 06 23:30:18 2008 +0300
     2.3 @@ -4,7 +4,7 @@
     2.4      <configuration>
     2.5          <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
     2.6              <!-- Do not use Project Properties customizer when editing this file manually. -->
     2.7 -            <name>TEMA</name>
     2.8 +            <name>Tema</name>
     2.9              <properties/>
    2.10              <folders>
    2.11                  <source-folder>
     3.1 --- a/src/kryshen/tema/TemplateParser.java	Tue Feb 19 20:32:17 2008 +0300
     3.2 +++ b/src/kryshen/tema/TemplateParser.java	Thu Nov 06 23:30:18 2008 +0300
     3.3 @@ -17,7 +17,7 @@
     3.4   *  GNU Lesser General Public License along with Tema.  
     3.5   *  If not, see <http://www.gnu.org/licenses/>.
     3.6   *
     3.7 - *  $Id: TemplateParser.java,v 1.58 2008/02/19 00:20:48 mikhail Exp $
     3.8 + *  $Id: TemplateParser.java,v 1.59 2008/09/30 14:02:24 mikhail Exp $
     3.9   */
    3.10  
    3.11  package kryshen.tema;
    3.12 @@ -236,7 +236,7 @@
    3.13              return false;
    3.14          
    3.15          // Put the matched characters back to the stream
    3.16 -        in.unread(BRACKET_CLOSE[termBracket].toCharArray());
    3.17 +        in.unread(BRACKET_CLOSE[termBracket]);
    3.18          
    3.19          return true;
    3.20      }
    3.21 @@ -309,7 +309,7 @@
    3.22              
    3.23              if (!Character.isWhitespace(c)) {
    3.24                  in.unread(c);
    3.25 -                in.unread(ESCAPE_WHITESPACE.toCharArray());
    3.26 +                in.unread(ESCAPE_WHITESPACE);
    3.27                  return;
    3.28              }
    3.29              
     4.1 --- a/src/kryshen/tema/io/TemplateReader.java	Tue Feb 19 20:32:17 2008 +0300
     4.2 +++ b/src/kryshen/tema/io/TemplateReader.java	Thu Nov 06 23:30:18 2008 +0300
     4.3 @@ -17,11 +17,12 @@
     4.4   *  GNU Lesser General Public License along with Tema.  
     4.5   *  If not, see <http://www.gnu.org/licenses/>.
     4.6   *
     4.7 - *  $Id: TemplateReader.java,v 1.8 2008/02/19 00:20:48 mikhail Exp $
     4.8 + *  $Id: TemplateReader.java,v 1.9 2008/09/30 14:02:24 mikhail Exp $
     4.9   */
    4.10  
    4.11  package kryshen.tema.io;
    4.12  
    4.13 +import java.io.IOException;
    4.14  import java.io.Reader;
    4.15  import java.io.LineNumberReader;
    4.16  import java.io.PushbackReader;
    4.17 @@ -99,4 +100,8 @@
    4.18          
    4.19          return parentReader.getLineNumber();
    4.20      }
    4.21 +    
    4.22 +    public void unread(String s) throws IOException {
    4.23 +        unread(s.toCharArray());
    4.24 +    }
    4.25  }