lite protobuf update

2 files changed, 162 insertions, 1661 deletions

diff --git a/indexer/drules_struct_lite.pb.cc b/indexer/drules_struct_lite.pb.cc
index 0d838d627e..5b4384e963 100644
--- a/indexer/drules_struct_lite.pb.cc
+++ b/indexer/drules_struct_lite.pb.cc
@@ -1,373 +1,29 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 
 #define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
-#include "drules_struct.pb.h"
+#include "drules_struct_lite.pb.h"
 
 #include <algorithm>
 
 #include <google/protobuf/stubs/once.h>
 #include <google/protobuf/io/coded_stream.h>
 #include <google/protobuf/wire_format_lite_inl.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
 // @@protoc_insertion_point(includes)
 
-namespace {
-
-const ::google::protobuf::Descriptor* DashDotProto_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  DashDotProto_reflection_ = NULL;
-const ::google::protobuf::Descriptor* PathSymProto_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  PathSymProto_reflection_ = NULL;
-const ::google::protobuf::Descriptor* LineRuleProto_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  LineRuleProto_reflection_ = NULL;
-const ::google::protobuf::Descriptor* LineDefProto_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  LineDefProto_reflection_ = NULL;
-const ::google::protobuf::Descriptor* AreaRuleProto_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  AreaRuleProto_reflection_ = NULL;
-const ::google::protobuf::Descriptor* SymbolRuleProto_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  SymbolRuleProto_reflection_ = NULL;
-const ::google::protobuf::Descriptor* CaptionDefProto_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  CaptionDefProto_reflection_ = NULL;
-const ::google::protobuf::Descriptor* CaptionRuleProto_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  CaptionRuleProto_reflection_ = NULL;
-const ::google::protobuf::Descriptor* CircleRuleProto_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  CircleRuleProto_reflection_ = NULL;
-const ::google::protobuf::Descriptor* PathTextRuleProto_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  PathTextRuleProto_reflection_ = NULL;
-const ::google::protobuf::Descriptor* DrawElementProto_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  DrawElementProto_reflection_ = NULL;
-const ::google::protobuf::Descriptor* ClassifElementProto_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  ClassifElementProto_reflection_ = NULL;
-const ::google::protobuf::Descriptor* ContainerProto_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  ContainerProto_reflection_ = NULL;
-const ::google::protobuf::EnumDescriptor* LineJoin_descriptor_ = NULL;
-const ::google::protobuf::EnumDescriptor* LineCap_descriptor_ = NULL;
-
-}  // namespace
-
-
-void protobuf_AssignDesc_drules_5fstruct_2eproto() {
-  protobuf_AddDesc_drules_5fstruct_2eproto();
-  const ::google::protobuf::FileDescriptor* file =
-    ::google::protobuf::DescriptorPool::generated_pool()->FindFileByName(
-      "drules_struct.proto");
-  GOOGLE_CHECK(file != NULL);
-  DashDotProto_descriptor_ = file->message_type(0);
-  static const int DashDotProto_offsets_[2] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DashDotProto, dd_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DashDotProto, offset_),
-  };
-  DashDotProto_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      DashDotProto_descriptor_,
-      DashDotProto::default_instance_,
-      DashDotProto_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DashDotProto, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DashDotProto, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(DashDotProto));
-  PathSymProto_descriptor_ = file->message_type(1);
-  static const int PathSymProto_offsets_[3] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PathSymProto, name_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PathSymProto, step_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PathSymProto, offset_),
-  };
-  PathSymProto_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      PathSymProto_descriptor_,
-      PathSymProto::default_instance_,
-      PathSymProto_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PathSymProto, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PathSymProto, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(PathSymProto));
-  LineRuleProto_descriptor_ = file->message_type(2);
-  static const int LineRuleProto_offsets_[7] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LineRuleProto, width_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LineRuleProto, color_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LineRuleProto, dashdot_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LineRuleProto, priority_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LineRuleProto, pathsym_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LineRuleProto, join_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LineRuleProto, cap_),
-  };
-  LineRuleProto_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      LineRuleProto_descriptor_,
-      LineRuleProto::default_instance_,
-      LineRuleProto_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LineRuleProto, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LineRuleProto, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(LineRuleProto));
-  LineDefProto_descriptor_ = file->message_type(3);
-  static const int LineDefProto_offsets_[6] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LineDefProto, width_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LineDefProto, color_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LineDefProto, dashdot_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LineDefProto, pathsym_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LineDefProto, join_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LineDefProto, cap_),
-  };
-  LineDefProto_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      LineDefProto_descriptor_,
-      LineDefProto::default_instance_,
-      LineDefProto_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LineDefProto, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LineDefProto, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(LineDefProto));
-  AreaRuleProto_descriptor_ = file->message_type(4);
-  static const int AreaRuleProto_offsets_[3] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AreaRuleProto, color_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AreaRuleProto, border_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AreaRuleProto, priority_),
-  };
-  AreaRuleProto_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      AreaRuleProto_descriptor_,
-      AreaRuleProto::default_instance_,
-      AreaRuleProto_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AreaRuleProto, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AreaRuleProto, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(AreaRuleProto));
-  SymbolRuleProto_descriptor_ = file->message_type(5);
-  static const int SymbolRuleProto_offsets_[3] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SymbolRuleProto, name_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SymbolRuleProto, apply_for_type_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SymbolRuleProto, priority_),
-  };
-  SymbolRuleProto_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      SymbolRuleProto_descriptor_,
-      SymbolRuleProto::default_instance_,
-      SymbolRuleProto_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SymbolRuleProto, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SymbolRuleProto, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(SymbolRuleProto));
-  CaptionDefProto_descriptor_ = file->message_type(6);
-  static const int CaptionDefProto_offsets_[5] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CaptionDefProto, height_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CaptionDefProto, color_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CaptionDefProto, stroke_color_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CaptionDefProto, offset_x_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CaptionDefProto, offset_y_),
-  };
-  CaptionDefProto_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      CaptionDefProto_descriptor_,
-      CaptionDefProto::default_instance_,
-      CaptionDefProto_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CaptionDefProto, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CaptionDefProto, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(CaptionDefProto));
-  CaptionRuleProto_descriptor_ = file->message_type(7);
-  static const int CaptionRuleProto_offsets_[3] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CaptionRuleProto, primary_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CaptionRuleProto, secondary_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CaptionRuleProto, priority_),
-  };
-  CaptionRuleProto_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      CaptionRuleProto_descriptor_,
-      CaptionRuleProto::default_instance_,
-      CaptionRuleProto_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CaptionRuleProto, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CaptionRuleProto, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(CaptionRuleProto));
-  CircleRuleProto_descriptor_ = file->message_type(8);
-  static const int CircleRuleProto_offsets_[4] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CircleRuleProto, radius_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CircleRuleProto, color_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CircleRuleProto, border_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CircleRuleProto, priority_),
-  };
-  CircleRuleProto_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      CircleRuleProto_descriptor_,
-      CircleRuleProto::default_instance_,
-      CircleRuleProto_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CircleRuleProto, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CircleRuleProto, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(CircleRuleProto));
-  PathTextRuleProto_descriptor_ = file->message_type(9);
-  static const int PathTextRuleProto_offsets_[3] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PathTextRuleProto, primary_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PathTextRuleProto, secondary_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PathTextRuleProto, priority_),
-  };
-  PathTextRuleProto_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      PathTextRuleProto_descriptor_,
-      PathTextRuleProto::default_instance_,
-      PathTextRuleProto_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PathTextRuleProto, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PathTextRuleProto, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(PathTextRuleProto));
-  DrawElementProto_descriptor_ = file->message_type(10);
-  static const int DrawElementProto_offsets_[7] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DrawElementProto, scale_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DrawElementProto, lines_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DrawElementProto, area_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DrawElementProto, symbol_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DrawElementProto, caption_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DrawElementProto, circle_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DrawElementProto, path_text_),
-  };
-  DrawElementProto_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      DrawElementProto_descriptor_,
-      DrawElementProto::default_instance_,
-      DrawElementProto_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DrawElementProto, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DrawElementProto, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(DrawElementProto));
-  ClassifElementProto_descriptor_ = file->message_type(11);
-  static const int ClassifElementProto_offsets_[2] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClassifElementProto, name_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClassifElementProto, element_),
-  };
-  ClassifElementProto_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      ClassifElementProto_descriptor_,
-      ClassifElementProto::default_instance_,
-      ClassifElementProto_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClassifElementProto, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClassifElementProto, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(ClassifElementProto));
-  ContainerProto_descriptor_ = file->message_type(12);
-  static const int ContainerProto_offsets_[1] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ContainerProto, cont_),
-  };
-  ContainerProto_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      ContainerProto_descriptor_,
-      ContainerProto::default_instance_,
-      ContainerProto_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ContainerProto, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ContainerProto, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(ContainerProto));
-  LineJoin_descriptor_ = file->enum_type(0);
-  LineCap_descriptor_ = file->enum_type(1);
-}
-
-namespace {
-
-GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_AssignDescriptors_once_);
-inline void protobuf_AssignDescriptorsOnce() {
-  ::google::protobuf::GoogleOnceInit(&protobuf_AssignDescriptors_once_,
-                 &protobuf_AssignDesc_drules_5fstruct_2eproto);
-}
-
-void protobuf_RegisterTypes(const ::std::string&) {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    DashDotProto_descriptor_, &DashDotProto::default_instance());
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    PathSymProto_descriptor_, &PathSymProto::default_instance());
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    LineRuleProto_descriptor_, &LineRuleProto::default_instance());
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    LineDefProto_descriptor_, &LineDefProto::default_instance());
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    AreaRuleProto_descriptor_, &AreaRuleProto::default_instance());
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    SymbolRuleProto_descriptor_, &SymbolRuleProto::default_instance());
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    CaptionDefProto_descriptor_, &CaptionDefProto::default_instance());
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    CaptionRuleProto_descriptor_, &CaptionRuleProto::default_instance());
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    CircleRuleProto_descriptor_, &CircleRuleProto::default_instance());
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    PathTextRuleProto_descriptor_, &PathTextRuleProto::default_instance());
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    DrawElementProto_descriptor_, &DrawElementProto::default_instance());
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    ClassifElementProto_descriptor_, &ClassifElementProto::default_instance());
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    ContainerProto_descriptor_, &ContainerProto::default_instance());
-}
-
-}  // namespace
-
 void protobuf_ShutdownFile_drules_5fstruct_2eproto() {
   delete DashDotProto::default_instance_;
-  delete DashDotProto_reflection_;
   delete PathSymProto::default_instance_;
-  delete PathSymProto_reflection_;
   delete LineRuleProto::default_instance_;
-  delete LineRuleProto_reflection_;
   delete LineDefProto::default_instance_;
-  delete LineDefProto_reflection_;
   delete AreaRuleProto::default_instance_;
-  delete AreaRuleProto_reflection_;
   delete SymbolRuleProto::default_instance_;
-  delete SymbolRuleProto_reflection_;
   delete CaptionDefProto::default_instance_;
-  delete CaptionDefProto_reflection_;
   delete CaptionRuleProto::default_instance_;
-  delete CaptionRuleProto_reflection_;
   delete CircleRuleProto::default_instance_;
-  delete CircleRuleProto_reflection_;
   delete PathTextRuleProto::default_instance_;
-  delete PathTextRuleProto_reflection_;
   delete DrawElementProto::default_instance_;
-  delete DrawElementProto_reflection_;
   delete ClassifElementProto::default_instance_;
-  delete ClassifElementProto_reflection_;
   delete ContainerProto::default_instance_;
-  delete ContainerProto_reflection_;
 }
 
 void protobuf_AddDesc_drules_5fstruct_2eproto() {
@@ -376,47 +32,6 @@ void protobuf_AddDesc_drules_5fstruct_2eproto() {
   already_here = true;
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-    "\n\023drules_struct.proto\"*\n\014DashDotProto\022\n\n"
-    "\002dd\030\001 \003(\001\022\016\n\006offset\030\002 \001(\001\":\n\014PathSymProt"
-    "o\022\014\n\004name\030\001 \002(\t\022\014\n\004step\030\002 \002(\001\022\016\n\006offset\030"
-    "\003 \001(\001\"\257\001\n\rLineRuleProto\022\r\n\005width\030\001 \002(\001\022\r"
-    "\n\005color\030\002 \002(\r\022\036\n\007dashdot\030\003 \001(\0132\r.DashDot"
-    "Proto\022\020\n\010priority\030\004 \002(\005\022\036\n\007pathsym\030\005 \001(\013"
-    "2\r.PathSymProto\022\027\n\004join\030\006 \001(\0162\t.LineJoin"
-    "\022\025\n\003cap\030\007 \001(\0162\010.LineCap\"\234\001\n\014LineDefProto"
-    "\022\r\n\005width\030\001 \002(\001\022\r\n\005color\030\002 \002(\r\022\036\n\007dashdo"
-    "t\030\003 \001(\0132\r.DashDotProto\022\036\n\007pathsym\030\004 \001(\0132"
-    "\r.PathSymProto\022\027\n\004join\030\006 \001(\0162\t.LineJoin\022"
-    "\025\n\003cap\030\007 \001(\0162\010.LineCap\"O\n\rAreaRuleProto\022"
-    "\r\n\005color\030\001 \002(\r\022\035\n\006border\030\002 \001(\0132\r.LineDef"
-    "Proto\022\020\n\010priority\030\003 \002(\005\"I\n\017SymbolRulePro"
-    "to\022\014\n\004name\030\001 \002(\t\022\026\n\016apply_for_type\030\002 \001(\005"
-    "\022\020\n\010priority\030\003 \002(\005\"j\n\017CaptionDefProto\022\016\n"
-    "\006height\030\001 \002(\005\022\r\n\005color\030\002 \002(\r\022\024\n\014stroke_c"
-    "olor\030\003 \001(\r\022\020\n\010offset_x\030\004 \001(\005\022\020\n\010offset_y"
-    "\030\005 \001(\005\"l\n\020CaptionRuleProto\022!\n\007primary\030\001 "
-    "\002(\0132\020.CaptionDefProto\022#\n\tsecondary\030\002 \001(\013"
-    "2\020.CaptionDefProto\022\020\n\010priority\030\003 \002(\005\"a\n\017"
-    "CircleRuleProto\022\016\n\006radius\030\001 \002(\001\022\r\n\005color"
-    "\030\002 \002(\r\022\035\n\006border\030\003 \001(\0132\r.LineDefProto\022\020\n"
-    "\010priority\030\004 \002(\005\"m\n\021PathTextRuleProto\022!\n\007"
-    "primary\030\001 \002(\0132\020.CaptionDefProto\022#\n\tsecon"
-    "dary\030\002 \001(\0132\020.CaptionDefProto\022\020\n\010priority"
-    "\030\003 \002(\005\"\355\001\n\020DrawElementProto\022\r\n\005scale\030\001 \002"
-    "(\005\022\035\n\005lines\030\002 \003(\0132\016.LineRuleProto\022\034\n\004are"
-    "a\030\003 \001(\0132\016.AreaRuleProto\022 \n\006symbol\030\004 \001(\0132"
-    "\020.SymbolRuleProto\022\"\n\007caption\030\005 \001(\0132\021.Cap"
-    "tionRuleProto\022 \n\006circle\030\006 \001(\0132\020.CircleRu"
-    "leProto\022%\n\tpath_text\030\007 \001(\0132\022.PathTextRul"
-    "eProto\"G\n\023ClassifElementProto\022\014\n\004name\030\001 "
-    "\002(\t\022\"\n\007element\030\002 \003(\0132\021.DrawElementProto\""
-    "4\n\016ContainerProto\022\"\n\004cont\030\001 \003(\0132\024.Classi"
-    "fElementProto*4\n\010LineJoin\022\r\n\tROUNDJOIN\020\000"
-    "\022\r\n\tBEVELJOIN\020\001\022\n\n\006NOJOIN\020\002*3\n\007LineCap\022\014"
-    "\n\010ROUNDCAP\020\000\022\013\n\007BUTTCAP\020\001\022\r\n\tSQUARECAP\020\002", 1520);
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
-    "drules_struct.proto", &protobuf_RegisterTypes);
   DashDotProto::default_instance_ = new DashDotProto();
   PathSymProto::default_instance_ = new PathSymProto();
   LineRuleProto::default_instance_ = new LineRuleProto();
@@ -453,10 +68,6 @@ struct StaticDescriptorInitializer_drules_5fstruct_2eproto {
   }
 } static_descriptor_initializer_drules_5fstruct_2eproto_;
 
-const ::google::protobuf::EnumDescriptor* LineJoin_descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return LineJoin_descriptor_;
-}
 bool LineJoin_IsValid(int value) {
   switch(value) {
     case 0:
@@ -468,10 +79,6 @@ bool LineJoin_IsValid(int value) {
   }
 }
 
-const ::google::protobuf::EnumDescriptor* LineCap_descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return LineCap_descriptor_;
-}
 bool LineCap_IsValid(int value) {
   switch(value) {
     case 0:
@@ -492,7 +99,7 @@ const int DashDotProto::kOffsetFieldNumber;
 #endif  // !_MSC_VER
 
 DashDotProto::DashDotProto()
-  : ::google::protobuf::Message() {
+  : ::google::protobuf::MessageLite() {
   SharedCtor();
 }
 
@@ -500,7 +107,7 @@ void DashDotProto::InitAsDefaultInstance() {
 }
 
 DashDotProto::DashDotProto(const DashDotProto& from)
-  : ::google::protobuf::Message() {
+  : ::google::protobuf::MessageLite() {
   SharedCtor();
   MergeFrom(from);
 }
@@ -525,11 +132,6 @@ void DashDotProto::SetCachedSize(int size) const {
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* DashDotProto::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return DashDotProto_descriptor_;
-}
-
 const DashDotProto& DashDotProto::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto();  return *default_instance_;
 }
@@ -546,7 +148,6 @@ void DashDotProto::Clear() {
   }
   dd_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
 }
 
 bool DashDotProto::MergePartialFromCodedStream(
@@ -599,8 +200,7 @@ bool DashDotProto::MergePartialFromCodedStream(
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
           return true;
         }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
+        DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag));
         break;
       }
     }
@@ -622,30 +222,6 @@ void DashDotProto::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteDouble(2, this->offset(), output);
   }
   
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-}
-
-::google::protobuf::uint8* DashDotProto::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // repeated double dd = 1;
-  for (int i = 0; i < this->dd_size(); i++) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteDoubleToArray(1, this->dd(i), target);
-  }
-  
-  // optional double offset = 2;
-  if (has_offset()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(2, this->offset(), target);
-  }
-  
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  return target;
 }
 
 int DashDotProto::ByteSize() const {
@@ -665,27 +241,15 @@ int DashDotProto::ByteSize() const {
     total_size += 1 * this->dd_size() + data_size;
   }
   
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = total_size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
   return total_size;
 }
 
-void DashDotProto::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const DashDotProto* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const DashDotProto*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
+void DashDotProto::CheckTypeAndMergeFrom(
+    const ::google::protobuf::MessageLite& from) {
+  MergeFrom(*::google::protobuf::down_cast<const DashDotProto*>(&from));
 }
 
 void DashDotProto::MergeFrom(const DashDotProto& from) {
@@ -696,13 +260,6 @@ void DashDotProto::MergeFrom(const DashDotProto& from) {
       set_offset(from.offset());
     }
   }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void DashDotProto::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
 }
 
 void DashDotProto::CopyFrom(const DashDotProto& from) {
@@ -721,17 +278,12 @@ void DashDotProto::Swap(DashDotProto* other) {
     dd_.Swap(&other->dd_);
     std::swap(offset_, other->offset_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata DashDotProto::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = DashDotProto_descriptor_;
-  metadata.reflection = DashDotProto_reflection_;
-  return metadata;
+::std::string DashDotProto::GetTypeName() const {
+  return "DashDotProto";
 }
 
 
@@ -744,7 +296,7 @@ const int PathSymProto::kOffsetFieldNumber;
 #endif  // !_MSC_VER
 
 PathSymProto::PathSymProto()
-  : ::google::protobuf::Message() {
+  : ::google::protobuf::MessageLite() {
   SharedCtor();
 }
 
@@ -752,7 +304,7 @@ void PathSymProto::InitAsDefaultInstance() {
 }
 
 PathSymProto::PathSymProto(const PathSymProto& from)
-  : ::google::protobuf::Message() {
+  : ::google::protobuf::MessageLite() {
   SharedCtor();
   MergeFrom(from);
 }
@@ -782,11 +334,6 @@ void PathSymProto::SetCachedSize(int size) const {
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* PathSymProto::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return PathSymProto_descriptor_;
-}
-
 const PathSymProto& PathSymProto::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto();  return *default_instance_;
 }
@@ -808,7 +355,6 @@ void PathSymProto::Clear() {
     offset_ = 0;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
 }
 
 bool PathSymProto::MergePartialFromCodedStream(
@@ -823,9 +369,6 @@ bool PathSymProto::MergePartialFromCodedStream(
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadString(
                 input, this->mutable_name()));
-          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-            this->name().data(), this->name().length(),
-            ::google::protobuf::internal::WireFormat::PARSE);
         } else {
           goto handle_uninterpreted;
         }
@@ -871,8 +414,7 @@ bool PathSymProto::MergePartialFromCodedStream(
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
           return true;
         }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
+        DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag));
         break;
       }
     }
@@ -885,9 +427,6 @@ void PathSymProto::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required string name = 1;
   if (has_name()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->name().data(), this->name().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
     ::google::protobuf::internal::WireFormatLite::WriteString(
       1, this->name(), output);
   }
@@ -902,39 +441,6 @@ void PathSymProto::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteDouble(3, this->offset(), output);
   }
   
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-}
-
-::google::protobuf::uint8* PathSymProto::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // required string name = 1;
-  if (has_name()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->name().data(), this->name().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        1, this->name(), target);
-  }
-  
-  // required double step = 2;
-  if (has_step()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(2, this->step(), target);
-  }
-  
-  // optional double offset = 3;
-  if (has_offset()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(3, this->offset(), target);
-  }
-  
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  return target;
 }
 
 int PathSymProto::ByteSize() const {
@@ -959,27 +465,15 @@ int PathSymProto::ByteSize() const {
     }
     
   }
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = total_size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
   return total_size;
 }
 
-void PathSymProto::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const PathSymProto* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const PathSymProto*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
+void PathSymProto::CheckTypeAndMergeFrom(
+    const ::google::protobuf::MessageLite& from) {
+  MergeFrom(*::google::protobuf::down_cast<const PathSymProto*>(&from));
 }
 
 void PathSymProto::MergeFrom(const PathSymProto& from) {
@@ -995,13 +489,6 @@ void PathSymProto::MergeFrom(const PathSymProto& from) {
       set_offset(from.offset());
     }
   }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void PathSymProto::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
 }
 
 void PathSymProto::CopyFrom(const PathSymProto& from) {
@@ -1022,17 +509,12 @@ void PathSymProto::Swap(PathSymProto* other) {
     std::swap(step_, other->step_);
     std::swap(offset_, other->offset_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata PathSymProto::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = PathSymProto_descriptor_;
-  metadata.reflection = PathSymProto_reflection_;
-  return metadata;
+::std::string PathSymProto::GetTypeName() const {
+  return "PathSymProto";
 }
 
 
@@ -1049,7 +531,7 @@ const int LineRuleProto::kCapFieldNumber;
 #endif  // !_MSC_VER
 
 LineRuleProto::LineRuleProto()
-  : ::google::protobuf::Message() {
+  : ::google::protobuf::MessageLite() {
   SharedCtor();
 }
 
@@ -1059,7 +541,7 @@ void LineRuleProto::InitAsDefaultInstance() {
 }
 
 LineRuleProto::LineRuleProto(const LineRuleProto& from)
-  : ::google::protobuf::Message() {
+  : ::google::protobuf::MessageLite() {
   SharedCtor();
   MergeFrom(from);
 }
@@ -1092,11 +574,6 @@ void LineRuleProto::SetCachedSize(int size) const {
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* LineRuleProto::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return LineRuleProto_descriptor_;
-}
-
 const LineRuleProto& LineRuleProto::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto();  return *default_instance_;
 }
@@ -1122,7 +599,6 @@ void LineRuleProto::Clear() {
     cap_ = 0;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
 }
 
 bool LineRuleProto::MergePartialFromCodedStream(
@@ -1217,8 +693,6 @@ bool LineRuleProto::MergePartialFromCodedStream(
                  input, &value)));
           if (LineJoin_IsValid(value)) {
             set_join(static_cast< LineJoin >(value));
-          } else {
-            mutable_unknown_fields()->AddVarint(6, value);
           }
         } else {
           goto handle_uninterpreted;
@@ -1238,8 +712,6 @@ bool LineRuleProto::MergePartialFromCodedStream(
                  input, &value)));
           if (LineCap_IsValid(value)) {
             set_cap(static_cast< LineCap >(value));
-          } else {
-            mutable_unknown_fields()->AddVarint(7, value);
           }
         } else {
           goto handle_uninterpreted;
@@ -1254,8 +726,7 @@ bool LineRuleProto::MergePartialFromCodedStream(
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
           return true;
         }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
+        DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag));
         break;
       }
     }
@@ -1278,7 +749,7 @@ void LineRuleProto::SerializeWithCachedSizes(
   
   // optional .DashDotProto dashdot = 3;
   if (has_dashdot()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+    ::google::protobuf::internal::WireFormatLite::WriteMessage(
       3, this->dashdot(), output);
   }
   
@@ -1289,7 +760,7 @@ void LineRuleProto::SerializeWithCachedSizes(
   
   // optional .PathSymProto pathsym = 5;
   if (has_pathsym()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+    ::google::protobuf::internal::WireFormatLite::WriteMessage(
       5, this->pathsym(), output);
   }
   
@@ -1305,60 +776,6 @@ void LineRuleProto::SerializeWithCachedSizes(
       7, this->cap(), output);
   }
   
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-}
-
-::google::protobuf::uint8* LineRuleProto::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // required double width = 1;
-  if (has_width()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(1, this->width(), target);
-  }
-  
-  // required uint32 color = 2;
-  if (has_color()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->color(), target);
-  }
-  
-  // optional .DashDotProto dashdot = 3;
-  if (has_dashdot()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        3, this->dashdot(), target);
-  }
-  
-  // required int32 priority = 4;
-  if (has_priority()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(4, this->priority(), target);
-  }
-  
-  // optional .PathSymProto pathsym = 5;
-  if (has_pathsym()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        5, this->pathsym(), target);
-  }
-  
-  // optional .LineJoin join = 6;
-  if (has_join()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      6, this->join(), target);
-  }
-  
-  // optional .LineCap cap = 7;
-  if (has_cap()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      7, this->cap(), target);
-  }
-  
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  return target;
 }
 
 int LineRuleProto::ByteSize() const {
@@ -1411,27 +828,15 @@ int LineRuleProto::ByteSize() const {
     }
     
   }
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = total_size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
   return total_size;
 }
 
-void LineRuleProto::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const LineRuleProto* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const LineRuleProto*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
+void LineRuleProto::CheckTypeAndMergeFrom(
+    const ::google::protobuf::MessageLite& from) {
+  MergeFrom(*::google::protobuf::down_cast<const LineRuleProto*>(&from));
 }
 
 void LineRuleProto::MergeFrom(const LineRuleProto& from) {
@@ -1459,13 +864,6 @@ void LineRuleProto::MergeFrom(const LineRuleProto& from) {
       set_cap(from.cap());
     }
   }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void LineRuleProto::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
 }
 
 void LineRuleProto::CopyFrom(const LineRuleProto& from) {
@@ -1493,17 +891,12 @@ void LineRuleProto::Swap(LineRuleProto* other) {
     std::swap(join_, other->join_);
     std::swap(cap_, other->cap_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata LineRuleProto::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = LineRuleProto_descriptor_;
-  metadata.reflection = LineRuleProto_reflection_;
-  return metadata;
+::std::string LineRuleProto::GetTypeName() const {
+  return "LineRuleProto";
 }
 
 
@@ -1519,7 +912,7 @@ const int LineDefProto::kCapFieldNumber;
 #endif  // !_MSC_VER
 
 LineDefProto::LineDefProto()
-  : ::google::protobuf::Message() {
+  : ::google::protobuf::MessageLite() {
   SharedCtor();
 }
 
@@ -1529,7 +922,7 @@ void LineDefProto::InitAsDefaultInstance() {
 }
 
 LineDefProto::LineDefProto(const LineDefProto& from)
-  : ::google::protobuf::Message() {
+  : ::google::protobuf::MessageLite() {
   SharedCtor();
   MergeFrom(from);
 }
@@ -1561,11 +954,6 @@ void LineDefProto::SetCachedSize(int size) const {
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* LineDefProto::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return LineDefProto_descriptor_;
-}
-
 const LineDefProto& LineDefProto::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto();  return *default_instance_;
 }
@@ -1590,7 +978,6 @@ void LineDefProto::Clear() {
     cap_ = 0;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
 }
 
 bool LineDefProto::MergePartialFromCodedStream(
@@ -1669,8 +1056,6 @@ bool LineDefProto::MergePartialFromCodedStream(
                  input, &value)));
           if (LineJoin_IsValid(value)) {
             set_join(static_cast< LineJoin >(value));
-          } else {
-            mutable_unknown_fields()->AddVarint(6, value);
           }
         } else {
           goto handle_uninterpreted;
@@ -1690,8 +1075,6 @@ bool LineDefProto::MergePartialFromCodedStream(
                  input, &value)));
           if (LineCap_IsValid(value)) {
             set_cap(static_cast< LineCap >(value));
-          } else {
-            mutable_unknown_fields()->AddVarint(7, value);
           }
         } else {
           goto handle_uninterpreted;
@@ -1706,8 +1089,7 @@ bool LineDefProto::MergePartialFromCodedStream(
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
           return true;
         }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
+        DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag));
         break;
       }
     }
@@ -1730,13 +1112,13 @@ void LineDefProto::SerializeWithCachedSizes(
   
   // optional .DashDotProto dashdot = 3;
   if (has_dashdot()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+    ::google::protobuf::internal::WireFormatLite::WriteMessage(
       3, this->dashdot(), output);
   }
   
   // optional .PathSymProto pathsym = 4;
   if (has_pathsym()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+    ::google::protobuf::internal::WireFormatLite::WriteMessage(
       4, this->pathsym(), output);
   }
   
@@ -1752,55 +1134,6 @@ void LineDefProto::SerializeWithCachedSizes(
       7, this->cap(), output);
   }
   
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-}
-
-::google::protobuf::uint8* LineDefProto::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // required double width = 1;
-  if (has_width()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(1, this->width(), target);
-  }
-  
-  // required uint32 color = 2;
-  if (has_color()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->color(), target);
-  }
-  
-  // optional .DashDotProto dashdot = 3;
-  if (has_dashdot()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        3, this->dashdot(), target);
-  }
-  
-  // optional .PathSymProto pathsym = 4;
-  if (has_pathsym()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        4, this->pathsym(), target);
-  }
-  
-  // optional .LineJoin join = 6;
-  if (has_join()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      6, this->join(), target);
-  }
-  
-  // optional .LineCap cap = 7;
-  if (has_cap()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      7, this->cap(), target);
-  }
-  
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  return target;
 }
 
 int LineDefProto::ByteSize() const {
@@ -1846,27 +1179,15 @@ int LineDefProto::ByteSize() const {
     }
     
   }
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = total_size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
   return total_size;
 }
 
-void LineDefProto::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const LineDefProto* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const LineDefProto*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
+void LineDefProto::CheckTypeAndMergeFrom(
+    const ::google::protobuf::MessageLite& from) {
+  MergeFrom(*::google::protobuf::down_cast<const LineDefProto*>(&from));
 }
 
 void LineDefProto::MergeFrom(const LineDefProto& from) {
@@ -1891,13 +1212,6 @@ void LineDefProto::MergeFrom(const LineDefProto& from) {
       set_cap(from.cap());
     }
   }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void LineDefProto::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
 }
 
 void LineDefProto::CopyFrom(const LineDefProto& from) {
@@ -1924,17 +1238,12 @@ void LineDefProto::Swap(LineDefProto* other) {
     std::swap(join_, other->join_);
     std::swap(cap_, other->cap_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata LineDefProto::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = LineDefProto_descriptor_;
-  metadata.reflection = LineDefProto_reflection_;
-  return metadata;
+::std::string LineDefProto::GetTypeName() const {
+  return "LineDefProto";
 }
 
 
@@ -1947,7 +1256,7 @@ const int AreaRuleProto::kPriorityFieldNumber;
 #endif  // !_MSC_VER
 
 AreaRuleProto::AreaRuleProto()
-  : ::google::protobuf::Message() {
+  : ::google::protobuf::MessageLite() {
   SharedCtor();
 }
 
@@ -1956,7 +1265,7 @@ void AreaRuleProto::InitAsDefaultInstance() {
 }
 
 AreaRuleProto::AreaRuleProto(const AreaRuleProto& from)
-  : ::google::protobuf::Message() {
+  : ::google::protobuf::MessageLite() {
   SharedCtor();
   MergeFrom(from);
 }
@@ -1984,11 +1293,6 @@ void AreaRuleProto::SetCachedSize(int size) const {
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* AreaRuleProto::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return AreaRuleProto_descriptor_;
-}
-
 const AreaRuleProto& AreaRuleProto::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto();  return *default_instance_;
 }
@@ -2008,7 +1312,6 @@ void AreaRuleProto::Clear() {
     priority_ = 0;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
 }
 
 bool AreaRuleProto::MergePartialFromCodedStream(
@@ -2068,8 +1371,7 @@ bool AreaRuleProto::MergePartialFromCodedStream(
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
           return true;
         }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
+        DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag));
         break;
       }
     }
@@ -2087,7 +1389,7 @@ void AreaRuleProto::SerializeWithCachedSizes(
   
   // optional .LineDefProto border = 2;
   if (has_border()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+    ::google::protobuf::internal::WireFormatLite::WriteMessage(
       2, this->border(), output);
   }
   
@@ -2096,36 +1398,6 @@ void AreaRuleProto::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteInt32(3, this->priority(), output);
   }
   
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-}
-
-::google::protobuf::uint8* AreaRuleProto::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // required uint32 color = 1;
-  if (has_color()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(1, this->color(), target);
-  }
-  
-  // optional .LineDefProto border = 2;
-  if (has_border()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        2, this->border(), target);
-  }
-  
-  // required int32 priority = 3;
-  if (has_priority()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(3, this->priority(), target);
-  }
-  
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  return target;
 }
 
 int AreaRuleProto::ByteSize() const {
@@ -2154,27 +1426,15 @@ int AreaRuleProto::ByteSize() const {
     }
     
   }
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = total_size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
   return total_size;
 }
 
-void AreaRuleProto::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const AreaRuleProto* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const AreaRuleProto*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
+void AreaRuleProto::CheckTypeAndMergeFrom(
+    const ::google::protobuf::MessageLite& from) {
+  MergeFrom(*::google::protobuf::down_cast<const AreaRuleProto*>(&from));
 }
 
 void AreaRuleProto::MergeFrom(const AreaRuleProto& from) {
@@ -2190,13 +1450,6 @@ void AreaRuleProto::MergeFrom(const AreaRuleProto& from) {
       set_priority(from.priority());
     }
   }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void AreaRuleProto::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
 }
 
 void AreaRuleProto::CopyFrom(const AreaRuleProto& from) {
@@ -2220,17 +1473,12 @@ void AreaRuleProto::Swap(AreaRuleProto* other) {
     std::swap(border_, other->border_);
     std::swap(priority_, other->priority_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata AreaRuleProto::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = AreaRuleProto_descriptor_;
-  metadata.reflection = AreaRuleProto_reflection_;
-  return metadata;
+::std::string AreaRuleProto::GetTypeName() const {
+  return "AreaRuleProto";
 }
 
 
@@ -2243,7 +1491,7 @@ const int SymbolRuleProto::kPriorityFieldNumber;
 #endif  // !_MSC_VER
 
 SymbolRuleProto::SymbolRuleProto()
-  : ::google::protobuf::Message() {
+  : ::google::protobuf::MessageLite() {
   SharedCtor();
 }
 
@@ -2251,7 +1499,7 @@ void SymbolRuleProto::InitAsDefaultInstance() {
 }
 
 SymbolRuleProto::SymbolRuleProto(const SymbolRuleProto& from)
-  : ::google::protobuf::Message() {
+  : ::google::protobuf::MessageLite() {
   SharedCtor();
   MergeFrom(from);
 }
@@ -2281,11 +1529,6 @@ void SymbolRuleProto::SetCachedSize(int size) const {
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* SymbolRuleProto::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return SymbolRuleProto_descriptor_;
-}
-
 const SymbolRuleProto& SymbolRuleProto::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto();  return *default_instance_;
 }
@@ -2307,7 +1550,6 @@ void SymbolRuleProto::Clear() {
     priority_ = 0;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
 }
 
 bool SymbolRuleProto::MergePartialFromCodedStream(
@@ -2322,9 +1564,6 @@ bool SymbolRuleProto::MergePartialFromCodedStream(
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadString(
                 input, this->mutable_name()));
-          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-            this->name().data(), this->name().length(),
-            ::google::protobuf::internal::WireFormat::PARSE);
         } else {
           goto handle_uninterpreted;
         }
@@ -2370,8 +1609,7 @@ bool SymbolRuleProto::MergePartialFromCodedStream(
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
           return true;
         }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
+        DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag));
         break;
       }
     }
@@ -2384,9 +1622,6 @@ void SymbolRuleProto::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required string name = 1;
   if (has_name()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->name().data(), this->name().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
     ::google::protobuf::internal::WireFormatLite::WriteString(
       1, this->name(), output);
   }
@@ -2401,39 +1636,6 @@ void SymbolRuleProto::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteInt32(3, this->priority(), output);
   }
   
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-}
-
-::google::protobuf::uint8* SymbolRuleProto::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // required string name = 1;
-  if (has_name()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->name().data(), this->name().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        1, this->name(), target);
-  }
-  
-  // optional int32 apply_for_type = 2;
-  if (has_apply_for_type()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(2, this->apply_for_type(), target);
-  }
-  
-  // required int32 priority = 3;
-  if (has_priority()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(3, this->priority(), target);
-  }
-  
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  return target;
 }
 
 int SymbolRuleProto::ByteSize() const {
@@ -2462,27 +1664,15 @@ int SymbolRuleProto::ByteSize() const {
     }
     
   }
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = total_size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
   return total_size;
 }
 
-void SymbolRuleProto::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const SymbolRuleProto* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const SymbolRuleProto*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
+void SymbolRuleProto::CheckTypeAndMergeFrom(
+    const ::google::protobuf::MessageLite& from) {
+  MergeFrom(*::google::protobuf::down_cast<const SymbolRuleProto*>(&from));
 }
 
 void SymbolRuleProto::MergeFrom(const SymbolRuleProto& from) {
@@ -2498,13 +1688,6 @@ void SymbolRuleProto::MergeFrom(const SymbolRuleProto& from) {
       set_priority(from.priority());
     }
   }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void SymbolRuleProto::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
 }
 
 void SymbolRuleProto::CopyFrom(const SymbolRuleProto& from) {
@@ -2525,17 +1708,12 @@ void SymbolRuleProto::Swap(SymbolRuleProto* other) {
     std::swap(apply_for_type_, other->apply_for_type_);
     std::swap(priority_, other->priority_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata SymbolRuleProto::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = SymbolRuleProto_descriptor_;
-  metadata.reflection = SymbolRuleProto_reflection_;
-  return metadata;
+::std::string SymbolRuleProto::GetTypeName() const {
+  return "SymbolRuleProto";
 }
 
 
@@ -2550,7 +1728,7 @@ const int CaptionDefProto::kOffsetYFieldNumber;
 #endif  // !_MSC_VER
 
 CaptionDefProto::CaptionDefProto()
-  : ::google::protobuf::Message() {
+  : ::google::protobuf::MessageLite() {
   SharedCtor();
 }
 
@@ -2558,7 +1736,7 @@ void CaptionDefProto::InitAsDefaultInstance() {
 }
 
 CaptionDefProto::CaptionDefProto(const CaptionDefProto& from)
-  : ::google::protobuf::Message() {
+  : ::google::protobuf::MessageLite() {
   SharedCtor();
   MergeFrom(from);
 }
@@ -2587,11 +1765,6 @@ void CaptionDefProto::SetCachedSize(int size) const {
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CaptionDefProto::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return CaptionDefProto_descriptor_;
-}
-
 const CaptionDefProto& CaptionDefProto::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto();  return *default_instance_;
 }
@@ -2611,7 +1784,6 @@ void CaptionDefProto::Clear() {
     offset_y_ = 0;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
 }
 
 bool CaptionDefProto::MergePartialFromCodedStream(
@@ -2705,8 +1877,7 @@ bool CaptionDefProto::MergePartialFromCodedStream(
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
           return true;
         }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
+        DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag));
         break;
       }
     }
@@ -2742,44 +1913,6 @@ void CaptionDefProto::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteInt32(5, this->offset_y(), output);
   }
   
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-}
-
-::google::protobuf::uint8* CaptionDefProto::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // required int32 height = 1;
-  if (has_height()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->height(), target);
-  }
-  
-  // required uint32 color = 2;
-  if (has_color()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->color(), target);
-  }
-  
-  // optional uint32 stroke_color = 3;
-  if (has_stroke_color()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->stroke_color(), target);
-  }
-  
-  // optional int32 offset_x = 4;
-  if (has_offset_x()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(4, this->offset_x(), target);
-  }
-  
-  // optional int32 offset_y = 5;
-  if (has_offset_y()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(5, this->offset_y(), target);
-  }
-  
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  return target;
 }
 
 int CaptionDefProto::ByteSize() const {
@@ -2822,27 +1955,15 @@ int CaptionDefProto::ByteSize() const {
     }
     
   }
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = total_size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
   return total_size;
 }
 
-void CaptionDefProto::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const CaptionDefProto* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CaptionDefProto*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
+void CaptionDefProto::CheckTypeAndMergeFrom(
+    const ::google::protobuf::MessageLite& from) {
+  MergeFrom(*::google::protobuf::down_cast<const CaptionDefProto*>(&from));
 }
 
 void CaptionDefProto::MergeFrom(const CaptionDefProto& from) {
@@ -2864,13 +1985,6 @@ void CaptionDefProto::MergeFrom(const CaptionDefProto& from) {
       set_offset_y(from.offset_y());
     }
   }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void CaptionDefProto::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
 }
 
 void CaptionDefProto::CopyFrom(const CaptionDefProto& from) {
@@ -2893,17 +2007,12 @@ void CaptionDefProto::Swap(CaptionDefProto* other) {
     std::swap(offset_x_, other->offset_x_);
     std::swap(offset_y_, other->offset_y_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CaptionDefProto::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CaptionDefProto_descriptor_;
-  metadata.reflection = CaptionDefProto_reflection_;
-  return metadata;
+::std::string CaptionDefProto::GetTypeName() const {
+  return "CaptionDefProto";
 }
 
 
@@ -2916,7 +2025,7 @@ const int CaptionRuleProto::kPriorityFieldNumber;
 #endif  // !_MSC_VER
 
 CaptionRuleProto::CaptionRuleProto()
-  : ::google::protobuf::Message() {
+  : ::google::protobuf::MessageLite() {
   SharedCtor();
 }
 
@@ -2926,7 +2035,7 @@ void CaptionRuleProto::InitAsDefaultInstance() {
 }
 
 CaptionRuleProto::CaptionRuleProto(const CaptionRuleProto& from)
-  : ::google::protobuf::Message() {
+  : ::google::protobuf::MessageLite() {
   SharedCtor();
   MergeFrom(from);
 }
@@ -2955,11 +2064,6 @@ void CaptionRuleProto::SetCachedSize(int size) const {
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CaptionRuleProto::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return CaptionRuleProto_descriptor_;
-}
-
 const CaptionRuleProto& CaptionRuleProto::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto();  return *default_instance_;
 }
@@ -2981,7 +2085,6 @@ void CaptionRuleProto::Clear() {
     priority_ = 0;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
 }
 
 bool CaptionRuleProto::MergePartialFromCodedStream(
@@ -3039,8 +2142,7 @@ bool CaptionRuleProto::MergePartialFromCodedStream(
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
           return true;
         }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
+        DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag));
         break;
       }
     }
@@ -3053,13 +2155,13 @@ void CaptionRuleProto::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .CaptionDefProto primary = 1;
   if (has_primary()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+    ::google::protobuf::internal::WireFormatLite::WriteMessage(
       1, this->primary(), output);
   }
   
   // optional .CaptionDefProto secondary = 2;
   if (has_secondary()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+    ::google::protobuf::internal::WireFormatLite::WriteMessage(
       2, this->secondary(), output);
   }
   
@@ -3068,38 +2170,6 @@ void CaptionRuleProto::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteInt32(3, this->priority(), output);
   }
   
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-}
-
-::google::protobuf::uint8* CaptionRuleProto::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // required .CaptionDefProto primary = 1;
-  if (has_primary()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        1, this->primary(), target);
-  }
-  
-  // optional .CaptionDefProto secondary = 2;
-  if (has_secondary()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        2, this->secondary(), target);
-  }
-  
-  // required int32 priority = 3;
-  if (has_priority()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(3, this->priority(), target);
-  }
-  
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  return target;
 }
 
 int CaptionRuleProto::ByteSize() const {
@@ -3128,27 +2198,15 @@ int CaptionRuleProto::ByteSize() const {
     }
     
   }
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = total_size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
   return total_size;
 }
 
-void CaptionRuleProto::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const CaptionRuleProto* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CaptionRuleProto*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
+void CaptionRuleProto::CheckTypeAndMergeFrom(
+    const ::google::protobuf::MessageLite& from) {
+  MergeFrom(*::google::protobuf::down_cast<const CaptionRuleProto*>(&from));
 }
 
 void CaptionRuleProto::MergeFrom(const CaptionRuleProto& from) {
@@ -3164,13 +2222,6 @@ void CaptionRuleProto::MergeFrom(const CaptionRuleProto& from) {
       set_priority(from.priority());
     }
   }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void CaptionRuleProto::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
 }
 
 void CaptionRuleProto::CopyFrom(const CaptionRuleProto& from) {
@@ -3197,17 +2248,12 @@ void CaptionRuleProto::Swap(CaptionRuleProto* other) {
     std::swap(secondary_, other->secondary_);
     std::swap(priority_, other->priority_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CaptionRuleProto::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CaptionRuleProto_descriptor_;
-  metadata.reflection = CaptionRuleProto_reflection_;
-  return metadata;
+::std::string CaptionRuleProto::GetTypeName() const {
+  return "CaptionRuleProto";
 }
 
 
@@ -3221,7 +2267,7 @@ const int CircleRuleProto::kPriorityFieldNumber;
 #endif  // !_MSC_VER
 
 CircleRuleProto::CircleRuleProto()
-  : ::google::protobuf::Message() {
+  : ::google::protobuf::MessageLite() {
   SharedCtor();
 }
 
@@ -3230,7 +2276,7 @@ void CircleRuleProto::InitAsDefaultInstance() {
 }
 
 CircleRuleProto::CircleRuleProto(const CircleRuleProto& from)
-  : ::google::protobuf::Message() {
+  : ::google::protobuf::MessageLite() {
   SharedCtor();
   MergeFrom(from);
 }
@@ -3259,11 +2305,6 @@ void CircleRuleProto::SetCachedSize(int size) const {
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CircleRuleProto::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return CircleRuleProto_descriptor_;
-}
-
 const CircleRuleProto& CircleRuleProto::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto();  return *default_instance_;
 }
@@ -3284,7 +2325,6 @@ void CircleRuleProto::Clear() {
     priority_ = 0;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
 }
 
 bool CircleRuleProto::MergePartialFromCodedStream(
@@ -3360,8 +2400,7 @@ bool CircleRuleProto::MergePartialFromCodedStream(
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
           return true;
         }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
+        DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag));
         break;
       }
     }
@@ -3384,7 +2423,7 @@ void CircleRuleProto::SerializeWithCachedSizes(
   
   // optional .LineDefProto border = 3;
   if (has_border()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+    ::google::protobuf::internal::WireFormatLite::WriteMessage(
       3, this->border(), output);
   }
   
@@ -3393,41 +2432,6 @@ void CircleRuleProto::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteInt32(4, this->priority(), output);
   }
   
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-}
-
-::google::protobuf::uint8* CircleRuleProto::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // required double radius = 1;
-  if (has_radius()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(1, this->radius(), target);
-  }
-  
-  // required uint32 color = 2;
-  if (has_color()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->color(), target);
-  }
-  
-  // optional .LineDefProto border = 3;
-  if (has_border()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        3, this->border(), target);
-  }
-  
-  // required int32 priority = 4;
-  if (has_priority()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(4, this->priority(), target);
-  }
-  
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  return target;
 }
 
 int CircleRuleProto::ByteSize() const {
@@ -3461,27 +2465,15 @@ int CircleRuleProto::ByteSize() const {
     }
     
   }
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = total_size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
   return total_size;
 }
 
-void CircleRuleProto::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const CircleRuleProto* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CircleRuleProto*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
+void CircleRuleProto::CheckTypeAndMergeFrom(
+    const ::google::protobuf::MessageLite& from) {
+  MergeFrom(*::google::protobuf::down_cast<const CircleRuleProto*>(&from));
 }
 
 void CircleRuleProto::MergeFrom(const CircleRuleProto& from) {
@@ -3500,13 +2492,6 @@ void CircleRuleProto::MergeFrom(const CircleRuleProto& from) {
       set_priority(from.priority());
     }
   }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void CircleRuleProto::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
 }
 
 void CircleRuleProto::CopyFrom(const CircleRuleProto& from) {
@@ -3531,17 +2516,12 @@ void CircleRuleProto::Swap(CircleRuleProto* other) {
     std::swap(border_, other->border_);
     std::swap(priority_, other->priority_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CircleRuleProto::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CircleRuleProto_descriptor_;
-  metadata.reflection = CircleRuleProto_reflection_;
-  return metadata;
+::std::string CircleRuleProto::GetTypeName() const {
+  return "CircleRuleProto";
 }
 
 
@@ -3554,7 +2534,7 @@ const int PathTextRuleProto::kPriorityFieldNumber;
 #endif  // !_MSC_VER
 
 PathTextRuleProto::PathTextRuleProto()
-  : ::google::protobuf::Message() {
+  : ::google::protobuf::MessageLite() {
   SharedCtor();
 }
 
@@ -3564,7 +2544,7 @@ void PathTextRuleProto::InitAsDefaultInstance() {
 }
 
 PathTextRuleProto::PathTextRuleProto(const PathTextRuleProto& from)
-  : ::google::protobuf::Message() {
+  : ::google::protobuf::MessageLite() {
   SharedCtor();
   MergeFrom(from);
 }
@@ -3593,11 +2573,6 @@ void PathTextRuleProto::SetCachedSize(int size) const {
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* PathTextRuleProto::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return PathTextRuleProto_descriptor_;
-}
-
 const PathTextRuleProto& PathTextRuleProto::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto();  return *default_instance_;
 }
@@ -3619,7 +2594,6 @@ void PathTextRuleProto::Clear() {
     priority_ = 0;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
 }
 
 bool PathTextRuleProto::MergePartialFromCodedStream(
@@ -3677,8 +2651,7 @@ bool PathTextRuleProto::MergePartialFromCodedStream(
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
           return true;
         }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
+        DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag));
         break;
       }
     }
@@ -3691,13 +2664,13 @@ void PathTextRuleProto::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .CaptionDefProto primary = 1;
   if (has_primary()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+    ::google::protobuf::internal::WireFormatLite::WriteMessage(
       1, this->primary(), output);
   }
   
   // optional .CaptionDefProto secondary = 2;
   if (has_secondary()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+    ::google::protobuf::internal::WireFormatLite::WriteMessage(
       2, this->secondary(), output);
   }
   
@@ -3706,38 +2679,6 @@ void PathTextRuleProto::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteInt32(3, this->priority(), output);
   }
   
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-}
-
-::google::protobuf::uint8* PathTextRuleProto::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // required .CaptionDefProto primary = 1;
-  if (has_primary()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        1, this->primary(), target);
-  }
-  
-  // optional .CaptionDefProto secondary = 2;
-  if (has_secondary()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        2, this->secondary(), target);
-  }
-  
-  // required int32 priority = 3;
-  if (has_priority()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(3, this->priority(), target);
-  }
-  
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  return target;
 }
 
 int PathTextRuleProto::ByteSize() const {
@@ -3766,27 +2707,15 @@ int PathTextRuleProto::ByteSize() const {
     }
     
   }
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = total_size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
   return total_size;
 }
 
-void PathTextRuleProto::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const PathTextRuleProto* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const PathTextRuleProto*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
+void PathTextRuleProto::CheckTypeAndMergeFrom(
+    const ::google::protobuf::MessageLite& from) {
+  MergeFrom(*::google::protobuf::down_cast<const PathTextRuleProto*>(&from));
 }
 
 void PathTextRuleProto::MergeFrom(const PathTextRuleProto& from) {
@@ -3802,13 +2731,6 @@ void PathTextRuleProto::MergeFrom(const PathTextRuleProto& from) {
       set_priority(from.priority());
     }
   }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void PathTextRuleProto::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
 }
 
 void PathTextRuleProto::CopyFrom(const PathTextRuleProto& from) {
@@ -3835,17 +2757,12 @@ void PathTextRuleProto::Swap(PathTextRuleProto* other) {
     std::swap(secondary_, other->secondary_);
     std::swap(priority_, other->priority_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata PathTextRuleProto::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = PathTextRuleProto_descriptor_;
-  metadata.reflection = PathTextRuleProto_reflection_;
-  return metadata;
+::std::string PathTextRuleProto::GetTypeName() const {
+  return "PathTextRuleProto";
 }
 
 
@@ -3862,7 +2779,7 @@ const int DrawElementProto::kPathTextFieldNumber;
 #endif  // !_MSC_VER
 
 DrawElementProto::DrawElementProto()
-  : ::google::protobuf::Message() {
+  : ::google::protobuf::MessageLite() {
   SharedCtor();
 }
 
@@ -3875,7 +2792,7 @@ void DrawElementProto::InitAsDefaultInstance() {
 }
 
 DrawElementProto::DrawElementProto(const DrawElementProto& from)
-  : ::google::protobuf::Message() {
+  : ::google::protobuf::MessageLite() {
   SharedCtor();
   MergeFrom(from);
 }
@@ -3910,11 +2827,6 @@ void DrawElementProto::SetCachedSize(int size) const {
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* DrawElementProto::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return DrawElementProto_descriptor_;
-}
-
 const DrawElementProto& DrawElementProto::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto();  return *default_instance_;
 }
@@ -3946,7 +2858,6 @@ void DrawElementProto::Clear() {
   }
   lines_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
 }
 
 bool DrawElementProto::MergePartialFromCodedStream(
@@ -4061,8 +2972,7 @@ bool DrawElementProto::MergePartialFromCodedStream(
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
           return true;
         }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
+        DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag));
         break;
       }
     }
@@ -4080,100 +2990,40 @@ void DrawElementProto::SerializeWithCachedSizes(
   
   // repeated .LineRuleProto lines = 2;
   for (int i = 0; i < this->lines_size(); i++) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+    ::google::protobuf::internal::WireFormatLite::WriteMessage(
       2, this->lines(i), output);
   }
   
   // optional .AreaRuleProto area = 3;
   if (has_area()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+    ::google::protobuf::internal::WireFormatLite::WriteMessage(
       3, this->area(), output);
   }
   
   // optional .SymbolRuleProto symbol = 4;
   if (has_symbol()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+    ::google::protobuf::internal::WireFormatLite::WriteMessage(
       4, this->symbol(), output);
   }
   
   // optional .CaptionRuleProto caption = 5;
   if (has_caption()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+    ::google::protobuf::internal::WireFormatLite::WriteMessage(
       5, this->caption(), output);
   }
   
   // optional .CircleRuleProto circle = 6;
   if (has_circle()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+    ::google::protobuf::internal::WireFormatLite::WriteMessage(
       6, this->circle(), output);
   }
   
   // optional .PathTextRuleProto path_text = 7;
   if (has_path_text()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+    ::google::protobuf::internal::WireFormatLite::WriteMessage(
       7, this->path_text(), output);
   }
   
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-}
-
-::google::protobuf::uint8* DrawElementProto::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // required int32 scale = 1;
-  if (has_scale()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->scale(), target);
-  }
-  
-  // repeated .LineRuleProto lines = 2;
-  for (int i = 0; i < this->lines_size(); i++) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        2, this->lines(i), target);
-  }
-  
-  // optional .AreaRuleProto area = 3;
-  if (has_area()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        3, this->area(), target);
-  }
-  
-  // optional .SymbolRuleProto symbol = 4;
-  if (has_symbol()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        4, this->symbol(), target);
-  }
-  
-  // optional .CaptionRuleProto caption = 5;
-  if (has_caption()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        5, this->caption(), target);
-  }
-  
-  // optional .CircleRuleProto circle = 6;
-  if (has_circle()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        6, this->circle(), target);
-  }
-  
-  // optional .PathTextRuleProto path_text = 7;
-  if (has_path_text()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        7, this->path_text(), target);
-  }
-  
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  return target;
 }
 
 int DrawElementProto::ByteSize() const {
@@ -4231,27 +3081,15 @@ int DrawElementProto::ByteSize() const {
         this->lines(i));
   }
   
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = total_size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
   return total_size;
 }
 
-void DrawElementProto::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const DrawElementProto* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const DrawElementProto*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
+void DrawElementProto::CheckTypeAndMergeFrom(
+    const ::google::protobuf::MessageLite& from) {
+  MergeFrom(*::google::protobuf::down_cast<const DrawElementProto*>(&from));
 }
 
 void DrawElementProto::MergeFrom(const DrawElementProto& from) {
@@ -4277,13 +3115,6 @@ void DrawElementProto::MergeFrom(const DrawElementProto& from) {
       mutable_path_text()->::PathTextRuleProto::MergeFrom(from.path_text());
     }
   }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void DrawElementProto::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
 }
 
 void DrawElementProto::CopyFrom(const DrawElementProto& from) {
@@ -4326,17 +3157,12 @@ void DrawElementProto::Swap(DrawElementProto* other) {
     std::swap(circle_, other->circle_);
     std::swap(path_text_, other->path_text_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata DrawElementProto::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = DrawElementProto_descriptor_;
-  metadata.reflection = DrawElementProto_reflection_;
-  return metadata;
+::std::string DrawElementProto::GetTypeName() const {
+  return "DrawElementProto";
 }
 
 
@@ -4348,7 +3174,7 @@ const int ClassifElementProto::kElementFieldNumber;
 #endif  // !_MSC_VER
 
 ClassifElementProto::ClassifElementProto()
-  : ::google::protobuf::Message() {
+  : ::google::protobuf::MessageLite() {
   SharedCtor();
 }
 
@@ -4356,7 +3182,7 @@ void ClassifElementProto::InitAsDefaultInstance() {
 }
 
 ClassifElementProto::ClassifElementProto(const ClassifElementProto& from)
-  : ::google::protobuf::Message() {
+  : ::google::protobuf::MessageLite() {
   SharedCtor();
   MergeFrom(from);
 }
@@ -4384,11 +3210,6 @@ void ClassifElementProto::SetCachedSize(int size) const {
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* ClassifElementProto::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return ClassifElementProto_descriptor_;
-}
-
 const ClassifElementProto& ClassifElementProto::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto();  return *default_instance_;
 }
@@ -4409,7 +3230,6 @@ void ClassifElementProto::Clear() {
   }
   element_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
 }
 
 bool ClassifElementProto::MergePartialFromCodedStream(
@@ -4424,9 +3244,6 @@ bool ClassifElementProto::MergePartialFromCodedStream(
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadString(
                 input, this->mutable_name()));
-          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-            this->name().data(), this->name().length(),
-            ::google::protobuf::internal::WireFormat::PARSE);
         } else {
           goto handle_uninterpreted;
         }
@@ -4455,8 +3272,7 @@ bool ClassifElementProto::MergePartialFromCodedStream(
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
           return true;
         }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
+        DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag));
         break;
       }
     }
@@ -4469,49 +3285,16 @@ void ClassifElementProto::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required string name = 1;
   if (has_name()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->name().data(), this->name().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
     ::google::protobuf::internal::WireFormatLite::WriteString(
       1, this->name(), output);
   }
   
   // repeated .DrawElementProto element = 2;
   for (int i = 0; i < this->element_size(); i++) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+    ::google::protobuf::internal::WireFormatLite::WriteMessage(
       2, this->element(i), output);
   }
   
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-}
-
-::google::protobuf::uint8* ClassifElementProto::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // required string name = 1;
-  if (has_name()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->name().data(), this->name().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        1, this->name(), target);
-  }
-  
-  // repeated .DrawElementProto element = 2;
-  for (int i = 0; i < this->element_size(); i++) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        2, this->element(i), target);
-  }
-  
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  return target;
 }
 
 int ClassifElementProto::ByteSize() const {
@@ -4534,27 +3317,15 @@ int ClassifElementProto::ByteSize() const {
         this->element(i));
   }
   
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = total_size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
   return total_size;
 }
 
-void ClassifElementProto::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const ClassifElementProto* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const ClassifElementProto*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
+void ClassifElementProto::CheckTypeAndMergeFrom(
+    const ::google::protobuf::MessageLite& from) {
+  MergeFrom(*::google::protobuf::down_cast<const ClassifElementProto*>(&from));
 }
 
 void ClassifElementProto::MergeFrom(const ClassifElementProto& from) {
@@ -4565,13 +3336,6 @@ void ClassifElementProto::MergeFrom(const ClassifElementProto& from) {
       set_name(from.name());
     }
   }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void ClassifElementProto::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
 }
 
 void ClassifElementProto::CopyFrom(const ClassifElementProto& from) {
@@ -4594,17 +3358,12 @@ void ClassifElementProto::Swap(ClassifElementProto* other) {
     std::swap(name_, other->name_);
     element_.Swap(&other->element_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata ClassifElementProto::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = ClassifElementProto_descriptor_;
-  metadata.reflection = ClassifElementProto_reflection_;
-  return metadata;
+::std::string ClassifElementProto::GetTypeName() const {
+  return "ClassifElementProto";
 }
 
 
@@ -4615,7 +3374,7 @@ const int ContainerProto::kContFieldNumber;
 #endif  // !_MSC_VER
 
 ContainerProto::ContainerProto()
-  : ::google::protobuf::Message() {
+  : ::google::protobuf::MessageLite() {
   SharedCtor();
 }
 
@@ -4623,7 +3382,7 @@ void ContainerProto::InitAsDefaultInstance() {
 }
 
 ContainerProto::ContainerProto(const ContainerProto& from)
-  : ::google::protobuf::Message() {
+  : ::google::protobuf::MessageLite() {
   SharedCtor();
   MergeFrom(from);
 }
@@ -4647,11 +3406,6 @@ void ContainerProto::SetCachedSize(int size) const {
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* ContainerProto::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return ContainerProto_descriptor_;
-}
-
 const ContainerProto& ContainerProto::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto();  return *default_instance_;
 }
@@ -4665,7 +3419,6 @@ ContainerProto* ContainerProto::New() const {
 void ContainerProto::Clear() {
   cont_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
 }
 
 bool ContainerProto::MergePartialFromCodedStream(
@@ -4695,8 +3448,7 @@ bool ContainerProto::MergePartialFromCodedStream(
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
           return true;
         }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
+        DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag));
         break;
       }
     }
@@ -4709,30 +3461,10 @@ void ContainerProto::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // repeated .ClassifElementProto cont = 1;
   for (int i = 0; i < this->cont_size(); i++) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+    ::google::protobuf::internal::WireFormatLite::WriteMessage(
       1, this->cont(i), output);
   }
   
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-}
-
-::google::protobuf::uint8* ContainerProto::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // repeated .ClassifElementProto cont = 1;
-  for (int i = 0; i < this->cont_size(); i++) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        1, this->cont(i), target);
-  }
-  
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  return target;
 }
 
 int ContainerProto::ByteSize() const {
@@ -4746,39 +3478,20 @@ int ContainerProto::ByteSize() const {
         this->cont(i));
   }
   
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = total_size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
   return total_size;
 }
 
-void ContainerProto::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const ContainerProto* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const ContainerProto*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
+void ContainerProto::CheckTypeAndMergeFrom(
+    const ::google::protobuf::MessageLite& from) {
+  MergeFrom(*::google::protobuf::down_cast<const ContainerProto*>(&from));
 }
 
 void ContainerProto::MergeFrom(const ContainerProto& from) {
   GOOGLE_CHECK_NE(&from, this);
   cont_.MergeFrom(from.cont_);
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void ContainerProto::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
 }
 
 void ContainerProto::CopyFrom(const ContainerProto& from) {
@@ -4799,17 +3512,12 @@ void ContainerProto::Swap(ContainerProto* other) {
   if (other != this) {
     cont_.Swap(&other->cont_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata ContainerProto::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = ContainerProto_descriptor_;
-  metadata.reflection = ContainerProto_reflection_;
-  return metadata;
+::std::string ContainerProto::GetTypeName() const {
+  return "ContainerProto";
 }
 
 
diff --git a/indexer/drules_struct_lite.pb.h b/indexer/drules_struct_lite.pb.h
index 8e87a63e21..7e83cd45f1 100644
--- a/indexer/drules_struct_lite.pb.h
+++ b/indexer/drules_struct_lite.pb.h
@@ -22,7 +22,6 @@
 #include <google/protobuf/generated_message_util.h>
 #include <google/protobuf/repeated_field.h>
 #include <google/protobuf/extension_set.h>
-#include <google/protobuf/generated_message_reflection.h>
 // @@protoc_insertion_point(includes)
 
 // Internal implementation detail -- do not call these.
@@ -54,16 +53,6 @@ const LineJoin LineJoin_MIN = ROUNDJOIN;
 const LineJoin LineJoin_MAX = NOJOIN;
 const int LineJoin_ARRAYSIZE = LineJoin_MAX + 1;
 
-const ::google::protobuf::EnumDescriptor* LineJoin_descriptor();
-inline const ::std::string& LineJoin_Name(LineJoin value) {
-  return ::google::protobuf::internal::NameOfEnum(
-    LineJoin_descriptor(), value);
-}
-inline bool LineJoin_Parse(
-    const ::std::string& name, LineJoin* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<LineJoin>(
-    LineJoin_descriptor(), name, value);
-}
 enum LineCap {
   ROUNDCAP = 0,
   BUTTCAP = 1,
@@ -74,19 +63,9 @@ const LineCap LineCap_MIN = ROUNDCAP;
 const LineCap LineCap_MAX = SQUARECAP;
 const int LineCap_ARRAYSIZE = LineCap_MAX + 1;
 
-const ::google::protobuf::EnumDescriptor* LineCap_descriptor();
-inline const ::std::string& LineCap_Name(LineCap value) {
-  return ::google::protobuf::internal::NameOfEnum(
-    LineCap_descriptor(), value);
-}
-inline bool LineCap_Parse(
-    const ::std::string& name, LineCap* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<LineCap>(
-    LineCap_descriptor(), name, value);
-}
 // ===================================================================
 
-class DashDotProto : public ::google::protobuf::Message {
+class DashDotProto : public ::google::protobuf::MessageLite {
  public:
   DashDotProto();
   virtual ~DashDotProto();
@@ -98,15 +77,6 @@ class DashDotProto : public ::google::protobuf::Message {
     return *this;
   }
   
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
-  }
-  
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
-  }
-  
-  static const ::google::protobuf::Descriptor* descriptor();
   static const DashDotProto& default_instance();
   
   void Swap(DashDotProto* other);
@@ -114,8 +84,7 @@ class DashDotProto : public ::google::protobuf::Message {
   // implements Message ----------------------------------------------
   
   DashDotProto* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
+  void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from);
   void CopyFrom(const DashDotProto& from);
   void MergeFrom(const DashDotProto& from);
   void Clear();
@@ -126,7 +95,6 @@ class DashDotProto : public ::google::protobuf::Message {
       ::google::protobuf::io::CodedInputStream* input);
   void SerializeWithCachedSizes(
       ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
   int GetCachedSize() const { return _cached_size_; }
   private:
   void SharedCtor();
@@ -134,7 +102,7 @@ class DashDotProto : public ::google::protobuf::Message {
   void SetCachedSize(int size) const;
   public:
   
-  ::google::protobuf::Metadata GetMetadata() const;
+  ::std::string GetTypeName() const;
   
   // nested types ----------------------------------------------------
   
@@ -164,8 +132,6 @@ class DashDotProto : public ::google::protobuf::Message {
   inline void set_has_offset();
   inline void clear_has_offset();
   
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-  
   ::google::protobuf::RepeatedField< double > dd_;
   double offset_;
   
@@ -181,7 +147,7 @@ class DashDotProto : public ::google::protobuf::Message {
 };
 // -------------------------------------------------------------------
 
-class PathSymProto : public ::google::protobuf::Message {
+class PathSymProto : public ::google::protobuf::MessageLite {
  public:
   PathSymProto();
   virtual ~PathSymProto();
@@ -193,15 +159,6 @@ class PathSymProto : public ::google::protobuf::Message {
     return *this;
   }
   
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
-  }
-  
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
-  }
-  
-  static const ::google::protobuf::Descriptor* descriptor();
   static const PathSymProto& default_instance();
   
   void Swap(PathSymProto* other);
@@ -209,8 +166,7 @@ class PathSymProto : public ::google::protobuf::Message {
   // implements Message ----------------------------------------------
   
   PathSymProto* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
+  void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from);
   void CopyFrom(const PathSymProto& from);
   void MergeFrom(const PathSymProto& from);
   void Clear();
@@ -221,7 +177,6 @@ class PathSymProto : public ::google::protobuf::Message {
       ::google::protobuf::io::CodedInputStream* input);
   void SerializeWithCachedSizes(
       ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
   int GetCachedSize() const { return _cached_size_; }
   private:
   void SharedCtor();
@@ -229,7 +184,7 @@ class PathSymProto : public ::google::protobuf::Message {
   void SetCachedSize(int size) const;
   public:
   
-  ::google::protobuf::Metadata GetMetadata() const;
+  ::std::string GetTypeName() const;
   
   // nested types ----------------------------------------------------
   
@@ -269,8 +224,6 @@ class PathSymProto : public ::google::protobuf::Message {
   inline void set_has_offset();
   inline void clear_has_offset();
   
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-  
   ::std::string* name_;
   double step_;
   double offset_;
@@ -287,7 +240,7 @@ class PathSymProto : public ::google::protobuf::Message {
 };
 // -------------------------------------------------------------------
 
-class LineRuleProto : public ::google::protobuf::Message {
+class LineRuleProto : public ::google::protobuf::MessageLite {
  public:
   LineRuleProto();
   virtual ~LineRuleProto();
@@ -299,15 +252,6 @@ class LineRuleProto : public ::google::protobuf::Message {
     return *this;
   }
   
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
-  }
-  
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
-  }
-  
-  static const ::google::protobuf::Descriptor* descriptor();
   static const LineRuleProto& default_instance();
   
   void Swap(LineRuleProto* other);
@@ -315,8 +259,7 @@ class LineRuleProto : public ::google::protobuf::Message {
   // implements Message ----------------------------------------------
   
   LineRuleProto* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
+  void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from);
   void CopyFrom(const LineRuleProto& from);
   void MergeFrom(const LineRuleProto& from);
   void Clear();
@@ -327,7 +270,6 @@ class LineRuleProto : public ::google::protobuf::Message {
       ::google::protobuf::io::CodedInputStream* input);
   void SerializeWithCachedSizes(
       ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
   int GetCachedSize() const { return _cached_size_; }
   private:
   void SharedCtor();
@@ -335,7 +277,7 @@ class LineRuleProto : public ::google::protobuf::Message {
   void SetCachedSize(int size) const;
   public:
   
-  ::google::protobuf::Metadata GetMetadata() const;
+  ::std::string GetTypeName() const;
   
   // nested types ----------------------------------------------------
   
@@ -409,8 +351,6 @@ class LineRuleProto : public ::google::protobuf::Message {
   inline void set_has_cap();
   inline void clear_has_cap();
   
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-  
   double width_;
   ::DashDotProto* dashdot_;
   ::google::protobuf::uint32 color_;
@@ -431,7 +371,7 @@ class LineRuleProto : public ::google::protobuf::Message {
 };
 // -------------------------------------------------------------------
 
-class LineDefProto : public ::google::protobuf::Message {
+class LineDefProto : public ::google::protobuf::MessageLite {
  public:
   LineDefProto();
   virtual ~LineDefProto();
@@ -443,15 +383,6 @@ class LineDefProto : public ::google::protobuf::Message {
     return *this;
   }
   
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
-  }
-  
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
-  }
-  
-  static const ::google::protobuf::Descriptor* descriptor();
   static const LineDefProto& default_instance();
   
   void Swap(LineDefProto* other);
@@ -459,8 +390,7 @@ class LineDefProto : public ::google::protobuf::Message {
   // implements Message ----------------------------------------------
   
   LineDefProto* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
+  void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from);
   void CopyFrom(const LineDefProto& from);
   void MergeFrom(const LineDefProto& from);
   void Clear();
@@ -471,7 +401,6 @@ class LineDefProto : public ::google::protobuf::Message {
       ::google::protobuf::io::CodedInputStream* input);
   void SerializeWithCachedSizes(
       ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
   int GetCachedSize() const { return _cached_size_; }
   private:
   void SharedCtor();
@@ -479,7 +408,7 @@ class LineDefProto : public ::google::protobuf::Message {
   void SetCachedSize(int size) const;
   public:
   
-  ::google::protobuf::Metadata GetMetadata() const;
+  ::std::string GetTypeName() const;
   
   // nested types ----------------------------------------------------
   
@@ -544,8 +473,6 @@ class LineDefProto : public ::google::protobuf::Message {
   inline void set_has_cap();
   inline void clear_has_cap();
   
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-  
   double width_;
   ::DashDotProto* dashdot_;
   ::google::protobuf::uint32 color_;
@@ -565,7 +492,7 @@ class LineDefProto : public ::google::protobuf::Message {
 };
 // -------------------------------------------------------------------
 
-class AreaRuleProto : public ::google::protobuf::Message {
+class AreaRuleProto : public ::google::protobuf::MessageLite {
  public:
   AreaRuleProto();
   virtual ~AreaRuleProto();
@@ -577,15 +504,6 @@ class AreaRuleProto : public ::google::protobuf::Message {
     return *this;
   }
   
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
-  }
-  
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
-  }
-  
-  static const ::google::protobuf::Descriptor* descriptor();
   static const AreaRuleProto& default_instance();
   
   void Swap(AreaRuleProto* other);
@@ -593,8 +511,7 @@ class AreaRuleProto : public ::google::protobuf::Message {
   // implements Message ----------------------------------------------
   
   AreaRuleProto* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
+  void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from);
   void CopyFrom(const AreaRuleProto& from);
   void MergeFrom(const AreaRuleProto& from);
   void Clear();
@@ -605,7 +522,6 @@ class AreaRuleProto : public ::google::protobuf::Message {
       ::google::protobuf::io::CodedInputStream* input);
   void SerializeWithCachedSizes(
       ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
   int GetCachedSize() const { return _cached_size_; }
   private:
   void SharedCtor();
@@ -613,7 +529,7 @@ class AreaRuleProto : public ::google::protobuf::Message {
   void SetCachedSize(int size) const;
   public:
   
-  ::google::protobuf::Metadata GetMetadata() const;
+  ::std::string GetTypeName() const;
   
   // nested types ----------------------------------------------------
   
@@ -650,8 +566,6 @@ class AreaRuleProto : public ::google::protobuf::Message {
   inline void set_has_priority();
   inline void clear_has_priority();
   
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-  
   ::LineDefProto* border_;
   ::google::protobuf::uint32 color_;
   ::google::protobuf::int32 priority_;
@@ -668,7 +582,7 @@ class AreaRuleProto : public ::google::protobuf::Message {
 };
 // -------------------------------------------------------------------
 
-class SymbolRuleProto : public ::google::protobuf::Message {
+class SymbolRuleProto : public ::google::protobuf::MessageLite {
  public:
   SymbolRuleProto();
   virtual ~SymbolRuleProto();
@@ -680,15 +594,6 @@ class SymbolRuleProto : public ::google::protobuf::Message {
     return *this;
   }
   
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
-  }
-  
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
-  }
-  
-  static const ::google::protobuf::Descriptor* descriptor();
   static const SymbolRuleProto& default_instance();
   
   void Swap(SymbolRuleProto* other);
@@ -696,8 +601,7 @@ class SymbolRuleProto : public ::google::protobuf::Message {
   // implements Message ----------------------------------------------
   
   SymbolRuleProto* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
+  void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from);
   void CopyFrom(const SymbolRuleProto& from);
   void MergeFrom(const SymbolRuleProto& from);
   void Clear();
@@ -708,7 +612,6 @@ class SymbolRuleProto : public ::google::protobuf::Message {
       ::google::protobuf::io::CodedInputStream* input);
   void SerializeWithCachedSizes(
       ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
   int GetCachedSize() const { return _cached_size_; }
   private:
   void SharedCtor();
@@ -716,7 +619,7 @@ class SymbolRuleProto : public ::google::protobuf::Message {
   void SetCachedSize(int size) const;
   public:
   
-  ::google::protobuf::Metadata GetMetadata() const;
+  ::std::string GetTypeName() const;
   
   // nested types ----------------------------------------------------
   
@@ -756,8 +659,6 @@ class SymbolRuleProto : public ::google::protobuf::Message {
   inline void set_has_priority();
   inline void clear_has_priority();
   
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-  
   ::std::string* name_;
   ::google::protobuf::int32 apply_for_type_;
   ::google::protobuf::int32 priority_;
@@ -774,7 +675,7 @@ class SymbolRuleProto : public ::google::protobuf::Message {
 };
 // -------------------------------------------------------------------
 
-class CaptionDefProto : public ::google::protobuf::Message {
+class CaptionDefProto : public ::google::protobuf::MessageLite {
  public:
   CaptionDefProto();
   virtual ~CaptionDefProto();
@@ -786,15 +687,6 @@ class CaptionDefProto : public ::google::protobuf::Message {
     return *this;
   }
   
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
-  }
-  
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
-  }
-  
-  static const ::google::protobuf::Descriptor* descriptor();
   static const CaptionDefProto& default_instance();
   
   void Swap(CaptionDefProto* other);
@@ -802,8 +694,7 @@ class CaptionDefProto : public ::google::protobuf::Message {
   // implements Message ----------------------------------------------
   
   CaptionDefProto* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
+  void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from);
   void CopyFrom(const CaptionDefProto& from);
   void MergeFrom(const CaptionDefProto& from);
   void Clear();
@@ -814,7 +705,6 @@ class CaptionDefProto : public ::google::protobuf::Message {
       ::google::protobuf::io::CodedInputStream* input);
   void SerializeWithCachedSizes(
       ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
   int GetCachedSize() const { return _cached_size_; }
   private:
   void SharedCtor();
@@ -822,7 +712,7 @@ class CaptionDefProto : public ::google::protobuf::Message {
   void SetCachedSize(int size) const;
   public:
   
-  ::google::protobuf::Metadata GetMetadata() const;
+  ::std::string GetTypeName() const;
   
   // nested types ----------------------------------------------------
   
@@ -876,8 +766,6 @@ class CaptionDefProto : public ::google::protobuf::Message {
   inline void set_has_offset_y();
   inline void clear_has_offset_y();
   
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-  
   ::google::protobuf::int32 height_;
   ::google::protobuf::uint32 color_;
   ::google::protobuf::uint32 stroke_color_;
@@ -896,7 +784,7 @@ class CaptionDefProto : public ::google::protobuf::Message {
 };
 // -------------------------------------------------------------------
 
-class CaptionRuleProto : public ::google::protobuf::Message {
+class CaptionRuleProto : public ::google::protobuf::MessageLite {
  public:
   CaptionRuleProto();
   virtual ~CaptionRuleProto();
@@ -908,15 +796,6 @@ class CaptionRuleProto : public ::google::protobuf::Message {
     return *this;
   }
   
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
-  }
-  
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
-  }
-  
-  static const ::google::protobuf::Descriptor* descriptor();
   static const CaptionRuleProto& default_instance();
   
   void Swap(CaptionRuleProto* other);
@@ -924,8 +803,7 @@ class CaptionRuleProto : public ::google::protobuf::Message {
   // implements Message ----------------------------------------------
   
   CaptionRuleProto* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
+  void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from);
   void CopyFrom(const CaptionRuleProto& from);
   void MergeFrom(const CaptionRuleProto& from);
   void Clear();
@@ -936,7 +814,6 @@ class CaptionRuleProto : public ::google::protobuf::Message {
       ::google::protobuf::io::CodedInputStream* input);
   void SerializeWithCachedSizes(
       ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
   int GetCachedSize() const { return _cached_size_; }
   private:
   void SharedCtor();
@@ -944,7 +821,7 @@ class CaptionRuleProto : public ::google::protobuf::Message {
   void SetCachedSize(int size) const;
   public:
   
-  ::google::protobuf::Metadata GetMetadata() const;
+  ::std::string GetTypeName() const;
   
   // nested types ----------------------------------------------------
   
@@ -982,8 +859,6 @@ class CaptionRuleProto : public ::google::protobuf::Message {
   inline void set_has_priority();
   inline void clear_has_priority();
   
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-  
   ::CaptionDefProto* primary_;
   ::CaptionDefProto* secondary_;
   ::google::protobuf::int32 priority_;
@@ -1000,7 +875,7 @@ class CaptionRuleProto : public ::google::protobuf::Message {
 };
 // -------------------------------------------------------------------
 
-class CircleRuleProto : public ::google::protobuf::Message {
+class CircleRuleProto : public ::google::protobuf::MessageLite {
  public:
   CircleRuleProto();
   virtual ~CircleRuleProto();
@@ -1012,15 +887,6 @@ class CircleRuleProto : public ::google::protobuf::Message {
     return *this;
   }
   
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
-  }
-  
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
-  }
-  
-  static const ::google::protobuf::Descriptor* descriptor();
   static const CircleRuleProto& default_instance();
   
   void Swap(CircleRuleProto* other);
@@ -1028,8 +894,7 @@ class CircleRuleProto : public ::google::protobuf::Message {
   // implements Message ----------------------------------------------
   
   CircleRuleProto* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
+  void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from);
   void CopyFrom(const CircleRuleProto& from);
   void MergeFrom(const CircleRuleProto& from);
   void Clear();
@@ -1040,7 +905,6 @@ class CircleRuleProto : public ::google::protobuf::Message {
       ::google::protobuf::io::CodedInputStream* input);
   void SerializeWithCachedSizes(
       ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
   int GetCachedSize() const { return _cached_size_; }
   private:
   void SharedCtor();
@@ -1048,7 +912,7 @@ class CircleRuleProto : public ::google::protobuf::Message {
   void SetCachedSize(int size) const;
   public:
   
-  ::google::protobuf::Metadata GetMetadata() const;
+  ::std::string GetTypeName() const;
   
   // nested types ----------------------------------------------------
   
@@ -1094,8 +958,6 @@ class CircleRuleProto : public ::google::protobuf::Message {
   inline void set_has_priority();
   inline void clear_has_priority();
   
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-  
   double radius_;
   ::LineDefProto* border_;
   ::google::protobuf::uint32 color_;
@@ -1113,7 +975,7 @@ class CircleRuleProto : public ::google::protobuf::Message {
 };
 // -------------------------------------------------------------------
 
-class PathTextRuleProto : public ::google::protobuf::Message {
+class PathTextRuleProto : public ::google::protobuf::MessageLite {
  public:
   PathTextRuleProto();
   virtual ~PathTextRuleProto();
@@ -1125,15 +987,6 @@ class PathTextRuleProto : public ::google::protobuf::Message {
     return *this;
   }
   
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
-  }
-  
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
-  }
-  
-  static const ::google::protobuf::Descriptor* descriptor();
   static const PathTextRuleProto& default_instance();
   
   void Swap(PathTextRuleProto* other);
@@ -1141,8 +994,7 @@ class PathTextRuleProto : public ::google::protobuf::Message {
   // implements Message ----------------------------------------------
   
   PathTextRuleProto* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
+  void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from);
   void CopyFrom(const PathTextRuleProto& from);
   void MergeFrom(const PathTextRuleProto& from);
   void Clear();
@@ -1153,7 +1005,6 @@ class PathTextRuleProto : public ::google::protobuf::Message {
       ::google::protobuf::io::CodedInputStream* input);
   void SerializeWithCachedSizes(
       ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
   int GetCachedSize() const { return _cached_size_; }
   private:
   void SharedCtor();
@@ -1161,7 +1012,7 @@ class PathTextRuleProto : public ::google::protobuf::Message {
   void SetCachedSize(int size) const;
   public:
   
-  ::google::protobuf::Metadata GetMetadata() const;
+  ::std::string GetTypeName() const;
   
   // nested types ----------------------------------------------------
   
@@ -1199,8 +1050,6 @@ class PathTextRuleProto : public ::google::protobuf::Message {
   inline void set_has_priority();
   inline void clear_has_priority();
   
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-  
   ::CaptionDefProto* primary_;
   ::CaptionDefProto* secondary_;
   ::google::protobuf::int32 priority_;
@@ -1217,7 +1066,7 @@ class PathTextRuleProto : public ::google::protobuf::Message {
 };
 // -------------------------------------------------------------------
 
-class DrawElementProto : public ::google::protobuf::Message {
+class DrawElementProto : public ::google::protobuf::MessageLite {
  public:
   DrawElementProto();
   virtual ~DrawElementProto();
@@ -1229,15 +1078,6 @@ class DrawElementProto : public ::google::protobuf::Message {
     return *this;
   }
   
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
-  }
-  
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
-  }
-  
-  static const ::google::protobuf::Descriptor* descriptor();
   static const DrawElementProto& default_instance();
   
   void Swap(DrawElementProto* other);
@@ -1245,8 +1085,7 @@ class DrawElementProto : public ::google::protobuf::Message {
   // implements Message ----------------------------------------------
   
   DrawElementProto* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
+  void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from);
   void CopyFrom(const DrawElementProto& from);
   void MergeFrom(const DrawElementProto& from);
   void Clear();
@@ -1257,7 +1096,6 @@ class DrawElementProto : public ::google::protobuf::Message {
       ::google::protobuf::io::CodedInputStream* input);
   void SerializeWithCachedSizes(
       ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
   int GetCachedSize() const { return _cached_size_; }
   private:
   void SharedCtor();
@@ -1265,7 +1103,7 @@ class DrawElementProto : public ::google::protobuf::Message {
   void SetCachedSize(int size) const;
   public:
   
-  ::google::protobuf::Metadata GetMetadata() const;
+  ::std::string GetTypeName() const;
   
   // nested types ----------------------------------------------------
   
@@ -1345,8 +1183,6 @@ class DrawElementProto : public ::google::protobuf::Message {
   inline void set_has_path_text();
   inline void clear_has_path_text();
   
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-  
   ::google::protobuf::RepeatedPtrField< ::LineRuleProto > lines_;
   ::AreaRuleProto* area_;
   ::SymbolRuleProto* symbol_;
@@ -1367,7 +1203,7 @@ class DrawElementProto : public ::google::protobuf::Message {
 };
 // -------------------------------------------------------------------
 
-class ClassifElementProto : public ::google::protobuf::Message {
+class ClassifElementProto : public ::google::protobuf::MessageLite {
  public:
   ClassifElementProto();
   virtual ~ClassifElementProto();
@@ -1379,15 +1215,6 @@ class ClassifElementProto : public ::google::protobuf::Message {
     return *this;
   }
   
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
-  }
-  
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
-  }
-  
-  static const ::google::protobuf::Descriptor* descriptor();
   static const ClassifElementProto& default_instance();
   
   void Swap(ClassifElementProto* other);
@@ -1395,8 +1222,7 @@ class ClassifElementProto : public ::google::protobuf::Message {
   // implements Message ----------------------------------------------
   
   ClassifElementProto* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
+  void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from);
   void CopyFrom(const ClassifElementProto& from);
   void MergeFrom(const ClassifElementProto& from);
   void Clear();
@@ -1407,7 +1233,6 @@ class ClassifElementProto : public ::google::protobuf::Message {
       ::google::protobuf::io::CodedInputStream* input);
   void SerializeWithCachedSizes(
       ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
   int GetCachedSize() const { return _cached_size_; }
   private:
   void SharedCtor();
@@ -1415,7 +1240,7 @@ class ClassifElementProto : public ::google::protobuf::Message {
   void SetCachedSize(int size) const;
   public:
   
-  ::google::protobuf::Metadata GetMetadata() const;
+  ::std::string GetTypeName() const;
   
   // nested types ----------------------------------------------------
   
@@ -1449,8 +1274,6 @@ class ClassifElementProto : public ::google::protobuf::Message {
   inline void set_has_name();
   inline void clear_has_name();
   
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-  
   ::std::string* name_;
   ::google::protobuf::RepeatedPtrField< ::DrawElementProto > element_;
   
@@ -1466,7 +1289,7 @@ class ClassifElementProto : public ::google::protobuf::Message {
 };
 // -------------------------------------------------------------------
 
-class ContainerProto : public ::google::protobuf::Message {
+class ContainerProto : public ::google::protobuf::MessageLite {
  public:
   ContainerProto();
   virtual ~ContainerProto();
@@ -1478,15 +1301,6 @@ class ContainerProto : public ::google::protobuf::Message {
     return *this;
   }
   
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
-  }
-  
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
-  }
-  
-  static const ::google::protobuf::Descriptor* descriptor();
   static const ContainerProto& default_instance();
   
   void Swap(ContainerProto* other);
@@ -1494,8 +1308,7 @@ class ContainerProto : public ::google::protobuf::Message {
   // implements Message ----------------------------------------------
   
   ContainerProto* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
+  void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from);
   void CopyFrom(const ContainerProto& from);
   void MergeFrom(const ContainerProto& from);
   void Clear();
@@ -1506,7 +1319,6 @@ class ContainerProto : public ::google::protobuf::Message {
       ::google::protobuf::io::CodedInputStream* input);
   void SerializeWithCachedSizes(
       ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
   int GetCachedSize() const { return _cached_size_; }
   private:
   void SharedCtor();
@@ -1514,7 +1326,7 @@ class ContainerProto : public ::google::protobuf::Message {
   void SetCachedSize(int size) const;
   public:
   
-  ::google::protobuf::Metadata GetMetadata() const;
+  ::std::string GetTypeName() const;
   
   // nested types ----------------------------------------------------
   
@@ -1535,8 +1347,6 @@ class ContainerProto : public ::google::protobuf::Message {
   // @@protoc_insertion_point(class_scope:ContainerProto)
  private:
   
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-  
   ::google::protobuf::RepeatedPtrField< ::ClassifElementProto > cont_;
   
   mutable int _cached_size_;
@@ -2914,23 +2724,6 @@ ContainerProto::mutable_cont() {
 
 // @@protoc_insertion_point(namespace_scope)
 
-#ifndef SWIG
-namespace google {
-namespace protobuf {
-
-template <>
-inline const EnumDescriptor* GetEnumDescriptor< LineJoin>() {
-  return LineJoin_descriptor();
-}
-template <>
-inline const EnumDescriptor* GetEnumDescriptor< LineCap>() {
-  return LineCap_descriptor();
-}
-
-}  // namespace google
-}  // namespace protobuf
-#endif  // SWIG
-
 // @@protoc_insertion_point(global_scope)
 
 #endif  // PROTOBUF_drules_5fstruct_2eproto__INCLUDED