[3party] Updated protobuf to 2.6.1

1 files changed, 334 insertions, 93 deletions

diff --git a/indexer/drules_struct.pb.h b/indexer/drules_struct.pb.h
index d52b39fb68..86128071f3 100644
--- a/indexer/drules_struct.pb.h
+++ b/indexer/drules_struct.pb.h
@@ -8,12 +8,12 @@
 
 #include <google/protobuf/stubs/common.h>
 
-#if GOOGLE_PROTOBUF_VERSION < 2005000
+#if GOOGLE_PROTOBUF_VERSION < 2006000
 #error This file was generated by a newer version of protoc which is
 #error incompatible with your Protocol Buffer headers.  Please update
 #error your headers.
 #endif
-#if 2005000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
+#if 2006001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
 #error This file was generated by an older version of protoc which is
 #error incompatible with your Protocol Buffer headers.  Please
 #error regenerate this file with a newer version of protoc.
@@ -78,6 +78,14 @@ class DashDotProto : public ::google::protobuf::MessageLite {
     return *this;
   }
 
+  inline const ::std::string& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::std::string* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
   static const DashDotProto& default_instance();
 
   #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
@@ -106,13 +114,13 @@ class DashDotProto : public ::google::protobuf::MessageLite {
       ::google::protobuf::io::CodedInputStream* input);
   void SerializeWithCachedSizes(
       ::google::protobuf::io::CodedOutputStream* output) const;
+  void DiscardUnknownFields();
   int GetCachedSize() const { return _cached_size_; }
   private:
   void SharedCtor();
   void SharedDtor();
   void SetCachedSize(int size) const;
   public:
-
   ::std::string GetTypeName() const;
 
   // nested types ----------------------------------------------------
@@ -143,12 +151,12 @@ class DashDotProto : public ::google::protobuf::MessageLite {
   inline void set_has_offset();
   inline void clear_has_offset();
 
-  ::google::protobuf::RepeatedField< double > dd_;
-  double offset_;
+  ::std::string _unknown_fields_;
 
+  ::google::protobuf::uint32 _has_bits_[1];
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
-
+  ::google::protobuf::RepeatedField< double > dd_;
+  double offset_;
   #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
   friend void  protobuf_AddDesc_drules_5fstruct_2eproto_impl();
   #else
@@ -174,6 +182,14 @@ class PathSymProto : public ::google::protobuf::MessageLite {
     return *this;
   }
 
+  inline const ::std::string& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::std::string* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
   static const PathSymProto& default_instance();
 
   #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
@@ -202,13 +218,13 @@ class PathSymProto : public ::google::protobuf::MessageLite {
       ::google::protobuf::io::CodedInputStream* input);
   void SerializeWithCachedSizes(
       ::google::protobuf::io::CodedOutputStream* output) const;
+  void DiscardUnknownFields();
   int GetCachedSize() const { return _cached_size_; }
   private:
   void SharedCtor();
   void SharedDtor();
   void SetCachedSize(int size) const;
   public:
-
   ::std::string GetTypeName() const;
 
   // nested types ----------------------------------------------------
@@ -250,13 +266,13 @@ class PathSymProto : public ::google::protobuf::MessageLite {
   inline void set_has_offset();
   inline void clear_has_offset();
 
+  ::std::string _unknown_fields_;
+
+  ::google::protobuf::uint32 _has_bits_[1];
+  mutable int _cached_size_;
   ::std::string* name_;
   double step_;
   double offset_;
-
-  mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
-
   #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
   friend void  protobuf_AddDesc_drules_5fstruct_2eproto_impl();
   #else
@@ -282,6 +298,14 @@ class LineRuleProto : public ::google::protobuf::MessageLite {
     return *this;
   }
 
+  inline const ::std::string& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::std::string* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
   static const LineRuleProto& default_instance();
 
   #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
@@ -310,13 +334,13 @@ class LineRuleProto : public ::google::protobuf::MessageLite {
       ::google::protobuf::io::CodedInputStream* input);
   void SerializeWithCachedSizes(
       ::google::protobuf::io::CodedOutputStream* output) const;
+  void DiscardUnknownFields();
   int GetCachedSize() const { return _cached_size_; }
   private:
   void SharedCtor();
   void SharedDtor();
   void SetCachedSize(int size) const;
   public:
-
   ::std::string GetTypeName() const;
 
   // nested types ----------------------------------------------------
@@ -393,6 +417,10 @@ class LineRuleProto : public ::google::protobuf::MessageLite {
   inline void set_has_cap();
   inline void clear_has_cap();
 
+  ::std::string _unknown_fields_;
+
+  ::google::protobuf::uint32 _has_bits_[1];
+  mutable int _cached_size_;
   double width_;
   ::DashDotProto* dashdot_;
   ::google::protobuf::uint32 color_;
@@ -400,10 +428,6 @@ class LineRuleProto : public ::google::protobuf::MessageLite {
   ::PathSymProto* pathsym_;
   int join_;
   int cap_;
-
-  mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(7 + 31) / 32];
-
   #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
   friend void  protobuf_AddDesc_drules_5fstruct_2eproto_impl();
   #else
@@ -429,6 +453,14 @@ class LineDefProto : public ::google::protobuf::MessageLite {
     return *this;
   }
 
+  inline const ::std::string& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::std::string* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
   static const LineDefProto& default_instance();
 
   #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
@@ -457,13 +489,13 @@ class LineDefProto : public ::google::protobuf::MessageLite {
       ::google::protobuf::io::CodedInputStream* input);
   void SerializeWithCachedSizes(
       ::google::protobuf::io::CodedOutputStream* output) const;
+  void DiscardUnknownFields();
   int GetCachedSize() const { return _cached_size_; }
   private:
   void SharedCtor();
   void SharedDtor();
   void SetCachedSize(int size) const;
   public:
-
   ::std::string GetTypeName() const;
 
   // nested types ----------------------------------------------------
@@ -531,16 +563,16 @@ class LineDefProto : public ::google::protobuf::MessageLite {
   inline void set_has_cap();
   inline void clear_has_cap();
 
+  ::std::string _unknown_fields_;
+
+  ::google::protobuf::uint32 _has_bits_[1];
+  mutable int _cached_size_;
   double width_;
   ::DashDotProto* dashdot_;
   ::google::protobuf::uint32 color_;
   int join_;
   ::PathSymProto* pathsym_;
   int cap_;
-
-  mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(6 + 31) / 32];
-
   #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
   friend void  protobuf_AddDesc_drules_5fstruct_2eproto_impl();
   #else
@@ -566,6 +598,14 @@ class AreaRuleProto : public ::google::protobuf::MessageLite {
     return *this;
   }
 
+  inline const ::std::string& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::std::string* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
   static const AreaRuleProto& default_instance();
 
   #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
@@ -594,13 +634,13 @@ class AreaRuleProto : public ::google::protobuf::MessageLite {
       ::google::protobuf::io::CodedInputStream* input);
   void SerializeWithCachedSizes(
       ::google::protobuf::io::CodedOutputStream* output) const;
+  void DiscardUnknownFields();
   int GetCachedSize() const { return _cached_size_; }
   private:
   void SharedCtor();
   void SharedDtor();
   void SetCachedSize(int size) const;
   public:
-
   ::std::string GetTypeName() const;
 
   // nested types ----------------------------------------------------
@@ -639,13 +679,13 @@ class AreaRuleProto : public ::google::protobuf::MessageLite {
   inline void set_has_priority();
   inline void clear_has_priority();
 
+  ::std::string _unknown_fields_;
+
+  ::google::protobuf::uint32 _has_bits_[1];
+  mutable int _cached_size_;
   ::LineDefProto* border_;
   ::google::protobuf::uint32 color_;
   ::google::protobuf::int32 priority_;
-
-  mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
-
   #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
   friend void  protobuf_AddDesc_drules_5fstruct_2eproto_impl();
   #else
@@ -671,6 +711,14 @@ class SymbolRuleProto : public ::google::protobuf::MessageLite {
     return *this;
   }
 
+  inline const ::std::string& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::std::string* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
   static const SymbolRuleProto& default_instance();
 
   #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
@@ -699,13 +747,13 @@ class SymbolRuleProto : public ::google::protobuf::MessageLite {
       ::google::protobuf::io::CodedInputStream* input);
   void SerializeWithCachedSizes(
       ::google::protobuf::io::CodedOutputStream* output) const;
+  void DiscardUnknownFields();
   int GetCachedSize() const { return _cached_size_; }
   private:
   void SharedCtor();
   void SharedDtor();
   void SetCachedSize(int size) const;
   public:
-
   ::std::string GetTypeName() const;
 
   // nested types ----------------------------------------------------
@@ -747,13 +795,13 @@ class SymbolRuleProto : public ::google::protobuf::MessageLite {
   inline void set_has_priority();
   inline void clear_has_priority();
 
+  ::std::string _unknown_fields_;
+
+  ::google::protobuf::uint32 _has_bits_[1];
+  mutable int _cached_size_;
   ::std::string* name_;
   ::google::protobuf::int32 apply_for_type_;
   ::google::protobuf::int32 priority_;
-
-  mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
-
   #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
   friend void  protobuf_AddDesc_drules_5fstruct_2eproto_impl();
   #else
@@ -779,6 +827,14 @@ class CaptionDefProto : public ::google::protobuf::MessageLite {
     return *this;
   }
 
+  inline const ::std::string& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::std::string* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
   static const CaptionDefProto& default_instance();
 
   #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
@@ -807,13 +863,13 @@ class CaptionDefProto : public ::google::protobuf::MessageLite {
       ::google::protobuf::io::CodedInputStream* input);
   void SerializeWithCachedSizes(
       ::google::protobuf::io::CodedOutputStream* output) const;
+  void DiscardUnknownFields();
   int GetCachedSize() const { return _cached_size_; }
   private:
   void SharedCtor();
   void SharedDtor();
   void SetCachedSize(int size) const;
   public:
-
   ::std::string GetTypeName() const;
 
   // nested types ----------------------------------------------------
@@ -868,15 +924,15 @@ class CaptionDefProto : public ::google::protobuf::MessageLite {
   inline void set_has_offset_y();
   inline void clear_has_offset_y();
 
+  ::std::string _unknown_fields_;
+
+  ::google::protobuf::uint32 _has_bits_[1];
+  mutable int _cached_size_;
   ::google::protobuf::int32 height_;
   ::google::protobuf::uint32 color_;
   ::google::protobuf::uint32 stroke_color_;
   ::google::protobuf::int32 offset_x_;
   ::google::protobuf::int32 offset_y_;
-
-  mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(5 + 31) / 32];
-
   #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
   friend void  protobuf_AddDesc_drules_5fstruct_2eproto_impl();
   #else
@@ -902,6 +958,14 @@ class CaptionRuleProto : public ::google::protobuf::MessageLite {
     return *this;
   }
 
+  inline const ::std::string& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::std::string* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
   static const CaptionRuleProto& default_instance();
 
   #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
@@ -930,13 +994,13 @@ class CaptionRuleProto : public ::google::protobuf::MessageLite {
       ::google::protobuf::io::CodedInputStream* input);
   void SerializeWithCachedSizes(
       ::google::protobuf::io::CodedOutputStream* output) const;
+  void DiscardUnknownFields();
   int GetCachedSize() const { return _cached_size_; }
   private:
   void SharedCtor();
   void SharedDtor();
   void SetCachedSize(int size) const;
   public:
-
   ::std::string GetTypeName() const;
 
   // nested types ----------------------------------------------------
@@ -977,13 +1041,13 @@ class CaptionRuleProto : public ::google::protobuf::MessageLite {
   inline void set_has_priority();
   inline void clear_has_priority();
 
+  ::std::string _unknown_fields_;
+
+  ::google::protobuf::uint32 _has_bits_[1];
+  mutable int _cached_size_;
   ::CaptionDefProto* primary_;
   ::CaptionDefProto* secondary_;
   ::google::protobuf::int32 priority_;
-
-  mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
-
   #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
   friend void  protobuf_AddDesc_drules_5fstruct_2eproto_impl();
   #else
@@ -1009,6 +1073,14 @@ class CircleRuleProto : public ::google::protobuf::MessageLite {
     return *this;
   }
 
+  inline const ::std::string& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::std::string* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
   static const CircleRuleProto& default_instance();
 
   #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
@@ -1037,13 +1109,13 @@ class CircleRuleProto : public ::google::protobuf::MessageLite {
       ::google::protobuf::io::CodedInputStream* input);
   void SerializeWithCachedSizes(
       ::google::protobuf::io::CodedOutputStream* output) const;
+  void DiscardUnknownFields();
   int GetCachedSize() const { return _cached_size_; }
   private:
   void SharedCtor();
   void SharedDtor();
   void SetCachedSize(int size) const;
   public:
-
   ::std::string GetTypeName() const;
 
   // nested types ----------------------------------------------------
@@ -1091,14 +1163,14 @@ class CircleRuleProto : public ::google::protobuf::MessageLite {
   inline void set_has_priority();
   inline void clear_has_priority();
 
+  ::std::string _unknown_fields_;
+
+  ::google::protobuf::uint32 _has_bits_[1];
+  mutable int _cached_size_;
   double radius_;
   ::LineDefProto* border_;
   ::google::protobuf::uint32 color_;
   ::google::protobuf::int32 priority_;
-
-  mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
-
   #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
   friend void  protobuf_AddDesc_drules_5fstruct_2eproto_impl();
   #else
@@ -1124,6 +1196,14 @@ class PathTextRuleProto : public ::google::protobuf::MessageLite {
     return *this;
   }
 
+  inline const ::std::string& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::std::string* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
   static const PathTextRuleProto& default_instance();
 
   #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
@@ -1152,13 +1232,13 @@ class PathTextRuleProto : public ::google::protobuf::MessageLite {
       ::google::protobuf::io::CodedInputStream* input);
   void SerializeWithCachedSizes(
       ::google::protobuf::io::CodedOutputStream* output) const;
+  void DiscardUnknownFields();
   int GetCachedSize() const { return _cached_size_; }
   private:
   void SharedCtor();
   void SharedDtor();
   void SetCachedSize(int size) const;
   public:
-
   ::std::string GetTypeName() const;
 
   // nested types ----------------------------------------------------
@@ -1199,13 +1279,13 @@ class PathTextRuleProto : public ::google::protobuf::MessageLite {
   inline void set_has_priority();
   inline void clear_has_priority();
 
+  ::std::string _unknown_fields_;
+
+  ::google::protobuf::uint32 _has_bits_[1];
+  mutable int _cached_size_;
   ::CaptionDefProto* primary_;
   ::CaptionDefProto* secondary_;
   ::google::protobuf::int32 priority_;
-
-  mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
-
   #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
   friend void  protobuf_AddDesc_drules_5fstruct_2eproto_impl();
   #else
@@ -1231,6 +1311,14 @@ class DrawElementProto : public ::google::protobuf::MessageLite {
     return *this;
   }
 
+  inline const ::std::string& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::std::string* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
   static const DrawElementProto& default_instance();
 
   #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
@@ -1259,13 +1347,13 @@ class DrawElementProto : public ::google::protobuf::MessageLite {
       ::google::protobuf::io::CodedInputStream* input);
   void SerializeWithCachedSizes(
       ::google::protobuf::io::CodedOutputStream* output) const;
+  void DiscardUnknownFields();
   int GetCachedSize() const { return _cached_size_; }
   private:
   void SharedCtor();
   void SharedDtor();
   void SetCachedSize(int size) const;
   public:
-
   ::std::string GetTypeName() const;
 
   // nested types ----------------------------------------------------
@@ -1351,6 +1439,10 @@ class DrawElementProto : public ::google::protobuf::MessageLite {
   inline void set_has_path_text();
   inline void clear_has_path_text();
 
+  ::std::string _unknown_fields_;
+
+  ::google::protobuf::uint32 _has_bits_[1];
+  mutable int _cached_size_;
   ::google::protobuf::RepeatedPtrField< ::LineRuleProto > lines_;
   ::AreaRuleProto* area_;
   ::SymbolRuleProto* symbol_;
@@ -1358,10 +1450,6 @@ class DrawElementProto : public ::google::protobuf::MessageLite {
   ::CircleRuleProto* circle_;
   ::PathTextRuleProto* path_text_;
   ::google::protobuf::int32 scale_;
-
-  mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(7 + 31) / 32];
-
   #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
   friend void  protobuf_AddDesc_drules_5fstruct_2eproto_impl();
   #else
@@ -1387,6 +1475,14 @@ class ClassifElementProto : public ::google::protobuf::MessageLite {
     return *this;
   }
 
+  inline const ::std::string& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::std::string* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
   static const ClassifElementProto& default_instance();
 
   #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
@@ -1415,13 +1511,13 @@ class ClassifElementProto : public ::google::protobuf::MessageLite {
       ::google::protobuf::io::CodedInputStream* input);
   void SerializeWithCachedSizes(
       ::google::protobuf::io::CodedOutputStream* output) const;
+  void DiscardUnknownFields();
   int GetCachedSize() const { return _cached_size_; }
   private:
   void SharedCtor();
   void SharedDtor();
   void SetCachedSize(int size) const;
   public:
-
   ::std::string GetTypeName() const;
 
   // nested types ----------------------------------------------------
@@ -1457,12 +1553,12 @@ class ClassifElementProto : public ::google::protobuf::MessageLite {
   inline void set_has_name();
   inline void clear_has_name();
 
-  ::std::string* name_;
-  ::google::protobuf::RepeatedPtrField< ::DrawElementProto > element_;
+  ::std::string _unknown_fields_;
 
+  ::google::protobuf::uint32 _has_bits_[1];
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
-
+  ::std::string* name_;
+  ::google::protobuf::RepeatedPtrField< ::DrawElementProto > element_;
   #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
   friend void  protobuf_AddDesc_drules_5fstruct_2eproto_impl();
   #else
@@ -1488,6 +1584,14 @@ class ContainerProto : public ::google::protobuf::MessageLite {
     return *this;
   }
 
+  inline const ::std::string& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::std::string* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
   static const ContainerProto& default_instance();
 
   #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
@@ -1516,13 +1620,13 @@ class ContainerProto : public ::google::protobuf::MessageLite {
       ::google::protobuf::io::CodedInputStream* input);
   void SerializeWithCachedSizes(
       ::google::protobuf::io::CodedOutputStream* output) const;
+  void DiscardUnknownFields();
   int GetCachedSize() const { return _cached_size_; }
   private:
   void SharedCtor();
   void SharedDtor();
   void SetCachedSize(int size) const;
   public:
-
   ::std::string GetTypeName() const;
 
   // nested types ----------------------------------------------------
@@ -1544,11 +1648,11 @@ class ContainerProto : public ::google::protobuf::MessageLite {
   // @@protoc_insertion_point(class_scope:ContainerProto)
  private:
 
-  ::google::protobuf::RepeatedPtrField< ::ClassifElementProto > cont_;
+  ::std::string _unknown_fields_;
 
+  ::google::protobuf::uint32 _has_bits_[1];
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
-
+  ::google::protobuf::RepeatedPtrField< ::ClassifElementProto > cont_;
   #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
   friend void  protobuf_AddDesc_drules_5fstruct_2eproto_impl();
   #else
@@ -1575,20 +1679,25 @@ inline void DashDotProto::clear_dd() {
   dd_.Clear();
 }
 inline double DashDotProto::dd(int index) const {
+  // @@protoc_insertion_point(field_get:DashDotProto.dd)
   return dd_.Get(index);
 }
 inline void DashDotProto::set_dd(int index, double value) {
   dd_.Set(index, value);
+  // @@protoc_insertion_point(field_set:DashDotProto.dd)
 }
 inline void DashDotProto::add_dd(double value) {
   dd_.Add(value);
+  // @@protoc_insertion_point(field_add:DashDotProto.dd)
 }
 inline const ::google::protobuf::RepeatedField< double >&
 DashDotProto::dd() const {
+  // @@protoc_insertion_point(field_list:DashDotProto.dd)
   return dd_;
 }
 inline ::google::protobuf::RepeatedField< double >*
 DashDotProto::mutable_dd() {
+  // @@protoc_insertion_point(field_mutable_list:DashDotProto.dd)
   return &dd_;
 }
 
@@ -1607,11 +1716,13 @@ inline void DashDotProto::clear_offset() {
   clear_has_offset();
 }
 inline double DashDotProto::offset() const {
+  // @@protoc_insertion_point(field_get:DashDotProto.offset)
   return offset_;
 }
 inline void DashDotProto::set_offset(double value) {
   set_has_offset();
   offset_ = value;
+  // @@protoc_insertion_point(field_set:DashDotProto.offset)
 }
 
 // -------------------------------------------------------------------
@@ -1629,54 +1740,59 @@ inline void PathSymProto::clear_has_name() {
   _has_bits_[0] &= ~0x00000001u;
 }
 inline void PathSymProto::clear_name() {
-  if (name_ != &::google::protobuf::internal::kEmptyString) {
+  if (name_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
     name_->clear();
   }
   clear_has_name();
 }
 inline const ::std::string& PathSymProto::name() const {
+  // @@protoc_insertion_point(field_get:PathSymProto.name)
   return *name_;
 }
 inline void PathSymProto::set_name(const ::std::string& value) {
   set_has_name();
-  if (name_ == &::google::protobuf::internal::kEmptyString) {
+  if (name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
     name_ = new ::std::string;
   }
   name_->assign(value);
+  // @@protoc_insertion_point(field_set:PathSymProto.name)
 }
 inline void PathSymProto::set_name(const char* value) {
   set_has_name();
-  if (name_ == &::google::protobuf::internal::kEmptyString) {
+  if (name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
     name_ = new ::std::string;
   }
   name_->assign(value);
+  // @@protoc_insertion_point(field_set_char:PathSymProto.name)
 }
 inline void PathSymProto::set_name(const char* value, size_t size) {
   set_has_name();
-  if (name_ == &::google::protobuf::internal::kEmptyString) {
+  if (name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
     name_ = new ::std::string;
   }
   name_->assign(reinterpret_cast<const char*>(value), size);
+  // @@protoc_insertion_point(field_set_pointer:PathSymProto.name)
 }
 inline ::std::string* PathSymProto::mutable_name() {
   set_has_name();
-  if (name_ == &::google::protobuf::internal::kEmptyString) {
+  if (name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
     name_ = new ::std::string;
   }
+  // @@protoc_insertion_point(field_mutable:PathSymProto.name)
   return name_;
 }
 inline ::std::string* PathSymProto::release_name() {
   clear_has_name();
-  if (name_ == &::google::protobuf::internal::kEmptyString) {
+  if (name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
     return NULL;
   } else {
     ::std::string* temp = name_;
-    name_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
     return temp;
   }
 }
 inline void PathSymProto::set_allocated_name(::std::string* name) {
-  if (name_ != &::google::protobuf::internal::kEmptyString) {
+  if (name_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
     delete name_;
   }
   if (name) {
@@ -1684,8 +1800,9 @@ inline void PathSymProto::set_allocated_name(::std::string* name) {
     name_ = name;
   } else {
     clear_has_name();
-    name_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   }
+  // @@protoc_insertion_point(field_set_allocated:PathSymProto.name)
 }
 
 // required double step = 2;
@@ -1703,11 +1820,13 @@ inline void PathSymProto::clear_step() {
   clear_has_step();
 }
 inline double PathSymProto::step() const {
+  // @@protoc_insertion_point(field_get:PathSymProto.step)
   return step_;
 }
 inline void PathSymProto::set_step(double value) {
   set_has_step();
   step_ = value;
+  // @@protoc_insertion_point(field_set:PathSymProto.step)
 }
 
 // optional double offset = 3;
@@ -1725,11 +1844,13 @@ inline void PathSymProto::clear_offset() {
   clear_has_offset();
 }
 inline double PathSymProto::offset() const {
+  // @@protoc_insertion_point(field_get:PathSymProto.offset)
   return offset_;
 }
 inline void PathSymProto::set_offset(double value) {
   set_has_offset();
   offset_ = value;
+  // @@protoc_insertion_point(field_set:PathSymProto.offset)
 }
 
 // -------------------------------------------------------------------
@@ -1751,11 +1872,13 @@ inline void LineRuleProto::clear_width() {
   clear_has_width();
 }
 inline double LineRuleProto::width() const {
+  // @@protoc_insertion_point(field_get:LineRuleProto.width)
   return width_;
 }
 inline void LineRuleProto::set_width(double value) {
   set_has_width();
   width_ = value;
+  // @@protoc_insertion_point(field_set:LineRuleProto.width)
 }
 
 // required uint32 color = 2;
@@ -1773,11 +1896,13 @@ inline void LineRuleProto::clear_color() {
   clear_has_color();
 }
 inline ::google::protobuf::uint32 LineRuleProto::color() const {
+  // @@protoc_insertion_point(field_get:LineRuleProto.color)
   return color_;
 }
 inline void LineRuleProto::set_color(::google::protobuf::uint32 value) {
   set_has_color();
   color_ = value;
+  // @@protoc_insertion_point(field_set:LineRuleProto.color)
 }
 
 // optional .DashDotProto dashdot = 3;
@@ -1795,6 +1920,7 @@ inline void LineRuleProto::clear_dashdot() {
   clear_has_dashdot();
 }
 inline const ::DashDotProto& LineRuleProto::dashdot() const {
+  // @@protoc_insertion_point(field_get:LineRuleProto.dashdot)
 #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
   return dashdot_ != NULL ? *dashdot_ : *default_instance().dashdot_;
 #else
@@ -1804,6 +1930,7 @@ inline const ::DashDotProto& LineRuleProto::dashdot() const {
 inline ::DashDotProto* LineRuleProto::mutable_dashdot() {
   set_has_dashdot();
   if (dashdot_ == NULL) dashdot_ = new ::DashDotProto;
+  // @@protoc_insertion_point(field_mutable:LineRuleProto.dashdot)
   return dashdot_;
 }
 inline ::DashDotProto* LineRuleProto::release_dashdot() {
@@ -1820,6 +1947,7 @@ inline void LineRuleProto::set_allocated_dashdot(::DashDotProto* dashdot) {
   } else {
     clear_has_dashdot();
   }
+  // @@protoc_insertion_point(field_set_allocated:LineRuleProto.dashdot)
 }
 
 // required int32 priority = 4;
@@ -1837,11 +1965,13 @@ inline void LineRuleProto::clear_priority() {
   clear_has_priority();
 }
 inline ::google::protobuf::int32 LineRuleProto::priority() const {
+  // @@protoc_insertion_point(field_get:LineRuleProto.priority)
   return priority_;
 }
 inline void LineRuleProto::set_priority(::google::protobuf::int32 value) {
   set_has_priority();
   priority_ = value;
+  // @@protoc_insertion_point(field_set:LineRuleProto.priority)
 }
 
 // optional .PathSymProto pathsym = 5;
@@ -1859,6 +1989,7 @@ inline void LineRuleProto::clear_pathsym() {
   clear_has_pathsym();
 }
 inline const ::PathSymProto& LineRuleProto::pathsym() const {
+  // @@protoc_insertion_point(field_get:LineRuleProto.pathsym)
 #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
   return pathsym_ != NULL ? *pathsym_ : *default_instance().pathsym_;
 #else
@@ -1868,6 +1999,7 @@ inline const ::PathSymProto& LineRuleProto::pathsym() const {
 inline ::PathSymProto* LineRuleProto::mutable_pathsym() {
   set_has_pathsym();
   if (pathsym_ == NULL) pathsym_ = new ::PathSymProto;
+  // @@protoc_insertion_point(field_mutable:LineRuleProto.pathsym)
   return pathsym_;
 }
 inline ::PathSymProto* LineRuleProto::release_pathsym() {
@@ -1884,6 +2016,7 @@ inline void LineRuleProto::set_allocated_pathsym(::PathSymProto* pathsym) {
   } else {
     clear_has_pathsym();
   }
+  // @@protoc_insertion_point(field_set_allocated:LineRuleProto.pathsym)
 }
 
 // optional .LineJoin join = 6;
@@ -1901,12 +2034,14 @@ inline void LineRuleProto::clear_join() {
   clear_has_join();
 }
 inline ::LineJoin LineRuleProto::join() const {
+  // @@protoc_insertion_point(field_get:LineRuleProto.join)
   return static_cast< ::LineJoin >(join_);
 }
 inline void LineRuleProto::set_join(::LineJoin value) {
   assert(::LineJoin_IsValid(value));
   set_has_join();
   join_ = value;
+  // @@protoc_insertion_point(field_set:LineRuleProto.join)
 }
 
 // optional .LineCap cap = 7;
@@ -1924,12 +2059,14 @@ inline void LineRuleProto::clear_cap() {
   clear_has_cap();
 }
 inline ::LineCap LineRuleProto::cap() const {
+  // @@protoc_insertion_point(field_get:LineRuleProto.cap)
   return static_cast< ::LineCap >(cap_);
 }
 inline void LineRuleProto::set_cap(::LineCap value) {
   assert(::LineCap_IsValid(value));
   set_has_cap();
   cap_ = value;
+  // @@protoc_insertion_point(field_set:LineRuleProto.cap)
 }
 
 // -------------------------------------------------------------------
@@ -1951,11 +2088,13 @@ inline void LineDefProto::clear_width() {
   clear_has_width();
 }
 inline double LineDefProto::width() const {
+  // @@protoc_insertion_point(field_get:LineDefProto.width)
   return width_;
 }
 inline void LineDefProto::set_width(double value) {
   set_has_width();
   width_ = value;
+  // @@protoc_insertion_point(field_set:LineDefProto.width)
 }
 
 // required uint32 color = 2;
@@ -1973,11 +2112,13 @@ inline void LineDefProto::clear_color() {
   clear_has_color();
 }
 inline ::google::protobuf::uint32 LineDefProto::color() const {
+  // @@protoc_insertion_point(field_get:LineDefProto.color)
   return color_;
 }
 inline void LineDefProto::set_color(::google::protobuf::uint32 value) {
   set_has_color();
   color_ = value;
+  // @@protoc_insertion_point(field_set:LineDefProto.color)
 }
 
 // optional .DashDotProto dashdot = 3;
@@ -1995,6 +2136,7 @@ inline void LineDefProto::clear_dashdot() {
   clear_has_dashdot();
 }
 inline const ::DashDotProto& LineDefProto::dashdot() const {
+  // @@protoc_insertion_point(field_get:LineDefProto.dashdot)
 #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
   return dashdot_ != NULL ? *dashdot_ : *default_instance().dashdot_;
 #else
@@ -2004,6 +2146,7 @@ inline const ::DashDotProto& LineDefProto::dashdot() const {
 inline ::DashDotProto* LineDefProto::mutable_dashdot() {
   set_has_dashdot();
   if (dashdot_ == NULL) dashdot_ = new ::DashDotProto;
+  // @@protoc_insertion_point(field_mutable:LineDefProto.dashdot)
   return dashdot_;
 }
 inline ::DashDotProto* LineDefProto::release_dashdot() {
@@ -2020,6 +2163,7 @@ inline void LineDefProto::set_allocated_dashdot(::DashDotProto* dashdot) {
   } else {
     clear_has_dashdot();
   }
+  // @@protoc_insertion_point(field_set_allocated:LineDefProto.dashdot)
 }
 
 // optional .PathSymProto pathsym = 4;
@@ -2037,6 +2181,7 @@ inline void LineDefProto::clear_pathsym() {
   clear_has_pathsym();
 }
 inline const ::PathSymProto& LineDefProto::pathsym() const {
+  // @@protoc_insertion_point(field_get:LineDefProto.pathsym)
 #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
   return pathsym_ != NULL ? *pathsym_ : *default_instance().pathsym_;
 #else
@@ -2046,6 +2191,7 @@ inline const ::PathSymProto& LineDefProto::pathsym() const {
 inline ::PathSymProto* LineDefProto::mutable_pathsym() {
   set_has_pathsym();
   if (pathsym_ == NULL) pathsym_ = new ::PathSymProto;
+  // @@protoc_insertion_point(field_mutable:LineDefProto.pathsym)
   return pathsym_;
 }
 inline ::PathSymProto* LineDefProto::release_pathsym() {
@@ -2062,6 +2208,7 @@ inline void LineDefProto::set_allocated_pathsym(::PathSymProto* pathsym) {
   } else {
     clear_has_pathsym();
   }
+  // @@protoc_insertion_point(field_set_allocated:LineDefProto.pathsym)
 }
 
 // optional .LineJoin join = 6;
@@ -2079,12 +2226,14 @@ inline void LineDefProto::clear_join() {
   clear_has_join();
 }
 inline ::LineJoin LineDefProto::join() const {
+  // @@protoc_insertion_point(field_get:LineDefProto.join)
   return static_cast< ::LineJoin >(join_);
 }
 inline void LineDefProto::set_join(::LineJoin value) {
   assert(::LineJoin_IsValid(value));
   set_has_join();
   join_ = value;
+  // @@protoc_insertion_point(field_set:LineDefProto.join)
 }
 
 // optional .LineCap cap = 7;
@@ -2102,12 +2251,14 @@ inline void LineDefProto::clear_cap() {
   clear_has_cap();
 }
 inline ::LineCap LineDefProto::cap() const {
+  // @@protoc_insertion_point(field_get:LineDefProto.cap)
   return static_cast< ::LineCap >(cap_);
 }
 inline void LineDefProto::set_cap(::LineCap value) {
   assert(::LineCap_IsValid(value));
   set_has_cap();
   cap_ = value;
+  // @@protoc_insertion_point(field_set:LineDefProto.cap)
 }
 
 // -------------------------------------------------------------------
@@ -2129,11 +2280,13 @@ inline void AreaRuleProto::clear_color() {
   clear_has_color();
 }
 inline ::google::protobuf::uint32 AreaRuleProto::color() const {
+  // @@protoc_insertion_point(field_get:AreaRuleProto.color)
   return color_;
 }
 inline void AreaRuleProto::set_color(::google::protobuf::uint32 value) {
   set_has_color();
   color_ = value;
+  // @@protoc_insertion_point(field_set:AreaRuleProto.color)
 }
 
 // optional .LineDefProto border = 2;
@@ -2151,6 +2304,7 @@ inline void AreaRuleProto::clear_border() {
   clear_has_border();
 }
 inline const ::LineDefProto& AreaRuleProto::border() const {
+  // @@protoc_insertion_point(field_get:AreaRuleProto.border)
 #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
   return border_ != NULL ? *border_ : *default_instance().border_;
 #else
@@ -2160,6 +2314,7 @@ inline const ::LineDefProto& AreaRuleProto::border() const {
 inline ::LineDefProto* AreaRuleProto::mutable_border() {
   set_has_border();
   if (border_ == NULL) border_ = new ::LineDefProto;
+  // @@protoc_insertion_point(field_mutable:AreaRuleProto.border)
   return border_;
 }
 inline ::LineDefProto* AreaRuleProto::release_border() {
@@ -2176,6 +2331,7 @@ inline void AreaRuleProto::set_allocated_border(::LineDefProto* border) {
   } else {
     clear_has_border();
   }
+  // @@protoc_insertion_point(field_set_allocated:AreaRuleProto.border)
 }
 
 // required int32 priority = 3;
@@ -2193,11 +2349,13 @@ inline void AreaRuleProto::clear_priority() {
   clear_has_priority();
 }
 inline ::google::protobuf::int32 AreaRuleProto::priority() const {
+  // @@protoc_insertion_point(field_get:AreaRuleProto.priority)
   return priority_;
 }
 inline void AreaRuleProto::set_priority(::google::protobuf::int32 value) {
   set_has_priority();
   priority_ = value;
+  // @@protoc_insertion_point(field_set:AreaRuleProto.priority)
 }
 
 // -------------------------------------------------------------------
@@ -2215,54 +2373,59 @@ inline void SymbolRuleProto::clear_has_name() {
   _has_bits_[0] &= ~0x00000001u;
 }
 inline void SymbolRuleProto::clear_name() {
-  if (name_ != &::google::protobuf::internal::kEmptyString) {
+  if (name_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
     name_->clear();
   }
   clear_has_name();
 }
 inline const ::std::string& SymbolRuleProto::name() const {
+  // @@protoc_insertion_point(field_get:SymbolRuleProto.name)
   return *name_;
 }
 inline void SymbolRuleProto::set_name(const ::std::string& value) {
   set_has_name();
-  if (name_ == &::google::protobuf::internal::kEmptyString) {
+  if (name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
     name_ = new ::std::string;
   }
   name_->assign(value);
+  // @@protoc_insertion_point(field_set:SymbolRuleProto.name)
 }
 inline void SymbolRuleProto::set_name(const char* value) {
   set_has_name();
-  if (name_ == &::google::protobuf::internal::kEmptyString) {
+  if (name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
     name_ = new ::std::string;
   }
   name_->assign(value);
+  // @@protoc_insertion_point(field_set_char:SymbolRuleProto.name)
 }
 inline void SymbolRuleProto::set_name(const char* value, size_t size) {
   set_has_name();
-  if (name_ == &::google::protobuf::internal::kEmptyString) {
+  if (name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
     name_ = new ::std::string;
   }
   name_->assign(reinterpret_cast<const char*>(value), size);
+  // @@protoc_insertion_point(field_set_pointer:SymbolRuleProto.name)
 }
 inline ::std::string* SymbolRuleProto::mutable_name() {
   set_has_name();
-  if (name_ == &::google::protobuf::internal::kEmptyString) {
+  if (name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
     name_ = new ::std::string;
   }
+  // @@protoc_insertion_point(field_mutable:SymbolRuleProto.name)
   return name_;
 }
 inline ::std::string* SymbolRuleProto::release_name() {
   clear_has_name();
-  if (name_ == &::google::protobuf::internal::kEmptyString) {
+  if (name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
     return NULL;
   } else {
     ::std::string* temp = name_;
-    name_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
     return temp;
   }
 }
 inline void SymbolRuleProto::set_allocated_name(::std::string* name) {
-  if (name_ != &::google::protobuf::internal::kEmptyString) {
+  if (name_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
     delete name_;
   }
   if (name) {
@@ -2270,8 +2433,9 @@ inline void SymbolRuleProto::set_allocated_name(::std::string* name) {
     name_ = name;
   } else {
     clear_has_name();
-    name_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   }
+  // @@protoc_insertion_point(field_set_allocated:SymbolRuleProto.name)
 }
 
 // optional int32 apply_for_type = 2;
@@ -2289,11 +2453,13 @@ inline void SymbolRuleProto::clear_apply_for_type() {
   clear_has_apply_for_type();
 }
 inline ::google::protobuf::int32 SymbolRuleProto::apply_for_type() const {
+  // @@protoc_insertion_point(field_get:SymbolRuleProto.apply_for_type)
   return apply_for_type_;
 }
 inline void SymbolRuleProto::set_apply_for_type(::google::protobuf::int32 value) {
   set_has_apply_for_type();
   apply_for_type_ = value;
+  // @@protoc_insertion_point(field_set:SymbolRuleProto.apply_for_type)
 }
 
 // required int32 priority = 3;
@@ -2311,11 +2477,13 @@ inline void SymbolRuleProto::clear_priority() {
   clear_has_priority();
 }
 inline ::google::protobuf::int32 SymbolRuleProto::priority() const {
+  // @@protoc_insertion_point(field_get:SymbolRuleProto.priority)
   return priority_;
 }
 inline void SymbolRuleProto::set_priority(::google::protobuf::int32 value) {
   set_has_priority();
   priority_ = value;
+  // @@protoc_insertion_point(field_set:SymbolRuleProto.priority)
 }
 
 // -------------------------------------------------------------------
@@ -2337,11 +2505,13 @@ inline void CaptionDefProto::clear_height() {
   clear_has_height();
 }
 inline ::google::protobuf::int32 CaptionDefProto::height() const {
+  // @@protoc_insertion_point(field_get:CaptionDefProto.height)
   return height_;
 }
 inline void CaptionDefProto::set_height(::google::protobuf::int32 value) {
   set_has_height();
   height_ = value;
+  // @@protoc_insertion_point(field_set:CaptionDefProto.height)
 }
 
 // required uint32 color = 2;
@@ -2359,11 +2529,13 @@ inline void CaptionDefProto::clear_color() {
   clear_has_color();
 }
 inline ::google::protobuf::uint32 CaptionDefProto::color() const {
+  // @@protoc_insertion_point(field_get:CaptionDefProto.color)
   return color_;
 }
 inline void CaptionDefProto::set_color(::google::protobuf::uint32 value) {
   set_has_color();
   color_ = value;
+  // @@protoc_insertion_point(field_set:CaptionDefProto.color)
 }
 
 // optional uint32 stroke_color = 3;
@@ -2381,11 +2553,13 @@ inline void CaptionDefProto::clear_stroke_color() {
   clear_has_stroke_color();
 }
 inline ::google::protobuf::uint32 CaptionDefProto::stroke_color() const {
+  // @@protoc_insertion_point(field_get:CaptionDefProto.stroke_color)
   return stroke_color_;
 }
 inline void CaptionDefProto::set_stroke_color(::google::protobuf::uint32 value) {
   set_has_stroke_color();
   stroke_color_ = value;
+  // @@protoc_insertion_point(field_set:CaptionDefProto.stroke_color)
 }
 
 // optional int32 offset_x = 4;
@@ -2403,11 +2577,13 @@ inline void CaptionDefProto::clear_offset_x() {
   clear_has_offset_x();
 }
 inline ::google::protobuf::int32 CaptionDefProto::offset_x() const {
+  // @@protoc_insertion_point(field_get:CaptionDefProto.offset_x)
   return offset_x_;
 }
 inline void CaptionDefProto::set_offset_x(::google::protobuf::int32 value) {
   set_has_offset_x();
   offset_x_ = value;
+  // @@protoc_insertion_point(field_set:CaptionDefProto.offset_x)
 }
 
 // optional int32 offset_y = 5;
@@ -2425,11 +2601,13 @@ inline void CaptionDefProto::clear_offset_y() {
   clear_has_offset_y();
 }
 inline ::google::protobuf::int32 CaptionDefProto::offset_y() const {
+  // @@protoc_insertion_point(field_get:CaptionDefProto.offset_y)
   return offset_y_;
 }
 inline void CaptionDefProto::set_offset_y(::google::protobuf::int32 value) {
   set_has_offset_y();
   offset_y_ = value;
+  // @@protoc_insertion_point(field_set:CaptionDefProto.offset_y)
 }
 
 // -------------------------------------------------------------------
@@ -2451,6 +2629,7 @@ inline void CaptionRuleProto::clear_primary() {
   clear_has_primary();
 }
 inline const ::CaptionDefProto& CaptionRuleProto::primary() const {
+  // @@protoc_insertion_point(field_get:CaptionRuleProto.primary)
 #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
   return primary_ != NULL ? *primary_ : *default_instance().primary_;
 #else
@@ -2460,6 +2639,7 @@ inline const ::CaptionDefProto& CaptionRuleProto::primary() const {
 inline ::CaptionDefProto* CaptionRuleProto::mutable_primary() {
   set_has_primary();
   if (primary_ == NULL) primary_ = new ::CaptionDefProto;
+  // @@protoc_insertion_point(field_mutable:CaptionRuleProto.primary)
   return primary_;
 }
 inline ::CaptionDefProto* CaptionRuleProto::release_primary() {
@@ -2476,6 +2656,7 @@ inline void CaptionRuleProto::set_allocated_primary(::CaptionDefProto* primary)
   } else {
     clear_has_primary();
   }
+  // @@protoc_insertion_point(field_set_allocated:CaptionRuleProto.primary)
 }
 
 // optional .CaptionDefProto secondary = 2;
@@ -2493,6 +2674,7 @@ inline void CaptionRuleProto::clear_secondary() {
   clear_has_secondary();
 }
 inline const ::CaptionDefProto& CaptionRuleProto::secondary() const {
+  // @@protoc_insertion_point(field_get:CaptionRuleProto.secondary)
 #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
   return secondary_ != NULL ? *secondary_ : *default_instance().secondary_;
 #else
@@ -2502,6 +2684,7 @@ inline const ::CaptionDefProto& CaptionRuleProto::secondary() const {
 inline ::CaptionDefProto* CaptionRuleProto::mutable_secondary() {
   set_has_secondary();
   if (secondary_ == NULL) secondary_ = new ::CaptionDefProto;
+  // @@protoc_insertion_point(field_mutable:CaptionRuleProto.secondary)
   return secondary_;
 }
 inline ::CaptionDefProto* CaptionRuleProto::release_secondary() {
@@ -2518,6 +2701,7 @@ inline void CaptionRuleProto::set_allocated_secondary(::CaptionDefProto* seconda
   } else {
     clear_has_secondary();
   }
+  // @@protoc_insertion_point(field_set_allocated:CaptionRuleProto.secondary)
 }
 
 // required int32 priority = 3;
@@ -2535,11 +2719,13 @@ inline void CaptionRuleProto::clear_priority() {
   clear_has_priority();
 }
 inline ::google::protobuf::int32 CaptionRuleProto::priority() const {
+  // @@protoc_insertion_point(field_get:CaptionRuleProto.priority)
   return priority_;
 }
 inline void CaptionRuleProto::set_priority(::google::protobuf::int32 value) {
   set_has_priority();
   priority_ = value;
+  // @@protoc_insertion_point(field_set:CaptionRuleProto.priority)
 }
 
 // -------------------------------------------------------------------
@@ -2561,11 +2747,13 @@ inline void CircleRuleProto::clear_radius() {
   clear_has_radius();
 }
 inline double CircleRuleProto::radius() const {
+  // @@protoc_insertion_point(field_get:CircleRuleProto.radius)
   return radius_;
 }
 inline void CircleRuleProto::set_radius(double value) {
   set_has_radius();
   radius_ = value;
+  // @@protoc_insertion_point(field_set:CircleRuleProto.radius)
 }
 
 // required uint32 color = 2;
@@ -2583,11 +2771,13 @@ inline void CircleRuleProto::clear_color() {
   clear_has_color();
 }
 inline ::google::protobuf::uint32 CircleRuleProto::color() const {
+  // @@protoc_insertion_point(field_get:CircleRuleProto.color)
   return color_;
 }
 inline void CircleRuleProto::set_color(::google::protobuf::uint32 value) {
   set_has_color();
   color_ = value;
+  // @@protoc_insertion_point(field_set:CircleRuleProto.color)
 }
 
 // optional .LineDefProto border = 3;
@@ -2605,6 +2795,7 @@ inline void CircleRuleProto::clear_border() {
   clear_has_border();
 }
 inline const ::LineDefProto& CircleRuleProto::border() const {
+  // @@protoc_insertion_point(field_get:CircleRuleProto.border)
 #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
   return border_ != NULL ? *border_ : *default_instance().border_;
 #else
@@ -2614,6 +2805,7 @@ inline const ::LineDefProto& CircleRuleProto::border() const {
 inline ::LineDefProto* CircleRuleProto::mutable_border() {
   set_has_border();
   if (border_ == NULL) border_ = new ::LineDefProto;
+  // @@protoc_insertion_point(field_mutable:CircleRuleProto.border)
   return border_;
 }
 inline ::LineDefProto* CircleRuleProto::release_border() {
@@ -2630,6 +2822,7 @@ inline void CircleRuleProto::set_allocated_border(::LineDefProto* border) {
   } else {
     clear_has_border();
   }
+  // @@protoc_insertion_point(field_set_allocated:CircleRuleProto.border)
 }
 
 // required int32 priority = 4;
@@ -2647,11 +2840,13 @@ inline void CircleRuleProto::clear_priority() {
   clear_has_priority();
 }
 inline ::google::protobuf::int32 CircleRuleProto::priority() const {
+  // @@protoc_insertion_point(field_get:CircleRuleProto.priority)
   return priority_;
 }
 inline void CircleRuleProto::set_priority(::google::protobuf::int32 value) {
   set_has_priority();
   priority_ = value;
+  // @@protoc_insertion_point(field_set:CircleRuleProto.priority)
 }
 
 // -------------------------------------------------------------------
@@ -2673,6 +2868,7 @@ inline void PathTextRuleProto::clear_primary() {
   clear_has_primary();
 }
 inline const ::CaptionDefProto& PathTextRuleProto::primary() const {
+  // @@protoc_insertion_point(field_get:PathTextRuleProto.primary)
 #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
   return primary_ != NULL ? *primary_ : *default_instance().primary_;
 #else
@@ -2682,6 +2878,7 @@ inline const ::CaptionDefProto& PathTextRuleProto::primary() const {
 inline ::CaptionDefProto* PathTextRuleProto::mutable_primary() {
   set_has_primary();
   if (primary_ == NULL) primary_ = new ::CaptionDefProto;
+  // @@protoc_insertion_point(field_mutable:PathTextRuleProto.primary)
   return primary_;
 }
 inline ::CaptionDefProto* PathTextRuleProto::release_primary() {
@@ -2698,6 +2895,7 @@ inline void PathTextRuleProto::set_allocated_primary(::CaptionDefProto* primary)
   } else {
     clear_has_primary();
   }
+  // @@protoc_insertion_point(field_set_allocated:PathTextRuleProto.primary)
 }
 
 // optional .CaptionDefProto secondary = 2;
@@ -2715,6 +2913,7 @@ inline void PathTextRuleProto::clear_secondary() {
   clear_has_secondary();
 }
 inline const ::CaptionDefProto& PathTextRuleProto::secondary() const {
+  // @@protoc_insertion_point(field_get:PathTextRuleProto.secondary)
 #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
   return secondary_ != NULL ? *secondary_ : *default_instance().secondary_;
 #else
@@ -2724,6 +2923,7 @@ inline const ::CaptionDefProto& PathTextRuleProto::secondary() const {
 inline ::CaptionDefProto* PathTextRuleProto::mutable_secondary() {
   set_has_secondary();
   if (secondary_ == NULL) secondary_ = new ::CaptionDefProto;
+  // @@protoc_insertion_point(field_mutable:PathTextRuleProto.secondary)
   return secondary_;
 }
 inline ::CaptionDefProto* PathTextRuleProto::release_secondary() {
@@ -2740,6 +2940,7 @@ inline void PathTextRuleProto::set_allocated_secondary(::CaptionDefProto* second
   } else {
     clear_has_secondary();
   }
+  // @@protoc_insertion_point(field_set_allocated:PathTextRuleProto.secondary)
 }
 
 // required int32 priority = 3;
@@ -2757,11 +2958,13 @@ inline void PathTextRuleProto::clear_priority() {
   clear_has_priority();
 }
 inline ::google::protobuf::int32 PathTextRuleProto::priority() const {
+  // @@protoc_insertion_point(field_get:PathTextRuleProto.priority)
   return priority_;
 }
 inline void PathTextRuleProto::set_priority(::google::protobuf::int32 value) {
   set_has_priority();
   priority_ = value;
+  // @@protoc_insertion_point(field_set:PathTextRuleProto.priority)
 }
 
 // -------------------------------------------------------------------
@@ -2783,11 +2986,13 @@ inline void DrawElementProto::clear_scale() {
   clear_has_scale();
 }
 inline ::google::protobuf::int32 DrawElementProto::scale() const {
+  // @@protoc_insertion_point(field_get:DrawElementProto.scale)
   return scale_;
 }
 inline void DrawElementProto::set_scale(::google::protobuf::int32 value) {
   set_has_scale();
   scale_ = value;
+  // @@protoc_insertion_point(field_set:DrawElementProto.scale)
 }
 
 // repeated .LineRuleProto lines = 2;
@@ -2798,20 +3003,25 @@ inline void DrawElementProto::clear_lines() {
   lines_.Clear();
 }
 inline const ::LineRuleProto& DrawElementProto::lines(int index) const {
+  // @@protoc_insertion_point(field_get:DrawElementProto.lines)
   return lines_.Get(index);
 }
 inline ::LineRuleProto* DrawElementProto::mutable_lines(int index) {
+  // @@protoc_insertion_point(field_mutable:DrawElementProto.lines)
   return lines_.Mutable(index);
 }
 inline ::LineRuleProto* DrawElementProto::add_lines() {
+  // @@protoc_insertion_point(field_add:DrawElementProto.lines)
   return lines_.Add();
 }
 inline const ::google::protobuf::RepeatedPtrField< ::LineRuleProto >&
 DrawElementProto::lines() const {
+  // @@protoc_insertion_point(field_list:DrawElementProto.lines)
   return lines_;
 }
 inline ::google::protobuf::RepeatedPtrField< ::LineRuleProto >*
 DrawElementProto::mutable_lines() {
+  // @@protoc_insertion_point(field_mutable_list:DrawElementProto.lines)
   return &lines_;
 }
 
@@ -2830,6 +3040,7 @@ inline void DrawElementProto::clear_area() {
   clear_has_area();
 }
 inline const ::AreaRuleProto& DrawElementProto::area() const {
+  // @@protoc_insertion_point(field_get:DrawElementProto.area)
 #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
   return area_ != NULL ? *area_ : *default_instance().area_;
 #else
@@ -2839,6 +3050,7 @@ inline const ::AreaRuleProto& DrawElementProto::area() const {
 inline ::AreaRuleProto* DrawElementProto::mutable_area() {
   set_has_area();
   if (area_ == NULL) area_ = new ::AreaRuleProto;
+  // @@protoc_insertion_point(field_mutable:DrawElementProto.area)
   return area_;
 }
 inline ::AreaRuleProto* DrawElementProto::release_area() {
@@ -2855,6 +3067,7 @@ inline void DrawElementProto::set_allocated_area(::AreaRuleProto* area) {
   } else {
     clear_has_area();
   }
+  // @@protoc_insertion_point(field_set_allocated:DrawElementProto.area)
 }
 
 // optional .SymbolRuleProto symbol = 4;
@@ -2872,6 +3085,7 @@ inline void DrawElementProto::clear_symbol() {
   clear_has_symbol();
 }
 inline const ::SymbolRuleProto& DrawElementProto::symbol() const {
+  // @@protoc_insertion_point(field_get:DrawElementProto.symbol)
 #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
   return symbol_ != NULL ? *symbol_ : *default_instance().symbol_;
 #else
@@ -2881,6 +3095,7 @@ inline const ::SymbolRuleProto& DrawElementProto::symbol() const {
 inline ::SymbolRuleProto* DrawElementProto::mutable_symbol() {
   set_has_symbol();
   if (symbol_ == NULL) symbol_ = new ::SymbolRuleProto;
+  // @@protoc_insertion_point(field_mutable:DrawElementProto.symbol)
   return symbol_;
 }
 inline ::SymbolRuleProto* DrawElementProto::release_symbol() {
@@ -2897,6 +3112,7 @@ inline void DrawElementProto::set_allocated_symbol(::SymbolRuleProto* symbol) {
   } else {
     clear_has_symbol();
   }
+  // @@protoc_insertion_point(field_set_allocated:DrawElementProto.symbol)
 }
 
 // optional .CaptionRuleProto caption = 5;
@@ -2914,6 +3130,7 @@ inline void DrawElementProto::clear_caption() {
   clear_has_caption();
 }
 inline const ::CaptionRuleProto& DrawElementProto::caption() const {
+  // @@protoc_insertion_point(field_get:DrawElementProto.caption)
 #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
   return caption_ != NULL ? *caption_ : *default_instance().caption_;
 #else
@@ -2923,6 +3140,7 @@ inline const ::CaptionRuleProto& DrawElementProto::caption() const {
 inline ::CaptionRuleProto* DrawElementProto::mutable_caption() {
   set_has_caption();
   if (caption_ == NULL) caption_ = new ::CaptionRuleProto;
+  // @@protoc_insertion_point(field_mutable:DrawElementProto.caption)
   return caption_;
 }
 inline ::CaptionRuleProto* DrawElementProto::release_caption() {
@@ -2939,6 +3157,7 @@ inline void DrawElementProto::set_allocated_caption(::CaptionRuleProto* caption)
   } else {
     clear_has_caption();
   }
+  // @@protoc_insertion_point(field_set_allocated:DrawElementProto.caption)
 }
 
 // optional .CircleRuleProto circle = 6;
@@ -2956,6 +3175,7 @@ inline void DrawElementProto::clear_circle() {
   clear_has_circle();
 }
 inline const ::CircleRuleProto& DrawElementProto::circle() const {
+  // @@protoc_insertion_point(field_get:DrawElementProto.circle)
 #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
   return circle_ != NULL ? *circle_ : *default_instance().circle_;
 #else
@@ -2965,6 +3185,7 @@ inline const ::CircleRuleProto& DrawElementProto::circle() const {
 inline ::CircleRuleProto* DrawElementProto::mutable_circle() {
   set_has_circle();
   if (circle_ == NULL) circle_ = new ::CircleRuleProto;
+  // @@protoc_insertion_point(field_mutable:DrawElementProto.circle)
   return circle_;
 }
 inline ::CircleRuleProto* DrawElementProto::release_circle() {
@@ -2981,6 +3202,7 @@ inline void DrawElementProto::set_allocated_circle(::CircleRuleProto* circle) {
   } else {
     clear_has_circle();
   }
+  // @@protoc_insertion_point(field_set_allocated:DrawElementProto.circle)
 }
 
 // optional .PathTextRuleProto path_text = 7;
@@ -2998,6 +3220,7 @@ inline void DrawElementProto::clear_path_text() {
   clear_has_path_text();
 }
 inline const ::PathTextRuleProto& DrawElementProto::path_text() const {
+  // @@protoc_insertion_point(field_get:DrawElementProto.path_text)
 #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
   return path_text_ != NULL ? *path_text_ : *default_instance().path_text_;
 #else
@@ -3007,6 +3230,7 @@ inline const ::PathTextRuleProto& DrawElementProto::path_text() const {
 inline ::PathTextRuleProto* DrawElementProto::mutable_path_text() {
   set_has_path_text();
   if (path_text_ == NULL) path_text_ = new ::PathTextRuleProto;
+  // @@protoc_insertion_point(field_mutable:DrawElementProto.path_text)
   return path_text_;
 }
 inline ::PathTextRuleProto* DrawElementProto::release_path_text() {
@@ -3023,6 +3247,7 @@ inline void DrawElementProto::set_allocated_path_text(::PathTextRuleProto* path_
   } else {
     clear_has_path_text();
   }
+  // @@protoc_insertion_point(field_set_allocated:DrawElementProto.path_text)
 }
 
 // -------------------------------------------------------------------
@@ -3040,54 +3265,59 @@ inline void ClassifElementProto::clear_has_name() {
   _has_bits_[0] &= ~0x00000001u;
 }
 inline void ClassifElementProto::clear_name() {
-  if (name_ != &::google::protobuf::internal::kEmptyString) {
+  if (name_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
     name_->clear();
   }
   clear_has_name();
 }
 inline const ::std::string& ClassifElementProto::name() const {
+  // @@protoc_insertion_point(field_get:ClassifElementProto.name)
   return *name_;
 }
 inline void ClassifElementProto::set_name(const ::std::string& value) {
   set_has_name();
-  if (name_ == &::google::protobuf::internal::kEmptyString) {
+  if (name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
     name_ = new ::std::string;
   }
   name_->assign(value);
+  // @@protoc_insertion_point(field_set:ClassifElementProto.name)
 }
 inline void ClassifElementProto::set_name(const char* value) {
   set_has_name();
-  if (name_ == &::google::protobuf::internal::kEmptyString) {
+  if (name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
     name_ = new ::std::string;
   }
   name_->assign(value);
+  // @@protoc_insertion_point(field_set_char:ClassifElementProto.name)
 }
 inline void ClassifElementProto::set_name(const char* value, size_t size) {
   set_has_name();
-  if (name_ == &::google::protobuf::internal::kEmptyString) {
+  if (name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
     name_ = new ::std::string;
   }
   name_->assign(reinterpret_cast<const char*>(value), size);
+  // @@protoc_insertion_point(field_set_pointer:ClassifElementProto.name)
 }
 inline ::std::string* ClassifElementProto::mutable_name() {
   set_has_name();
-  if (name_ == &::google::protobuf::internal::kEmptyString) {
+  if (name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
     name_ = new ::std::string;
   }
+  // @@protoc_insertion_point(field_mutable:ClassifElementProto.name)
   return name_;
 }
 inline ::std::string* ClassifElementProto::release_name() {
   clear_has_name();
-  if (name_ == &::google::protobuf::internal::kEmptyString) {
+  if (name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
     return NULL;
   } else {
     ::std::string* temp = name_;
-    name_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
     return temp;
   }
 }
 inline void ClassifElementProto::set_allocated_name(::std::string* name) {
-  if (name_ != &::google::protobuf::internal::kEmptyString) {
+  if (name_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
     delete name_;
   }
   if (name) {
@@ -3095,8 +3325,9 @@ inline void ClassifElementProto::set_allocated_name(::std::string* name) {
     name_ = name;
   } else {
     clear_has_name();
-    name_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   }
+  // @@protoc_insertion_point(field_set_allocated:ClassifElementProto.name)
 }
 
 // repeated .DrawElementProto element = 2;
@@ -3107,20 +3338,25 @@ inline void ClassifElementProto::clear_element() {
   element_.Clear();
 }
 inline const ::DrawElementProto& ClassifElementProto::element(int index) const {
+  // @@protoc_insertion_point(field_get:ClassifElementProto.element)
   return element_.Get(index);
 }
 inline ::DrawElementProto* ClassifElementProto::mutable_element(int index) {
+  // @@protoc_insertion_point(field_mutable:ClassifElementProto.element)
   return element_.Mutable(index);
 }
 inline ::DrawElementProto* ClassifElementProto::add_element() {
+  // @@protoc_insertion_point(field_add:ClassifElementProto.element)
   return element_.Add();
 }
 inline const ::google::protobuf::RepeatedPtrField< ::DrawElementProto >&
 ClassifElementProto::element() const {
+  // @@protoc_insertion_point(field_list:ClassifElementProto.element)
   return element_;
 }
 inline ::google::protobuf::RepeatedPtrField< ::DrawElementProto >*
 ClassifElementProto::mutable_element() {
+  // @@protoc_insertion_point(field_mutable_list:ClassifElementProto.element)
   return &element_;
 }
 
@@ -3136,20 +3372,25 @@ inline void ContainerProto::clear_cont() {
   cont_.Clear();
 }
 inline const ::ClassifElementProto& ContainerProto::cont(int index) const {
+  // @@protoc_insertion_point(field_get:ContainerProto.cont)
   return cont_.Get(index);
 }
 inline ::ClassifElementProto* ContainerProto::mutable_cont(int index) {
+  // @@protoc_insertion_point(field_mutable:ContainerProto.cont)
   return cont_.Mutable(index);
 }
 inline ::ClassifElementProto* ContainerProto::add_cont() {
+  // @@protoc_insertion_point(field_add:ContainerProto.cont)
   return cont_.Add();
 }
 inline const ::google::protobuf::RepeatedPtrField< ::ClassifElementProto >&
 ContainerProto::cont() const {
+  // @@protoc_insertion_point(field_list:ContainerProto.cont)
   return cont_;
 }
 inline ::google::protobuf::RepeatedPtrField< ::ClassifElementProto >*
 ContainerProto::mutable_cont() {
+  // @@protoc_insertion_point(field_mutable_list:ContainerProto.cont)
   return &cont_;
 }