breakout_parser 0.0.7 → 0.0.8

data/ext/breakout_parser/make_win32.bat

@@ -7,6 +7,7 @@ if exist breakout_parser.so.manifest mt.exe -manifest breakout_parser.so.manifes
 
 echo.
 echo ALL OK!
+copy breakout_parser.so ..\..\lib\breakout_parser\win32-ruby1.8\
 goto end
 
 :err

data/ext/breakout_parser/parser.l

@@ -5,6 +5,7 @@
 // HACK for parsing end of bold/italic text at EOF
 // see http://flex.sourceforge.net/manual/How-can-I-match-text-only-at-the-end-of-a-file_003f.html#How-can-I-match-text-only-at-the-end-of-a-file_003f
 int was_fake_br = 0;
+int parse_links_only = 0;
 
 extern char* in_buf;
 extern char* in_pos;
@@ -77,23 +78,19 @@ extern size_t in_buf_len;
 %}
 
 %option stack
-%x _PRE_CODE _PRE _CODE _NOTEXTILE
+%x _PRE_CODE _PRE _CODE _NOTEXTILE _LINKS_ONLY
 %s _BOLD _ITALIC
 
 
 
 %%
+    if( parse_links_only ) BEGIN(_LINKS_ONLY);
 
-\xff                    ; /* EOF mark. should not appear in valid UTF8 text */
-[\r\n\t ]+\xff          ; /* EOF + skip tailing whitespace */
-
- /*
-([ \t]*\n){2,}          { return BRBR; }
-([ \t]*\r){2,}          { return BRBR; }
-([ \t]*\r\n){2,}        { return BRBR; }
- */
-
-[ \t]*(\r\n|\r|\n)      { return BR; }
+<INITIAL,_LINKS_ONLY,_BOLD,_ITALIC>{
+    \xff                    ; /* EOF mark. should not appear in valid UTF8 text */
+    [\r\n\t ]+\xff          ; /* EOF + skip tailing whitespace */
+    [ \t]*(\r\n|\r|\n)      { return BR; }
+}
 
 \<pre>[ \t]*<code>[\r\n]*  { BEGIN _PRE_CODE;      return PRE_CODE_START; }
 \<pre>[\r\n]*              { BEGIN _PRE;           return PRE_START; }
@@ -124,35 +121,39 @@ extern size_t in_buf_len;
 ^[ \t]*\*[ ]+              { return ULI; }
 ^[ \t]*#[ ]+               { return OLI; }
 
-https?:\/\/[^ \r\n<>"(){}*]+[^ \r\n<>"(){}*,.\[\]]  { yylval.svalue = yytext; return URL; }
 
-#[0-9]+/[ \t\r\n,.;()?!:-]  { yylval.svalue = yytext; return TICKET_LINK; }
-\[\[ticket:[0-9]+(\|[^\[\]]+)?\]\]   { yylval.svalue = yytext; return TICKET_LINK; }
+<INITIAL,_LINKS_ONLY,_BOLD,_ITALIC>{
+    (https?:\/\/|www\.)[^ \r\n<>"(){}*]+[^ \r\n<>"(){}*,.\[\]]  { yylval.svalue = yytext; return URL; }
 
-\[\[revision:[0-9]+(\|[^\[\]]+)?\]\]    { yylval.svalue = yytext+11; return SVN_REVISION_LINK; }
-\[\[revision:[0-9a-f]+(\|[^\[\]]+)?\]\] { yylval.svalue = yytext+11; return GIT_REVISION_LINK; }
-\[\[r:[0-9]+(\|[^\[\]]+)?\]\]           { yylval.svalue = yytext+4;  return SVN_REVISION_LINK; }
-\[\[r:[0-9a-f]+(\|[^\[\]]+)?\]\]        { yylval.svalue = yytext+4;  return GIT_REVISION_LINK; }
+    [0-9a-zA-Z_.-]+@[0-9a-zA-Z_-]{2,}\.[0-9a-zA-Z_.-]+[a-zA-Z0-9] { yylval.svalue = yytext; return EMAIL; }
 
-\[\[url:[a-z]+:\/\/[^]]+\]\] { yylval.svalue = yytext+6; return URL_WITH_PROTO_LINK; }
-\[\[url:\/[^]]+\]\]          { yylval.svalue = yytext+6; return URL_WITH_PROTO_LINK; }
-\[\[url:[^]]+\]\]            { yylval.svalue = yytext+6; return URL_WITHOUT_PROTO_LINK; }
+#[0-9]+/[ \t\r\n,.;()?!:-]  { yylval.svalue = yytext; return TICKET_LINK; }
+    \[\[ticket:[0-9]+(\|[^\[\]]+)?\]\]   { yylval.svalue = yytext; return TICKET_LINK; }
+
+    \[\[revision:[0-9]+(\|[^\[\]]+)?\]\]    { yylval.svalue = yytext+11; return SVN_REVISION_LINK; }
+    \[\[revision:[0-9a-f]+(\|[^\[\]]+)?\]\] { yylval.svalue = yytext+11; return GIT_REVISION_LINK; }
+    \[\[r:[0-9]+(\|[^\[\]]+)?\]\]           { yylval.svalue = yytext+4;  return SVN_REVISION_LINK; }
+    \[\[r:[0-9a-f]+(\|[^\[\]]+)?\]\]        { yylval.svalue = yytext+4;  return GIT_REVISION_LINK; }
 
-\[\[wiki:[^]]+\]\]           { yylval.svalue = yytext+7; return WIKI_LINK; }
-\[\[[a-zA-Z0-9_-][a-zA-Z0-9_#-]+(\|[^\[\]]+)?\]\] { yylval.svalue = yytext+2; return WIKI_LINK; }
+    \[\[url:[a-z]+:\/\/[^]]+\]\] { yylval.svalue = yytext+6; return URL_WITH_PROTO_LINK; }
+    \[\[url:\/[^]]+\]\]          { yylval.svalue = yytext+6; return URL_WITH_PROTO_LINK; }
+    \[\[url:[^]]+\]\]            { yylval.svalue = yytext+6; return URL_WITHOUT_PROTO_LINK; }
 
-\[\[#[^\r\n\[\]]+\]\]   { yylval.svalue = yytext+3; return ANCHOR_LINK; }
+    \[\[wiki:[^]]+\]\]           { yylval.svalue = yytext+7; return WIKI_LINK; }
+    \[\[[a-zA-Z0-9_-][a-zA-Z0-9_#-]+(\|[^\[\]]+)?\]\] { yylval.svalue = yytext+2; return WIKI_LINK; }
 
-\[\[file:[a-zA-Z0-9_.-]+(\|[^\[\]]+)?\]\]  { yylval.svalue = yytext+7; return FILE_LINK; }
-\[\[image:[a-zA-Z0-9_.-]+(\|[^\[\]]+)?\]\] { yylval.svalue = yytext+8; return IMAGE_LINK; }
+    \[\[#[^\r\n\[\]]+\]\]   { yylval.svalue = yytext+3; return ANCHOR_LINK; }
 
-^[ \t]+                 ; /* skip spaces at line start */
-[ \t]+                  { yylval.ivalue = ' '; return T_CHAR; }
+    \[\[file:[a-zA-Z0-9_.-]+(\|[^\[\]]+)?\]\]  { yylval.svalue = yytext+7; return FILE_LINK; }
+    \[\[image:[a-zA-Z0-9_.-]+(\|[^\[\]]+)?\]\] { yylval.svalue = yytext+8; return IMAGE_LINK; }
 
-[a-zA-Z0-9]+            { yylval.svalue = yytext; return T_WORD; }
+    ^[ \t]+                 ; /* skip spaces at line start */
+    [ \t]+                  { yylval.ivalue = ' '; return T_CHAR; }
 
-.                       { yylval.ivalue = yytext[0]; return T_CHAR; }
+    [a-zA-Z0-9]+            { yylval.svalue = yytext; return T_WORD; }
 
+    .                       { yylval.ivalue = yytext[0]; return T_CHAR; }
+}
 
 <_NOTEXTILE>[ \t\r\n]*<\/notextile>         { BEGIN INITIAL; return NOTEXTILE_END; }
 <_NOTEXTILE>[ \t\r\n]*\xff                  { BEGIN INITIAL; return NOTEXTILE_END; }

data/ext/breakout_parser/parser.tab.c

@@ -172,27 +172,28 @@ void yyerror(const char *msg)
      FILE_LINK = 270,
      IMAGE_LINK = 271,
      URL = 272,
-     UL = 273,
-     H1 = 274,
-     H2 = 275,
-     H3 = 276,
-     H4 = 277,
-     H5 = 278,
-     INLINE_CODE = 279,
-     SPACE = 280,
-     BR = 281,
-     OLI = 282,
-     ULI = 283,
-     PRE_CODE_START = 284,
-     PRE_CODE_END = 285,
-     PRE_START = 286,
-     PRE_END = 287,
-     CODE_START = 288,
-     CODE_END = 289,
-     NOTEXTILE_START = 290,
-     NOTEXTILE_END = 291,
-     BOLD_END = 292,
-     ITALIC_END = 293
+     EMAIL = 273,
+     UL = 274,
+     H1 = 275,
+     H2 = 276,
+     H3 = 277,
+     H4 = 278,
+     H5 = 279,
+     INLINE_CODE = 280,
+     SPACE = 281,
+     BR = 282,
+     OLI = 283,
+     ULI = 284,
+     PRE_CODE_START = 285,
+     PRE_CODE_END = 286,
+     PRE_START = 287,
+     PRE_END = 288,
+     CODE_START = 289,
+     CODE_END = 290,
+     NOTEXTILE_START = 291,
+     NOTEXTILE_END = 292,
+     BOLD_END = 293,
+     ITALIC_END = 294
    };
 #endif
 
@@ -212,7 +213,7 @@ typedef union YYSTYPE
 
 
 /* Line 214 of yacc.c  */
-#line 216 "parser.tab.c"
+#line 217 "parser.tab.c"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -224,7 +225,7 @@ typedef union YYSTYPE
 
 
 /* Line 264 of yacc.c  */
-#line 228 "parser.tab.c"
+#line 229 "parser.tab.c"
 
 #ifdef short
 # undef short
@@ -437,22 +438,22 @@ union yyalloc
 #endif
 
 /* YYFINAL -- State number of the termination state.  */
-#define YYFINAL  48
+#define YYFINAL  49
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   110
+#define YYLAST   113
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  39
+#define YYNTOKENS  40
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  28
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  63
+#define YYNRULES  64
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  77
+#define YYNSTATES  78
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   293
+#define YYMAXUTOK   294
 
 #define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -489,7 +490,7 @@ static const yytype_uint8 yytranslate[] =
        5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
       15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
       25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
-      35,    36,    37,    38
+      35,    36,    37,    38,    39
 };
 
 #if YYDEBUG
@@ -501,29 +502,29 @@ static const yytype_uint8 yyprhs[] =
       19,    21,    22,    23,    28,    29,    30,    35,    37,    39,
       42,    45,    49,    51,    54,    57,    61,    63,    66,    68,
       70,    72,    74,    76,    78,    80,    82,    84,    86,    88,
-      90,    92,    94,    96,    98,   100,   102,   103,   106,   108,
-     110,   112,   114,   116,   118,   120,   122,   124,   125,   130,
-     134,   135,   140,   141
+      90,    92,    94,    96,    98,   100,   102,   104,   105,   108,
+     110,   112,   114,   116,   118,   120,   122,   124,   126,   127,
+     132,   136,   137,   142,   143
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int8 yyrhs[] =
 {
-      40,     0,    -1,    -1,    41,    40,    -1,    62,    -1,    50,
-      -1,    55,    -1,    56,    -1,    57,    -1,    58,    -1,    59,
-      -1,    -1,    -1,    42,    46,    43,    41,    -1,    -1,    -1,
-      44,    48,    45,    41,    -1,    63,    -1,    47,    -1,    46,
-      47,    -1,    61,    50,    -1,    61,    50,    26,    -1,    49,
-      -1,    48,    49,    -1,    60,    50,    -1,    60,    50,    26,
-      -1,    51,    -1,    51,    50,    -1,    53,    -1,    52,    -1,
-       6,    -1,    17,    -1,     4,    -1,    37,    -1,     5,    -1,
-      38,    -1,    24,    -1,     7,    -1,     9,    -1,    10,    -1,
-      13,    -1,    14,    -1,    11,    -1,    12,    -1,    15,    -1,
-      16,    -1,    -1,    54,    53,    -1,     3,    -1,    19,    -1,
-      20,    -1,    21,    -1,    22,    -1,    23,    -1,    27,    -1,
-      28,    -1,    26,    -1,    -1,    29,    64,    53,    30,    -1,
-      35,    53,    36,    -1,    -1,    31,    65,    53,    32,    -1,
-      -1,    33,    66,    53,    34,    -1
+      41,     0,    -1,    -1,    42,    41,    -1,    63,    -1,    51,
+      -1,    56,    -1,    57,    -1,    58,    -1,    59,    -1,    60,
+      -1,    -1,    -1,    43,    47,    44,    42,    -1,    -1,    -1,
+      45,    49,    46,    42,    -1,    64,    -1,    48,    -1,    47,
+      48,    -1,    62,    51,    -1,    62,    51,    27,    -1,    50,
+      -1,    49,    50,    -1,    61,    51,    -1,    61,    51,    27,
+      -1,    52,    -1,    52,    51,    -1,    54,    -1,    53,    -1,
+       6,    -1,    17,    -1,    18,    -1,     4,    -1,    38,    -1,
+       5,    -1,    39,    -1,    25,    -1,     7,    -1,     9,    -1,
+      10,    -1,    13,    -1,    14,    -1,    11,    -1,    12,    -1,
+      15,    -1,    16,    -1,    -1,    55,    54,    -1,     3,    -1,
+      20,    -1,    21,    -1,    22,    -1,    23,    -1,    24,    -1,
+      28,    -1,    29,    -1,    27,    -1,    -1,    30,    65,    54,
+      31,    -1,    36,    54,    37,    -1,    -1,    32,    66,    54,
+      33,    -1,    -1,    34,    67,    54,    35,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
@@ -532,10 +533,10 @@ static const yytype_uint8 yyrline[] =
        0,    85,    85,    86,    89,    90,    91,    92,    93,    94,
       95,    96,    96,    96,    97,    97,    97,    98,   100,   101,
      103,   104,   106,   107,   109,   110,   112,   113,   115,   116,
-     117,   118,   119,   120,   121,   122,   123,   125,   126,   127,
-     128,   129,   130,   131,   132,   133,   135,   136,   138,   145,
-     146,   147,   148,   149,   151,   152,   153,   156,   156,   157,
-     158,   158,   159,   159
+     117,   118,   119,   120,   121,   122,   123,   124,   126,   127,
+     128,   129,   130,   131,   132,   133,   134,   136,   137,   139,
+     146,   147,   148,   149,   150,   152,   153,   154,   157,   157,
+     158,   159,   159,   160,   160
 };
 #endif
 
@@ -547,14 +548,14 @@ static const char *const yytname[] =
   "$end", "error", "$undefined", "T_CHAR", "BOLD_START", "ITALIC_START",
   "T_WORD", "TICKET_LINK", "LINK", "SVN_REVISION_LINK",
   "GIT_REVISION_LINK", "WIKI_LINK", "ANCHOR_LINK", "URL_WITH_PROTO_LINK",
-  "URL_WITHOUT_PROTO_LINK", "FILE_LINK", "IMAGE_LINK", "URL", "UL", "H1",
-  "H2", "H3", "H4", "H5", "INLINE_CODE", "SPACE", "BR", "OLI", "ULI",
-  "PRE_CODE_START", "PRE_CODE_END", "PRE_START", "PRE_END", "CODE_START",
-  "CODE_END", "NOTEXTILE_START", "NOTEXTILE_END", "BOLD_END", "ITALIC_END",
-  "$accept", "text", "textitem", "$@1", "$@2", "$@3", "$@4", "ulist",
-  "ulitem", "olist", "olitem", "words", "word", "link", "chars", "char",
-  "h1", "h2", "h3", "h4", "h5", "oli", "uli", "br", "code", "$@5", "$@6",
-  "$@7", 0
+  "URL_WITHOUT_PROTO_LINK", "FILE_LINK", "IMAGE_LINK", "URL", "EMAIL",
+  "UL", "H1", "H2", "H3", "H4", "H5", "INLINE_CODE", "SPACE", "BR", "OLI",
+  "ULI", "PRE_CODE_START", "PRE_CODE_END", "PRE_START", "PRE_END",
+  "CODE_START", "CODE_END", "NOTEXTILE_START", "NOTEXTILE_END", "BOLD_END",
+  "ITALIC_END", "$accept", "text", "textitem", "$@1", "$@2", "$@3", "$@4",
+  "ulist", "ulitem", "olist", "olitem", "words", "word", "link", "chars",
+  "char", "h1", "h2", "h3", "h4", "h5", "oli", "uli", "br", "code", "$@5",
+  "$@6", "$@7", 0
 };
 #endif
 
@@ -566,20 +567,20 @@ static const yytype_uint16 yytoknum[] =
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
      265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
      275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
-     285,   286,   287,   288,   289,   290,   291,   292,   293
+     285,   286,   287,   288,   289,   290,   291,   292,   293,   294
 };
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint8 yyr1[] =
 {
-       0,    39,    40,    40,    41,    41,    41,    41,    41,    41,
-      41,    42,    43,    41,    44,    45,    41,    41,    46,    46,
-      47,    47,    48,    48,    49,    49,    50,    50,    51,    51,
-      51,    51,    51,    51,    51,    51,    51,    52,    52,    52,
-      52,    52,    52,    52,    52,    52,    53,    53,    54,    55,
-      56,    57,    58,    59,    60,    61,    62,    64,    63,    63,
-      65,    63,    66,    63
+       0,    40,    41,    41,    42,    42,    42,    42,    42,    42,
+      42,    43,    44,    42,    45,    46,    42,    42,    47,    47,
+      48,    48,    49,    49,    50,    50,    51,    51,    52,    52,
+      52,    52,    52,    52,    52,    52,    52,    52,    53,    53,
+      53,    53,    53,    53,    53,    53,    53,    54,    54,    55,
+      56,    57,    58,    59,    60,    61,    62,    63,    65,    64,
+      64,    66,    64,    67,    64
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -589,9 +590,9 @@ static const yytype_uint8 yyr2[] =
        1,     0,     0,     4,     0,     0,     4,     1,     1,     2,
        2,     3,     1,     2,     2,     3,     1,     2,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     0,     2,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     0,     4,     3,
-       0,     4,     0,     4
+       1,     1,     1,     1,     1,     1,     1,     0,     2,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     0,     4,
+       3,     0,     4,     0,     4
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -599,82 +600,82 @@ static const yytype_uint8 yyr2[] =
    means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
-       2,    48,    32,    34,    30,    37,    38,    39,    42,    43,
-      40,    41,    44,    45,    31,    49,    50,    51,    52,    53,
-      36,    56,    57,    60,    62,    46,    33,    35,     0,     2,
-       0,     0,     5,    26,    29,    28,    46,     6,     7,     8,
-       9,    10,     4,    17,    46,    46,    46,     0,     1,     3,
-      55,    12,    18,    46,    54,    15,    22,    46,    27,    47,
-       0,     0,     0,    59,    11,    19,    20,    11,    23,    24,
-      58,    61,    63,    13,    21,    16,    25
+       2,    49,    33,    35,    30,    38,    39,    40,    43,    44,
+      41,    42,    45,    46,    31,    32,    50,    51,    52,    53,
+      54,    37,    57,    58,    61,    63,    47,    34,    36,     0,
+       2,     0,     0,     5,    26,    29,    28,    47,     6,     7,
+       8,     9,    10,     4,    17,    47,    47,    47,     0,     1,
+       3,    56,    12,    18,    47,    55,    15,    22,    47,    27,
+      48,     0,     0,     0,    60,    11,    19,    20,    11,    23,
+      24,    59,    62,    64,    13,    21,    16,    25
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int8 yydefgoto[] =
 {
-      -1,    28,    29,    30,    64,    31,    67,    51,    52,    55,
-      56,    32,    33,    34,    35,    36,    37,    38,    39,    40,
-      41,    57,    53,    42,    43,    44,    45,    46
+      -1,    29,    30,    31,    65,    32,    68,    52,    53,    56,
+      57,    33,    34,    35,    36,    37,    38,    39,    40,    41,
+      42,    58,    54,    43,    44,    45,    46,    47
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -26
+#define YYPACT_NINF -40
 static const yytype_int8 yypact[] =
 {
-      36,   -26,   -26,   -26,   -26,   -26,   -26,   -26,   -26,   -26,
-     -26,   -26,   -26,   -26,   -26,   -26,   -26,   -26,   -26,   -26,
-     -26,   -26,   -26,   -26,   -26,    -2,   -26,   -26,     2,    36,
-     -10,     3,   -26,    72,   -26,   -26,    -2,   -26,   -26,   -26,
-     -26,   -26,   -26,   -26,    -2,    -2,    -2,   -11,   -26,   -26,
-     -26,   -10,   -26,    72,   -26,     3,   -26,    72,   -26,   -26,
-       4,    12,    20,   -26,     0,   -26,    10,     0,   -26,    35,
-     -26,   -26,   -26,   -26,   -26,   -26,   -26
+      37,   -40,   -40,   -40,   -40,   -40,   -40,   -40,   -40,   -40,
+     -40,   -40,   -40,   -40,   -40,   -40,   -40,   -40,   -40,   -40,
+     -40,   -40,   -40,   -40,   -40,   -40,    -2,   -40,   -40,     2,
+      37,   -21,    -9,   -40,    74,   -40,   -40,    -2,   -40,   -40,
+     -40,   -40,   -40,   -40,   -40,    -2,    -2,    -2,    -6,   -40,
+     -40,   -40,   -21,   -40,    74,   -40,    -9,   -40,    74,   -40,
+     -40,     4,    12,    21,   -40,     0,   -40,     6,     0,   -40,
+      10,   -40,   -40,   -40,   -40,   -40,   -40,   -40
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int8 yypgoto[] =
 {
-     -26,    37,    26,   -26,   -26,   -26,   -26,   -26,    17,   -26,
-      15,   -25,   -26,   -26,    55,   -26,   -26,   -26,   -26,   -26,
-     -26,   -26,   -26,   -26,   -26,   -26,   -26,   -26
+     -40,    33,   -39,   -40,   -40,   -40,   -40,   -40,    16,   -40,
+      14,    40,   -40,   -40,    56,   -40,   -40,   -40,   -40,   -40,
+     -40,   -40,   -40,   -40,   -40,   -40,   -40,   -40
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
    number is the opposite.  If zero, do what YYDEFACT says.
    If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -47
+#define YYTABLE_NINF -48
 static const yytype_int8 yytable[] =
 {
-     -46,     1,    48,     1,     2,     3,     4,     5,    58,     6,
-       7,     8,     9,    10,    11,    12,    13,    14,    50,    15,
-      16,    17,    18,    19,    20,    63,    21,   -14,    66,    22,
-      54,    23,    69,    24,    70,    25,    74,    26,    27,     1,
-       2,     3,     4,     5,    71,     6,     7,     8,     9,    10,
-      11,    12,    13,    14,    72,    15,    16,    17,    18,    19,
-      20,    76,    21,   -14,   -11,    22,    49,    23,    65,    24,
-      68,    25,     0,    26,    27,     1,     2,     3,     4,     5,
-      47,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-      73,    59,     0,    75,     0,     0,    20,     0,     0,    60,
-      61,    62,     0,     0,     0,     0,     0,     0,     0,    26,
-      27
+     -47,     1,    49,     1,     2,     3,     4,     5,    51,     6,
+       7,     8,     9,    10,    11,    12,    13,    14,    15,    55,
+      16,    17,    18,    19,    20,    21,    74,    22,   -14,    76,
+      23,    64,    24,    75,    25,    71,    26,    77,    27,    28,
+       1,     2,     3,     4,     5,    72,     6,     7,     8,     9,
+      10,    11,    12,    13,    14,    15,    73,    16,    17,    18,
+      19,    20,    21,    50,    22,   -14,   -11,    23,    66,    24,
+      69,    25,     0,    26,    59,    27,    28,     1,     2,     3,
+       4,     5,    48,     6,     7,     8,     9,    10,    11,    12,
+      13,    14,    15,    60,    67,     0,     0,     0,    70,    21,
+       0,    61,    62,    63,     0,     0,     0,     0,     0,     0,
+       0,     0,    27,    28
 };
 
 static const yytype_int8 yycheck[] =
 {
-       0,     3,     0,     3,     4,     5,     6,     7,    33,     9,
-      10,    11,    12,    13,    14,    15,    16,    17,    28,    19,
-      20,    21,    22,    23,    24,    36,    26,    27,    53,    29,
-      27,    31,    57,    33,    30,    35,    26,    37,    38,     3,
-       4,     5,     6,     7,    32,     9,    10,    11,    12,    13,
-      14,    15,    16,    17,    34,    19,    20,    21,    22,    23,
-      24,    26,    26,    27,    28,    29,    29,    31,    51,    33,
-      55,    35,    -1,    37,    38,     3,     4,     5,     6,     7,
-      25,     9,    10,    11,    12,    13,    14,    15,    16,    17,
-      64,    36,    -1,    67,    -1,    -1,    24,    -1,    -1,    44,
-      45,    46,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,
-      38
+       0,     3,     0,     3,     4,     5,     6,     7,    29,     9,
+      10,    11,    12,    13,    14,    15,    16,    17,    18,    28,
+      20,    21,    22,    23,    24,    25,    65,    27,    28,    68,
+      30,    37,    32,    27,    34,    31,    36,    27,    38,    39,
+       3,     4,     5,     6,     7,    33,     9,    10,    11,    12,
+      13,    14,    15,    16,    17,    18,    35,    20,    21,    22,
+      23,    24,    25,    30,    27,    28,    29,    30,    52,    32,
+      56,    34,    -1,    36,    34,    38,    39,     3,     4,     5,
+       6,     7,    26,     9,    10,    11,    12,    13,    14,    15,
+      16,    17,    18,    37,    54,    -1,    -1,    -1,    58,    25,
+      -1,    45,    46,    47,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    38,    39
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -682,13 +683,13 @@ static const yytype_int8 yycheck[] =
 static const yytype_uint8 yystos[] =
 {
        0,     3,     4,     5,     6,     7,     9,    10,    11,    12,
-      13,    14,    15,    16,    17,    19,    20,    21,    22,    23,
-      24,    26,    29,    31,    33,    35,    37,    38,    40,    41,
-      42,    44,    50,    51,    52,    53,    54,    55,    56,    57,
-      58,    59,    62,    63,    64,    65,    66,    53,     0,    40,
-      28,    46,    47,    61,    27,    48,    49,    60,    50,    53,
-      53,    53,    53,    36,    43,    47,    50,    45,    49,    50,
-      30,    32,    34,    41,    26,    41,    26
+      13,    14,    15,    16,    17,    18,    20,    21,    22,    23,
+      24,    25,    27,    30,    32,    34,    36,    38,    39,    41,
+      42,    43,    45,    51,    52,    53,    54,    55,    56,    57,
+      58,    59,    60,    63,    64,    65,    66,    67,    54,     0,
+      41,    29,    47,    48,    62,    28,    49,    50,    61,    51,
+      54,    54,    54,    54,    37,    44,    48,    51,    46,    50,
+      51,    31,    33,    35,    42,    27,    42,    27
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -1608,147 +1609,147 @@ yyreduce:
 
 /* Line 1455 of yacc.c  */
 #line 119 "parser.y"
-    {(yyvsp[(1) - (1)].ivalue) ? concat(" <strong>",9) : concat("<strong>",8);}
+    {process_email((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 33:
 
 /* Line 1455 of yacc.c  */
 #line 120 "parser.y"
-    {concat("</strong>",9);}
+    {(yyvsp[(1) - (1)].ivalue) ? concat(" <strong>",9) : concat("<strong>",8);}
     break;
 
   case 34:
 
 /* Line 1455 of yacc.c  */
 #line 121 "parser.y"
-    {(yyvsp[(1) - (1)].ivalue) ? concat(" <em>",5) : concat("<em>",4);}
+    {concat("</strong>",9);}
     break;
 
   case 35:
 
 /* Line 1455 of yacc.c  */
 #line 122 "parser.y"
-    {concat("</em>",5);}
+    {(yyvsp[(1) - (1)].ivalue) ? concat(" <em>",5) : concat("<em>",4);}
     break;
 
   case 36:
 
 /* Line 1455 of yacc.c  */
 #line 123 "parser.y"
-    {process_inline_code((yyvsp[(1) - (1)].svalue));}
+    {concat("</em>",5);}
     break;
 
   case 37:
 
 /* Line 1455 of yacc.c  */
-#line 125 "parser.y"
-    {process_ticket_link((yyvsp[(1) - (1)].svalue));}
+#line 124 "parser.y"
+    {process_inline_code((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 38:
 
 /* Line 1455 of yacc.c  */
 #line 126 "parser.y"
-    {process_svn_link((yyvsp[(1) - (1)].svalue));}
+    {process_ticket_link((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 39:
 
 /* Line 1455 of yacc.c  */
 #line 127 "parser.y"
-    {process_git_link((yyvsp[(1) - (1)].svalue));}
+    {process_svn_link((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 40:
 
 /* Line 1455 of yacc.c  */
 #line 128 "parser.y"
-    {process_url_link((yyvsp[(1) - (1)].svalue),NULL);}
+    {process_git_link((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 41:
 
 /* Line 1455 of yacc.c  */
 #line 129 "parser.y"
-    {process_url_link((yyvsp[(1) - (1)].svalue),"http://");}
+    {process_url_link((yyvsp[(1) - (1)].svalue),NULL);}
     break;
 
   case 42:
 
 /* Line 1455 of yacc.c  */
 #line 130 "parser.y"
-    {process_wiki_link((yyvsp[(1) - (1)].svalue));}
+    {process_url_link((yyvsp[(1) - (1)].svalue),"http://");}
     break;
 
   case 43:
 
 /* Line 1455 of yacc.c  */
 #line 131 "parser.y"
-    {process_anchor_link((yyvsp[(1) - (1)].svalue));}
+    {process_wiki_link((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 44:
 
 /* Line 1455 of yacc.c  */
 #line 132 "parser.y"
-    {process_file_link((yyvsp[(1) - (1)].svalue));}
+    {process_anchor_link((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 45:
 
 /* Line 1455 of yacc.c  */
 #line 133 "parser.y"
-    {process_image_link((yyvsp[(1) - (1)].svalue));}
+    {process_file_link((yyvsp[(1) - (1)].svalue));}
     break;
 
-  case 48:
+  case 46:
 
 /* Line 1455 of yacc.c  */
-#line 138 "parser.y"
-    {concat_escaped_char((yyvsp[(1) - (1)].ivalue));}
+#line 134 "parser.y"
+    {process_image_link((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 49:
 
 /* Line 1455 of yacc.c  */
-#line 145 "parser.y"
-    {concat("<h1 id=\"",8); process_header((yyvsp[(1) - (1)].svalue));}
+#line 139 "parser.y"
+    {concat_escaped_char((yyvsp[(1) - (1)].ivalue));}
     break;
 
   case 50:
 
 /* Line 1455 of yacc.c  */
 #line 146 "parser.y"
-    {concat("<h2 id=\"",8); process_header((yyvsp[(1) - (1)].svalue));}
+    {concat("<h1 id=\"",8); process_header((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 51:
 
 /* Line 1455 of yacc.c  */
 #line 147 "parser.y"
-    {concat("<h3 id=\"",8); process_header((yyvsp[(1) - (1)].svalue));}
+    {concat("<h2 id=\"",8); process_header((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 52:
 
 /* Line 1455 of yacc.c  */
 #line 148 "parser.y"
-    {concat("<h4 id=\"",8); process_header((yyvsp[(1) - (1)].svalue));}
+    {concat("<h3 id=\"",8); process_header((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 53:
 
 /* Line 1455 of yacc.c  */
 #line 149 "parser.y"
-    {concat("<h5 id=\"",8); process_header((yyvsp[(1) - (1)].svalue));}
+    {concat("<h4 id=\"",8); process_header((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 54:
 
 /* Line 1455 of yacc.c  */
-#line 151 "parser.y"
-    {concat("<li>",4);}
+#line 150 "parser.y"
+    {concat("<h5 id=\"",8); process_header((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 55:
@@ -1762,55 +1763,62 @@ yyreduce:
 
 /* Line 1455 of yacc.c  */
 #line 153 "parser.y"
-    {concat("<br />",6);}
+    {concat("<li>",4);}
     break;
 
   case 57:
 
 /* Line 1455 of yacc.c  */
-#line 156 "parser.y"
-    {concat("<pre><code>",11);}
+#line 154 "parser.y"
+    {concat("<br />",6);}
     break;
 
   case 58:
 
 /* Line 1455 of yacc.c  */
-#line 156 "parser.y"
-    {concat("</code></pre>",13);}
+#line 157 "parser.y"
+    {concat("<pre><code>",11);}
     break;
 
-  case 60:
+  case 59:
 
 /* Line 1455 of yacc.c  */
-#line 158 "parser.y"
-    {concat("<pre>",5);}
+#line 157 "parser.y"
+    {concat("</code></pre>",13);}
     break;
 
   case 61:
 
 /* Line 1455 of yacc.c  */
-#line 158 "parser.y"
-    {concat("</pre>",6);}
+#line 159 "parser.y"
+    {concat("<pre>",5);}
     break;
 
   case 62:
 
 /* Line 1455 of yacc.c  */
 #line 159 "parser.y"
-    {concat("<code>",6);}
+    {concat("</pre>",6);}
     break;
 
   case 63:
 
 /* Line 1455 of yacc.c  */
-#line 159 "parser.y"
+#line 160 "parser.y"
+    {concat("<code>",6);}
+    break;
+
+  case 64:
+
+/* Line 1455 of yacc.c  */
+#line 160 "parser.y"
     {concat("</code>",7);}
     break;
 
 
 
 /* Line 1455 of yacc.c  */
-#line 1814 "parser.tab.c"
+#line 1822 "parser.tab.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -2022,7 +2030,7 @@ yyreturn:
 
 
 /* Line 1675 of yacc.c  */
-#line 163 "parser.y"
+#line 164 "parser.y"
 
 
 concat_hex_char(char c){
@@ -2265,7 +2273,22 @@ process_url(const char*url){
     const char *p;
 
     concat("<a rel=\"nofollow\" href=\"",24);
+    if( *url == 'w' ){
+        // url starts with 'www.'
+        concat("http://",7);
+    } else {
+        // assume url starts with 'http://'
+    }
+    for(p=url; *p; p++) concat_raw_char(*p);
+    process_link_tail(url,NULL,NULL);
+}
+
+process_email(const char*url){
+    const char *p;
+
+    concat("<a href=\"mailto:",16);
     for(p=url; *p; p++) concat_raw_char(*p);
     process_link_tail(url,NULL,NULL);
 }
 
+