breakout_parser 0.0.10 → 0.0.11

data/ext/breakout_parser/parser.l

@@ -103,8 +103,14 @@ extern size_t in_buf_len;
 ^_/[^ \t\r\n_]            { yylval.ivalue=0; yy_push_state(_ITALIC); return ITALIC_START; }
 [ \t]+_/[^ \t\r\n_]       { yylval.ivalue=1; yy_push_state(_ITALIC); return ITALIC_START; }
 
-^@[^\r\n\xff@]+@/[ \t\r\n\xff]      { yylval.svalue = yytext; return INLINE_CODE; }
-[ \t]+@[^\r\n\xff@]+@/[ \t\r\n\xff] { yylval.svalue = yytext; return INLINE_CODE; }
+^\*_/[^ \t\r\n*_.]        { yylval.ivalue=0; yy_push_state(_BOLD); yy_push_state(_ITALIC); return BOLD_ITALIC_START; }
+[ \t]+\*_/[^ \t\r\n*_.]   { yylval.ivalue=1; yy_push_state(_BOLD); yy_push_state(_ITALIC); return BOLD_ITALIC_START; }
+
+^_\*/[^ \t\r\n*_.]        { yylval.ivalue=0; yy_push_state(_ITALIC); yy_push_state(_BOLD); return ITALIC_BOLD_START; }
+[ \t]+_\*/[^ \t\r\n*_.]   { yylval.ivalue=1; yy_push_state(_ITALIC); yy_push_state(_BOLD); return ITALIC_BOLD_START; }
+
+^@[^\r\n\xff@]+@/[ \t\r\n,.\xff]      { yylval.svalue = yytext; return INLINE_CODE; }
+[ \t]+@[^\r\n\xff@]+@/[ \t\r\n,.\xff] { yylval.svalue = yytext; return INLINE_CODE; }
 
 ^h[1-5]\.[ \t]+[^ \t\r\n][^\r\n]*/[\r\n\xff] {
     yylval.svalue = yytext+4; 
@@ -176,12 +182,12 @@ extern size_t in_buf_len;
 <_CODE><<EOF>>                               { yy_pop_state(); return CODE_END; }
 
 <_BOLD>[ \t]+\*/[ \t]+       { yylval.svalue = " *"; return T_WORD; } /* skip lone star */
-<_BOLD>\*/[ \t\r\n'.,]       { yy_pop_state(); return BOLD_END; }
-<_BOLD><<EOF>>               { yy_pop_state(); return BOLD_END; }
+<_BOLD>\*/[ \t\r\n'.,_]      { yy_pop_state(); return BOLD_END; }
+<_BOLD><<EOF>>               { yy_pop_state(); return REVERT_BOLD; }
 
 <_ITALIC>[ \t]+_/[ \t]+      { yylval.svalue = " _"; return T_WORD; } /* skip lone underscore */
-<_ITALIC>_/[ \t\r\n'.,]      { yy_pop_state(); return ITALIC_END; }
-<_ITALIC><<EOF>>             { yy_pop_state(); return ITALIC_END; }
+<_ITALIC>_/[ \t\r\n'.,*]     { yy_pop_state(); return ITALIC_END; }
+<_ITALIC><<EOF>>             { yy_pop_state(); return REVERT_ITALIC; }
 
 %%
 

data/ext/breakout_parser/parser.tab.c

@@ -160,40 +160,44 @@ void yyerror(const char *msg)
      T_CHAR = 258,
      BOLD_START = 259,
      ITALIC_START = 260,
-     T_WORD = 261,
-     TICKET_LINK = 262,
-     LINK = 263,
-     SVN_REVISION_LINK = 264,
-     GIT_REVISION_LINK = 265,
-     WIKI_LINK = 266,
-     ANCHOR_LINK = 267,
-     URL_WITH_PROTO_LINK = 268,
-     URL_WITHOUT_PROTO_LINK = 269,
-     FILE_LINK = 270,
-     IMAGE_LINK = 271,
-     URL = 272,
-     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
+     BOLD_ITALIC_START = 261,
+     ITALIC_BOLD_START = 262,
+     T_WORD = 263,
+     TICKET_LINK = 264,
+     LINK = 265,
+     SVN_REVISION_LINK = 266,
+     GIT_REVISION_LINK = 267,
+     WIKI_LINK = 268,
+     ANCHOR_LINK = 269,
+     URL_WITH_PROTO_LINK = 270,
+     URL_WITHOUT_PROTO_LINK = 271,
+     FILE_LINK = 272,
+     IMAGE_LINK = 273,
+     URL = 274,
+     EMAIL = 275,
+     UL = 276,
+     H1 = 277,
+     H2 = 278,
+     H3 = 279,
+     H4 = 280,
+     H5 = 281,
+     INLINE_CODE = 282,
+     SPACE = 283,
+     BR = 284,
+     OLI = 285,
+     ULI = 286,
+     PRE_CODE_START = 287,
+     PRE_CODE_END = 288,
+     PRE_START = 289,
+     PRE_END = 290,
+     CODE_START = 291,
+     CODE_END = 292,
+     NOTEXTILE_START = 293,
+     NOTEXTILE_END = 294,
+     BOLD_END = 295,
+     ITALIC_END = 296,
+     REVERT_BOLD = 297,
+     REVERT_ITALIC = 298
    };
 #endif
 
@@ -213,7 +217,7 @@ typedef union YYSTYPE
 
 
 /* Line 214 of yacc.c  */
-#line 217 "parser.tab.c"
+#line 221 "parser.tab.c"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -225,7 +229,7 @@ typedef union YYSTYPE
 
 
 /* Line 264 of yacc.c  */
-#line 229 "parser.tab.c"
+#line 233 "parser.tab.c"
 
 #ifdef short
 # undef short
@@ -438,22 +442,22 @@ union yyalloc
 #endif
 
 /* YYFINAL -- State number of the termination state.  */
-#define YYFINAL  49
+#define YYFINAL  53
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   113
+#define YYLAST   128
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  40
+#define YYNTOKENS  44
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  28
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  64
+#define YYNRULES  68
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  78
+#define YYNSTATES  82
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   294
+#define YYMAXUTOK   298
 
 #define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -490,7 +494,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,    39
+      35,    36,    37,    38,    39,    40,    41,    42,    43
 };
 
 #if YYDEBUG
@@ -502,41 +506,42 @@ 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,   104,   105,   108,
-     110,   112,   114,   116,   118,   120,   122,   124,   126,   127,
-     132,   136,   137,   142,   143
+      90,    92,    94,    96,    98,   100,   102,   104,   106,   108,
+     110,   112,   113,   116,   118,   120,   122,   124,   126,   128,
+     130,   132,   134,   135,   140,   144,   145,   150,   151
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int8 yyrhs[] =
 {
-      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
+      45,     0,    -1,    -1,    46,    45,    -1,    67,    -1,    55,
+      -1,    60,    -1,    61,    -1,    62,    -1,    63,    -1,    64,
+      -1,    -1,    -1,    47,    51,    48,    46,    -1,    -1,    -1,
+      49,    53,    50,    46,    -1,    68,    -1,    52,    -1,    51,
+      52,    -1,    66,    55,    -1,    66,    55,    29,    -1,    54,
+      -1,    53,    54,    -1,    65,    55,    -1,    65,    55,    29,
+      -1,    56,    -1,    56,    55,    -1,    58,    -1,    57,    -1,
+       8,    -1,    19,    -1,    20,    -1,     4,    -1,    40,    -1,
+       5,    -1,    41,    -1,     6,    -1,     7,    -1,    27,    -1,
+      42,    -1,    43,    -1,     9,    -1,    11,    -1,    12,    -1,
+      15,    -1,    16,    -1,    13,    -1,    14,    -1,    17,    -1,
+      18,    -1,    -1,    59,    58,    -1,     3,    -1,    22,    -1,
+      23,    -1,    24,    -1,    25,    -1,    26,    -1,    30,    -1,
+      31,    -1,    29,    -1,    -1,    32,    69,    58,    33,    -1,
+      38,    58,    39,    -1,    -1,    34,    70,    58,    35,    -1,
+      -1,    36,    71,    58,    37,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 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,   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
+       0,    87,    87,    88,    91,    92,    93,    94,    95,    96,
+      97,    98,    98,    98,    99,    99,    99,   100,   102,   103,
+     105,   106,   108,   109,   111,   112,   114,   115,   117,   118,
+     119,   120,   121,   122,   123,   124,   125,   126,   127,   128,
+     129,   130,   132,   133,   134,   135,   136,   137,   138,   139,
+     140,   142,   143,   145,   152,   153,   154,   155,   156,   158,
+     159,   160,   163,   163,   164,   165,   165,   166,   166
 };
 #endif
 
@@ -546,16 +551,17 @@ static const yytype_uint8 yyrline[] =
 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", "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
+  "BOLD_ITALIC_START", "ITALIC_BOLD_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", "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",
+  "REVERT_BOLD", "REVERT_ITALIC", "$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
 
@@ -567,20 +573,21 @@ 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,   294
+     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
+     295,   296,   297,   298
 };
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint8 yyr1[] =
 {
-       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
+       0,    44,    45,    45,    46,    46,    46,    46,    46,    46,
+      46,    47,    48,    46,    49,    50,    46,    46,    51,    51,
+      52,    52,    53,    53,    54,    54,    55,    55,    56,    56,
+      56,    56,    56,    56,    56,    56,    56,    56,    56,    56,
+      56,    56,    57,    57,    57,    57,    57,    57,    57,    57,
+      57,    58,    58,    59,    60,    61,    62,    63,    64,    65,
+      66,    67,    69,    68,    68,    70,    68,    71,    68
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -590,9 +597,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,     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,     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
@@ -600,96 +607,101 @@ static const yytype_uint8 yyr2[] =
    means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
-       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
+       2,    53,    33,    35,    37,    38,    30,    42,    43,    44,
+      47,    48,    45,    46,    49,    50,    31,    32,    54,    55,
+      56,    57,    58,    39,    61,    62,    65,    67,    51,    34,
+      36,    40,    41,     0,     2,     0,     0,     5,    26,    29,
+      28,    51,     6,     7,     8,     9,    10,     4,    17,    51,
+      51,    51,     0,     1,     3,    60,    12,    18,    51,    59,
+      15,    22,    51,    27,    52,     0,     0,     0,    64,    11,
+      19,    20,    11,    23,    24,    63,    66,    68,    13,    21,
+      16,    25
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int8 yydefgoto[] =
 {
-      -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
+      -1,    33,    34,    35,    69,    36,    72,    56,    57,    60,
+      61,    37,    38,    39,    40,    41,    42,    43,    44,    45,
+      46,    62,    58,    47,    48,    49,    50,    51
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -40
+#define YYPACT_NINF -42
 static const yytype_int8 yypact[] =
 {
-      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
+      41,   -42,   -42,   -42,   -42,   -42,   -42,   -42,   -42,   -42,
+     -42,   -42,   -42,   -42,   -42,   -42,   -42,   -42,   -42,   -42,
+     -42,   -42,   -42,   -42,   -42,   -42,   -42,   -42,    -2,   -42,
+     -42,   -42,   -42,     2,    41,   -21,    -9,   -42,    82,   -42,
+     -42,    -2,   -42,   -42,   -42,   -42,   -42,   -42,   -42,    -2,
+      -2,    -2,    -6,   -42,   -42,   -42,   -21,   -42,    82,   -42,
+      -9,   -42,    82,   -42,   -42,     4,    16,    25,   -42,     0,
+     -42,     6,     0,   -42,    10,   -42,   -42,   -42,   -42,   -42,
+     -42,   -42
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int8 yypgoto[] =
 {
-     -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
+     -42,    35,   -41,   -42,   -42,   -42,   -42,   -42,    18,   -42,
+      20,    54,   -42,   -42,    77,   -42,   -42,   -42,   -42,   -42,
+     -42,   -42,   -42,   -42,   -42,   -42,   -42,   -42
 };
 
 /* 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 -48
+#define YYTABLE_NINF -52
 static const yytype_int8 yytable[] =
 {
-     -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
+     -51,     1,    53,     1,     2,     3,     4,     5,     6,     7,
+      55,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+      17,    59,    18,    19,    20,    21,    22,    23,    78,    24,
+     -14,    80,    25,    68,    26,    79,    27,    75,    28,    81,
+      29,    30,    31,    32,     1,     2,     3,     4,     5,     6,
+       7,    76,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    17,    77,    18,    19,    20,    21,    22,    23,    54,
+      24,   -14,   -11,    25,    70,    26,     0,    27,     0,    28,
+      73,    29,    30,    31,    32,     1,     2,     3,     4,     5,
+       6,     7,    63,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,     0,     0,    52,     0,     0,     0,    23,
+       0,     0,    71,     0,     0,     0,    74,     0,    64,     0,
+       0,     0,    29,    30,    31,    32,    65,    66,    67
 };
 
 static const yytype_int8 yycheck[] =
 {
-       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
+       0,     3,     0,     3,     4,     5,     6,     7,     8,     9,
+      31,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+      20,    30,    22,    23,    24,    25,    26,    27,    69,    29,
+      30,    72,    32,    39,    34,    29,    36,    33,    38,    29,
+      40,    41,    42,    43,     3,     4,     5,     6,     7,     8,
+       9,    35,    11,    12,    13,    14,    15,    16,    17,    18,
+      19,    20,    37,    22,    23,    24,    25,    26,    27,    34,
+      29,    30,    31,    32,    56,    34,    -1,    36,    -1,    38,
+      60,    40,    41,    42,    43,     3,     4,     5,     6,     7,
+       8,     9,    38,    11,    12,    13,    14,    15,    16,    17,
+      18,    19,    20,    -1,    -1,    28,    -1,    -1,    -1,    27,
+      -1,    -1,    58,    -1,    -1,    -1,    62,    -1,    41,    -1,
+      -1,    -1,    40,    41,    42,    43,    49,    50,    51
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
 static const yytype_uint8 yystos[] =
 {
-       0,     3,     4,     5,     6,     7,     9,    10,    11,    12,
-      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
+       0,     3,     4,     5,     6,     7,     8,     9,    11,    12,
+      13,    14,    15,    16,    17,    18,    19,    20,    22,    23,
+      24,    25,    26,    27,    29,    32,    34,    36,    38,    40,
+      41,    42,    43,    45,    46,    47,    49,    55,    56,    57,
+      58,    59,    60,    61,    62,    63,    64,    67,    68,    69,
+      70,    71,    58,     0,    45,    31,    51,    52,    66,    30,
+      53,    54,    65,    55,    58,    58,    58,    58,    39,    48,
+      52,    55,    50,    54,    55,    33,    35,    37,    46,    29,
+      46,    29
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -1503,322 +1515,350 @@ yyreduce:
         case 6:
 
 /* Line 1455 of yacc.c  */
-#line 91 "parser.y"
+#line 93 "parser.y"
     {concat("</h1>",5);}
     break;
 
   case 7:
 
 /* Line 1455 of yacc.c  */
-#line 92 "parser.y"
+#line 94 "parser.y"
     {concat("</h2>",5);}
     break;
 
   case 8:
 
 /* Line 1455 of yacc.c  */
-#line 93 "parser.y"
+#line 95 "parser.y"
     {concat("</h3>",5);}
     break;
 
   case 9:
 
 /* Line 1455 of yacc.c  */
-#line 94 "parser.y"
+#line 96 "parser.y"
     {concat("</h4>",5);}
     break;
 
   case 10:
 
 /* Line 1455 of yacc.c  */
-#line 95 "parser.y"
+#line 97 "parser.y"
     {concat("</h5>",5);}
     break;
 
   case 11:
 
 /* Line 1455 of yacc.c  */
-#line 96 "parser.y"
+#line 98 "parser.y"
     {concat("<ul>",4);}
     break;
 
   case 12:
 
 /* Line 1455 of yacc.c  */
-#line 96 "parser.y"
+#line 98 "parser.y"
     {concat("</ul>",5);}
     break;
 
   case 14:
 
 /* Line 1455 of yacc.c  */
-#line 97 "parser.y"
+#line 99 "parser.y"
     {concat("<ol>",4);}
     break;
 
   case 15:
 
 /* Line 1455 of yacc.c  */
-#line 97 "parser.y"
+#line 99 "parser.y"
     {concat("</ol>",5);}
     break;
 
   case 18:
 
 /* Line 1455 of yacc.c  */
-#line 100 "parser.y"
+#line 102 "parser.y"
     {concat("</li>",5);}
     break;
 
   case 19:
 
 /* Line 1455 of yacc.c  */
-#line 101 "parser.y"
+#line 103 "parser.y"
     {concat("</li>",5);}
     break;
 
   case 22:
 
 /* Line 1455 of yacc.c  */
-#line 106 "parser.y"
+#line 108 "parser.y"
     {concat("</li>",5);}
     break;
 
   case 23:
 
 /* Line 1455 of yacc.c  */
-#line 107 "parser.y"
+#line 109 "parser.y"
     {concat("</li>",5);}
     break;
 
   case 30:
 
 /* Line 1455 of yacc.c  */
-#line 117 "parser.y"
+#line 119 "parser.y"
     {concat2((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 31:
 
 /* Line 1455 of yacc.c  */
-#line 118 "parser.y"
+#line 120 "parser.y"
     {process_url((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 32:
 
 /* Line 1455 of yacc.c  */
-#line 119 "parser.y"
+#line 121 "parser.y"
     {process_email((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 33:
 
 /* Line 1455 of yacc.c  */
-#line 120 "parser.y"
+#line 122 "parser.y"
     {(yyvsp[(1) - (1)].ivalue) ? concat(" <strong>",9) : concat("<strong>",8);}
     break;
 
   case 34:
 
 /* Line 1455 of yacc.c  */
-#line 121 "parser.y"
+#line 123 "parser.y"
     {concat("</strong>",9);}
     break;
 
   case 35:
 
 /* Line 1455 of yacc.c  */
-#line 122 "parser.y"
+#line 124 "parser.y"
     {(yyvsp[(1) - (1)].ivalue) ? concat(" <em>",5) : concat("<em>",4);}
     break;
 
   case 36:
 
 /* Line 1455 of yacc.c  */
-#line 123 "parser.y"
+#line 125 "parser.y"
     {concat("</em>",5);}
     break;
 
   case 37:
 
 /* Line 1455 of yacc.c  */
-#line 124 "parser.y"
-    {process_inline_code((yyvsp[(1) - (1)].svalue));}
+#line 126 "parser.y"
+    {(yyvsp[(1) - (1)].ivalue) ? concat(" <strong><em>",13) : concat("<strong><em>",12);}
     break;
 
   case 38:
 
 /* Line 1455 of yacc.c  */
-#line 126 "parser.y"
-    {process_ticket_link((yyvsp[(1) - (1)].svalue));}
+#line 127 "parser.y"
+    {(yyvsp[(1) - (1)].ivalue) ? concat(" <em><strong>",13) : concat("<em><strong>",12);}
     break;
 
   case 39:
 
 /* Line 1455 of yacc.c  */
-#line 127 "parser.y"
-    {process_svn_link((yyvsp[(1) - (1)].svalue));}
+#line 128 "parser.y"
+    {process_inline_code((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 40:
 
 /* Line 1455 of yacc.c  */
-#line 128 "parser.y"
-    {process_git_link((yyvsp[(1) - (1)].svalue));}
+#line 129 "parser.y"
+    {revert_bold();}
     break;
 
   case 41:
 
 /* Line 1455 of yacc.c  */
-#line 129 "parser.y"
-    {process_url_link((yyvsp[(1) - (1)].svalue),NULL);}
+#line 130 "parser.y"
+    {revert_italic();}
     break;
 
   case 42:
 
 /* Line 1455 of yacc.c  */
-#line 130 "parser.y"
-    {process_url_link((yyvsp[(1) - (1)].svalue),"http://");}
+#line 132 "parser.y"
+    {process_ticket_link((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 43:
 
 /* Line 1455 of yacc.c  */
-#line 131 "parser.y"
-    {process_wiki_link((yyvsp[(1) - (1)].svalue));}
+#line 133 "parser.y"
+    {process_svn_link((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 44:
 
 /* Line 1455 of yacc.c  */
-#line 132 "parser.y"
-    {process_anchor_link((yyvsp[(1) - (1)].svalue));}
+#line 134 "parser.y"
+    {process_git_link((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 45:
 
 /* Line 1455 of yacc.c  */
-#line 133 "parser.y"
-    {process_file_link((yyvsp[(1) - (1)].svalue));}
+#line 135 "parser.y"
+    {process_url_link((yyvsp[(1) - (1)].svalue),NULL);}
     break;
 
   case 46:
 
 /* Line 1455 of yacc.c  */
-#line 134 "parser.y"
-    {process_image_link((yyvsp[(1) - (1)].svalue));}
+#line 136 "parser.y"
+    {process_url_link((yyvsp[(1) - (1)].svalue),"http://");}
+    break;
+
+  case 47:
+
+/* Line 1455 of yacc.c  */
+#line 137 "parser.y"
+    {process_wiki_link((yyvsp[(1) - (1)].svalue));}
+    break;
+
+  case 48:
+
+/* Line 1455 of yacc.c  */
+#line 138 "parser.y"
+    {process_anchor_link((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 49:
 
 /* Line 1455 of yacc.c  */
 #line 139 "parser.y"
-    {concat_escaped_char((yyvsp[(1) - (1)].ivalue));}
+    {process_file_link((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 50:
 
 /* Line 1455 of yacc.c  */
-#line 146 "parser.y"
+#line 140 "parser.y"
+    {process_image_link((yyvsp[(1) - (1)].svalue));}
+    break;
+
+  case 53:
+
+/* Line 1455 of yacc.c  */
+#line 145 "parser.y"
+    {concat_escaped_char((yyvsp[(1) - (1)].ivalue));}
+    break;
+
+  case 54:
+
+/* Line 1455 of yacc.c  */
+#line 152 "parser.y"
     {concat("<h1 id=\"",8); process_header((yyvsp[(1) - (1)].svalue));}
     break;
 
-  case 51:
+  case 55:
 
 /* Line 1455 of yacc.c  */
-#line 147 "parser.y"
+#line 153 "parser.y"
     {concat("<h2 id=\"",8); process_header((yyvsp[(1) - (1)].svalue));}
     break;
 
-  case 52:
+  case 56:
 
 /* Line 1455 of yacc.c  */
-#line 148 "parser.y"
+#line 154 "parser.y"
     {concat("<h3 id=\"",8); process_header((yyvsp[(1) - (1)].svalue));}
     break;
 
-  case 53:
+  case 57:
 
 /* Line 1455 of yacc.c  */
-#line 149 "parser.y"
+#line 155 "parser.y"
     {concat("<h4 id=\"",8); process_header((yyvsp[(1) - (1)].svalue));}
     break;
 
-  case 54:
+  case 58:
 
 /* Line 1455 of yacc.c  */
-#line 150 "parser.y"
+#line 156 "parser.y"
     {concat("<h5 id=\"",8); process_header((yyvsp[(1) - (1)].svalue));}
     break;
 
-  case 55:
+  case 59:
 
 /* Line 1455 of yacc.c  */
-#line 152 "parser.y"
+#line 158 "parser.y"
     {concat("<li>",4);}
     break;
 
-  case 56:
+  case 60:
 
 /* Line 1455 of yacc.c  */
-#line 153 "parser.y"
+#line 159 "parser.y"
     {concat("<li>",4);}
     break;
 
-  case 57:
+  case 61:
 
 /* Line 1455 of yacc.c  */
-#line 154 "parser.y"
+#line 160 "parser.y"
     {concat("<br />",6);}
     break;
 
-  case 58:
+  case 62:
 
 /* Line 1455 of yacc.c  */
-#line 157 "parser.y"
+#line 163 "parser.y"
     {concat("<pre><code>",11);}
     break;
 
-  case 59:
+  case 63:
 
 /* Line 1455 of yacc.c  */
-#line 157 "parser.y"
+#line 163 "parser.y"
     {concat("</code></pre>",13);}
     break;
 
-  case 61:
+  case 65:
 
 /* Line 1455 of yacc.c  */
-#line 159 "parser.y"
+#line 165 "parser.y"
     {concat("<pre>",5);}
     break;
 
-  case 62:
+  case 66:
 
 /* Line 1455 of yacc.c  */
-#line 159 "parser.y"
+#line 165 "parser.y"
     {concat("</pre>",6);}
     break;
 
-  case 63:
+  case 67:
 
 /* Line 1455 of yacc.c  */
-#line 160 "parser.y"
+#line 166 "parser.y"
     {concat("<code>",6);}
     break;
 
-  case 64:
+  case 68:
 
 /* Line 1455 of yacc.c  */
-#line 160 "parser.y"
+#line 166 "parser.y"
     {concat("</code>",7);}
     break;
 
 
 
 /* Line 1455 of yacc.c  */
-#line 1822 "parser.tab.c"
+#line 1862 "parser.tab.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -2030,7 +2070,7 @@ yyreturn:
 
 
 /* Line 1675 of yacc.c  */
-#line 164 "parser.y"
+#line 170 "parser.y"
 
 
 concat_hex_char(char c){
@@ -2291,4 +2331,23 @@ process_email(const char*url){
     process_link_tail(url,NULL,NULL);
 }
 
+revert_bold(){
+    char *p;
+    for( p=bufptr-1; p >= (buf+7) ; p--){
+        if( 0 == strncmp(p-7, "<strong>", 8) ){
+            memcpy(p-7,"       *",8);
+            break;
+        }
+    }
+}
+
+revert_italic(){
+    char *p;
+    for( p=bufptr-1; p >= (buf+3) ; p--){
+        if( 0 == strncmp(p-3, "<em>", 4) ){
+            memcpy(p-3,"   _",4);
+            break;
+        }
+    }
+}