breakout_parser 0.0.12 → 0.0.13

data/ext/breakout_parser/parser.tab.c

@@ -96,6 +96,8 @@ size_t site_url_len = 0;
 
 extern VALUE git_url;
 
+int list_level = 1;
+
 #define CHECK_BUF_SIZE(len) \
     if( (bufptr - buf + len + 1) >= bufsize ){ \
         /*printf("[.] REALLOC oldsz=%d, newsz=%d\n",bufsize, (bufsize+((len > 0x1000) ? (len+0x1000) : 0x1000)));*/ \
@@ -135,7 +137,7 @@ void yyerror(const char *msg)
 
 
 /* Line 189 of yacc.c  */
-#line 139 "parser.tab.c"
+#line 141 "parser.tab.c"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
@@ -167,32 +169,32 @@ void yyerror(const char *msg)
      ITALIC_START = 260,
      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,
-     SVN_N_REVISION_LINK = 270,
-     GIT_N_REVISION_LINK = 271,
-     URL_WITH_PROTO_LINK = 272,
-     URL_WITHOUT_PROTO_LINK = 273,
-     FILE_LINK = 274,
-     IMAGE_LINK = 275,
-     URL = 276,
-     EMAIL = 277,
-     UL = 278,
-     H1 = 279,
-     H2 = 280,
-     H3 = 281,
-     H4 = 282,
-     H5 = 283,
-     INLINE_CODE = 284,
-     SPACE = 285,
-     BR = 286,
-     OLI = 287,
-     ULI = 288,
+     ULI = 263,
+     OLI = 264,
+     T_WORD = 265,
+     TICKET_LINK = 266,
+     LINK = 267,
+     SVN_REVISION_LINK = 268,
+     GIT_REVISION_LINK = 269,
+     WIKI_LINK = 270,
+     ANCHOR_LINK = 271,
+     SVN_N_REVISION_LINK = 272,
+     GIT_N_REVISION_LINK = 273,
+     URL_WITH_PROTO_LINK = 274,
+     URL_WITHOUT_PROTO_LINK = 275,
+     FILE_LINK = 276,
+     IMAGE_LINK = 277,
+     URL = 278,
+     EMAIL = 279,
+     UL = 280,
+     H1 = 281,
+     H2 = 282,
+     H3 = 283,
+     H4 = 284,
+     H5 = 285,
+     INLINE_CODE = 286,
+     SPACE = 287,
+     BR = 288,
      PRE_CODE_START = 289,
      PRE_CODE_END = 290,
      PRE_START = 291,
@@ -215,7 +217,7 @@ typedef union YYSTYPE
 {
 
 /* Line 214 of yacc.c  */
-#line 66 "parser.y"
+#line 68 "parser.y"
 
         double dvalue;
         int ivalue;
@@ -224,7 +226,7 @@ typedef union YYSTYPE
 
 
 /* Line 214 of yacc.c  */
-#line 228 "parser.tab.c"
+#line 230 "parser.tab.c"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -236,7 +238,7 @@ typedef union YYSTYPE
 
 
 /* Line 264 of yacc.c  */
-#line 240 "parser.tab.c"
+#line 242 "parser.tab.c"
 
 #ifdef short
 # undef short
@@ -451,7 +453,7 @@ union yyalloc
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  55
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   134
+#define YYLAST   131
 
 /* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  46
@@ -527,16 +529,16 @@ static const yytype_int8 yyrhs[] =
       -1,    62,    -1,    63,    -1,    64,    -1,    65,    -1,    66,
       -1,    -1,    -1,    49,    53,    50,    48,    -1,    -1,    -1,
       51,    55,    52,    48,    -1,    70,    -1,    54,    -1,    53,
-      54,    -1,    68,    57,    -1,    68,    57,    31,    -1,    56,
-      -1,    55,    56,    -1,    67,    57,    -1,    67,    57,    31,
+      54,    -1,    68,    57,    -1,    68,    57,    33,    -1,    56,
+      -1,    55,    56,    -1,    67,    57,    -1,    67,    57,    33,
       -1,    58,    -1,    58,    57,    -1,    60,    -1,    59,    -1,
-       8,    -1,    21,    -1,    22,    -1,     4,    -1,    42,    -1,
-       5,    -1,    43,    -1,     6,    -1,     7,    -1,    29,    -1,
-      44,    -1,    45,    -1,     9,    -1,    11,    -1,    12,    -1,
-      15,    -1,    16,    -1,    17,    -1,    18,    -1,    13,    -1,
-      14,    -1,    19,    -1,    20,    -1,    -1,    61,    60,    -1,
-       3,    -1,    24,    -1,    25,    -1,    26,    -1,    27,    -1,
-      28,    -1,    32,    -1,    33,    -1,    31,    -1,    -1,    34,
+      10,    -1,    23,    -1,    24,    -1,     4,    -1,    42,    -1,
+       5,    -1,    43,    -1,     6,    -1,     7,    -1,    31,    -1,
+      44,    -1,    45,    -1,    11,    -1,    13,    -1,    14,    -1,
+      17,    -1,    18,    -1,    19,    -1,    20,    -1,    15,    -1,
+      16,    -1,    21,    -1,    22,    -1,    -1,    61,    60,    -1,
+       3,    -1,    26,    -1,    27,    -1,    28,    -1,    29,    -1,
+      30,    -1,     9,    -1,     8,    -1,    33,    -1,    -1,    34,
       71,    60,    35,    -1,    40,    60,    41,    -1,    -1,    36,
       72,    60,    37,    -1,    -1,    38,    73,    60,    39,    -1
 };
@@ -544,14 +546,14 @@ static const yytype_int8 yyrhs[] =
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint8 yyrline[] =
 {
-       0,    93,    93,    94,    97,    98,    99,   100,   101,   102,
-     103,   104,   104,   104,   105,   105,   105,   106,   108,   109,
-     111,   112,   114,   115,   117,   118,   120,   121,   123,   124,
-     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
-     135,   136,   138,   139,   140,   141,   142,   143,   144,   145,
-     146,   147,   148,   150,   151,   153,   160,   161,   162,   163,
-     164,   166,   167,   168,   171,   171,   172,   173,   173,   174,
-     174
+       0,    96,    96,    97,   100,   101,   102,   103,   104,   105,
+     106,   107,   110,   107,   114,   117,   114,   121,   123,   124,
+     126,   127,   129,   130,   132,   133,   135,   136,   138,   139,
+     140,   141,   142,   143,   144,   145,   146,   147,   148,   149,
+     150,   151,   153,   154,   155,   156,   157,   158,   159,   160,
+     161,   162,   163,   165,   166,   168,   175,   176,   177,   178,
+     179,   181,   182,   183,   186,   186,   187,   188,   188,   189,
+     189
 };
 #endif
 
@@ -561,18 +563,18 @@ static const yytype_uint8 yyrline[] =
 static const char *const yytname[] =
 {
   "$end", "error", "$undefined", "T_CHAR", "BOLD_START", "ITALIC_START",
-  "BOLD_ITALIC_START", "ITALIC_BOLD_START", "T_WORD", "TICKET_LINK",
-  "LINK", "SVN_REVISION_LINK", "GIT_REVISION_LINK", "WIKI_LINK",
-  "ANCHOR_LINK", "SVN_N_REVISION_LINK", "GIT_N_REVISION_LINK",
+  "BOLD_ITALIC_START", "ITALIC_BOLD_START", "ULI", "OLI", "T_WORD",
+  "TICKET_LINK", "LINK", "SVN_REVISION_LINK", "GIT_REVISION_LINK",
+  "WIKI_LINK", "ANCHOR_LINK", "SVN_N_REVISION_LINK", "GIT_N_REVISION_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
+  "INLINE_CODE", "SPACE", "BR", "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
 
@@ -641,26 +643,26 @@ static const yytype_int8 yydefgoto[] =
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -42
+#define YYPACT_NINF -40
 static const yytype_int8 yypact[] =
 {
-      43,   -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,   -42,   -42,
-      -2,   -42,   -42,   -42,   -42,     2,    43,   -23,    -9,   -42,
-      86,   -42,   -42,    -2,   -42,   -42,   -42,   -42,   -42,   -42,
-     -42,    -2,    -2,    -2,    -6,   -42,   -42,   -42,   -23,   -42,
-      86,   -42,    -9,   -42,    86,   -42,   -42,     4,    16,    27,
-     -42,     0,   -42,     6,     0,   -42,    10,   -42,   -42,   -42,
-     -42,   -42,   -42,   -42
+      43,   -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,   -40,   -40,   -40,   -40,
+      -2,   -40,   -40,   -40,   -40,     2,    43,     4,    -1,   -40,
+      86,   -40,   -40,    -2,   -40,   -40,   -40,   -40,   -40,   -40,
+     -40,    -2,    -2,    -2,   -16,   -40,   -40,   -40,     4,   -40,
+      86,   -40,    -1,   -40,    86,   -40,   -40,     6,    18,    29,
+     -40,     0,   -40,    42,     0,   -40,    45,   -40,   -40,   -40,
+     -40,   -40,   -40,   -40
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int8 yypgoto[] =
 {
-     -42,    37,   -41,   -42,   -42,   -42,   -42,   -42,    20,   -42,
-      18,    56,   -42,   -42,    81,   -42,   -42,   -42,   -42,   -42,
-     -42,   -42,   -42,   -42,   -42,   -42,   -42,   -42
+     -40,     1,   -39,   -40,   -40,   -40,   -40,   -40,   -19,   -40,
+      20,    54,   -40,   -40,    68,   -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
@@ -670,53 +672,53 @@ static const yytype_int8 yypgoto[] =
 #define YYTABLE_NINF -54
 static const yytype_int8 yytable[] =
 {
-     -53,     1,    55,     1,     2,     3,     4,     5,     6,     7,
-      57,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-      17,    18,    19,    61,    20,    21,    22,    23,    24,    25,
-      80,    26,   -14,    82,    27,    70,    28,    81,    29,    77,
-      30,    83,    31,    32,    33,    34,     1,     2,     3,     4,
-       5,     6,     7,    78,     8,     9,    10,    11,    12,    13,
-      14,    15,    16,    17,    18,    19,    79,    20,    21,    22,
-      23,    24,    25,    56,    26,   -14,   -11,    27,    72,    28,
-      75,    29,     0,    30,     0,    31,    32,    33,    34,     1,
-       2,     3,     4,     5,     6,     7,    65,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,     0,
-       0,    54,     0,     0,     0,    25,    73,     0,     0,     0,
-      76,     0,     0,     0,    66,     0,     0,     0,    31,    32,
-      33,    34,    67,    68,    69
+     -53,     1,    55,     1,     2,     3,     4,     5,    61,   -14,
+       6,     7,    57,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    70,    20,    21,    22,    23,
+      24,    25,    80,    26,    27,    82,    28,    56,    29,    72,
+      30,    77,    31,    32,    33,    34,     1,     2,     3,     4,
+       5,   -11,   -14,     6,     7,    78,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    17,    18,    19,    79,    20,
+      21,    22,    23,    24,    25,    81,    26,    27,    83,    28,
+       0,    29,    75,    30,     0,    31,    32,    33,    34,     1,
+       2,     3,     4,     5,    65,     0,     6,     7,    54,     8,
+       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
+      19,    66,     0,     0,    73,     0,     0,    25,    76,    67,
+      68,    69,     0,     0,     0,     0,     0,     0,    31,    32,
+      33,    34
 };
 
 static const yytype_int8 yycheck[] =
 {
-       0,     3,     0,     3,     4,     5,     6,     7,     8,     9,
-      33,    11,    12,    13,    14,    15,    16,    17,    18,    19,
-      20,    21,    22,    32,    24,    25,    26,    27,    28,    29,
-      71,    31,    32,    74,    34,    41,    36,    31,    38,    35,
-      40,    31,    42,    43,    44,    45,     3,     4,     5,     6,
-       7,     8,     9,    37,    11,    12,    13,    14,    15,    16,
-      17,    18,    19,    20,    21,    22,    39,    24,    25,    26,
-      27,    28,    29,    36,    31,    32,    33,    34,    58,    36,
-      62,    38,    -1,    40,    -1,    42,    43,    44,    45,     3,
-       4,     5,     6,     7,     8,     9,    40,    11,    12,    13,
-      14,    15,    16,    17,    18,    19,    20,    21,    22,    -1,
-      -1,    30,    -1,    -1,    -1,    29,    60,    -1,    -1,    -1,
-      64,    -1,    -1,    -1,    43,    -1,    -1,    -1,    42,    43,
-      44,    45,    51,    52,    53
+       0,     3,     0,     3,     4,     5,     6,     7,     9,     9,
+      10,    11,     8,    13,    14,    15,    16,    17,    18,    19,
+      20,    21,    22,    23,    24,    41,    26,    27,    28,    29,
+      30,    31,    71,    33,    34,    74,    36,    36,    38,    58,
+      40,    35,    42,    43,    44,    45,     3,     4,     5,     6,
+       7,     8,     9,    10,    11,    37,    13,    14,    15,    16,
+      17,    18,    19,    20,    21,    22,    23,    24,    39,    26,
+      27,    28,    29,    30,    31,    33,    33,    34,    33,    36,
+      -1,    38,    62,    40,    -1,    42,    43,    44,    45,     3,
+       4,     5,     6,     7,    40,    -1,    10,    11,    30,    13,
+      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
+      24,    43,    -1,    -1,    60,    -1,    -1,    31,    64,    51,
+      52,    53,    -1,    -1,    -1,    -1,    -1,    -1,    42,    43,
+      44,    45
 };
 
 /* 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,     8,     9,    11,    12,
-      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      24,    25,    26,    27,    28,    29,    31,    34,    36,    38,
+       0,     3,     4,     5,     6,     7,    10,    11,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      26,    27,    28,    29,    30,    31,    33,    34,    36,    38,
       40,    42,    43,    44,    45,    47,    48,    49,    51,    57,
       58,    59,    60,    61,    62,    63,    64,    65,    66,    69,
-      70,    71,    72,    73,    60,     0,    47,    33,    53,    54,
-      68,    32,    55,    56,    67,    57,    60,    60,    60,    60,
+      70,    71,    72,    73,    60,     0,    47,     8,    53,    54,
+      68,     9,    55,    56,    67,    57,    60,    60,    60,    60,
       41,    50,    54,    57,    52,    56,    57,    35,    37,    39,
-      48,    31,    48,    31
+      48,    33,    48,    33
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -1530,364 +1532,376 @@ yyreduce:
         case 6:
 
 /* Line 1455 of yacc.c  */
-#line 99 "parser.y"
+#line 102 "parser.y"
     {concat("</h1>",5);}
     break;
 
   case 7:
 
 /* Line 1455 of yacc.c  */
-#line 100 "parser.y"
+#line 103 "parser.y"
     {concat("</h2>",5);}
     break;
 
   case 8:
 
 /* Line 1455 of yacc.c  */
-#line 101 "parser.y"
+#line 104 "parser.y"
     {concat("</h3>",5);}
     break;
 
   case 9:
 
 /* Line 1455 of yacc.c  */
-#line 102 "parser.y"
+#line 105 "parser.y"
     {concat("</h4>",5);}
     break;
 
   case 10:
 
 /* Line 1455 of yacc.c  */
-#line 103 "parser.y"
+#line 106 "parser.y"
     {concat("</h5>",5);}
     break;
 
   case 11:
 
 /* Line 1455 of yacc.c  */
-#line 104 "parser.y"
-    {concat("<ul>",4);}
+#line 107 "parser.y"
+    {
+            list_level=1; 
+            concat("<ul>",4)
+       ;}
     break;
 
   case 12:
 
 /* Line 1455 of yacc.c  */
-#line 104 "parser.y"
-    {concat("</ul>",5);}
+#line 110 "parser.y"
+    { 
+            concat("</ul>",5); 
+            for(; list_level>1 && list_level<4; list_level--) concat("</li></ul>",10);
+       ;}
     break;
 
   case 14:
 
 /* Line 1455 of yacc.c  */
-#line 105 "parser.y"
-    {concat("<ol>",4);}
+#line 114 "parser.y"
+    {
+            list_level=1; 
+            concat("<ol>",4)
+       ;}
     break;
 
   case 15:
 
 /* Line 1455 of yacc.c  */
-#line 105 "parser.y"
-    {concat("</ol>",5);}
+#line 117 "parser.y"
+    { 
+            concat("</ol>",5); 
+            for(; list_level>1 && list_level<4; list_level--) concat("</li></ol>",10);
+       ;}
     break;
 
   case 18:
 
 /* Line 1455 of yacc.c  */
-#line 108 "parser.y"
+#line 123 "parser.y"
     {concat("</li>",5);}
     break;
 
   case 19:
 
 /* Line 1455 of yacc.c  */
-#line 109 "parser.y"
+#line 124 "parser.y"
     {concat("</li>",5);}
     break;
 
   case 22:
 
 /* Line 1455 of yacc.c  */
-#line 114 "parser.y"
+#line 129 "parser.y"
     {concat("</li>",5);}
     break;
 
   case 23:
 
 /* Line 1455 of yacc.c  */
-#line 115 "parser.y"
+#line 130 "parser.y"
     {concat("</li>",5);}
     break;
 
   case 30:
 
 /* Line 1455 of yacc.c  */
-#line 125 "parser.y"
+#line 140 "parser.y"
     {concat2((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 31:
 
 /* Line 1455 of yacc.c  */
-#line 126 "parser.y"
+#line 141 "parser.y"
     {process_url((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 32:
 
 /* Line 1455 of yacc.c  */
-#line 127 "parser.y"
+#line 142 "parser.y"
     {process_email((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 33:
 
 /* Line 1455 of yacc.c  */
-#line 128 "parser.y"
+#line 143 "parser.y"
     {(yyvsp[(1) - (1)].ivalue) ? concat(" <strong>",9) : concat("<strong>",8);}
     break;
 
   case 34:
 
 /* Line 1455 of yacc.c  */
-#line 129 "parser.y"
+#line 144 "parser.y"
     {concat("</strong>",9);}
     break;
 
   case 35:
 
 /* Line 1455 of yacc.c  */
-#line 130 "parser.y"
+#line 145 "parser.y"
     {(yyvsp[(1) - (1)].ivalue) ? concat(" <em>",5) : concat("<em>",4);}
     break;
 
   case 36:
 
 /* Line 1455 of yacc.c  */
-#line 131 "parser.y"
+#line 146 "parser.y"
     {concat("</em>",5);}
     break;
 
   case 37:
 
 /* Line 1455 of yacc.c  */
-#line 132 "parser.y"
+#line 147 "parser.y"
     {(yyvsp[(1) - (1)].ivalue) ? concat(" <strong><em>",13) : concat("<strong><em>",12);}
     break;
 
   case 38:
 
 /* Line 1455 of yacc.c  */
-#line 133 "parser.y"
+#line 148 "parser.y"
     {(yyvsp[(1) - (1)].ivalue) ? concat(" <em><strong>",13) : concat("<em><strong>",12);}
     break;
 
   case 39:
 
 /* Line 1455 of yacc.c  */
-#line 134 "parser.y"
+#line 149 "parser.y"
     {process_inline_code((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 40:
 
 /* Line 1455 of yacc.c  */
-#line 135 "parser.y"
+#line 150 "parser.y"
     {revert_bold();}
     break;
 
   case 41:
 
 /* Line 1455 of yacc.c  */
-#line 136 "parser.y"
+#line 151 "parser.y"
     {revert_italic();}
     break;
 
   case 42:
 
 /* Line 1455 of yacc.c  */
-#line 138 "parser.y"
+#line 153 "parser.y"
     {process_ticket_link((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 43:
 
 /* Line 1455 of yacc.c  */
-#line 139 "parser.y"
+#line 154 "parser.y"
     {process_svn_link((yyvsp[(1) - (1)].svalue),0);}
     break;
 
   case 44:
 
 /* Line 1455 of yacc.c  */
-#line 140 "parser.y"
+#line 155 "parser.y"
     {process_git_link((yyvsp[(1) - (1)].svalue),0);}
     break;
 
   case 45:
 
 /* Line 1455 of yacc.c  */
-#line 141 "parser.y"
+#line 156 "parser.y"
     {process_svn_link((yyvsp[(1) - (1)].svalue),1);}
     break;
 
   case 46:
 
 /* Line 1455 of yacc.c  */
-#line 142 "parser.y"
+#line 157 "parser.y"
     {process_git_link((yyvsp[(1) - (1)].svalue),1);}
     break;
 
   case 47:
 
 /* Line 1455 of yacc.c  */
-#line 143 "parser.y"
+#line 158 "parser.y"
     {process_url_link((yyvsp[(1) - (1)].svalue),NULL);}
     break;
 
   case 48:
 
 /* Line 1455 of yacc.c  */
-#line 144 "parser.y"
+#line 159 "parser.y"
     {process_url_link((yyvsp[(1) - (1)].svalue),"http://");}
     break;
 
   case 49:
 
 /* Line 1455 of yacc.c  */
-#line 145 "parser.y"
+#line 160 "parser.y"
     {process_wiki_link((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 50:
 
 /* Line 1455 of yacc.c  */
-#line 146 "parser.y"
+#line 161 "parser.y"
     {process_anchor_link((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 51:
 
 /* Line 1455 of yacc.c  */
-#line 147 "parser.y"
+#line 162 "parser.y"
     {process_file_link((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 52:
 
 /* Line 1455 of yacc.c  */
-#line 148 "parser.y"
+#line 163 "parser.y"
     {process_image_link((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 55:
 
 /* Line 1455 of yacc.c  */
-#line 153 "parser.y"
+#line 168 "parser.y"
     {concat_escaped_char((yyvsp[(1) - (1)].ivalue));}
     break;
 
   case 56:
 
 /* Line 1455 of yacc.c  */
-#line 160 "parser.y"
-    {concat("<h1 id=\"",8); process_header((yyvsp[(1) - (1)].svalue));}
+#line 175 "parser.y"
+    {concat("<h1 id=\"h-",10); process_header((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 57:
 
 /* Line 1455 of yacc.c  */
-#line 161 "parser.y"
-    {concat("<h2 id=\"",8); process_header((yyvsp[(1) - (1)].svalue));}
+#line 176 "parser.y"
+    {concat("<h2 id=\"h-",10); process_header((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 58:
 
 /* Line 1455 of yacc.c  */
-#line 162 "parser.y"
-    {concat("<h3 id=\"",8); process_header((yyvsp[(1) - (1)].svalue));}
+#line 177 "parser.y"
+    {concat("<h3 id=\"h-",10); process_header((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 59:
 
 /* Line 1455 of yacc.c  */
-#line 163 "parser.y"
-    {concat("<h4 id=\"",8); process_header((yyvsp[(1) - (1)].svalue));}
+#line 178 "parser.y"
+    {concat("<h4 id=\"h-",10); process_header((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 60:
 
 /* Line 1455 of yacc.c  */
-#line 164 "parser.y"
-    {concat("<h5 id=\"",8); process_header((yyvsp[(1) - (1)].svalue));}
+#line 179 "parser.y"
+    {concat("<h5 id=\"h-",10); process_header((yyvsp[(1) - (1)].svalue));}
     break;
 
   case 61:
 
 /* Line 1455 of yacc.c  */
-#line 166 "parser.y"
-    {concat("<li>",4);}
+#line 181 "parser.y"
+    {process_oli((yyvsp[(1) - (1)].ivalue));}
     break;
 
   case 62:
 
 /* Line 1455 of yacc.c  */
-#line 167 "parser.y"
-    {concat("<li>",4);}
+#line 182 "parser.y"
+    {process_uli((yyvsp[(1) - (1)].ivalue));}
     break;
 
   case 63:
 
 /* Line 1455 of yacc.c  */
-#line 168 "parser.y"
+#line 183 "parser.y"
     {concat("<br />",6);}
     break;
 
   case 64:
 
 /* Line 1455 of yacc.c  */
-#line 171 "parser.y"
+#line 186 "parser.y"
     {concat("<pre><code>",11);}
     break;
 
   case 65:
 
 /* Line 1455 of yacc.c  */
-#line 171 "parser.y"
+#line 186 "parser.y"
     {concat("</code></pre>",13);}
     break;
 
   case 67:
 
 /* Line 1455 of yacc.c  */
-#line 173 "parser.y"
+#line 188 "parser.y"
     {concat("<pre>",5);}
     break;
 
   case 68:
 
 /* Line 1455 of yacc.c  */
-#line 173 "parser.y"
+#line 188 "parser.y"
     {concat("</pre>",6);}
     break;
 
   case 69:
 
 /* Line 1455 of yacc.c  */
-#line 174 "parser.y"
+#line 189 "parser.y"
     {concat("<code>",6);}
     break;
 
   case 70:
 
 /* Line 1455 of yacc.c  */
-#line 174 "parser.y"
+#line 189 "parser.y"
     {concat("</code>",7);}
     break;
 
 
 
 /* Line 1455 of yacc.c  */
-#line 1891 "parser.tab.c"
+#line 1905 "parser.tab.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -2099,8 +2113,38 @@ yyreturn:
 
 
 /* Line 1675 of yacc.c  */
-#line 178 "parser.y"
+#line 193 "parser.y"
+
+
+process_uli(int level){
+    if( level == list_level ){
+        concat("<li>",4);
+    } else if( level < list_level ){
+        list_level = level;
+        //unconcat("</li>");
+        concat("</ul></li><li>",14);
+    } else {
+        // if(level > list_level)
+        list_level = level;
+        unconcat("</li>");
+        concat("<ul><li>",8);
+    }
+}
 
+process_oli(int level){
+    if( level == list_level ){
+        concat("<li>",4);
+    } else if( level < list_level ){
+        list_level = level;
+        //unconcat("</li>");
+        concat("</ol></li><li>",14);
+    } else {
+        // if(level > list_level)
+        list_level = level;
+        unconcat("</li>");
+        concat("<ol><li>",8);
+    }
+}
 
 concat_hex_char(char c){
     unsigned char d;
@@ -2199,7 +2243,7 @@ process_anchor_link(const char*target){
 
     if((p = strchr(target,'|')) && (p<pend) && (p>target)) pend = p-1;
 
-    concat("<a href=\"#",10);
+    concat("<a href=\"#h-",12);
     if( need_hex_convert(target,pend) ){
         for(p = target; *p && p<=pend; p++) concat_hex_char( *p );
     } else {
@@ -2287,7 +2331,16 @@ process_wiki_link(const char*target){
     concat("/wiki/show/",11);
     concat(space_name,space_name_len);
     concat_raw_char('/');
-    for(c=target; *c && *c!=']' && *c!='|'; c++) concat_raw_char(*c);
+    for(c=target; *c && *c!=']' && *c!='|' && *c!='#'; c++) concat_raw_char(*c);
+    if( *c == '#' ){
+        concat_raw_char('#');
+        //if(memcmp(c, "#h-", 3) != 0){
+            // anchor w/o "h-" prefix, we need to add it
+            concat_raw_char('h');
+            concat_raw_char('-');
+        //}
+        for(c++; *c && *c!=']' && *c!='|'; c++) concat_raw_char(*c);
+    }
     process_link_tail(target,NULL,NULL);
 }
 
@@ -2382,6 +2435,11 @@ process_email(const char*url){
     process_link_tail(url,NULL,NULL);
 }
 
+unconcat(const char*what){
+    int l = strlen(what);
+    if( bufptr-buf > l && strncmp(bufptr-l,what,l) == 0 ) bufptr -= l;
+}
+
 revert_bold(){
     char *p;
     for( p=bufptr-1; p >= (buf+7) ; p--){