* lib/yaml.rb: reworking YAML::Stream to use the new

  emitter.

* lib/yaml/stream.rb: ditto.

* lib/yaml/rubytypes.rb: added Object#yaml_new.

* lib/yaml/tag.rb: the tag_subclasses? method now
  shows up in the class.  allow taguri to be set using an accessor.
  continue support of Object#to_yaml_type.

* ext/syck/rubyext.c: new emitter code.  yaml_new and yaml_initialize
  get called, should they be present.  consolidated all the diaspora of internal
  node types into the family below YAML::Syck::Node -- Map,
  Seq, Scalar -- all of whom are SyckNode structs pointing to
  Ruby data.  moved Object#yaml_new into the node_import and made it the
  default behavior.  the target_class is always called wih yaml_new, prepended
  a parameter, which is the klass.  loaded nodes through GenericResolver show their style.
  new Resolver#tagurize converts type ids to taguris.

* ext/syck/implicit.re: were 'y' and 'n' seriously omitted??

* ext/syck/emitter.c: renovated emitter, walks the tree in advance.
  consolidated redundant block_styles struct into
  the scalar_style struct.  (this means loaded nodes can now
  be sent back to emitter and preserve at least its very basic
  formatting.)

* ext/syck/gram.c: headless documents of any kind allowed.

* ext/syck/node.c: new syck_replace_str methods and syck_empty_*
  methods for rewriting node contents, while keeping the ID
  and other setup info.  added syck_seq_assign.

* ext/syck/syck.h: reflect block_styles and new node functions.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9141 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 686 insertions, 614 deletions

diff --git a/ext/syck/token.c b/ext/syck/token.c
index 85a4e103ab..fd41a6138d 100644
--- a/ext/syck/token.c
+++ b/ext/syck/token.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.3 on Fri Aug 13 11:47:50 2004 */
+/* Generated by re2c 0.9.3 on Tue Apr 12 21:11:14 2005 */
 #line 1 "token.re"
 /*
  * token.re
@@ -61,7 +61,7 @@
 #define ENSURE_YAML_IOPEN(last_lvl, to_len, reset) \
         if ( last_lvl->spaces < to_len ) \
         { \
-            if ( last_lvl->status == syck_lvl_inline ) \
+            if ( last_lvl->status == syck_lvl_iseq || last_lvl->status == syck_lvl_imap ) \
             { \
                 goto Document; \
             } \
@@ -131,6 +131,25 @@
         return YAML_PLAIN; \
     }
 
+/* concat the inline characters to the plain scalar */
+#define PLAIN_NOT_INL() \
+    if ( *(YYCURSOR - 1) == ' ' || is_newline( YYCURSOR - 1 ) ) \
+    { \
+        YYCURSOR--; \
+    } \
+    QUOTECATS(qstr, qcapa, qidx, YYTOKEN, YYCURSOR - YYTOKEN); \
+    goto Plain2;
+
+/* trim spaces off the end in case of indent */
+#define PLAIN_IS_INL() \
+    char *walker = qstr + qidx - 1; \
+    while ( walker > qstr && ( *walker == '\n' || *walker == ' ' ) ) \
+    { \
+        qidx--; \
+        walker[0] = '\0'; \
+        walker--; \
+    }
+
 /*
  * Keep or chomp block?
  * * Use only in "ScalarBlock" section *
@@ -138,10 +157,21 @@
 #define RETURN_YAML_BLOCK() \
     { \
         SyckNode *n = syck_alloc_str(); \
-        n->type_id = syck_strndup( "str", 3 ); \
+        if ( ((SyckParser *)parser)->taguri_expansion == 1 ) \
+        { \
+            n->type_id = syck_taguri( YAML_DOMAIN, "str", 3 ); \
+        } \
+        else \
+        { \
+            n->type_id = syck_strndup( "str", 3 ); \
+        } \
         n->data.str->ptr = qstr; \
         n->data.str->len = qidx; \
-        n->data.str->style = scalar_block; \
+        if ( blockType == BLOCK_LIT ) { \
+            n->data.str->style = scalar_literal; \
+        } else { \
+            n->data.str->style = scalar_fold; \
+        } \
         if ( qidx > 0 ) \
         { \
             if ( nlDoWhat != NL_KEEP ) \
@@ -260,7 +290,7 @@ sycklex_yaml_utf8( YYSTYPE *sycklval, SyckParser *parser )
         return t;
     }
 
-#line 279 "token.re"
+#line 312 "token.re"
 
 
     if ( YYLINEPTR != YYCURSOR )
@@ -299,7 +329,7 @@ yy2:	yyaccept = 0;
 	default:	goto yy3;
 	}
 yy3:
-#line 338 "token.re"
+#line 371 "token.re"
 {   YYPOS(0);
                         goto Document; 
                     }
@@ -313,7 +343,7 @@ yy4:	yyaccept = 0;
 yy5:	++YYCURSOR;
 	goto yy6;
 yy6:
-#line 320 "token.re"
+#line 353 "token.re"
 {   eat_comments( parser ); 
                         goto Header;
                     }
@@ -321,7 +351,7 @@ yy6:
 yy7:	++YYCURSOR;
 	goto yy8;
 yy8:
-#line 324 "token.re"
+#line 357 "token.re"
 {   SyckLevel *lvl = CURRENT_LEVEL();
                         ENSURE_YAML_IEND(lvl, -1);
                         YYPOS(0);
@@ -332,7 +362,7 @@ yy9:	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	goto yy18;
 yy10:
-#line 330 "token.re"
+#line 363 "token.re"
 {   GOBBLE_UP_YAML_INDENT( doc_level, YYTOKEN );
                         goto Header; 
                     }
@@ -346,7 +376,7 @@ yy12:	++YYCURSOR;
 	yych = *YYCURSOR;
 	goto yy16;
 yy13:
-#line 334 "token.re"
+#line 367 "token.re"
 {   doc_level = YYCURSOR - YYLINEPTR;
                         goto Header;
                     }
@@ -398,7 +428,7 @@ yy22:	yych = *++YYCURSOR;
 yy23:	++YYCURSOR;
 	goto yy24;
 yy24:
-#line 306 "token.re"
+#line 339 "token.re"
 {   SyckLevel *lvl = CURRENT_LEVEL();
                         if ( lvl->status == syck_lvl_header )
                         {
@@ -441,7 +471,7 @@ yy29:	yych = *++YYCURSOR;
 yy30:	++YYCURSOR;
 	goto yy31;
 yy31:
-#line 292 "token.re"
+#line 325 "token.re"
 {   SyckLevel *lvl = CURRENT_LEVEL();
                         if ( lvl->status == syck_lvl_header )
                         {
@@ -470,7 +500,7 @@ yy34:	++YYCURSOR;
 	default:	goto yy20;
 	}
 }
-#line 342 "token.re"
+#line 375 "token.re"
 
 
 Document:
@@ -494,28 +524,29 @@ yy35:
 	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
 	yych = *YYCURSOR;
 	switch(yych){
-	case '\000':	goto yy60;
+	case '\000':	goto yy62;
 	case '\n':	goto yy37;
 	case '\r':	goto yy39;
-	case ' ':	goto yy58;
-	case '!':	goto yy49;
-	case '"':	goto yy53;
-	case '#':	goto yy56;
-	case '&':	goto yy47;
-	case '\'':	goto yy51;
-	case '*':	goto yy48;
-	case ',':	case ':':	goto yy45;
-	case '-':	case '?':	goto yy46;
-	case '>':	case '|':	goto yy55;
-	case '[':	case '{':	goto yy41;
-	case ']':	case '}':	goto yy43;
-	default:	goto yy62;
+	case ' ':	goto yy60;
+	case '!':	goto yy51;
+	case '"':	goto yy55;
+	case '#':	goto yy58;
+	case '&':	goto yy49;
+	case '\'':	goto yy53;
+	case '*':	goto yy50;
+	case ',':	case ':':	goto yy47;
+	case '-':	case '?':	goto yy48;
+	case '>':	case '|':	goto yy57;
+	case '[':	goto yy41;
+	case ']':	case '}':	goto yy45;
+	case '{':	goto yy43;
+	default:	goto yy64;
 	}
 yy37:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
-	goto yy90;
+	goto yy92;
 yy38:
-#line 356 "token.re"
+#line 389 "token.re"
 {   /* Isolate spaces */
                         int indt_len;
                         GOBBLE_UP_YAML_INDENT( indt_len, YYTOKEN );
@@ -529,7 +560,7 @@ yy38:
                         }
 
                         /* Ignore indentation inside inlines */
-                        if ( lvl->status == syck_lvl_inline )
+                        if ( lvl->status == syck_lvl_iseq || lvl->status == syck_lvl_imap )
                         {
                             goto Document;
                         }
@@ -543,53 +574,63 @@ yy38:
                         }
                         return YAML_INDENT;
                     }
-#line 268 "<stdout>"
+#line 269 "<stdout>"
 yy39:	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
-	case '\n':	goto yy89;
+	case '\n':	goto yy91;
 	default:	goto yy40;
 	}
 yy40:
-#line 454 "token.re"
+#line 493 "token.re"
 {   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
                         goto Plain; 
                     }
-#line 279 "<stdout>"
+#line 280 "<stdout>"
 yy41:	++YYCURSOR;
 	goto yy42;
 yy42:
-#line 384 "token.re"
+#line 417 "token.re"
 {   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
                         lvl = CURRENT_LEVEL();
-                        ADD_LEVEL(lvl->spaces + 1, syck_lvl_inline);
+                        ADD_LEVEL(lvl->spaces + 1, syck_lvl_iseq);
                         return YYTOKEN[0]; 
                     }
-#line 289 "<stdout>"
+#line 290 "<stdout>"
 yy43:	++YYCURSOR;
 	goto yy44;
 yy44:
-#line 390 "token.re"
+#line 423 "token.re"
+{   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
+                        lvl = CURRENT_LEVEL();
+                        ADD_LEVEL(lvl->spaces + 1, syck_lvl_imap);
+                        return YYTOKEN[0]; 
+                    }
+#line 300 "<stdout>"
+yy45:	++YYCURSOR;
+	goto yy46;
+yy46:
+#line 429 "token.re"
 {   POP_LEVEL();
                         return YYTOKEN[0]; 
                     }
-#line 297 "<stdout>"
-yy45:	yyaccept = 1;
+#line 308 "<stdout>"
+yy47:	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
-	case '\n':	goto yy84;
-	case '\r':	goto yy88;
-	case ' ':	goto yy86;
+	case '\n':	goto yy86;
+	case '\r':	goto yy90;
+	case ' ':	goto yy88;
 	default:	goto yy40;
 	}
-yy46:	yyaccept = 1;
+yy48:	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
-	case '\n':	goto yy79;
-	case '\r':	goto yy83;
-	case ' ':	goto yy81;
+	case '\n':	goto yy81;
+	case '\r':	goto yy85;
+	case ' ':	goto yy83;
 	default:	goto yy40;
 	}
-yy47:	yych = *++YYCURSOR;
+yy49:	yych = *++YYCURSOR;
 	switch(yych){
 	case '-':	case '0':
 	case '1':
@@ -650,10 +691,10 @@ yy47:	yych = *++YYCURSOR;
 	case 'w':
 	case 'x':
 	case 'y':
-	case 'z':	goto yy76;
+	case 'z':	goto yy78;
 	default:	goto yy40;
 	}
-yy48:	yych = *++YYCURSOR;
+yy50:	yych = *++YYCURSOR;
 	switch(yych){
 	case '-':	case '0':
 	case '1':
@@ -714,35 +755,35 @@ yy48:	yych = *++YYCURSOR;
 	case 'w':
 	case 'x':
 	case 'y':
-	case 'z':	goto yy73;
+	case 'z':	goto yy75;
 	default:	goto yy40;
 	}
-yy49:	++YYCURSOR;
-	goto yy50;
-yy50:
-#line 428 "token.re"
-{   goto TransferMethod; }
-#line 447 "<stdout>"
 yy51:	++YYCURSOR;
 	goto yy52;
 yy52:
-#line 430 "token.re"
-{   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
-                        goto SingleQuote; }
-#line 454 "<stdout>"
+#line 467 "token.re"
+{   goto TransferMethod; }
+#line 458 "<stdout>"
 yy53:	++YYCURSOR;
 	goto yy54;
 yy54:
-#line 433 "token.re"
+#line 469 "token.re"
+{   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
+                        goto SingleQuote; }
+#line 465 "<stdout>"
+yy55:	++YYCURSOR;
+	goto yy56;
+yy56:
+#line 472 "token.re"
 {   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
                         goto DoubleQuote; }
-#line 461 "<stdout>"
-yy55:	yyaccept = 1;
+#line 472 "<stdout>"
+yy57:	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
-	case '\n':	goto yy68;
-	case '\r':	goto yy72;
-	case ' ':	goto yy70;
+	case '\n':	goto yy70;
+	case '\r':	goto yy74;
+	case ' ':	goto yy72;
 	case '+':	case '-':	case '0':
 	case '1':
 	case '2':
@@ -752,51 +793,51 @@ yy55:	yyaccept = 1;
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy65;
+	case '9':	goto yy67;
 	default:	goto yy40;
 	}
-yy56:	++YYCURSOR;
-	goto yy57;
-yy57:
-#line 443 "token.re"
+yy58:	++YYCURSOR;
+	goto yy59;
+yy59:
+#line 482 "token.re"
 {   eat_comments( parser ); 
                         goto Document;
                     }
-#line 487 "<stdout>"
-yy58:	++YYCURSOR;
-	yych = *YYCURSOR;
-	goto yy64;
-yy59:
-#line 447 "token.re"
-{   goto Document; }
-#line 493 "<stdout>"
+#line 498 "<stdout>"
 yy60:	++YYCURSOR;
-	goto yy61;
+	yych = *YYCURSOR;
+	goto yy66;
 yy61:
-#line 449 "token.re"
+#line 486 "token.re"
+{   goto Document; }
+#line 504 "<stdout>"
+yy62:	++YYCURSOR;
+	goto yy63;
+yy63:
+#line 488 "token.re"
 {   ENSURE_YAML_IEND(lvl, -1);
                         YYPOS(0);
                         return 0; 
                     }
-#line 502 "<stdout>"
-yy62:	yych = *++YYCURSOR;
+#line 513 "<stdout>"
+yy64:	yych = *++YYCURSOR;
 	goto yy40;
-yy63:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy64;
-yy64:	switch(yych){
-	case ' ':	goto yy63;
-	default:	goto yy59;
-	}
 yy65:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	goto yy66;
 yy66:	switch(yych){
-	case '\n':	goto yy68;
-	case '\r':	goto yy72;
-	case ' ':	goto yy70;
+	case ' ':	goto yy65;
+	default:	goto yy61;
+	}
+yy67:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	goto yy68;
+yy68:	switch(yych){
+	case '\n':	goto yy70;
+	case '\r':	goto yy74;
+	case ' ':	goto yy72;
 	case '+':	case '-':	case '0':
 	case '1':
 	case '2':
@@ -806,43 +847,43 @@ yy66:	switch(yych){
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy65;
-	default:	goto yy67;
+	case '9':	goto yy67;
+	default:	goto yy69;
 	}
-yy67:	YYCURSOR = YYMARKER;
+yy69:	YYCURSOR = YYMARKER;
 	switch(yyaccept){
 	case 0:	goto yy38;
 	case 1:	goto yy40;
 	}
-yy68:	++YYCURSOR;
-	goto yy69;
-yy69:
-#line 436 "token.re"
+yy70:	++YYCURSOR;
+	goto yy71;
+yy71:
+#line 475 "token.re"
 {   if ( is_newline( YYCURSOR - 1 ) ) 
                         {
                             YYCURSOR--;
                         }
                         goto ScalarBlock; 
                     }
-#line 550 "<stdout>"
-yy70:	++YYCURSOR;
+#line 561 "<stdout>"
+yy72:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy71;
-yy71:	switch(yych){
-	case ' ':	goto yy70;
-	default:	goto yy69;
+	goto yy73;
+yy73:	switch(yych){
+	case ' ':	goto yy72;
+	default:	goto yy71;
 	}
-yy72:	yych = *++YYCURSOR;
+yy74:	yych = *++YYCURSOR;
 	switch(yych){
-	case '\n':	goto yy68;
-	default:	goto yy67;
+	case '\n':	goto yy70;
+	default:	goto yy69;
 	}
-yy73:	++YYCURSOR;
+yy75:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy74;
-yy74:	switch(yych){
+	goto yy76;
+yy76:	switch(yych){
 	case '-':	case '0':
 	case '1':
 	case '2':
@@ -902,21 +943,21 @@ yy74:	switch(yych){
 	case 'w':
 	case 'x':
 	case 'y':
-	case 'z':	goto yy73;
-	default:	goto yy75;
+	case 'z':	goto yy75;
+	default:	goto yy77;
 	}
-yy75:
-#line 423 "token.re"
+yy77:
+#line 462 "token.re"
 {   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
                         sycklval->name = syck_strndup( YYTOKEN + 1, YYCURSOR - YYTOKEN - 1 );
                         return YAML_ALIAS;
                     }
-#line 639 "<stdout>"
-yy76:	++YYCURSOR;
+#line 650 "<stdout>"
+yy78:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy77;
-yy77:	switch(yych){
+	goto yy79;
+yy79:	switch(yych){
 	case '-':	case '0':
 	case '1':
 	case '2':
@@ -976,11 +1017,11 @@ yy77:	switch(yych){
 	case 'w':
 	case 'x':
 	case 'y':
-	case 'z':	goto yy76;
-	default:	goto yy78;
+	case 'z':	goto yy78;
+	default:	goto yy80;
 	}
-yy78:
-#line 412 "token.re"
+yy80:
+#line 451 "token.re"
 {   sycklval->name = syck_strndup( YYTOKEN + 1, YYCURSOR - YYTOKEN - 1 );
 
                         /*
@@ -991,11 +1032,11 @@ yy78:
                         syck_hdlr_remove_anchor(parser, sycklval->name);
                         return YAML_ANCHOR;
                     }
-#line 720 "<stdout>"
-yy79:	++YYCURSOR;
-	goto yy80;
-yy80:
-#line 398 "token.re"
+#line 731 "<stdout>"
+yy81:	++YYCURSOR;
+	goto yy82;
+yy82:
+#line 437 "token.re"
 {   ENSURE_YAML_IOPEN(lvl, YYTOKEN - YYLINEPTR, 1);
                         FORCE_NEXT_TOKEN(YAML_IOPEN);
                         if ( *YYCURSOR == '#' || is_newline( YYCURSOR ) || is_newline( YYCURSOR - 1 ) )
@@ -1009,60 +1050,60 @@ yy80:
                         }
                         return YYTOKEN[0]; 
                     }
-#line 738 "<stdout>"
-yy81:	++YYCURSOR;
+#line 749 "<stdout>"
+yy83:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy82;
-yy82:	switch(yych){
-	case ' ':	goto yy81;
-	default:	goto yy80;
+	goto yy84;
+yy84:	switch(yych){
+	case ' ':	goto yy83;
+	default:	goto yy82;
 	}
-yy83:	yych = *++YYCURSOR;
+yy85:	yych = *++YYCURSOR;
 	switch(yych){
-	case '\n':	goto yy79;
-	default:	goto yy67;
+	case '\n':	goto yy81;
+	default:	goto yy69;
 	}
-yy84:	++YYCURSOR;
-	goto yy85;
-yy85:
-#line 394 "token.re"
+yy86:	++YYCURSOR;
+	goto yy87;
+yy87:
+#line 433 "token.re"
 {   YYPOS(1); 
                         return YYTOKEN[0]; 
                     }
-#line 760 "<stdout>"
-yy86:	++YYCURSOR;
+#line 771 "<stdout>"
+yy88:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy87;
-yy87:	switch(yych){
-	case ' ':	goto yy86;
-	default:	goto yy85;
+	goto yy89;
+yy89:	switch(yych){
+	case ' ':	goto yy88;
+	default:	goto yy87;
 	}
-yy88:	yych = *++YYCURSOR;
+yy90:	yych = *++YYCURSOR;
 	switch(yych){
-	case '\n':	goto yy84;
-	default:	goto yy67;
+	case '\n':	goto yy86;
+	default:	goto yy69;
 	}
-yy89:	yyaccept = 0;
+yy91:	yyaccept = 0;
 	YYMARKER = ++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy90;
-yy90:	switch(yych){
-	case '\n':	case ' ':	goto yy89;
-	case '\r':	goto yy91;
+	goto yy92;
+yy92:	switch(yych){
+	case '\n':	case ' ':	goto yy91;
+	case '\r':	goto yy93;
 	default:	goto yy38;
 	}
-yy91:	++YYCURSOR;
+yy93:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	switch(yych){
-	case '\n':	goto yy89;
-	default:	goto yy67;
+	case '\n':	goto yy91;
+	default:	goto yy69;
 	}
 }
-#line 458 "token.re"
+#line 497 "token.re"
 
     }
 
@@ -1071,26 +1112,26 @@ Directive:
         YYTOKTMP = YYCURSOR;
 
 
-#line 796 "<stdout>"
+#line 807 "<stdout>"
 {
 	YYCTYPE yych;
 	unsigned int yyaccept;
-	goto yy92;
-yy93:	++YYCURSOR;
-yy92:
+	goto yy94;
+yy95:	++YYCURSOR;
+yy94:
 	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
 	switch(yych){
-	case '\000':	goto yy94;
-	case ' ':	goto yy97;
-	case '%':	goto yy95;
-	default:	goto yy99;
+	case '\000':	goto yy96;
+	case ' ':	goto yy99;
+	case '%':	goto yy97;
+	default:	goto yy101;
 	}
-yy94:	YYCURSOR = YYMARKER;
+yy96:	YYCURSOR = YYMARKER;
 	switch(yyaccept){
-	case 0:	goto yy96;
+	case 0:	goto yy98;
 	}
-yy95:	yyaccept = 0;
+yy97:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
 	case '.':
@@ -1167,37 +1208,37 @@ yy95:	yyaccept = 0;
 	case 'w':
 	case 'x':
 	case 'y':
-	case 'z':	goto yy102;
-	default:	goto yy96;
+	case 'z':	goto yy104;
+	default:	goto yy98;
 	}
-yy96:
-#line 471 "token.re"
+yy98:
+#line 510 "token.re"
 {   YYCURSOR = YYTOKTMP;
                         return YAML_DOCSEP;
                     }
-#line 900 "<stdout>"
-yy97:	++YYCURSOR;
+#line 911 "<stdout>"
+yy99:	++YYCURSOR;
 	yych = *YYCURSOR;
-	goto yy101;
-yy98:
-#line 469 "token.re"
+	goto yy103;
+yy100:
+#line 508 "token.re"
 {   goto Directive; }
-#line 906 "<stdout>"
-yy99:	yych = *++YYCURSOR;
-	goto yy96;
-yy100:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	goto yy101;
-yy101:	switch(yych){
-	case ' ':	goto yy100;
-	default:	goto yy98;
-	}
+#line 917 "<stdout>"
+yy101:	yych = *++YYCURSOR;
+	goto yy98;
 yy102:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	goto yy103;
 yy103:	switch(yych){
+	case ' ':	goto yy102;
+	default:	goto yy100;
+	}
+yy104:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	goto yy105;
+yy105:	switch(yych){
 	case '.':
 	case '/':
 	case '0':
@@ -1270,11 +1311,11 @@ yy103:	switch(yych){
 	case 'w':
 	case 'x':
 	case 'y':
-	case 'z':	goto yy102;
-	case ':':	goto yy104;
-	default:	goto yy94;
+	case 'z':	goto yy104;
+	case ':':	goto yy106;
+	default:	goto yy96;
 	}
-yy104:	yych = *++YYCURSOR;
+yy106:	yych = *++YYCURSOR;
 	switch(yych){
 	case '.':
 	case '/':
@@ -1350,14 +1391,14 @@ yy104:	yych = *++YYCURSOR;
 	case 'w':
 	case 'x':
 	case 'y':
-	case 'z':	goto yy105;
-	default:	goto yy94;
+	case 'z':	goto yy107;
+	default:	goto yy96;
 	}
-yy105:	++YYCURSOR;
+yy107:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy106;
-yy106:	switch(yych){
+	goto yy108;
+yy108:	switch(yych){
 	case '.':
 	case '/':
 	case '0':
@@ -1432,15 +1473,15 @@ yy106:	switch(yych){
 	case 'w':
 	case 'x':
 	case 'y':
-	case 'z':	goto yy105;
-	default:	goto yy107;
+	case 'z':	goto yy107;
+	default:	goto yy109;
 	}
-yy107:
-#line 467 "token.re"
+yy109:
+#line 506 "token.re"
 {   goto Directive; }
-#line 1165 "<stdout>"
+#line 1176 "<stdout>"
 }
-#line 474 "token.re"
+#line 513 "token.re"
 
 
     }
@@ -1463,30 +1504,31 @@ Plain2:
 Plain3:
 
 
-#line 1169 "<stdout>"
+#line 1180 "<stdout>"
 {
 	YYCTYPE yych;
 	unsigned int yyaccept;
-	goto yy108;
-yy109:	++YYCURSOR;
-yy108:
+	goto yy110;
+yy111:	++YYCURSOR;
+yy110:
 	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
 	yych = *YYCURSOR;
 	switch(yych){
-	case '\000':	goto yy120;
-	case '\n':	goto yy110;
-	case '\r':	goto yy112;
-	case ' ':	goto yy118;
+	case '\000':	goto yy124;
+	case '\n':	goto yy112;
+	case '\r':	goto yy114;
+	case ' ':	goto yy122;
 	case ',':	goto yy117;
-	case ':':	goto yy114;
-	case ']':	case '}':	goto yy115;
-	default:	goto yy122;
+	case ':':	goto yy116;
+	case ']':	goto yy120;
+	case '}':	goto yy118;
+	default:	goto yy126;
 	}
-yy110:	yyaccept = 0;
+yy112:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
-	goto yy136;
-yy111:
-#line 497 "token.re"
+	goto yy141;
+yy113:
+#line 536 "token.re"
 {   int indt_len, nl_count = 0;
                         SyckLevel *lvl;
                         char *tok = YYTOKEN;
@@ -1522,144 +1564,160 @@ yy111:
 
                         goto Plain2; 
                     }
-#line 1228 "<stdout>"
-yy112:	++YYCURSOR;
+#line 1240 "<stdout>"
+yy114:	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
-	case '\n':	goto yy135;
-	default:	goto yy113;
+	case '\n':	goto yy140;
+	default:	goto yy115;
 	}
-yy113:
-#line 566 "token.re"
+yy115:
+#line 615 "token.re"
 {   QUOTECATS(qstr, qcapa, qidx, YYTOKEN, YYCURSOR - YYTOKEN);
                         goto Plain2;
                     }
-#line 1239 "<stdout>"
-yy114:	yyaccept = 1;
+#line 1251 "<stdout>"
+yy116:	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
-	case '\n':	goto yy130;
-	case '\r':	goto yy134;
-	case ' ':	goto yy132;
-	default:	goto yy113;
+	case '\n':	goto yy135;
+	case '\r':	goto yy139;
+	case ' ':	goto yy137;
+	default:	goto yy115;
 	}
-yy115:	++YYCURSOR;
-	goto yy116;
-yy116:
-#line 535 "token.re"
-{   if ( plvl->status != syck_lvl_inline )
+yy117:	yyaccept = 1;
+	yych = *(YYMARKER = ++YYCURSOR);
+	switch(yych){
+	case '\n':	goto yy129;
+	case '\r':	goto yy133;
+	case ' ':	goto yy131;
+	default:	goto yy115;
+	}
+yy118:	++YYCURSOR;
+	goto yy119;
+yy119:
+#line 585 "token.re"
+{   if ( plvl->status != syck_lvl_imap )
                         {
-                            if ( *(YYCURSOR - 1) == ' ' || is_newline( YYCURSOR - 1 ) )
-                            {
-                                YYCURSOR--;
-                            }
-                            QUOTECATS(qstr, qcapa, qidx, YYTOKEN, YYCURSOR - YYTOKEN);
-                            goto Plain2;
+                            PLAIN_NOT_INL();
                         }
                         else
                         {
-                            /* trim spaces off the end in case of indent */
-                            char *walker = qstr + qidx - 1;
-                            while ( walker > qstr && ( *walker == '\n' || *walker == ' ' ) )
-                            {
-                                qidx--;
-                                walker[0] = '\0';
-                                walker--;
-                            }
+                            PLAIN_IS_INL();
                         }
                         RETURN_IMPLICIT();
                     }
-#line 1274 "<stdout>"
-yy117:	yyaccept = 1;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch(yych){
-	case '\n':	goto yy125;
-	case '\r':	goto yy128;
-	case ' ':	goto yy126;
-	default:	goto yy113;
-	}
-yy118:	++YYCURSOR;
-	switch((yych = *YYCURSOR)) {
-	case '#':	goto yy123;
-	default:	goto yy119;
-	}
-yy119:
-#line 564 "token.re"
-{   goto Plain3; }
-#line 1291 "<stdout>"
+#line 1282 "<stdout>"
 yy120:	++YYCURSOR;
 	goto yy121;
 yy121:
-#line 562 "token.re"
-{   RETURN_IMPLICIT(); }
+#line 596 "token.re"
+{   if ( plvl->status != syck_lvl_iseq )
+                        {
+                            PLAIN_NOT_INL();
+                        }
+                        else
+                        {
+                            PLAIN_IS_INL();
+                        }
+                        RETURN_IMPLICIT();
+                    }
 #line 1297 "<stdout>"
-yy122:	yych = *++YYCURSOR;
-	goto yy113;
-yy123:	++YYCURSOR;
-	goto yy124;
-yy124:
-#line 558 "token.re"
+yy122:	++YYCURSOR;
+	switch((yych = *YYCURSOR)) {
+	case '#':	goto yy127;
+	default:	goto yy123;
+	}
+yy123:
+#line 613 "token.re"
+{   goto Plain3; }
+#line 1306 "<stdout>"
+yy124:	++YYCURSOR;
+	goto yy125;
+yy125:
+#line 611 "token.re"
+{   RETURN_IMPLICIT(); }
+#line 1312 "<stdout>"
+yy126:	yych = *++YYCURSOR;
+	goto yy115;
+yy127:	++YYCURSOR;
+	goto yy128;
+yy128:
+#line 607 "token.re"
 {   eat_comments( parser ); 
                         RETURN_IMPLICIT();
                     }
-#line 1307 "<stdout>"
-yy125:	yych = *++YYCURSOR;
-	goto yy116;
-yy126:	++YYCURSOR;
+#line 1322 "<stdout>"
+yy129:	++YYCURSOR;
+	goto yy130;
+yy130:
+#line 574 "token.re"
+{   if ( plvl->status != syck_lvl_iseq && plvl->status != syck_lvl_imap )
+                        {
+                            PLAIN_NOT_INL();
+                        }
+                        else
+                        {
+                            PLAIN_IS_INL();
+                        }
+                        RETURN_IMPLICIT();
+                    }
+#line 1337 "<stdout>"
+yy131:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy127;
-yy127:	switch(yych){
-	case ' ':	goto yy126;
-	default:	goto yy116;
+	goto yy132;
+yy132:	switch(yych){
+	case ' ':	goto yy131;
+	default:	goto yy130;
 	}
-yy128:	yych = *++YYCURSOR;
+yy133:	yych = *++YYCURSOR;
 	switch(yych){
-	case '\n':	goto yy125;
-	default:	goto yy129;
+	case '\n':	goto yy129;
+	default:	goto yy134;
 	}
-yy129:	YYCURSOR = YYMARKER;
+yy134:	YYCURSOR = YYMARKER;
 	switch(yyaccept){
-	case 0:	goto yy111;
-	case 1:	goto yy113;
+	case 0:	goto yy113;
+	case 1:	goto yy115;
 	}
-yy130:	++YYCURSOR;
-	goto yy131;
-yy131:
-#line 533 "token.re"
+yy135:	++YYCURSOR;
+	goto yy136;
+yy136:
+#line 572 "token.re"
 {   RETURN_IMPLICIT(); }
-#line 1334 "<stdout>"
-yy132:	++YYCURSOR;
+#line 1362 "<stdout>"
+yy137:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy133;
-yy133:	switch(yych){
-	case ' ':	goto yy132;
-	default:	goto yy131;
+	goto yy138;
+yy138:	switch(yych){
+	case ' ':	goto yy137;
+	default:	goto yy136;
 	}
-yy134:	yych = *++YYCURSOR;
+yy139:	yych = *++YYCURSOR;
 	switch(yych){
-	case '\n':	goto yy130;
-	default:	goto yy129;
+	case '\n':	goto yy135;
+	default:	goto yy134;
 	}
-yy135:	yyaccept = 0;
+yy140:	yyaccept = 0;
 	YYMARKER = ++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy136;
-yy136:	switch(yych){
-	case '\n':	case ' ':	goto yy135;
-	case '\r':	goto yy137;
-	default:	goto yy111;
+	goto yy141;
+yy141:	switch(yych){
+	case '\n':	case ' ':	goto yy140;
+	case '\r':	goto yy142;
+	default:	goto yy113;
 	}
-yy137:	++YYCURSOR;
+yy142:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	switch(yych){
-	case '\n':	goto yy135;
-	default:	goto yy129;
+	case '\n':	goto yy140;
+	default:	goto yy134;
 	}
 }
-#line 570 "token.re"
+#line 619 "token.re"
 
     }
 
@@ -1673,27 +1731,27 @@ SingleQuote2:
         YYTOKEN = YYCURSOR;
 
 
-#line 1370 "<stdout>"
+#line 1398 "<stdout>"
 {
 	YYCTYPE yych;
 	unsigned int yyaccept;
-	goto yy138;
-yy139:	++YYCURSOR;
-yy138:
+	goto yy143;
+yy144:	++YYCURSOR;
+yy143:
 	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
 	switch(yych){
-	case '\000':	goto yy146;
-	case '\n':	goto yy140;
-	case '\r':	goto yy142;
-	case '\'':	goto yy144;
-	default:	goto yy147;
+	case '\000':	goto yy151;
+	case '\n':	goto yy145;
+	case '\r':	goto yy147;
+	case '\'':	goto yy149;
+	default:	goto yy152;
 	}
-yy140:	yyaccept = 0;
+yy145:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
-	goto yy151;
-yy141:
-#line 584 "token.re"
+	goto yy156;
+yy146:
+#line 633 "token.re"
 {   int indt_len;
                         int nl_count = 0;
                         SyckLevel *lvl;
@@ -1733,25 +1791,25 @@ yy141:
 
                         goto SingleQuote2; 
                     }
-#line 1430 "<stdout>"
-yy142:	++YYCURSOR;
+#line 1458 "<stdout>"
+yy147:	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
-	case '\n':	goto yy150;
-	default:	goto yy143;
+	case '\n':	goto yy155;
+	default:	goto yy148;
 	}
-yy143:
-#line 644 "token.re"
+yy148:
+#line 700 "token.re"
 {   QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1)); 
                         goto SingleQuote2; 
                     }
-#line 1441 "<stdout>"
-yy144:	++YYCURSOR;
+#line 1469 "<stdout>"
+yy149:	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
-	case '\'':	goto yy148;
-	default:	goto yy145;
+	case '\'':	goto yy153;
+	default:	goto yy150;
 	}
-yy145:
-#line 628 "token.re"
+yy150:
+#line 677 "token.re"
 {   SyckLevel *lvl;
                         SyckNode *n = syck_alloc_str();
                         lvl = CURRENT_LEVEL();
@@ -1760,49 +1818,56 @@ yy145:
                         {
                             POP_LEVEL();
                         }
-                        n->type_id = syck_strndup( "str", 3 );
+                        if ( ((SyckParser *)parser)->taguri_expansion == 1 )
+                        {
+                            n->type_id = syck_taguri( YAML_DOMAIN, "str", 3 );
+                        }
+                        else
+                        {
+                            n->type_id = syck_strndup( "str", 3 );
+                        }
                         n->data.str->ptr = qstr;
                         n->data.str->len = qidx;
                         n->data.str->style = scalar_1quote;
                         sycklval->nodeData = n;
                         return YAML_PLAIN; 
                     }
-#line 1464 "<stdout>"
-yy146:	yych = *++YYCURSOR;
-	goto yy145;
-yy147:	yych = *++YYCURSOR;
-	goto yy143;
-yy148:	++YYCURSOR;
-	goto yy149;
-yy149:
-#line 624 "token.re"
+#line 1499 "<stdout>"
+yy151:	yych = *++YYCURSOR;
+	goto yy150;
+yy152:	yych = *++YYCURSOR;
+	goto yy148;
+yy153:	++YYCURSOR;
+	goto yy154;
+yy154:
+#line 673 "token.re"
 {   QUOTECAT(qstr, qcapa, qidx, '\'');
                         goto SingleQuote2; 
                     }
-#line 1476 "<stdout>"
-yy150:	yyaccept = 0;
+#line 1511 "<stdout>"
+yy155:	yyaccept = 0;
 	YYMARKER = ++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy151;
-yy151:	switch(yych){
-	case '\n':	case ' ':	goto yy150;
-	case '\r':	goto yy152;
-	default:	goto yy141;
+	goto yy156;
+yy156:	switch(yych){
+	case '\n':	case ' ':	goto yy155;
+	case '\r':	goto yy157;
+	default:	goto yy146;
 	}
-yy152:	++YYCURSOR;
+yy157:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	switch(yych){
-	case '\n':	goto yy150;
-	default:	goto yy153;
+	case '\n':	goto yy155;
+	default:	goto yy158;
 	}
-yy153:	YYCURSOR = YYMARKER;
+yy158:	YYCURSOR = YYMARKER;
 	switch(yyaccept){
-	case 0:	goto yy141;
+	case 0:	goto yy146;
 	}
 }
-#line 648 "token.re"
+#line 704 "token.re"
 
 
     }
@@ -1820,28 +1885,28 @@ DoubleQuote2:
 
 
 
-#line 1502 "<stdout>"
+#line 1537 "<stdout>"
 {
 	YYCTYPE yych;
 	unsigned int yyaccept;
-	goto yy154;
-yy155:	++YYCURSOR;
-yy154:
+	goto yy159;
+yy160:	++YYCURSOR;
+yy159:
 	if((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
 	yych = *YYCURSOR;
 	switch(yych){
-	case '\000':	goto yy161;
-	case '\n':	goto yy156;
-	case '\r':	goto yy158;
-	case '"':	goto yy163;
-	case '\\':	goto yy160;
-	default:	goto yy164;
-	}
-yy156:	yyaccept = 0;
+	case '\000':	goto yy166;
+	case '\n':	goto yy161;
+	case '\r':	goto yy163;
+	case '"':	goto yy168;
+	case '\\':	goto yy165;
+	default:	goto yy169;
+	}
+yy161:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
-	goto yy178;
-yy157:
-#line 666 "token.re"
+	goto yy183;
+yy162:
+#line 722 "token.re"
 {   int indt_len;
                         int nl_count = 0;
                         SyckLevel *lvl;
@@ -1885,34 +1950,34 @@ yy157:
                         keep_nl = 1;
                         goto DoubleQuote2; 
                     }
-#line 1567 "<stdout>"
-yy158:	++YYCURSOR;
+#line 1602 "<stdout>"
+yy163:	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
-	case '\n':	goto yy177;
-	default:	goto yy159;
+	case '\n':	goto yy182;
+	default:	goto yy164;
 	}
-yy159:
-#line 745 "token.re"
+yy164:
+#line 808 "token.re"
 {   QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1)); 
                         goto DoubleQuote2; 
                     }
-#line 1578 "<stdout>"
-yy160:	yyaccept = 1;
+#line 1613 "<stdout>"
+yy165:	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
-	case '\n':	goto yy168;
-	case '\r':	goto yy170;
-	case ' ':	goto yy165;
+	case '\n':	goto yy173;
+	case '\r':	goto yy175;
+	case ' ':	goto yy170;
 	case '"':	case '0':	case '\\':	case 'a':
 	case 'b':	case 'e':
-	case 'f':	case 'n':	case 'r':	case 't':	case 'v':	goto yy172;
-	case 'x':	goto yy171;
-	default:	goto yy159;
+	case 'f':	case 'n':	case 'r':	case 't':	case 'v':	goto yy177;
+	case 'x':	goto yy176;
+	default:	goto yy164;
 	}
-yy161:	++YYCURSOR;
-	goto yy162;
-yy162:
-#line 729 "token.re"
+yy166:	++YYCURSOR;
+	goto yy167;
+yy167:
+#line 785 "token.re"
 {   SyckLevel *lvl;
                         SyckNode *n = syck_alloc_str();
                         lvl = CURRENT_LEVEL();
@@ -1921,48 +1986,55 @@ yy162:
                         {
                             POP_LEVEL();
                         }
-                        n->type_id = syck_strndup( "str", 3 );
+                        if ( ((SyckParser *)parser)->taguri_expansion == 1 )
+                        {
+                            n->type_id = syck_taguri( YAML_DOMAIN, "str", 3 );
+                        }
+                        else
+                        {
+                            n->type_id = syck_strndup( "str", 3 );
+                        }
                         n->data.str->ptr = qstr;
                         n->data.str->len = qidx;
                         n->data.str->style = scalar_2quote;
                         sycklval->nodeData = n;
                         return YAML_PLAIN; 
                     }
-#line 1610 "<stdout>"
-yy163:	yych = *++YYCURSOR;
-	goto yy162;
-yy164:	yych = *++YYCURSOR;
-	goto yy159;
-yy165:	++YYCURSOR;
+#line 1652 "<stdout>"
+yy168:	yych = *++YYCURSOR;
+	goto yy167;
+yy169:	yych = *++YYCURSOR;
+	goto yy164;
+yy170:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy166;
-yy166:	switch(yych){
-	case '\n':	goto yy168;
-	case '\r':	goto yy170;
-	case ' ':	goto yy165;
-	default:	goto yy167;
-	}
-yy167:	YYCURSOR = YYMARKER;
+	goto yy171;
+yy171:	switch(yych){
+	case '\n':	goto yy173;
+	case '\r':	goto yy175;
+	case ' ':	goto yy170;
+	default:	goto yy172;
+	}
+yy172:	YYCURSOR = YYMARKER;
 	switch(yyaccept){
-	case 0:	goto yy157;
-	case 1:	goto yy159;
+	case 0:	goto yy162;
+	case 1:	goto yy164;
 	}
-yy168:	++YYCURSOR;
-	goto yy169;
-yy169:
-#line 724 "token.re"
+yy173:	++YYCURSOR;
+	goto yy174;
+yy174:
+#line 780 "token.re"
 {   keep_nl = 0;
                         YYCURSOR--;
                         goto DoubleQuote2; 
                     }
-#line 1639 "<stdout>"
-yy170:	yych = *++YYCURSOR;
+#line 1681 "<stdout>"
+yy175:	yych = *++YYCURSOR;
 	switch(yych){
-	case '\n':	goto yy168;
-	default:	goto yy167;
+	case '\n':	goto yy173;
+	default:	goto yy172;
 	}
-yy171:	yych = *++YYCURSOR;
+yy176:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -1983,19 +2055,19 @@ yy171:	yych = *++YYCURSOR;
 	case 'c':
 	case 'd':
 	case 'e':
-	case 'f':	goto yy174;
-	default:	goto yy167;
+	case 'f':	goto yy179;
+	default:	goto yy172;
 	}
-yy172:	++YYCURSOR;
-	goto yy173;
-yy173:
-#line 710 "token.re"
+yy177:	++YYCURSOR;
+	goto yy178;
+yy178:
+#line 766 "token.re"
 {   char ch = *( YYCURSOR - 1 );
                         QUOTECAT(qstr, qcapa, qidx, escape_seq( ch ));
                         goto DoubleQuote2; 
                     }
-#line 1677 "<stdout>"
-yy174:	yych = *++YYCURSOR;
+#line 1719 "<stdout>"
+yy179:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -2016,13 +2088,13 @@ yy174:	yych = *++YYCURSOR;
 	case 'c':
 	case 'd':
 	case 'e':
-	case 'f':	goto yy175;
-	default:	goto yy167;
+	case 'f':	goto yy180;
+	default:	goto yy172;
 	}
-yy175:	++YYCURSOR;
-	goto yy176;
-yy176:
-#line 715 "token.re"
+yy180:	++YYCURSOR;
+	goto yy181;
+yy181:
+#line 771 "token.re"
 {   long ch;
                         char *chr_text = syck_strndup( YYTOKEN, 4 );
                         chr_text[0] = '0';
@@ -2031,26 +2103,26 @@ yy176:
                         QUOTECAT(qstr, qcapa, qidx, ch);
                         goto DoubleQuote2; 
                     }
-#line 1714 "<stdout>"
-yy177:	yyaccept = 0;
+#line 1756 "<stdout>"
+yy182:	yyaccept = 0;
 	YYMARKER = ++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy178;
-yy178:	switch(yych){
-	case '\n':	case ' ':	goto yy177;
-	case '\r':	goto yy179;
-	default:	goto yy157;
+	goto yy183;
+yy183:	switch(yych){
+	case '\n':	case ' ':	goto yy182;
+	case '\r':	goto yy184;
+	default:	goto yy162;
 	}
-yy179:	++YYCURSOR;
+yy184:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	switch(yych){
-	case '\n':	goto yy177;
-	default:	goto yy167;
+	case '\n':	goto yy182;
+	default:	goto yy172;
 	}
 }
-#line 749 "token.re"
+#line 812 "token.re"
 
     }
 
@@ -2064,31 +2136,27 @@ TransferMethod2:
         YYTOKTMP = YYCURSOR;
 
 
-#line 1736 "<stdout>"
+#line 1778 "<stdout>"
 {
 	YYCTYPE yych;
 	unsigned int yyaccept;
-	goto yy180;
-yy181:	++YYCURSOR;
-yy180:
+	goto yy185;
+yy186:	++YYCURSOR;
+yy185:
 	if((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
 	yych = *YYCURSOR;
 	switch(yych){
-	case '\000':	goto yy182;
-	case '\n':	goto yy183;
-	case '\r':	goto yy186;
-	case ' ':	goto yy185;
-	case '\\':	goto yy188;
-	default:	goto yy189;
-	}
-yy182:	YYCURSOR = YYMARKER;
-	switch(yyaccept){
-	case 0:	goto yy187;
-	}
-yy183:	++YYCURSOR;
-	goto yy184;
-yy184:
-#line 763 "token.re"
+	case '\000':	goto yy187;
+	case '\n':	goto yy189;
+	case '\r':	goto yy191;
+	case ' ':	goto yy190;
+	case '\\':	goto yy193;
+	default:	goto yy194;
+	}
+yy187:	++YYCURSOR;
+	goto yy188;
+yy188:
+#line 826 "token.re"
 {   SyckLevel *lvl;
                         YYCURSOR = YYTOKTMP;
                         if ( YYCURSOR == YYTOKEN + 1 )
@@ -2138,32 +2206,34 @@ yy184:
 
                         return YAML_TRANSFER; 
                     }
-#line 1810 "<stdout>"
-yy185:	yych = *++YYCURSOR;
-	goto yy198;
-yy186:	++YYCURSOR;
+#line 1848 "<stdout>"
+yy189:	yych = *++YYCURSOR;
+	goto yy188;
+yy190:	yych = *++YYCURSOR;
+	goto yy203;
+yy191:	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
-	case '\n':	goto yy196;
-	default:	goto yy187;
+	case '\n':	goto yy187;
+	default:	goto yy192;
 	}
-yy187:
-#line 830 "token.re"
+yy192:
+#line 893 "token.re"
 {   QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1)); 
                         goto TransferMethod2;
                     }
-#line 1823 "<stdout>"
-yy188:	yyaccept = 0;
+#line 1863 "<stdout>"
+yy193:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
 	case '"':	case '0':	case '\\':	case 'a':
 	case 'b':	case 'e':
-	case 'f':	case 'n':	case 'r':	case 't':	case 'v':	goto yy191;
-	case 'x':	goto yy190;
-	default:	goto yy187;
+	case 'f':	case 'n':	case 'r':	case 't':	case 'v':	goto yy197;
+	case 'x':	goto yy195;
+	default:	goto yy192;
 	}
-yy189:	yych = *++YYCURSOR;
-	goto yy187;
-yy190:	yych = *++YYCURSOR;
+yy194:	yych = *++YYCURSOR;
+	goto yy192;
+yy195:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -2184,19 +2254,23 @@ yy190:	yych = *++YYCURSOR;
 	case 'c':
 	case 'd':
 	case 'e':
-	case 'f':	goto yy193;
-	default:	goto yy182;
+	case 'f':	goto yy199;
+	default:	goto yy196;
 	}
-yy191:	++YYCURSOR;
-	goto yy192;
-yy192:
-#line 816 "token.re"
+yy196:	YYCURSOR = YYMARKER;
+	switch(yyaccept){
+	case 0:	goto yy192;
+	}
+yy197:	++YYCURSOR;
+	goto yy198;
+yy198:
+#line 879 "token.re"
 {  char ch = *( YYCURSOR - 1 );
                         QUOTECAT(qstr, qcapa, qidx, escape_seq( ch ));
                         goto TransferMethod2;
                     }
-#line 1867 "<stdout>"
-yy193:	yych = *++YYCURSOR;
+#line 1911 "<stdout>"
+yy199:	yych = *++YYCURSOR;
 	switch(yych){
 	case '0':
 	case '1':
@@ -2217,13 +2291,13 @@ yy193:	yych = *++YYCURSOR;
 	case 'c':
 	case 'd':
 	case 'e':
-	case 'f':	goto yy194;
-	default:	goto yy182;
+	case 'f':	goto yy200;
+	default:	goto yy196;
 	}
-yy194:	++YYCURSOR;
-	goto yy195;
-yy195:
-#line 821 "token.re"
+yy200:	++YYCURSOR;
+	goto yy201;
+yy201:
+#line 884 "token.re"
 {   long ch;
                         char *chr_text = syck_strndup( YYTOKTMP, 4 );
                         chr_text[0] = '0';
@@ -2232,19 +2306,17 @@ yy195:
                         QUOTECAT(qstr, qcapa, qidx, ch);
                         goto TransferMethod2;
                     }
-#line 1904 "<stdout>"
-yy196:	yych = *++YYCURSOR;
-	goto yy184;
-yy197:	++YYCURSOR;
+#line 1948 "<stdout>"
+yy202:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy198;
-yy198:	switch(yych){
-	case ' ':	goto yy197;
-	default:	goto yy184;
+	goto yy203;
+yy203:	switch(yych){
+	case ' ':	goto yy202;
+	default:	goto yy188;
 	}
 }
-#line 835 "token.re"
+#line 898 "token.re"
 
     }
 
@@ -2291,28 +2363,28 @@ ScalarBlock2:
         YYTOKEN = YYCURSOR;
 
 
-#line 1919 "<stdout>"
+#line 1961 "<stdout>"
 {
 	YYCTYPE yych;
 	unsigned int yyaccept;
-	goto yy199;
-yy200:	++YYCURSOR;
-yy199:
+	goto yy204;
+yy205:	++YYCURSOR;
+yy204:
 	if((YYLIMIT - YYCURSOR) < 5) YYFILL(5);
 	yych = *YYCURSOR;
 	switch(yych){
-	case '\000':	goto yy207;
-	case '\n':	goto yy201;
-	case '\r':	goto yy203;
-	case '#':	goto yy205;
-	case '-':	goto yy209;
-	default:	goto yy210;
-	}
-yy201:	yyaccept = 0;
+	case '\000':	goto yy212;
+	case '\n':	goto yy206;
+	case '\r':	goto yy208;
+	case '#':	goto yy210;
+	case '-':	goto yy214;
+	default:	goto yy215;
+	}
+yy206:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
-	goto yy220;
-yy202:
-#line 882 "token.re"
+	goto yy225;
+yy207:
+#line 945 "token.re"
 {   char *pacer;
                         char *tok = YYTOKEN;
                         int indt_len = 0, nl_count = 0, fold_nl = 0, nl_begin = 0;
@@ -2382,22 +2454,22 @@ yy202:
                         }
                         goto ScalarBlock2;
                     }
-#line 2010 "<stdout>"
-yy203:	++YYCURSOR;
+#line 2052 "<stdout>"
+yy208:	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
-	case '\n':	goto yy219;
-	default:	goto yy204;
+	case '\n':	goto yy224;
+	default:	goto yy209;
 	}
-yy204:
-#line 991 "token.re"
+yy209:
+#line 1054 "token.re"
 {   QUOTECAT(qstr, qcapa, qidx, *YYTOKEN);
                         goto ScalarBlock2;
                     }
-#line 2021 "<stdout>"
-yy205:	++YYCURSOR;
-	goto yy206;
-yy206:
-#line 953 "token.re"
+#line 2063 "<stdout>"
+yy210:	++YYCURSOR;
+	goto yy211;
+yy211:
+#line 1016 "token.re"
 {   lvl = CURRENT_LEVEL();
                         if ( lvl->status != syck_lvl_block )
                         {
@@ -2410,45 +2482,45 @@ yy206:
                         }
                         goto ScalarBlock2;
                     }
-#line 2038 "<stdout>"
-yy207:	++YYCURSOR;
-	goto yy208;
-yy208:
-#line 967 "token.re"
+#line 2080 "<stdout>"
+yy212:	++YYCURSOR;
+	goto yy213;
+yy213:
+#line 1030 "token.re"
 {   YYCURSOR--;
                         POP_LEVEL();
                         RETURN_YAML_BLOCK(); 
                     }
-#line 2047 "<stdout>"
-yy209:	yyaccept = 1;
+#line 2089 "<stdout>"
+yy214:	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
-	case '-':	goto yy211;
-	default:	goto yy204;
+	case '-':	goto yy216;
+	default:	goto yy209;
 	}
-yy210:	yych = *++YYCURSOR;
-	goto yy204;
-yy211:	yych = *++YYCURSOR;
+yy215:	yych = *++YYCURSOR;
+	goto yy209;
+yy216:	yych = *++YYCURSOR;
 	switch(yych){
-	case '-':	goto yy213;
-	default:	goto yy212;
+	case '-':	goto yy218;
+	default:	goto yy217;
 	}
-yy212:	YYCURSOR = YYMARKER;
+yy217:	YYCURSOR = YYMARKER;
 	switch(yyaccept){
-	case 0:	goto yy202;
-	case 1:	goto yy204;
+	case 0:	goto yy207;
+	case 1:	goto yy209;
 	}
-yy213:	yych = *++YYCURSOR;
+yy218:	yych = *++YYCURSOR;
 	switch(yych){
-	case '\n':	goto yy214;
-	case '\r':	goto yy218;
-	case ' ':	goto yy216;
-	default:	goto yy212;
-	}
-yy214:	++YYCURSOR;
-	goto yy215;
-yy215:
-#line 972 "token.re"
+	case '\n':	goto yy219;
+	case '\r':	goto yy223;
+	case ' ':	goto yy221;
+	default:	goto yy217;
+	}
+yy219:	++YYCURSOR;
+	goto yy220;
+yy220:
+#line 1035 "token.re"
 {   if ( YYTOKEN == YYLINEPTR )
                         {
                             if ( blockType == BLOCK_FOLD && qidx > 0 )
@@ -2467,39 +2539,39 @@ yy215:
                             goto ScalarBlock2;
                         }
                     }
-#line 2095 "<stdout>"
-yy216:	++YYCURSOR;
+#line 2137 "<stdout>"
+yy221:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy217;
-yy217:	switch(yych){
-	case ' ':	goto yy216;
-	default:	goto yy215;
+	goto yy222;
+yy222:	switch(yych){
+	case ' ':	goto yy221;
+	default:	goto yy220;
 	}
-yy218:	yych = *++YYCURSOR;
+yy223:	yych = *++YYCURSOR;
 	switch(yych){
-	case '\n':	goto yy214;
-	default:	goto yy212;
+	case '\n':	goto yy219;
+	default:	goto yy217;
 	}
-yy219:	yyaccept = 0;
+yy224:	yyaccept = 0;
 	YYMARKER = ++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy220;
-yy220:	switch(yych){
-	case '\n':	case ' ':	goto yy219;
-	case '\r':	goto yy221;
-	default:	goto yy202;
+	goto yy225;
+yy225:	switch(yych){
+	case '\n':	case ' ':	goto yy224;
+	case '\r':	goto yy226;
+	default:	goto yy207;
 	}
-yy221:	++YYCURSOR;
+yy226:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	switch(yych){
-	case '\n':	goto yy219;
-	default:	goto yy212;
+	case '\n':	goto yy224;
+	default:	goto yy217;
 	}
 }
-#line 996 "token.re"
+#line 1059 "token.re"
 
     }
 
@@ -2515,67 +2587,67 @@ Comment:
         YYTOKEN = YYCURSOR;
 
 
-#line 2131 "<stdout>"
+#line 2173 "<stdout>"
 {
 	YYCTYPE yych;
 	unsigned int yyaccept;
-	goto yy222;
-yy223:	++YYCURSOR;
-yy222:
+	goto yy227;
+yy228:	++YYCURSOR;
+yy227:
 	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
 	switch(yych){
-	case '\000':	goto yy224;
-	case '\n':	goto yy226;
-	case '\r':	goto yy227;
-	default:	goto yy229;
+	case '\000':	goto yy229;
+	case '\n':	goto yy231;
+	case '\r':	goto yy232;
+	default:	goto yy234;
 	}
-yy224:	++YYCURSOR;
-	goto yy225;
-yy225:
-#line 1012 "token.re"
+yy229:	++YYCURSOR;
+	goto yy230;
+yy230:
+#line 1075 "token.re"
 {   YYCURSOR = YYTOKEN;
                         return;
                     }
-#line 2153 "<stdout>"
-yy226:	yyaccept = 0;
+#line 2195 "<stdout>"
+yy231:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
-	goto yy231;
-yy227:	++YYCURSOR;
+	goto yy236;
+yy232:	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
-	case '\n':	goto yy230;
-	default:	goto yy228;
+	case '\n':	goto yy235;
+	default:	goto yy233;
 	}
-yy228:
-#line 1016 "token.re"
+yy233:
+#line 1079 "token.re"
 {   goto Comment; 
                     }
-#line 2166 "<stdout>"
-yy229:	yych = *++YYCURSOR;
-	goto yy228;
-yy230:	yyaccept = 0;
+#line 2208 "<stdout>"
+yy234:	yych = *++YYCURSOR;
+	goto yy233;
+yy235:	yyaccept = 0;
 	YYMARKER = ++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy231;
-yy231:	switch(yych){
-	case '\n':	goto yy230;
-	case '\r':	goto yy232;
-	default:	goto yy225;
+	goto yy236;
+yy236:	switch(yych){
+	case '\n':	goto yy235;
+	case '\r':	goto yy237;
+	default:	goto yy230;
 	}
-yy232:	++YYCURSOR;
+yy237:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	switch(yych){
-	case '\n':	goto yy230;
-	default:	goto yy233;
+	case '\n':	goto yy235;
+	default:	goto yy238;
 	}
-yy233:	YYCURSOR = YYMARKER;
+yy238:	YYCURSOR = YYMARKER;
 	switch(yyaccept){
-	case 0:	goto yy225;
+	case 0:	goto yy230;
 	}
 }
-#line 1019 "token.re"
+#line 1082 "token.re"
 
 
     }