Index: libyaml/trunk/include/yaml/yaml.h
===================================================================
--- libyaml/trunk/include/yaml.h	(revision 162)
+++ libyaml/trunk/include/yaml/yaml.h	(revision 169)
@@ -1,5 +1,5 @@
 
-#ifndef _YAML_H
-#define _YAML_H
+#ifndef YAML_H
+#define YAML_H
 
 #ifdef __cplusplus
@@ -7,12 +7,11 @@
 #endif
 
-typedef enum {
-    YAML_READER_ERROR,
-    YAML_SCANNER_ERROR,
-    YAML_PARSER_ERROR,
-    YAML_EMITTER_ERROR
-} yaml_error_type_t;
+#include <stdlib.h>
+
+#include "yaml_version.h"
+#include "yaml_error.h"
 
 typedef enum {
+    YAML_DETECT_ENCODING,
     YAML_UTF8_ENCODING,
     YAML_UTF16LE_ENCODING,
@@ -21,4 +20,5 @@
 
 typedef enum {
+    YAML_ANY_SCALAR_STYLE,
     YAML_PLAIN_SCALAR_STYLE,
     YAML_SINGLE_QUOTED_SCALAR_STYLE,
@@ -29,4 +29,5 @@
 
 typedef enum {
+    YAML_ANY_SEQUENCE_STYLE,
     YAML_BLOCK_SEQUENCE_STYLE,
     YAML_FLOW_SEQUENCE_STYLE
@@ -34,4 +35,5 @@
 
 typedef enum {
+    YAML_ANY_MAPPING_STYLE,
     YAML_BLOCK_MAPPING_STYLE,
     YAML_FLOW_MAPPING_STYLE
@@ -41,19 +43,24 @@
     YAML_STREAM_START_TOKEN,
     YAML_STREAM_END_TOKEN,
+
     YAML_VERSION_DIRECTIVE_TOKEN,
     YAML_TAG_DIRECTIVE_TOKEN,
     YAML_DOCUMENT_START_TOKEN,
     YAML_DOCUMENT_END_TOKEN,
+
     YAML_BLOCK_SEQUENCE_START_TOKEN,
     YAML_BLOCK_MAPPING_START_TOKEN,
     YAML_BLOCK_END_TOKEN,
+
     YAML_FLOW_SEQUENCE_START_TOKEN,
     YAML_FLOW_SEQUENCE_END_TOKEN,
     YAML_FLOW_MAPPING_START_TOKEN,
     YAML_FLOW_MAPPING_END_TOKEN,
+
     YAML_BLOCK_ENTRY_TOKEN,
     YAML_FLOW_ENTRY_TOKEN,
     YAML_KEY_TOKEN,
     YAML_VALUE_TOKEN,
+
     YAML_ALIAS_TOKEN,
     YAML_ANCHOR_TOKEN,
@@ -65,20 +72,20 @@
     YAML_STREAM_START_EVENT,
     YAML_STREAM_END_EVENT,
+
     YAML_DOCUMENT_START_EVENT,
     YAML_DOCUMENT_END_EVENT,
+
     YAML_ALIAS_EVENT,
+    YAML_SCALAR_EVENT,
+
     YAML_SEQUENCE_START_EVENT,
     YAML_SEQUENCE_END_EVENT,
+
     YAML_MAPPING_START_EVENT,
-    YAML_MAPPING_END_EVENT,
-    YAML_SCALAR_EVENT
+    YAML_MAPPING_END_EVENT
 } yaml_event_type_t;
 
 typedef struct {
-    char *value;
-    size_t length;
-} yaml_string_t;
-
-typedef struct {
+    size_t offset;
     size_t index;
     size_t line;
@@ -98,8 +105,9 @@
     union {
         yaml_encoding_t encoding;
-        yaml_string_t anchor;
-        yaml_string_t tag;
+        char *anchor;
+        char *tag;
         struct {
-            yaml_string_t value;
+            char *value;
+            size_t length;
             yaml_scalar_style_t style;
         } scalar;
@@ -109,6 +117,6 @@
         } version;
         struct {
-          yaml_string_t handle;
-          yaml_string_t prefix;
+          char *handle;
+          char *prefix;
         } tag_pair;
     } data;
@@ -129,6 +137,6 @@
             } version;
             struct {
-                yaml_string_t handle;
-                yaml_string_t prefix;
+                char *handle;
+                char *prefix;
             } **tag_pairs;
             int implicit;
@@ -138,9 +146,11 @@
         } document_end;
         struct {
-            yaml_string_t anchor;
+            char *anchor;
         } alias;
         struct {
-            yaml_string_t anchor;
-            yaml_string_t tag;
+            char *anchor;
+            char *tag;
+            char *value;
+            size_t length;
             int plain_implicit;
             int quoted_implicit;
@@ -148,12 +158,12 @@
         } scalar;
         struct {
-            yaml_string_t anchor;
-            yaml_string_t tag;
+            char *anchor;
+            char *tag;
             int implicit;
             yaml_sequence_style_t style;
         } sequence_start;
         struct {
-            yaml_string_t anchor;
-            yaml_string_t tag;
+            char *anchor;
+            char *tag;
             int implicit;
             yaml_mapping_style_t style;
@@ -164,18 +174,11 @@
 } yaml_event_t;
 
-typedef struct {
-} yaml_scanner_t;
-
+/*
 typedef struct {
 } yaml_parser_t;
 
 typedef struct {
-} yaml_composer_t;
-
-typedef struct {
 } yaml_emitter_t;
-
-typedef struct {
-} yaml_serializer_t;
+*/
 
 #ifdef __cplusplus
@@ -183,4 +186,4 @@
 #endif
 
-#endif /* #ifndef _YAML_H */
+#endif /* #ifndef YAML_H */