diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java
index 409f2c445..087e4021c 100644
--- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java
+++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java
@@ -101,7 +101,7 @@ public class DefineText2Tag extends CharacterTag implements BoundedTag, TextTag
}
}
}
- ret += "[font " + rec.fontId + " height:" + rec.textHeight + "]";
+ ret += "[font " + rec.fontId + " height " + rec.textHeight + "]";
}
if (rec.styleFlagsHasColor) {
ret += "[color " + rec.textColorA.toHexARGB() + "]";
diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineTextTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineTextTag.java
index 8c442b15b..b3c159b15 100644
--- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineTextTag.java
+++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineTextTag.java
@@ -96,7 +96,7 @@ public class DefineTextTag extends CharacterTag implements BoundedTag, TextTag {
}
}
}
- ret += "[font " + rec.fontId + " height:" + rec.textHeight + "]";
+ ret += "[font " + rec.fontId + " height " + rec.textHeight + "]";
}
if (rec.styleFlagsHasColor) {
ret += "[color " + rec.textColor.toHexRGB() + "]";
diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/text/TextLexer.java b/trunk/src/com/jpexs/decompiler/flash/tags/text/TextLexer.java
index 5dcc6306a..6261391e9 100644
--- a/trunk/src/com/jpexs/decompiler/flash/tags/text/TextLexer.java
+++ b/trunk/src/com/jpexs/decompiler/flash/tags/text/TextLexer.java
@@ -1,274 +1,273 @@
/* The following code was generated by JFlex 1.4.3 on 28.4.13 11:46 */
/* Flash assembler language lexer specification */
+
package com.jpexs.decompiler.flash.tags.text;
import java.util.regex.*;
+
/**
- * This class is a scanner generated by
- * JFlex 1.4.3 on 28.4.13 11:46 from the
- * specification file
+ * This class is a scanner generated by
+ * JFlex 1.4.3
+ * on 28.4.13 11:46 from the specification file
* D:/Dokumenty/Programovani/JavaSE/FFDec/trunk/src/com/jpexs/decompiler/flash/tags/text/text.flex
*/
public final class TextLexer {
- /**
- * This character denotes the end of file
- */
- public static final int YYEOF = -1;
- /**
- * initial size of the lookahead buffer
- */
- private static final int ZZ_BUFFERSIZE = 16384;
- /**
- * lexical states
- */
- public static final int YYINITIAL = 0;
- /**
- * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l
- * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l at the
- * beginning of a line l is of the form l = 2*k, k a non negative integer
- */
- private static final int ZZ_LEXSTATE[] = {
- 0, 0
- };
- /**
- * Translates characters to character classes
- */
- private static final String ZZ_CMAP_PACKED =
- "\12\0\1\33\25\0\1\12\1\0\1\31\1\24\3\0\1\32\5\0"
- + "\1\3\2\0\1\1\11\2\1\17\40\0\1\5\1\27\1\20\3\0"
- + "\1\4\1\30\1\21\1\4\1\14\1\6\1\16\1\13\1\15\2\0"
- + "\1\22\1\0\1\10\1\7\2\0\1\23\1\0\1\11\3\0\1\25"
- + "\1\26\uff86\0";
- /**
- * Translates characters to character classes
- */
- private static final char[] ZZ_CMAP = zzUnpackCMap(ZZ_CMAP_PACKED);
- /**
- * Translates DFA states to action switch labels.
- */
- private static final int[] ZZ_ACTION = zzUnpackAction();
- private static final String ZZ_ACTION_PACKED_0 =
- "\1\0\3\1\1\2\4\0\1\3\1\4\1\5\1\6"
- + "\1\7\1\10\1\11\1\12\1\13\1\14\1\15\16\0"
- + "\1\16\1\17\25\0\1\20\3\0\1\21";
+ /** This character denotes the end of file */
+ public static final int YYEOF = -1;
- private static int[] zzUnpackAction() {
- int[] result = new int[62];
- int offset = 0;
- offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
- return result;
+ /** initial size of the lookahead buffer */
+ private static final int ZZ_BUFFERSIZE = 16384;
+
+ /** lexical states */
+ public static final int YYINITIAL = 0;
+
+ /**
+ * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l
+ * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l
+ * at the beginning of a line
+ * l is of the form l = 2*k, k a non negative integer
+ */
+ private static final int ZZ_LEXSTATE[] = {
+ 0, 0
+ };
+
+ /**
+ * Translates characters to character classes
+ */
+ private static final String ZZ_CMAP_PACKED =
+ "\12\0\1\32\25\0\1\12\1\0\1\30\1\23\3\0\1\31\5\0"+
+ "\1\3\2\0\1\1\11\2\41\0\1\5\1\26\1\17\3\0\1\4"+
+ "\1\27\1\20\1\4\1\14\1\6\1\16\1\13\1\15\2\0\1\21"+
+ "\1\0\1\10\1\7\2\0\1\22\1\0\1\11\3\0\1\24\1\25"+
+ "\uff86\0";
+
+ /**
+ * Translates characters to character classes
+ */
+ private static final char [] ZZ_CMAP = zzUnpackCMap(ZZ_CMAP_PACKED);
+
+ /**
+ * Translates DFA states to action switch labels.
+ */
+ private static final int [] ZZ_ACTION = zzUnpackAction();
+
+ private static final String ZZ_ACTION_PACKED_0 =
+ "\1\0\3\1\1\2\4\0\1\3\1\4\1\5\1\6"+
+ "\1\7\1\10\1\11\1\12\1\13\1\14\1\15\16\0"+
+ "\1\16\1\17\25\0\1\20\3\0\1\21";
+
+ private static int [] zzUnpackAction() {
+ int [] result = new int[62];
+ int offset = 0;
+ offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
+ return result;
+ }
+
+ private static int zzUnpackAction(String packed, int offset, int [] result) {
+ int i = 0; /* index in packed string */
+ int j = offset; /* index in unpacked array */
+ int l = packed.length();
+ while (i < l) {
+ int count = packed.charAt(i++);
+ int value = packed.charAt(i++);
+ do result[j++] = value; while (--count > 0);
}
+ return j;
+ }
- private static int zzUnpackAction(String packed, int offset, int[] result) {
- int i = 0; /* index in packed string */
- int j = offset; /* index in unpacked array */
- int l = packed.length();
- while (i < l) {
- int count = packed.charAt(i++);
- int value = packed.charAt(i++);
- do {
- result[j++] = value;
- } while (--count > 0);
- }
- return j;
+
+ /**
+ * Translates a state to a row index in the transition table
+ */
+ private static final int [] ZZ_ROWMAP = zzUnpackRowMap();
+
+ private static final String ZZ_ROWMAP_PACKED_0 =
+ "\0\0\0\33\0\66\0\121\0\33\0\154\0\207\0\242"+
+ "\0\275\0\33\0\33\0\33\0\33\0\33\0\33\0\33"+
+ "\0\33\0\33\0\33\0\33\0\330\0\363\0\u010e\0\u0129"+
+ "\0\u0144\0\u015f\0\u017a\0\u0195\0\u01b0\0\u01cb\0\u01e6\0\u0201"+
+ "\0\u021c\0\u0237\0\33\0\33\0\u0252\0\u026d\0\u0288\0\u02a3"+
+ "\0\u02be\0\u02d9\0\u02f4\0\u030f\0\u032a\0\u0345\0\u0360\0\u037b"+
+ "\0\u0396\0\u03b1\0\u03cc\0\u03e7\0\u0402\0\u041d\0\u0438\0\u0453"+
+ "\0\u046e\0\33\0\u0489\0\u04a4\0\u04bf\0\33";
+
+ private static int [] zzUnpackRowMap() {
+ int [] result = new int[62];
+ int offset = 0;
+ offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
+ return result;
+ }
+
+ private static int zzUnpackRowMap(String packed, int offset, int [] result) {
+ int i = 0; /* index in packed string */
+ int j = offset; /* index in unpacked array */
+ int l = packed.length();
+ while (i < l) {
+ int high = packed.charAt(i++) << 16;
+ result[j++] = high | packed.charAt(i++);
}
- /**
- * Translates a state to a row index in the transition table
- */
- private static final int[] ZZ_ROWMAP = zzUnpackRowMap();
- private static final String ZZ_ROWMAP_PACKED_0 =
- "\0\0\0\34\0\70\0\124\0\34\0\160\0\214\0\250"
- + "\0\304\0\34\0\34\0\34\0\34\0\34\0\34\0\34"
- + "\0\34\0\34\0\34\0\34\0\340\0\374\0\u0118\0\u0134"
- + "\0\u0150\0\u016c\0\u0188\0\u01a4\0\u01c0\0\u01dc\0\u01f8\0\u0214"
- + "\0\u0230\0\u024c\0\34\0\34\0\u0268\0\u0284\0\u02a0\0\u02bc"
- + "\0\u02d8\0\u02f4\0\u0310\0\u032c\0\u0348\0\u0364\0\u0380\0\u039c"
- + "\0\u03b8\0\u03d4\0\u03f0\0\u040c\0\u0428\0\u0444\0\u0460\0\u047c"
- + "\0\u0498\0\34\0\u04b4\0\u04d0\0\u04ec\0\34";
+ return j;
+ }
- private static int[] zzUnpackRowMap() {
- int[] result = new int[62];
- int offset = 0;
- offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
- return result;
+ /**
+ * The transition table of the DFA
+ */
+ private static final int [] ZZ_TRANS = zzUnpackTrans();
+
+ private static final String ZZ_TRANS_PACKED_0 =
+ "\5\2\1\3\20\2\1\4\3\2\1\5\41\0\1\6"+
+ "\11\0\1\7\3\0\1\10\1\11\5\0\5\12\1\13"+
+ "\1\14\1\12\1\15\1\16\5\12\1\17\2\12\1\20"+
+ "\3\12\1\21\1\22\1\23\1\24\10\0\1\25\32\0"+
+ "\1\26\35\0\1\27\32\0\1\30\30\0\1\31\43\0"+
+ "\1\32\12\0\1\33\1\34\1\35\30\0\1\36\1\37"+
+ "\1\40\40\0\1\41\30\0\1\42\42\0\1\43\14\0"+
+ "\2\34\14\0\1\43\14\0\1\33\1\34\47\0\1\44"+
+ "\14\0\2\37\14\0\1\44\14\0\1\36\1\37\42\0"+
+ "\1\45\42\0\1\46\11\0\1\47\1\50\42\0\1\51"+
+ "\32\0\1\52\21\0\2\50\7\0\1\52\43\0\1\53"+
+ "\22\0\1\54\20\0\2\55\1\0\1\55\1\0\1\55"+
+ "\5\0\1\55\3\0\1\55\6\0\1\55\17\0\1\56"+
+ "\17\0\2\57\1\0\1\57\1\0\1\57\5\0\1\57"+
+ "\3\0\1\57\6\0\1\57\20\0\1\60\16\0\2\61"+
+ "\1\0\1\61\1\0\1\61\5\0\1\61\3\0\1\61"+
+ "\6\0\1\61\21\0\1\62\15\0\2\63\1\0\1\63"+
+ "\1\0\1\63\5\0\1\63\3\0\1\63\6\0\1\63"+
+ "\16\0\1\64\20\0\2\65\1\0\1\65\1\0\1\65"+
+ "\5\0\1\65\3\0\1\65\6\0\1\65\14\0\1\66"+
+ "\22\0\2\67\1\0\1\67\1\0\1\67\5\0\1\67"+
+ "\3\0\1\67\6\0\1\67\15\0\1\70\21\0\2\71"+
+ "\1\0\1\71\1\0\1\71\5\0\1\71\2\0\1\72"+
+ "\1\71\6\0\1\71\4\0\1\73\1\74\31\0\2\75"+
+ "\1\0\1\75\1\0\1\75\5\0\1\75\3\0\1\75"+
+ "\6\0\1\75\22\0\1\76\14\0\2\74\14\0\1\76"+
+ "\32\0\1\72\13\0";
+
+ private static int [] zzUnpackTrans() {
+ int [] result = new int[1242];
+ int offset = 0;
+ offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result);
+ return result;
+ }
+
+ private static int zzUnpackTrans(String packed, int offset, int [] result) {
+ int i = 0; /* index in packed string */
+ int j = offset; /* index in unpacked array */
+ int l = packed.length();
+ while (i < l) {
+ int count = packed.charAt(i++);
+ int value = packed.charAt(i++);
+ value--;
+ do result[j++] = value; while (--count > 0);
}
+ return j;
+ }
- private static int zzUnpackRowMap(String packed, int offset, int[] result) {
- int i = 0; /* index in packed string */
- int j = offset; /* index in unpacked array */
- int l = packed.length();
- while (i < l) {
- int high = packed.charAt(i++) << 16;
- result[j++] = high | packed.charAt(i++);
- }
- return j;
+
+ /* error codes */
+ private static final int ZZ_UNKNOWN_ERROR = 0;
+ private static final int ZZ_NO_MATCH = 1;
+ private static final int ZZ_PUSHBACK_2BIG = 2;
+
+ /* error messages for the codes above */
+ private static final String ZZ_ERROR_MSG[] = {
+ "Unkown internal scanner error",
+ "Error: could not match input",
+ "Error: pushback value was too large"
+ };
+
+ /**
+ * ZZ_ATTRIBUTE[aState] contains the attributes of state aState
+ */
+ private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute();
+
+ private static final String ZZ_ATTRIBUTE_PACKED_0 =
+ "\1\0\1\11\2\1\1\11\4\0\13\11\16\0\2\11"+
+ "\25\0\1\11\3\0\1\11";
+
+ private static int [] zzUnpackAttribute() {
+ int [] result = new int[62];
+ int offset = 0;
+ offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
+ return result;
+ }
+
+ private static int zzUnpackAttribute(String packed, int offset, int [] result) {
+ int i = 0; /* index in packed string */
+ int j = offset; /* index in unpacked array */
+ int l = packed.length();
+ while (i < l) {
+ int count = packed.charAt(i++);
+ int value = packed.charAt(i++);
+ do result[j++] = value; while (--count > 0);
}
- /**
- * The transition table of the DFA
- */
- private static final int[] ZZ_TRANS = zzUnpackTrans();
- private static final String ZZ_TRANS_PACKED_0 =
- "\5\2\1\3\21\2\1\4\3\2\1\5\42\0\1\6"
- + "\12\0\1\7\3\0\1\10\1\11\5\0\5\12\1\13"
- + "\1\14\1\12\1\15\1\16\6\12\1\17\2\12\1\20"
- + "\3\12\1\21\1\22\1\23\1\24\10\0\1\25\33\0"
- + "\1\26\36\0\1\27\33\0\1\30\31\0\1\31\45\0"
- + "\1\32\12\0\1\33\1\34\1\35\31\0\1\36\1\37"
- + "\1\40\41\0\1\41\31\0\1\42\44\0\1\43\14\0"
- + "\2\34\15\0\1\43\14\0\1\33\1\34\51\0\1\44"
- + "\14\0\2\37\15\0\1\44\14\0\1\36\1\37\43\0"
- + "\1\45\44\0\1\46\11\0\1\47\1\50\43\0\1\51"
- + "\33\0\1\52\22\0\2\50\7\0\1\52\45\0\1\53"
- + "\22\0\1\54\21\0\2\55\1\0\1\55\1\0\1\55"
- + "\5\0\1\55\4\0\1\55\6\0\1\55\17\0\1\56"
- + "\20\0\2\57\1\0\1\57\1\0\1\57\5\0\1\57"
- + "\4\0\1\57\6\0\1\57\20\0\1\60\17\0\2\61"
- + "\1\0\1\61\1\0\1\61\5\0\1\61\4\0\1\61"
- + "\6\0\1\61\21\0\1\62\16\0\2\63\1\0\1\63"
- + "\1\0\1\63\5\0\1\63\4\0\1\63\6\0\1\63"
- + "\16\0\1\64\21\0\2\65\1\0\1\65\1\0\1\65"
- + "\5\0\1\65\4\0\1\65\6\0\1\65\14\0\1\66"
- + "\23\0\2\67\1\0\1\67\1\0\1\67\5\0\1\67"
- + "\4\0\1\67\6\0\1\67\22\0\1\70\15\0\2\71"
- + "\1\0\1\71\1\0\1\71\5\0\1\71\3\0\1\72"
- + "\1\71\6\0\1\71\4\0\1\73\1\74\32\0\2\75"
- + "\1\0\1\75\1\0\1\75\5\0\1\75\4\0\1\75"
- + "\6\0\1\75\23\0\1\76\14\0\2\74\15\0\1\76"
- + "\33\0\1\72\13\0";
+ return j;
+ }
- private static int[] zzUnpackTrans() {
- int[] result = new int[1288];
- int offset = 0;
- offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result);
- return result;
- }
+ /** the input device */
+ private java.io.Reader zzReader;
- private static int zzUnpackTrans(String packed, int offset, int[] result) {
- int i = 0; /* index in packed string */
- int j = offset; /* index in unpacked array */
- int l = packed.length();
- while (i < l) {
- int count = packed.charAt(i++);
- int value = packed.charAt(i++);
- value--;
- do {
- result[j++] = value;
- } while (--count > 0);
- }
- return j;
- }
- /* error codes */
- private static final int ZZ_UNKNOWN_ERROR = 0;
- private static final int ZZ_NO_MATCH = 1;
- private static final int ZZ_PUSHBACK_2BIG = 2;
+ /** the current state of the DFA */
+ private int zzState;
- /* error messages for the codes above */
- private static final String ZZ_ERROR_MSG[] = {
- "Unkown internal scanner error",
- "Error: could not match input",
- "Error: pushback value was too large"
- };
- /**
- * ZZ_ATTRIBUTE[aState] contains the attributes of state
- * aState
- */
- private static final int[] ZZ_ATTRIBUTE = zzUnpackAttribute();
- private static final String ZZ_ATTRIBUTE_PACKED_0 =
- "\1\0\1\11\2\1\1\11\4\0\13\11\16\0\2\11"
- + "\25\0\1\11\3\0\1\11";
+ /** the current lexical state */
+ private int zzLexicalState = YYINITIAL;
- private static int[] zzUnpackAttribute() {
- int[] result = new int[62];
- int offset = 0;
- offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
- return result;
- }
+ /** this buffer contains the current text to be matched and is
+ the source of the yytext() string */
+ private char zzBuffer[] = new char[ZZ_BUFFERSIZE];
- private static int zzUnpackAttribute(String packed, int offset, int[] result) {
- int i = 0; /* index in packed string */
- int j = offset; /* index in unpacked array */
- int l = packed.length();
- while (i < l) {
- int count = packed.charAt(i++);
- int value = packed.charAt(i++);
- do {
- result[j++] = value;
- } while (--count > 0);
- }
- return j;
- }
- /**
- * the input device
- */
- private java.io.Reader zzReader;
- /**
- * the current state of the DFA
- */
- private int zzState;
- /**
- * the current lexical state
- */
- private int zzLexicalState = YYINITIAL;
- /**
- * this buffer contains the current text to be matched and is the source of
- * the yytext() string
- */
- private char zzBuffer[] = new char[ZZ_BUFFERSIZE];
- /**
- * the textposition at the last accepting state
- */
- private int zzMarkedPos;
- /**
- * the current text position in the buffer
- */
- private int zzCurrentPos;
- /**
- * startRead marks the beginning of the yytext() string in the buffer
- */
- private int zzStartRead;
- /**
- * endRead marks the last character in the buffer, that has been read from
- * input
- */
- private int zzEndRead;
- /**
- * number of newlines encountered up to the start of the matched text
- */
- private int yyline;
- /**
- * the number of characters up to the start of the matched text
- */
- private int yychar;
- /**
- * the number of characters from the last newline up to the start of the
- * matched text
- */
- private int yycolumn;
- /**
- * zzAtBOL == true <=> the scanner is currently at the beginning of a line
- */
- private boolean zzAtBOL = true;
- /**
- * zzAtEOF == true <=> the scanner is at the EOF
- */
- private boolean zzAtEOF;
- /**
- * denotes if the user-EOF-code has already been executed
- */
- private boolean zzEOFDone;
+ /** the textposition at the last accepting state */
+ private int zzMarkedPos;
+
+ /** the current text position in the buffer */
+ private int zzCurrentPos;
+
+ /** startRead marks the beginning of the yytext() string in the buffer */
+ private int zzStartRead;
+
+ /** endRead marks the last character in the buffer, that has been read
+ from input */
+ private int zzEndRead;
+
+ /** number of newlines encountered up to the start of the matched text */
+ private int yyline;
+
+ /** the number of characters up to the start of the matched text */
+ private int yychar;
+
+ /**
+ * the number of characters from the last newline up to the start of the
+ * matched text
+ */
+ private int yycolumn;
+
+ /**
+ * zzAtBOL == true <=> the scanner is currently at the beginning of a line
+ */
+ private boolean zzAtBOL = true;
+
+ /** zzAtEOF == true <=> the scanner is at the EOF */
+ private boolean zzAtEOF;
+
+ /** denotes if the user-EOF-code has already been executed */
+ private boolean zzEOFDone;
+
+ /* user code: */
+
+ StringBuffer string = null;
+ boolean finish=false;
- /* user code: */
- StringBuffer string = null;
- boolean finish = false;
/**
* Create an empty lexer, yyrset will be called later to reset and assign
* the reader
*/
public TextLexer() {
+
}
public int yychar() {
@@ -276,526 +275,481 @@ public final class TextLexer {
}
public int yyline() {
- return yyline + 1;
+ return yyline+1;
}
- /**
- * Creates a new scanner There is also a java.io.InputStream version of this
- * constructor.
- *
- * @param in the java.io.Reader to read input from.
- */
- public TextLexer(java.io.Reader in) {
- this.zzReader = in;
+
+
+ /**
+ * Creates a new scanner
+ * There is also a java.io.InputStream version of this constructor.
+ *
+ * @param in the java.io.Reader to read input from.
+ */
+ public TextLexer(java.io.Reader in) {
+ this.zzReader = in;
+ }
+
+ /**
+ * Creates a new scanner.
+ * There is also java.io.Reader version of this constructor.
+ *
+ * @param in the java.io.Inputstream to read input from.
+ */
+ public TextLexer(java.io.InputStream in) {
+ this(new java.io.InputStreamReader(in));
+ }
+
+ /**
+ * Unpacks the compressed character translation table.
+ *
+ * @param packed the packed character translation table
+ * @return the unpacked character translation table
+ */
+ private static char [] zzUnpackCMap(String packed) {
+ char [] map = new char[0x10000];
+ int i = 0; /* index in packed string */
+ int j = 0; /* index in unpacked array */
+ while (i < 82) {
+ int count = packed.charAt(i++);
+ char value = packed.charAt(i++);
+ do map[j++] = value; while (--count > 0);
+ }
+ return map;
+ }
+
+
+ /**
+ * Refills the input buffer.
+ *
+ * @return false, iff there was new input.
+ *
+ * @exception java.io.IOException if any I/O-Error occurs
+ */
+ private boolean zzRefill() throws java.io.IOException {
+
+ /* first: make room (if you can) */
+ if (zzStartRead > 0) {
+ System.arraycopy(zzBuffer, zzStartRead,
+ zzBuffer, 0,
+ zzEndRead-zzStartRead);
+
+ /* translate stored positions */
+ zzEndRead-= zzStartRead;
+ zzCurrentPos-= zzStartRead;
+ zzMarkedPos-= zzStartRead;
+ zzStartRead = 0;
}
- /**
- * Creates a new scanner. There is also java.io.Reader version of this
- * constructor.
- *
- * @param in the java.io.Inputstream to read input from.
- */
- public TextLexer(java.io.InputStream in) {
- this(new java.io.InputStreamReader(in));
+ /* is the buffer big enough? */
+ if (zzCurrentPos >= zzBuffer.length) {
+ /* if not: blow it up */
+ char newBuffer[] = new char[zzCurrentPos*2];
+ System.arraycopy(zzBuffer, 0, newBuffer, 0, zzBuffer.length);
+ zzBuffer = newBuffer;
}
- /**
- * Unpacks the compressed character translation table.
- *
- * @param packed the packed character translation table
- * @return the unpacked character translation table
- */
- private static char[] zzUnpackCMap(String packed) {
- char[] map = new char[0x10000];
- int i = 0; /* index in packed string */
- int j = 0; /* index in unpacked array */
- while (i < 84) {
- int count = packed.charAt(i++);
- char value = packed.charAt(i++);
- do {
- map[j++] = value;
- } while (--count > 0);
- }
- return map;
+ /* finally: fill the buffer with new input */
+ int numRead = zzReader.read(zzBuffer, zzEndRead,
+ zzBuffer.length-zzEndRead);
+
+ if (numRead > 0) {
+ zzEndRead+= numRead;
+ return false;
}
-
- /**
- * Refills the input buffer.
- *
- * @return false, iff there was new input.
- *
- * @exception java.io.IOException if any I/O-Error occurs
- */
- private boolean zzRefill() throws java.io.IOException {
-
- /* first: make room (if you can) */
- if (zzStartRead > 0) {
- System.arraycopy(zzBuffer, zzStartRead,
- zzBuffer, 0,
- zzEndRead - zzStartRead);
-
- /* translate stored positions */
- zzEndRead -= zzStartRead;
- zzCurrentPos -= zzStartRead;
- zzMarkedPos -= zzStartRead;
- zzStartRead = 0;
- }
-
- /* is the buffer big enough? */
- if (zzCurrentPos >= zzBuffer.length) {
- /* if not: blow it up */
- char newBuffer[] = new char[zzCurrentPos * 2];
- System.arraycopy(zzBuffer, 0, newBuffer, 0, zzBuffer.length);
- zzBuffer = newBuffer;
- }
-
- /* finally: fill the buffer with new input */
- int numRead = zzReader.read(zzBuffer, zzEndRead,
- zzBuffer.length - zzEndRead);
-
- if (numRead > 0) {
- zzEndRead += numRead;
- return false;
- }
- // unlikely but not impossible: read 0 characters, but not at end of stream
- if (numRead == 0) {
- int c = zzReader.read();
- if (c == -1) {
- return true;
- } else {
- zzBuffer[zzEndRead++] = (char) c;
- return false;
- }
- }
-
- // numRead < 0
+ // unlikely but not impossible: read 0 characters, but not at end of stream
+ if (numRead == 0) {
+ int c = zzReader.read();
+ if (c == -1) {
return true;
+ } else {
+ zzBuffer[zzEndRead++] = (char) c;
+ return false;
+ }
}
- /**
- * Closes the input stream.
- */
- public final void yyclose() throws java.io.IOException {
- zzAtEOF = true; /* indicate end of file */
- zzEndRead = zzStartRead; /* invalidate buffer */
+ // numRead < 0
+ return true;
+ }
- if (zzReader != null) {
- zzReader.close();
+
+ /**
+ * Closes the input stream.
+ */
+ public final void yyclose() throws java.io.IOException {
+ zzAtEOF = true; /* indicate end of file */
+ zzEndRead = zzStartRead; /* invalidate buffer */
+
+ if (zzReader != null)
+ zzReader.close();
+ }
+
+
+ /**
+ * Resets the scanner to read from a new input stream.
+ * Does not close the old reader.
+ *
+ * All internal variables are reset, the old input stream
+ * cannot be reused (internal buffer is discarded and lost).
+ * Lexical state is set to ZZ_INITIAL.
+ *
+ * @param reader the new input stream
+ */
+ public final void yyreset(java.io.Reader reader) {
+ zzReader = reader;
+ zzAtBOL = true;
+ zzAtEOF = false;
+ zzEOFDone = false;
+ zzEndRead = zzStartRead = 0;
+ zzCurrentPos = zzMarkedPos = 0;
+ yyline = yychar = yycolumn = 0;
+ zzLexicalState = YYINITIAL;
+ }
+
+
+ /**
+ * Returns the current lexical state.
+ */
+ public final int yystate() {
+ return zzLexicalState;
+ }
+
+
+ /**
+ * Enters a new lexical state
+ *
+ * @param newState the new lexical state
+ */
+ public final void yybegin(int newState) {
+ zzLexicalState = newState;
+ }
+
+
+ /**
+ * Returns the text matched by the current regular expression.
+ */
+ public final String yytext() {
+ return new String( zzBuffer, zzStartRead, zzMarkedPos-zzStartRead );
+ }
+
+
+ /**
+ * Returns the character at position pos from the
+ * matched text.
+ *
+ * It is equivalent to yytext().charAt(pos), but faster
+ *
+ * @param pos the position of the character to fetch.
+ * A value from 0 to yylength()-1.
+ *
+ * @return the character at position pos
+ */
+ public final char yycharat(int pos) {
+ return zzBuffer[zzStartRead+pos];
+ }
+
+
+ /**
+ * Returns the length of the matched text region.
+ */
+ public final int yylength() {
+ return zzMarkedPos-zzStartRead;
+ }
+
+
+ /**
+ * Reports an error that occured while scanning.
+ *
+ * In a wellformed scanner (no or only correct usage of
+ * yypushback(int) and a match-all fallback rule) this method
+ * will only be called with things that "Can't Possibly Happen".
+ * If this method is called, something is seriously wrong
+ * (e.g. a JFlex bug producing a faulty scanner etc.).
+ *
+ * Usual syntax/scanner level error handling should be done
+ * in error fallback rules.
+ *
+ * @param errorCode the code of the errormessage to display
+ */
+ private void zzScanError(int errorCode) {
+ String message;
+ try {
+ message = ZZ_ERROR_MSG[errorCode];
+ }
+ catch (ArrayIndexOutOfBoundsException e) {
+ message = ZZ_ERROR_MSG[ZZ_UNKNOWN_ERROR];
+ }
+
+ throw new Error(message);
+ }
+
+
+ /**
+ * Pushes the specified amount of characters back into the input stream.
+ *
+ * They will be read again by then next call of the scanning method
+ *
+ * @param number the number of characters to be read again.
+ * This number must not be greater than yylength()!
+ */
+ public void yypushback(int number) {
+ if ( number > yylength() )
+ zzScanError(ZZ_PUSHBACK_2BIG);
+
+ zzMarkedPos -= number;
+ }
+
+
+ /**
+ * Resumes scanning until the next regular expression is matched,
+ * the end of input is encountered or an I/O-Error occurs.
+ *
+ * @return the next token
+ * @exception java.io.IOException if any I/O-Error occurs
+ */
+ public ParsedSymbol yylex() throws java.io.IOException, ParseException {
+ int zzInput;
+ int zzAction;
+
+ // cached fields:
+ int zzCurrentPosL;
+ int zzMarkedPosL;
+ int zzEndReadL = zzEndRead;
+ char [] zzBufferL = zzBuffer;
+ char [] zzCMapL = ZZ_CMAP;
+
+ int [] zzTransL = ZZ_TRANS;
+ int [] zzRowMapL = ZZ_ROWMAP;
+ int [] zzAttrL = ZZ_ATTRIBUTE;
+
+ while (true) {
+ zzMarkedPosL = zzMarkedPos;
+
+ yychar+= zzMarkedPosL-zzStartRead;
+
+ boolean zzR = false;
+ for (zzCurrentPosL = zzStartRead; zzCurrentPosL < zzMarkedPosL;
+ zzCurrentPosL++) {
+ switch (zzBufferL[zzCurrentPosL]) {
+ case '\u000B':
+ case '\u000C':
+ case '\u0085':
+ case '\u2028':
+ case '\u2029':
+ yyline++;
+ yycolumn = 0;
+ zzR = false;
+ break;
+ case '\r':
+ yyline++;
+ yycolumn = 0;
+ zzR = true;
+ break;
+ case '\n':
+ if (zzR)
+ zzR = false;
+ else {
+ yyline++;
+ yycolumn = 0;
+ }
+ break;
+ default:
+ zzR = false;
+ yycolumn++;
}
- }
+ }
- /**
- * Resets the scanner to read from a new input stream. Does not close the
- * old reader.
- *
- * All internal variables are reset, the old input stream
- * cannot be reused (internal buffer is discarded and lost). Lexical
- * state is set to ZZ_INITIAL.
- *
- * @param reader the new input stream
- */
- public final void yyreset(java.io.Reader reader) {
- zzReader = reader;
- zzAtBOL = true;
- zzAtEOF = false;
- zzEOFDone = false;
- zzEndRead = zzStartRead = 0;
- zzCurrentPos = zzMarkedPos = 0;
- yyline = yychar = yycolumn = 0;
- zzLexicalState = YYINITIAL;
- }
-
- /**
- * Returns the current lexical state.
- */
- public final int yystate() {
- return zzLexicalState;
- }
-
- /**
- * Enters a new lexical state
- *
- * @param newState the new lexical state
- */
- public final void yybegin(int newState) {
- zzLexicalState = newState;
- }
-
- /**
- * Returns the text matched by the current regular expression.
- */
- public final String yytext() {
- return new String(zzBuffer, zzStartRead, zzMarkedPos - zzStartRead);
- }
-
- /**
- * Returns the character at position pos from the matched text.
- *
- * It is equivalent to yytext().charAt(pos), but faster
- *
- * @param pos the position of the character to fetch. A value from 0 to
- * yylength()-1.
- *
- * @return the character at position pos
- */
- public final char yycharat(int pos) {
- return zzBuffer[zzStartRead + pos];
- }
-
- /**
- * Returns the length of the matched text region.
- */
- public final int yylength() {
- return zzMarkedPos - zzStartRead;
- }
-
- /**
- * Reports an error that occured while scanning.
- *
- * In a wellformed scanner (no or only correct usage of yypushback(int) and
- * a match-all fallback rule) this method will only be called with things
- * that "Can't Possibly Happen". If this method is called, something is
- * seriously wrong (e.g. a JFlex bug producing a faulty scanner etc.).
- *
- * Usual syntax/scanner level error handling should be done in error
- * fallback rules.
- *
- * @param errorCode the code of the errormessage to display
- */
- private void zzScanError(int errorCode) {
- String message;
- try {
- message = ZZ_ERROR_MSG[errorCode];
- } catch (ArrayIndexOutOfBoundsException e) {
- message = ZZ_ERROR_MSG[ZZ_UNKNOWN_ERROR];
+ if (zzR) {
+ // peek one character ahead if it is \n (if we have counted one line too much)
+ boolean zzPeek;
+ if (zzMarkedPosL < zzEndReadL)
+ zzPeek = zzBufferL[zzMarkedPosL] == '\n';
+ else if (zzAtEOF)
+ zzPeek = false;
+ else {
+ boolean eof = zzRefill();
+ zzEndReadL = zzEndRead;
+ zzMarkedPosL = zzMarkedPos;
+ zzBufferL = zzBuffer;
+ if (eof)
+ zzPeek = false;
+ else
+ zzPeek = zzBufferL[zzMarkedPosL] == '\n';
}
+ if (zzPeek) yyline--;
+ }
+ zzAction = -1;
- throw new Error(message);
- }
+ zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL;
+
+ zzState = ZZ_LEXSTATE[zzLexicalState];
- /**
- * Pushes the specified amount of characters back into the input stream.
- *
- * They will be read again by then next call of the scanning method
- *
- * @param number the number of characters to be read again. This number must
- * not be greater than yylength()!
- */
- public void yypushback(int number) {
- if (number > yylength()) {
- zzScanError(ZZ_PUSHBACK_2BIG);
- }
-
- zzMarkedPos -= number;
- }
-
- /**
- * Resumes scanning until the next regular expression is matched, the end of
- * input is encountered or an I/O-Error occurs.
- *
- * @return the next token
- * @exception java.io.IOException if any I/O-Error occurs
- */
- public ParsedSymbol yylex() throws java.io.IOException, ParseException {
- int zzInput;
- int zzAction;
-
- // cached fields:
- int zzCurrentPosL;
- int zzMarkedPosL;
- int zzEndReadL = zzEndRead;
- char[] zzBufferL = zzBuffer;
- char[] zzCMapL = ZZ_CMAP;
-
- int[] zzTransL = ZZ_TRANS;
- int[] zzRowMapL = ZZ_ROWMAP;
- int[] zzAttrL = ZZ_ATTRIBUTE;
+ zzForAction: {
while (true) {
- zzMarkedPosL = zzMarkedPos;
-
- yychar += zzMarkedPosL - zzStartRead;
-
- boolean zzR = false;
- for (zzCurrentPosL = zzStartRead; zzCurrentPosL < zzMarkedPosL;
- zzCurrentPosL++) {
- switch (zzBufferL[zzCurrentPosL]) {
- case '\u000B':
- case '\u000C':
- case '\u0085':
- case '\u2028':
- case '\u2029':
- yyline++;
- yycolumn = 0;
- zzR = false;
- break;
- case '\r':
- yyline++;
- yycolumn = 0;
- zzR = true;
- break;
- case '\n':
- if (zzR) {
- zzR = false;
- } else {
- yyline++;
- yycolumn = 0;
- }
- break;
- default:
- zzR = false;
- yycolumn++;
- }
+
+ if (zzCurrentPosL < zzEndReadL)
+ zzInput = zzBufferL[zzCurrentPosL++];
+ else if (zzAtEOF) {
+ zzInput = YYEOF;
+ break zzForAction;
+ }
+ else {
+ // store back cached positions
+ zzCurrentPos = zzCurrentPosL;
+ zzMarkedPos = zzMarkedPosL;
+ boolean eof = zzRefill();
+ // get translated positions and possibly new buffer
+ zzCurrentPosL = zzCurrentPos;
+ zzMarkedPosL = zzMarkedPos;
+ zzBufferL = zzBuffer;
+ zzEndReadL = zzEndRead;
+ if (eof) {
+ zzInput = YYEOF;
+ break zzForAction;
}
-
- if (zzR) {
- // peek one character ahead if it is \n (if we have counted one line too much)
- boolean zzPeek;
- if (zzMarkedPosL < zzEndReadL) {
- zzPeek = zzBufferL[zzMarkedPosL] == '\n';
- } else if (zzAtEOF) {
- zzPeek = false;
- } else {
- boolean eof = zzRefill();
- zzEndReadL = zzEndRead;
- zzMarkedPosL = zzMarkedPos;
- zzBufferL = zzBuffer;
- if (eof) {
- zzPeek = false;
- } else {
- zzPeek = zzBufferL[zzMarkedPosL] == '\n';
- }
- }
- if (zzPeek) {
- yyline--;
- }
+ else {
+ zzInput = zzBufferL[zzCurrentPosL++];
}
- zzAction = -1;
+ }
+ int zzNext = zzTransL[ zzRowMapL[zzState] + zzCMapL[zzInput] ];
+ if (zzNext == -1) break zzForAction;
+ zzState = zzNext;
- zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL;
+ int zzAttributes = zzAttrL[zzState];
+ if ( (zzAttributes & 1) == 1 ) {
+ zzAction = zzState;
+ zzMarkedPosL = zzCurrentPosL;
+ if ( (zzAttributes & 8) == 8 ) break zzForAction;
+ }
- zzState = ZZ_LEXSTATE[zzLexicalState];
-
-
- zzForAction:
- {
- while (true) {
-
- if (zzCurrentPosL < zzEndReadL) {
- zzInput = zzBufferL[zzCurrentPosL++];
- } else if (zzAtEOF) {
- zzInput = YYEOF;
- break zzForAction;
- } else {
- // store back cached positions
- zzCurrentPos = zzCurrentPosL;
- zzMarkedPos = zzMarkedPosL;
- boolean eof = zzRefill();
- // get translated positions and possibly new buffer
- zzCurrentPosL = zzCurrentPos;
- zzMarkedPosL = zzMarkedPos;
- zzBufferL = zzBuffer;
- zzEndReadL = zzEndRead;
- if (eof) {
- zzInput = YYEOF;
- break zzForAction;
- } else {
- zzInput = zzBufferL[zzCurrentPosL++];
- }
- }
- int zzNext = zzTransL[ zzRowMapL[zzState] + zzCMapL[zzInput]];
- if (zzNext == -1) {
- break zzForAction;
- }
- zzState = zzNext;
-
- int zzAttributes = zzAttrL[zzState];
- if ((zzAttributes & 1) == 1) {
- zzAction = zzState;
- zzMarkedPosL = zzCurrentPosL;
- if ((zzAttributes & 8) == 8) {
- break zzForAction;
- }
- }
-
- }
- }
-
- // store back cached position
- zzMarkedPos = zzMarkedPosL;
-
- switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) {
- case 1: {
- if (string == null) {
- string = new StringBuffer();
- }
- string.append(yytext());
- }
- case 18:
- break;
- case 3: {
- throw new ParseException("Illegal escape sequence \"" + yytext() + "\"", yyline + 1);
- }
- case 19:
- break;
- case 6: {
- if (string == null) {
- string = new StringBuffer();
- }
- string.append('\n');
- }
- case 20:
- break;
- case 11: {
- if (string == null) {
- string = new StringBuffer();
- }
- string.append('\b');
- }
- case 21:
- break;
- case 13: {
- if (string == null) {
- string = new StringBuffer();
- }
- string.append('\'');
- }
- case 22:
- break;
- case 16: {
- if (string == null) {
- return new ParsedSymbol(SymbolType.COLOR, yytext().substring(8, yytext().length() - 1));
- } else {
- yypushback(yylength());
- String ret = string.toString();
- string = null;
- return new ParsedSymbol(SymbolType.TEXT, ret.toString());
- }
- }
- case 23:
- break;
- case 8: {
- if (string == null) {
- string = new StringBuffer();
- }
- string.append(']');
- }
- case 24:
- break;
- case 15: {
- if (string == null) {
- return new ParsedSymbol(SymbolType.Y, Integer.parseInt(yytext().substring(3, yytext().length() - 1)));
- } else {
- yypushback(yylength());
- String ret = string.toString();
- string = null;
- return new ParsedSymbol(SymbolType.TEXT, ret.toString());
- }
- }
- case 25:
- break;
- case 14: {
- if (string == null) {
- return new ParsedSymbol(SymbolType.X, Integer.parseInt(yytext().substring(3, yytext().length() - 1)));
- } else {
- yypushback(yylength());
- String ret = string.toString();
- string = null;
- return new ParsedSymbol(SymbolType.TEXT, ret.toString());
- }
- }
- case 26:
- break;
- case 17: {
- if (string == null) {
- Pattern pat = Pattern.compile("\\[font ([0-9]+) height:([0-9]+)\\]");
- Matcher m = pat.matcher(yytext());
- if (m.matches()) {
- return new ParsedSymbol(SymbolType.FONT, Integer.parseInt(m.group(1)), Integer.parseInt(m.group(2)));
- }
- } else {
- yypushback(yylength());
- String ret = string.toString();
- string = null;
- return new ParsedSymbol(SymbolType.TEXT, ret.toString());
- }
- }
- case 27:
- break;
- case 7: {
- if (string == null) {
- string = new StringBuffer();
- }
- string.append('\t');
- }
- case 28:
- break;
- case 4: {
- if (string == null) {
- string = new StringBuffer();
- }
- string.append('[');
- }
- case 29:
- break;
- case 10: {
- if (string == null) {
- string = new StringBuffer();
- }
- string.append('\\');
- }
- case 30:
- break;
- case 12: {
- if (string == null) {
- string = new StringBuffer();
- }
- string.append('\"');
- }
- case 31:
- break;
- case 9: {
- if (string == null) {
- string = new StringBuffer();
- }
- string.append('\r');
- }
- case 32:
- break;
- case 5: {
- if (string == null) {
- string = new StringBuffer();
- }
- string.append('\f');
- }
- case 33:
- break;
- case 2: {
- }
- case 34:
- break;
- default:
- if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
- zzAtEOF = true;
- switch (zzLexicalState) {
- case YYINITIAL: {
- if (finish) {
- return null;
- } else {
- finish = true;
- return new ParsedSymbol(SymbolType.TEXT, string.toString());
- }
- }
- case 63:
- break;
- default: {
- return null;
- }
- }
- } else {
- zzScanError(ZZ_NO_MATCH);
- }
- }
}
+ }
+
+ // store back cached position
+ zzMarkedPos = zzMarkedPosL;
+
+ switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) {
+ case 1:
+ { if(string==null) string=new StringBuffer(); string.append( yytext() );
+ }
+ case 18: break;
+ case 3:
+ { throw new ParseException("Illegal escape sequence \""+yytext()+"\"",yyline+1);
+ }
+ case 19: break;
+ case 6:
+ { if(string==null) string=new StringBuffer(); string.append( '\n' );
+ }
+ case 20: break;
+ case 11:
+ { if(string==null) string=new StringBuffer(); string.append( '\b' );
+ }
+ case 21: break;
+ case 17:
+ { if(string==null){
+ Pattern pat = Pattern.compile("\\[font ([0-9]+) height ([0-9]+)\\]");
+ Matcher m=pat.matcher(yytext());
+ if(m.matches()){
+ return new ParsedSymbol(SymbolType.FONT,Integer.parseInt(m.group(1)),Integer.parseInt(m.group(2)));
+ }
+ }else{
+ yypushback(yylength());
+ String ret=string.toString();
+ string = null;
+ return new ParsedSymbol(SymbolType.TEXT,ret.toString());
+ }
+ }
+ case 22: break;
+ case 13:
+ { if(string==null) string=new StringBuffer(); string.append( '\'' );
+ }
+ case 23: break;
+ case 16:
+ { if(string==null){
+ return new ParsedSymbol(SymbolType.COLOR,yytext().substring(8,yytext().length()-1));
+ }else{
+ yypushback(yylength());
+ String ret=string.toString();
+ string = null;
+ return new ParsedSymbol(SymbolType.TEXT,ret.toString());
+ }
+ }
+ case 24: break;
+ case 8:
+ { if(string==null) string=new StringBuffer(); string.append( ']' );
+ }
+ case 25: break;
+ case 15:
+ { if(string==null){
+ return new ParsedSymbol(SymbolType.Y,Integer.parseInt(yytext().substring(3,yytext().length()-1)));
+ }else{
+ yypushback(yylength());
+ String ret=string.toString();
+ string = null;
+ return new ParsedSymbol(SymbolType.TEXT,ret.toString());
+ }
+ }
+ case 26: break;
+ case 14:
+ { if(string==null){
+ return new ParsedSymbol(SymbolType.X,Integer.parseInt(yytext().substring(3,yytext().length()-1)));
+ }else{
+ yypushback(yylength());
+ String ret=string.toString();
+ string = null;
+ return new ParsedSymbol(SymbolType.TEXT,ret.toString());
+ }
+ }
+ case 27: break;
+ case 7:
+ { if(string==null) string=new StringBuffer(); string.append( '\t' );
+ }
+ case 28: break;
+ case 4:
+ { if(string==null) string=new StringBuffer(); string.append( '[' );
+ }
+ case 29: break;
+ case 10:
+ { if(string==null) string=new StringBuffer(); string.append( '\\' );
+ }
+ case 30: break;
+ case 12:
+ { if(string==null) string=new StringBuffer(); string.append( '\"' );
+ }
+ case 31: break;
+ case 9:
+ { if(string==null) string=new StringBuffer(); string.append( '\r' );
+ }
+ case 32: break;
+ case 5:
+ { if(string==null) string=new StringBuffer(); string.append( '\f' );
+ }
+ case 33: break;
+ case 2:
+ {
+ }
+ case 34: break;
+ default:
+ if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
+ zzAtEOF = true;
+ switch (zzLexicalState) {
+ case YYINITIAL: {
+ if(finish){return null;}else{finish=true; return new ParsedSymbol(SymbolType.TEXT,string.toString());}
+ }
+ case 63: break;
+ default:
+ {
+ return null;
+ }
+ }
+ }
+ else {
+ zzScanError(ZZ_NO_MATCH);
+ }
+ }
}
+ }
+
+
}
diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/text/text.flex b/trunk/src/com/jpexs/decompiler/flash/tags/text/text.flex
index 9fb3f5d68..eb0af0abb 100644
--- a/trunk/src/com/jpexs/decompiler/flash/tags/text/text.flex
+++ b/trunk/src/com/jpexs/decompiler/flash/tags/text/text.flex
@@ -45,7 +45,7 @@ NegativeNumber = - {PositiveNumber}
Number = {PositiveNumber}|{NegativeNumber}
Hex = [0-9a-f][0-9a-f]
-Font = "[font " {PositiveNumber} " height:" {PositiveNumber} "]"
+Font = "[font " {PositiveNumber} " height " {PositiveNumber} "]"
Color = "[color #" {Hex}{Hex}{Hex} "]"
ColorA = "[color #" {Hex}{Hex}{Hex}{Hex} "]"
X = "[x " {Number} "]"
@@ -57,7 +57,7 @@ Y = "[y " {Number} "]"
{
{Font} {
if(string==null){
- Pattern pat = Pattern.compile("\\[font ([0-9]+) height:([0-9]+)\\]");
+ Pattern pat = Pattern.compile("\\[font ([0-9]+) height ([0-9]+)\\]");
Matcher m=pat.matcher(yytext());
if(m.matches()){
return new ParsedSymbol(SymbolType.FONT,Integer.parseInt(m.group(1)),Integer.parseInt(m.group(2)));