[3party] Updated protobuf to 2.5.0

1 files changed, 259 insertions, 244 deletions

diff --git a/indexer/drules_struct.pb.cc b/indexer/drules_struct.pb.cc
index 0d838d627e..348c38e3ff 100644
--- a/indexer/drules_struct.pb.cc
+++ b/indexer/drules_struct.pb.cc
@@ -1,14 +1,17 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: drules_struct.proto
 
 #define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
 #include "drules_struct.pb.h"
 
 #include <algorithm>
 
+#include <google/protobuf/stubs/common.h>
 #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/generated_message_reflection.h>
 #include <google/protobuf/reflection_ops.h>
 #include <google/protobuf/wire_format.h>
 // @@protoc_insertion_point(includes)
@@ -452,7 +455,6 @@ struct StaticDescriptorInitializer_drules_5fstruct_2eproto {
     protobuf_AddDesc_drules_5fstruct_2eproto();
   }
 } static_descriptor_initializer_drules_5fstruct_2eproto_;
-
 const ::google::protobuf::EnumDescriptor* LineJoin_descriptor() {
   protobuf_AssignDescriptorsOnce();
   return LineJoin_descriptor_;
@@ -531,7 +533,8 @@ const ::google::protobuf::Descriptor* DashDotProto::descriptor() {
 }
 
 const DashDotProto& DashDotProto::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto();  return *default_instance_;
+  if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto();
+  return *default_instance_;
 }
 
 DashDotProto* DashDotProto::default_instance_ = NULL;
@@ -576,7 +579,7 @@ bool DashDotProto::MergePartialFromCodedStream(
         if (input->ExpectTag(17)) goto parse_offset;
         break;
       }
-      
+
       // optional double offset = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -592,7 +595,7 @@ bool DashDotProto::MergePartialFromCodedStream(
         if (input->ExpectAtEnd()) return true;
         break;
       }
-      
+
       default: {
       handle_uninterpreted:
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -616,12 +619,12 @@ void DashDotProto::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteDouble(
       1, this->dd(i), output);
   }
-  
+
   // optional double offset = 2;
   if (has_offset()) {
     ::google::protobuf::internal::WireFormatLite::WriteDouble(2, this->offset(), output);
   }
-  
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -635,12 +638,12 @@ void DashDotProto::SerializeWithCachedSizes(
     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);
@@ -650,13 +653,13 @@ void DashDotProto::SerializeWithCachedSizes(
 
 int DashDotProto::ByteSize() const {
   int total_size = 0;
-  
+
   if (_has_bits_[1 / 32] & (0xffu << (1 % 32))) {
     // optional double offset = 2;
     if (has_offset()) {
       total_size += 1 + 8;
     }
-    
+
   }
   // repeated double dd = 1;
   {
@@ -664,7 +667,7 @@ int DashDotProto::ByteSize() const {
     data_size = 8 * this->dd_size();
     total_size += 1 * this->dd_size() + data_size;
   }
-  
+
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -712,7 +715,7 @@ void DashDotProto::CopyFrom(const DashDotProto& from) {
 }
 
 bool DashDotProto::IsInitialized() const {
-  
+
   return true;
 }
 
@@ -788,7 +791,8 @@ const ::google::protobuf::Descriptor* PathSymProto::descriptor() {
 }
 
 const PathSymProto& PathSymProto::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto();  return *default_instance_;
+  if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto();
+  return *default_instance_;
 }
 
 PathSymProto* PathSymProto::default_instance_ = NULL;
@@ -832,7 +836,7 @@ bool PathSymProto::MergePartialFromCodedStream(
         if (input->ExpectTag(17)) goto parse_step;
         break;
       }
-      
+
       // required double step = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -848,7 +852,7 @@ bool PathSymProto::MergePartialFromCodedStream(
         if (input->ExpectTag(25)) goto parse_offset;
         break;
       }
-      
+
       // optional double offset = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -864,7 +868,7 @@ bool PathSymProto::MergePartialFromCodedStream(
         if (input->ExpectAtEnd()) return true;
         break;
       }
-      
+
       default: {
       handle_uninterpreted:
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -891,17 +895,17 @@ void PathSymProto::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteString(
       1, this->name(), output);
   }
-  
+
   // required double step = 2;
   if (has_step()) {
     ::google::protobuf::internal::WireFormatLite::WriteDouble(2, this->step(), output);
   }
-  
+
   // optional double offset = 3;
   if (has_offset()) {
     ::google::protobuf::internal::WireFormatLite::WriteDouble(3, this->offset(), output);
   }
-  
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -919,17 +923,17 @@ void PathSymProto::SerializeWithCachedSizes(
       ::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);
@@ -939,7 +943,7 @@ void PathSymProto::SerializeWithCachedSizes(
 
 int PathSymProto::ByteSize() const {
   int total_size = 0;
-  
+
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     // required string name = 1;
     if (has_name()) {
@@ -947,17 +951,17 @@ int PathSymProto::ByteSize() const {
         ::google::protobuf::internal::WireFormatLite::StringSize(
           this->name());
     }
-    
+
     // required double step = 2;
     if (has_step()) {
       total_size += 1 + 8;
     }
-    
+
     // optional double offset = 3;
     if (has_offset()) {
       total_size += 1 + 8;
     }
-    
+
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -1012,7 +1016,7 @@ void PathSymProto::CopyFrom(const PathSymProto& from) {
 
 bool PathSymProto::IsInitialized() const {
   if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
-  
+
   return true;
 }
 
@@ -1098,7 +1102,8 @@ const ::google::protobuf::Descriptor* LineRuleProto::descriptor() {
 }
 
 const LineRuleProto& LineRuleProto::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto();  return *default_instance_;
+  if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto();
+  return *default_instance_;
 }
 
 LineRuleProto* LineRuleProto::default_instance_ = NULL;
@@ -1145,7 +1150,7 @@ bool LineRuleProto::MergePartialFromCodedStream(
         if (input->ExpectTag(16)) goto parse_color;
         break;
       }
-      
+
       // required uint32 color = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -1161,7 +1166,7 @@ bool LineRuleProto::MergePartialFromCodedStream(
         if (input->ExpectTag(26)) goto parse_dashdot;
         break;
       }
-      
+
       // optional .DashDotProto dashdot = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -1175,7 +1180,7 @@ bool LineRuleProto::MergePartialFromCodedStream(
         if (input->ExpectTag(32)) goto parse_priority;
         break;
       }
-      
+
       // required int32 priority = 4;
       case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -1191,7 +1196,7 @@ bool LineRuleProto::MergePartialFromCodedStream(
         if (input->ExpectTag(42)) goto parse_pathsym;
         break;
       }
-      
+
       // optional .PathSymProto pathsym = 5;
       case 5: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -1205,7 +1210,7 @@ bool LineRuleProto::MergePartialFromCodedStream(
         if (input->ExpectTag(48)) goto parse_join;
         break;
       }
-      
+
       // optional .LineJoin join = 6;
       case 6: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -1215,8 +1220,8 @@ bool LineRuleProto::MergePartialFromCodedStream(
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
                  input, &value)));
-          if (LineJoin_IsValid(value)) {
-            set_join(static_cast< LineJoin >(value));
+          if (::LineJoin_IsValid(value)) {
+            set_join(static_cast< ::LineJoin >(value));
           } else {
             mutable_unknown_fields()->AddVarint(6, value);
           }
@@ -1226,7 +1231,7 @@ bool LineRuleProto::MergePartialFromCodedStream(
         if (input->ExpectTag(56)) goto parse_cap;
         break;
       }
-      
+
       // optional .LineCap cap = 7;
       case 7: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -1236,8 +1241,8 @@ bool LineRuleProto::MergePartialFromCodedStream(
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
                  input, &value)));
-          if (LineCap_IsValid(value)) {
-            set_cap(static_cast< LineCap >(value));
+          if (::LineCap_IsValid(value)) {
+            set_cap(static_cast< ::LineCap >(value));
           } else {
             mutable_unknown_fields()->AddVarint(7, value);
           }
@@ -1247,7 +1252,7 @@ bool LineRuleProto::MergePartialFromCodedStream(
         if (input->ExpectAtEnd()) return true;
         break;
       }
-      
+
       default: {
       handle_uninterpreted:
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -1270,41 +1275,41 @@ void LineRuleProto::SerializeWithCachedSizes(
   if (has_width()) {
     ::google::protobuf::internal::WireFormatLite::WriteDouble(1, this->width(), output);
   }
-  
+
   // required uint32 color = 2;
   if (has_color()) {
     ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->color(), output);
   }
-  
+
   // optional .DashDotProto dashdot = 3;
   if (has_dashdot()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       3, this->dashdot(), output);
   }
-  
+
   // required int32 priority = 4;
   if (has_priority()) {
     ::google::protobuf::internal::WireFormatLite::WriteInt32(4, this->priority(), output);
   }
-  
+
   // optional .PathSymProto pathsym = 5;
   if (has_pathsym()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       5, this->pathsym(), output);
   }
-  
+
   // optional .LineJoin join = 6;
   if (has_join()) {
     ::google::protobuf::internal::WireFormatLite::WriteEnum(
       6, this->join(), output);
   }
-  
+
   // optional .LineCap cap = 7;
   if (has_cap()) {
     ::google::protobuf::internal::WireFormatLite::WriteEnum(
       7, this->cap(), output);
   }
-  
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -1317,43 +1322,43 @@ void LineRuleProto::SerializeWithCachedSizes(
   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);
@@ -1363,53 +1368,53 @@ void LineRuleProto::SerializeWithCachedSizes(
 
 int LineRuleProto::ByteSize() const {
   int total_size = 0;
-  
+
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     // required double width = 1;
     if (has_width()) {
       total_size += 1 + 8;
     }
-    
+
     // required uint32 color = 2;
     if (has_color()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::UInt32Size(
           this->color());
     }
-    
+
     // optional .DashDotProto dashdot = 3;
     if (has_dashdot()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
           this->dashdot());
     }
-    
+
     // required int32 priority = 4;
     if (has_priority()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::Int32Size(
           this->priority());
     }
-    
+
     // optional .PathSymProto pathsym = 5;
     if (has_pathsym()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
           this->pathsym());
     }
-    
+
     // optional .LineJoin join = 6;
     if (has_join()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::EnumSize(this->join());
     }
-    
+
     // optional .LineCap cap = 7;
     if (has_cap()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::EnumSize(this->cap());
     }
-    
+
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -1476,7 +1481,7 @@ void LineRuleProto::CopyFrom(const LineRuleProto& from) {
 
 bool LineRuleProto::IsInitialized() const {
   if ((_has_bits_[0] & 0x0000000b) != 0x0000000b) return false;
-  
+
   if (has_pathsym()) {
     if (!this->pathsym().IsInitialized()) return false;
   }
@@ -1567,7 +1572,8 @@ const ::google::protobuf::Descriptor* LineDefProto::descriptor() {
 }
 
 const LineDefProto& LineDefProto::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto();  return *default_instance_;
+  if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto();
+  return *default_instance_;
 }
 
 LineDefProto* LineDefProto::default_instance_ = NULL;
@@ -1613,7 +1619,7 @@ bool LineDefProto::MergePartialFromCodedStream(
         if (input->ExpectTag(16)) goto parse_color;
         break;
       }
-      
+
       // required uint32 color = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -1629,7 +1635,7 @@ bool LineDefProto::MergePartialFromCodedStream(
         if (input->ExpectTag(26)) goto parse_dashdot;
         break;
       }
-      
+
       // optional .DashDotProto dashdot = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -1643,7 +1649,7 @@ bool LineDefProto::MergePartialFromCodedStream(
         if (input->ExpectTag(34)) goto parse_pathsym;
         break;
       }
-      
+
       // optional .PathSymProto pathsym = 4;
       case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -1657,7 +1663,7 @@ bool LineDefProto::MergePartialFromCodedStream(
         if (input->ExpectTag(48)) goto parse_join;
         break;
       }
-      
+
       // optional .LineJoin join = 6;
       case 6: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -1667,8 +1673,8 @@ bool LineDefProto::MergePartialFromCodedStream(
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
                  input, &value)));
-          if (LineJoin_IsValid(value)) {
-            set_join(static_cast< LineJoin >(value));
+          if (::LineJoin_IsValid(value)) {
+            set_join(static_cast< ::LineJoin >(value));
           } else {
             mutable_unknown_fields()->AddVarint(6, value);
           }
@@ -1678,7 +1684,7 @@ bool LineDefProto::MergePartialFromCodedStream(
         if (input->ExpectTag(56)) goto parse_cap;
         break;
       }
-      
+
       // optional .LineCap cap = 7;
       case 7: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -1688,8 +1694,8 @@ bool LineDefProto::MergePartialFromCodedStream(
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
                  input, &value)));
-          if (LineCap_IsValid(value)) {
-            set_cap(static_cast< LineCap >(value));
+          if (::LineCap_IsValid(value)) {
+            set_cap(static_cast< ::LineCap >(value));
           } else {
             mutable_unknown_fields()->AddVarint(7, value);
           }
@@ -1699,7 +1705,7 @@ bool LineDefProto::MergePartialFromCodedStream(
         if (input->ExpectAtEnd()) return true;
         break;
       }
-      
+
       default: {
       handle_uninterpreted:
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -1722,36 +1728,36 @@ void LineDefProto::SerializeWithCachedSizes(
   if (has_width()) {
     ::google::protobuf::internal::WireFormatLite::WriteDouble(1, this->width(), output);
   }
-  
+
   // required uint32 color = 2;
   if (has_color()) {
     ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->color(), output);
   }
-  
+
   // optional .DashDotProto dashdot = 3;
   if (has_dashdot()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       3, this->dashdot(), output);
   }
-  
+
   // optional .PathSymProto pathsym = 4;
   if (has_pathsym()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       4, this->pathsym(), output);
   }
-  
+
   // optional .LineJoin join = 6;
   if (has_join()) {
     ::google::protobuf::internal::WireFormatLite::WriteEnum(
       6, this->join(), output);
   }
-  
+
   // optional .LineCap cap = 7;
   if (has_cap()) {
     ::google::protobuf::internal::WireFormatLite::WriteEnum(
       7, this->cap(), output);
   }
-  
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -1764,38 +1770,38 @@ void LineDefProto::SerializeWithCachedSizes(
   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);
@@ -1805,46 +1811,46 @@ void LineDefProto::SerializeWithCachedSizes(
 
 int LineDefProto::ByteSize() const {
   int total_size = 0;
-  
+
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     // required double width = 1;
     if (has_width()) {
       total_size += 1 + 8;
     }
-    
+
     // required uint32 color = 2;
     if (has_color()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::UInt32Size(
           this->color());
     }
-    
+
     // optional .DashDotProto dashdot = 3;
     if (has_dashdot()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
           this->dashdot());
     }
-    
+
     // optional .PathSymProto pathsym = 4;
     if (has_pathsym()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
           this->pathsym());
     }
-    
+
     // optional .LineJoin join = 6;
     if (has_join()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::EnumSize(this->join());
     }
-    
+
     // optional .LineCap cap = 7;
     if (has_cap()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::EnumSize(this->cap());
     }
-    
+
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -1908,7 +1914,7 @@ void LineDefProto::CopyFrom(const LineDefProto& from) {
 
 bool LineDefProto::IsInitialized() const {
   if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
-  
+
   if (has_pathsym()) {
     if (!this->pathsym().IsInitialized()) return false;
   }
@@ -1990,7 +1996,8 @@ const ::google::protobuf::Descriptor* AreaRuleProto::descriptor() {
 }
 
 const AreaRuleProto& AreaRuleProto::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto();  return *default_instance_;
+  if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto();
+  return *default_instance_;
 }
 
 AreaRuleProto* AreaRuleProto::default_instance_ = NULL;
@@ -2031,7 +2038,7 @@ bool AreaRuleProto::MergePartialFromCodedStream(
         if (input->ExpectTag(18)) goto parse_border;
         break;
       }
-      
+
       // optional .LineDefProto border = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -2045,7 +2052,7 @@ bool AreaRuleProto::MergePartialFromCodedStream(
         if (input->ExpectTag(24)) goto parse_priority;
         break;
       }
-      
+
       // required int32 priority = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -2061,7 +2068,7 @@ bool AreaRuleProto::MergePartialFromCodedStream(
         if (input->ExpectAtEnd()) return true;
         break;
       }
-      
+
       default: {
       handle_uninterpreted:
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -2084,18 +2091,18 @@ void AreaRuleProto::SerializeWithCachedSizes(
   if (has_color()) {
     ::google::protobuf::internal::WireFormatLite::WriteUInt32(1, this->color(), output);
   }
-  
+
   // optional .LineDefProto border = 2;
   if (has_border()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       2, this->border(), output);
   }
-  
+
   // required int32 priority = 3;
   if (has_priority()) {
     ::google::protobuf::internal::WireFormatLite::WriteInt32(3, this->priority(), output);
   }
-  
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -2108,19 +2115,19 @@ void AreaRuleProto::SerializeWithCachedSizes(
   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);
@@ -2130,7 +2137,7 @@ void AreaRuleProto::SerializeWithCachedSizes(
 
 int AreaRuleProto::ByteSize() const {
   int total_size = 0;
-  
+
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     // required uint32 color = 1;
     if (has_color()) {
@@ -2138,21 +2145,21 @@ int AreaRuleProto::ByteSize() const {
         ::google::protobuf::internal::WireFormatLite::UInt32Size(
           this->color());
     }
-    
+
     // optional .LineDefProto border = 2;
     if (has_border()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
           this->border());
     }
-    
+
     // required int32 priority = 3;
     if (has_priority()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::Int32Size(
           this->priority());
     }
-    
+
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -2207,7 +2214,7 @@ void AreaRuleProto::CopyFrom(const AreaRuleProto& from) {
 
 bool AreaRuleProto::IsInitialized() const {
   if ((_has_bits_[0] & 0x00000005) != 0x00000005) return false;
-  
+
   if (has_border()) {
     if (!this->border().IsInitialized()) return false;
   }
@@ -2287,7 +2294,8 @@ const ::google::protobuf::Descriptor* SymbolRuleProto::descriptor() {
 }
 
 const SymbolRuleProto& SymbolRuleProto::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto();  return *default_instance_;
+  if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto();
+  return *default_instance_;
 }
 
 SymbolRuleProto* SymbolRuleProto::default_instance_ = NULL;
@@ -2331,7 +2339,7 @@ bool SymbolRuleProto::MergePartialFromCodedStream(
         if (input->ExpectTag(16)) goto parse_apply_for_type;
         break;
       }
-      
+
       // optional int32 apply_for_type = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -2347,7 +2355,7 @@ bool SymbolRuleProto::MergePartialFromCodedStream(
         if (input->ExpectTag(24)) goto parse_priority;
         break;
       }
-      
+
       // required int32 priority = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -2363,7 +2371,7 @@ bool SymbolRuleProto::MergePartialFromCodedStream(
         if (input->ExpectAtEnd()) return true;
         break;
       }
-      
+
       default: {
       handle_uninterpreted:
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -2390,17 +2398,17 @@ void SymbolRuleProto::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteString(
       1, this->name(), output);
   }
-  
+
   // optional int32 apply_for_type = 2;
   if (has_apply_for_type()) {
     ::google::protobuf::internal::WireFormatLite::WriteInt32(2, this->apply_for_type(), output);
   }
-  
+
   // required int32 priority = 3;
   if (has_priority()) {
     ::google::protobuf::internal::WireFormatLite::WriteInt32(3, this->priority(), output);
   }
-  
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -2418,17 +2426,17 @@ void SymbolRuleProto::SerializeWithCachedSizes(
       ::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);
@@ -2438,7 +2446,7 @@ void SymbolRuleProto::SerializeWithCachedSizes(
 
 int SymbolRuleProto::ByteSize() const {
   int total_size = 0;
-  
+
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     // required string name = 1;
     if (has_name()) {
@@ -2446,21 +2454,21 @@ int SymbolRuleProto::ByteSize() const {
         ::google::protobuf::internal::WireFormatLite::StringSize(
           this->name());
     }
-    
+
     // optional int32 apply_for_type = 2;
     if (has_apply_for_type()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::Int32Size(
           this->apply_for_type());
     }
-    
+
     // required int32 priority = 3;
     if (has_priority()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::Int32Size(
           this->priority());
     }
-    
+
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -2515,7 +2523,7 @@ void SymbolRuleProto::CopyFrom(const SymbolRuleProto& from) {
 
 bool SymbolRuleProto::IsInitialized() const {
   if ((_has_bits_[0] & 0x00000005) != 0x00000005) return false;
-  
+
   return true;
 }
 
@@ -2593,7 +2601,8 @@ const ::google::protobuf::Descriptor* CaptionDefProto::descriptor() {
 }
 
 const CaptionDefProto& CaptionDefProto::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto();  return *default_instance_;
+  if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto();
+  return *default_instance_;
 }
 
 CaptionDefProto* CaptionDefProto::default_instance_ = NULL;
@@ -2634,7 +2643,7 @@ bool CaptionDefProto::MergePartialFromCodedStream(
         if (input->ExpectTag(16)) goto parse_color;
         break;
       }
-      
+
       // required uint32 color = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -2650,7 +2659,7 @@ bool CaptionDefProto::MergePartialFromCodedStream(
         if (input->ExpectTag(24)) goto parse_stroke_color;
         break;
       }
-      
+
       // optional uint32 stroke_color = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -2666,7 +2675,7 @@ bool CaptionDefProto::MergePartialFromCodedStream(
         if (input->ExpectTag(32)) goto parse_offset_x;
         break;
       }
-      
+
       // optional int32 offset_x = 4;
       case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -2682,7 +2691,7 @@ bool CaptionDefProto::MergePartialFromCodedStream(
         if (input->ExpectTag(40)) goto parse_offset_y;
         break;
       }
-      
+
       // optional int32 offset_y = 5;
       case 5: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -2698,7 +2707,7 @@ bool CaptionDefProto::MergePartialFromCodedStream(
         if (input->ExpectAtEnd()) return true;
         break;
       }
-      
+
       default: {
       handle_uninterpreted:
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -2721,27 +2730,27 @@ void CaptionDefProto::SerializeWithCachedSizes(
   if (has_height()) {
     ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->height(), output);
   }
-  
+
   // required uint32 color = 2;
   if (has_color()) {
     ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->color(), output);
   }
-  
+
   // optional uint32 stroke_color = 3;
   if (has_stroke_color()) {
     ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->stroke_color(), output);
   }
-  
+
   // optional int32 offset_x = 4;
   if (has_offset_x()) {
     ::google::protobuf::internal::WireFormatLite::WriteInt32(4, this->offset_x(), output);
   }
-  
+
   // optional int32 offset_y = 5;
   if (has_offset_y()) {
     ::google::protobuf::internal::WireFormatLite::WriteInt32(5, this->offset_y(), output);
   }
-  
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -2754,27 +2763,27 @@ void CaptionDefProto::SerializeWithCachedSizes(
   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);
@@ -2784,7 +2793,7 @@ void CaptionDefProto::SerializeWithCachedSizes(
 
 int CaptionDefProto::ByteSize() const {
   int total_size = 0;
-  
+
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     // required int32 height = 1;
     if (has_height()) {
@@ -2792,35 +2801,35 @@ int CaptionDefProto::ByteSize() const {
         ::google::protobuf::internal::WireFormatLite::Int32Size(
           this->height());
     }
-    
+
     // required uint32 color = 2;
     if (has_color()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::UInt32Size(
           this->color());
     }
-    
+
     // optional uint32 stroke_color = 3;
     if (has_stroke_color()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::UInt32Size(
           this->stroke_color());
     }
-    
+
     // optional int32 offset_x = 4;
     if (has_offset_x()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::Int32Size(
           this->offset_x());
     }
-    
+
     // optional int32 offset_y = 5;
     if (has_offset_y()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::Int32Size(
           this->offset_y());
     }
-    
+
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -2881,7 +2890,7 @@ void CaptionDefProto::CopyFrom(const CaptionDefProto& from) {
 
 bool CaptionDefProto::IsInitialized() const {
   if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
-  
+
   return true;
 }
 
@@ -2961,7 +2970,8 @@ const ::google::protobuf::Descriptor* CaptionRuleProto::descriptor() {
 }
 
 const CaptionRuleProto& CaptionRuleProto::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto();  return *default_instance_;
+  if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto();
+  return *default_instance_;
 }
 
 CaptionRuleProto* CaptionRuleProto::default_instance_ = NULL;
@@ -3002,7 +3012,7 @@ bool CaptionRuleProto::MergePartialFromCodedStream(
         if (input->ExpectTag(18)) goto parse_secondary;
         break;
       }
-      
+
       // optional .CaptionDefProto secondary = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -3016,7 +3026,7 @@ bool CaptionRuleProto::MergePartialFromCodedStream(
         if (input->ExpectTag(24)) goto parse_priority;
         break;
       }
-      
+
       // required int32 priority = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -3032,7 +3042,7 @@ bool CaptionRuleProto::MergePartialFromCodedStream(
         if (input->ExpectAtEnd()) return true;
         break;
       }
-      
+
       default: {
       handle_uninterpreted:
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -3056,18 +3066,18 @@ void CaptionRuleProto::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       1, this->primary(), output);
   }
-  
+
   // optional .CaptionDefProto secondary = 2;
   if (has_secondary()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       2, this->secondary(), output);
   }
-  
+
   // required int32 priority = 3;
   if (has_priority()) {
     ::google::protobuf::internal::WireFormatLite::WriteInt32(3, this->priority(), output);
   }
-  
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -3082,19 +3092,19 @@ void CaptionRuleProto::SerializeWithCachedSizes(
       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);
@@ -3104,7 +3114,7 @@ void CaptionRuleProto::SerializeWithCachedSizes(
 
 int CaptionRuleProto::ByteSize() const {
   int total_size = 0;
-  
+
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     // required .CaptionDefProto primary = 1;
     if (has_primary()) {
@@ -3112,21 +3122,21 @@ int CaptionRuleProto::ByteSize() const {
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
           this->primary());
     }
-    
+
     // optional .CaptionDefProto secondary = 2;
     if (has_secondary()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
           this->secondary());
     }
-    
+
     // required int32 priority = 3;
     if (has_priority()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::Int32Size(
           this->priority());
     }
-    
+
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -3181,7 +3191,7 @@ void CaptionRuleProto::CopyFrom(const CaptionRuleProto& from) {
 
 bool CaptionRuleProto::IsInitialized() const {
   if ((_has_bits_[0] & 0x00000005) != 0x00000005) return false;
-  
+
   if (has_primary()) {
     if (!this->primary().IsInitialized()) return false;
   }
@@ -3265,7 +3275,8 @@ const ::google::protobuf::Descriptor* CircleRuleProto::descriptor() {
 }
 
 const CircleRuleProto& CircleRuleProto::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto();  return *default_instance_;
+  if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto();
+  return *default_instance_;
 }
 
 CircleRuleProto* CircleRuleProto::default_instance_ = NULL;
@@ -3307,7 +3318,7 @@ bool CircleRuleProto::MergePartialFromCodedStream(
         if (input->ExpectTag(16)) goto parse_color;
         break;
       }
-      
+
       // required uint32 color = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -3323,7 +3334,7 @@ bool CircleRuleProto::MergePartialFromCodedStream(
         if (input->ExpectTag(26)) goto parse_border;
         break;
       }
-      
+
       // optional .LineDefProto border = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -3337,7 +3348,7 @@ bool CircleRuleProto::MergePartialFromCodedStream(
         if (input->ExpectTag(32)) goto parse_priority;
         break;
       }
-      
+
       // required int32 priority = 4;
       case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -3353,7 +3364,7 @@ bool CircleRuleProto::MergePartialFromCodedStream(
         if (input->ExpectAtEnd()) return true;
         break;
       }
-      
+
       default: {
       handle_uninterpreted:
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -3376,23 +3387,23 @@ void CircleRuleProto::SerializeWithCachedSizes(
   if (has_radius()) {
     ::google::protobuf::internal::WireFormatLite::WriteDouble(1, this->radius(), output);
   }
-  
+
   // required uint32 color = 2;
   if (has_color()) {
     ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->color(), output);
   }
-  
+
   // optional .LineDefProto border = 3;
   if (has_border()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       3, this->border(), output);
   }
-  
+
   // required int32 priority = 4;
   if (has_priority()) {
     ::google::protobuf::internal::WireFormatLite::WriteInt32(4, this->priority(), output);
   }
-  
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -3405,24 +3416,24 @@ void CircleRuleProto::SerializeWithCachedSizes(
   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);
@@ -3432,34 +3443,34 @@ void CircleRuleProto::SerializeWithCachedSizes(
 
 int CircleRuleProto::ByteSize() const {
   int total_size = 0;
-  
+
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     // required double radius = 1;
     if (has_radius()) {
       total_size += 1 + 8;
     }
-    
+
     // required uint32 color = 2;
     if (has_color()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::UInt32Size(
           this->color());
     }
-    
+
     // optional .LineDefProto border = 3;
     if (has_border()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
           this->border());
     }
-    
+
     // required int32 priority = 4;
     if (has_priority()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::Int32Size(
           this->priority());
     }
-    
+
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -3517,7 +3528,7 @@ void CircleRuleProto::CopyFrom(const CircleRuleProto& from) {
 
 bool CircleRuleProto::IsInitialized() const {
   if ((_has_bits_[0] & 0x0000000b) != 0x0000000b) return false;
-  
+
   if (has_border()) {
     if (!this->border().IsInitialized()) return false;
   }
@@ -3599,7 +3610,8 @@ const ::google::protobuf::Descriptor* PathTextRuleProto::descriptor() {
 }
 
 const PathTextRuleProto& PathTextRuleProto::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto();  return *default_instance_;
+  if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto();
+  return *default_instance_;
 }
 
 PathTextRuleProto* PathTextRuleProto::default_instance_ = NULL;
@@ -3640,7 +3652,7 @@ bool PathTextRuleProto::MergePartialFromCodedStream(
         if (input->ExpectTag(18)) goto parse_secondary;
         break;
       }
-      
+
       // optional .CaptionDefProto secondary = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -3654,7 +3666,7 @@ bool PathTextRuleProto::MergePartialFromCodedStream(
         if (input->ExpectTag(24)) goto parse_priority;
         break;
       }
-      
+
       // required int32 priority = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -3670,7 +3682,7 @@ bool PathTextRuleProto::MergePartialFromCodedStream(
         if (input->ExpectAtEnd()) return true;
         break;
       }
-      
+
       default: {
       handle_uninterpreted:
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -3694,18 +3706,18 @@ void PathTextRuleProto::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       1, this->primary(), output);
   }
-  
+
   // optional .CaptionDefProto secondary = 2;
   if (has_secondary()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       2, this->secondary(), output);
   }
-  
+
   // required int32 priority = 3;
   if (has_priority()) {
     ::google::protobuf::internal::WireFormatLite::WriteInt32(3, this->priority(), output);
   }
-  
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -3720,19 +3732,19 @@ void PathTextRuleProto::SerializeWithCachedSizes(
       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);
@@ -3742,7 +3754,7 @@ void PathTextRuleProto::SerializeWithCachedSizes(
 
 int PathTextRuleProto::ByteSize() const {
   int total_size = 0;
-  
+
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     // required .CaptionDefProto primary = 1;
     if (has_primary()) {
@@ -3750,21 +3762,21 @@ int PathTextRuleProto::ByteSize() const {
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
           this->primary());
     }
-    
+
     // optional .CaptionDefProto secondary = 2;
     if (has_secondary()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
           this->secondary());
     }
-    
+
     // required int32 priority = 3;
     if (has_priority()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::Int32Size(
           this->priority());
     }
-    
+
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -3819,7 +3831,7 @@ void PathTextRuleProto::CopyFrom(const PathTextRuleProto& from) {
 
 bool PathTextRuleProto::IsInitialized() const {
   if ((_has_bits_[0] & 0x00000005) != 0x00000005) return false;
-  
+
   if (has_primary()) {
     if (!this->primary().IsInitialized()) return false;
   }
@@ -3916,7 +3928,8 @@ const ::google::protobuf::Descriptor* DrawElementProto::descriptor() {
 }
 
 const DrawElementProto& DrawElementProto::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto();  return *default_instance_;
+  if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto();
+  return *default_instance_;
 }
 
 DrawElementProto* DrawElementProto::default_instance_ = NULL;
@@ -3969,7 +3982,7 @@ bool DrawElementProto::MergePartialFromCodedStream(
         if (input->ExpectTag(18)) goto parse_lines;
         break;
       }
-      
+
       // repeated .LineRuleProto lines = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -3984,7 +3997,7 @@ bool DrawElementProto::MergePartialFromCodedStream(
         if (input->ExpectTag(26)) goto parse_area;
         break;
       }
-      
+
       // optional .AreaRuleProto area = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -3998,7 +4011,7 @@ bool DrawElementProto::MergePartialFromCodedStream(
         if (input->ExpectTag(34)) goto parse_symbol;
         break;
       }
-      
+
       // optional .SymbolRuleProto symbol = 4;
       case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -4012,7 +4025,7 @@ bool DrawElementProto::MergePartialFromCodedStream(
         if (input->ExpectTag(42)) goto parse_caption;
         break;
       }
-      
+
       // optional .CaptionRuleProto caption = 5;
       case 5: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -4026,7 +4039,7 @@ bool DrawElementProto::MergePartialFromCodedStream(
         if (input->ExpectTag(50)) goto parse_circle;
         break;
       }
-      
+
       // optional .CircleRuleProto circle = 6;
       case 6: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -4040,7 +4053,7 @@ bool DrawElementProto::MergePartialFromCodedStream(
         if (input->ExpectTag(58)) goto parse_path_text;
         break;
       }
-      
+
       // optional .PathTextRuleProto path_text = 7;
       case 7: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -4054,7 +4067,7 @@ bool DrawElementProto::MergePartialFromCodedStream(
         if (input->ExpectAtEnd()) return true;
         break;
       }
-      
+
       default: {
       handle_uninterpreted:
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -4077,43 +4090,43 @@ void DrawElementProto::SerializeWithCachedSizes(
   if (has_scale()) {
     ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->scale(), output);
   }
-  
+
   // repeated .LineRuleProto lines = 2;
   for (int i = 0; i < this->lines_size(); i++) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       2, this->lines(i), output);
   }
-  
+
   // optional .AreaRuleProto area = 3;
   if (has_area()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       3, this->area(), output);
   }
-  
+
   // optional .SymbolRuleProto symbol = 4;
   if (has_symbol()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       4, this->symbol(), output);
   }
-  
+
   // optional .CaptionRuleProto caption = 5;
   if (has_caption()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       5, this->caption(), output);
   }
-  
+
   // optional .CircleRuleProto circle = 6;
   if (has_circle()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       6, this->circle(), output);
   }
-  
+
   // optional .PathTextRuleProto path_text = 7;
   if (has_path_text()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       7, this->path_text(), output);
   }
-  
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -4126,49 +4139,49 @@ void DrawElementProto::SerializeWithCachedSizes(
   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);
@@ -4178,7 +4191,7 @@ void DrawElementProto::SerializeWithCachedSizes(
 
 int DrawElementProto::ByteSize() const {
   int total_size = 0;
-  
+
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     // required int32 scale = 1;
     if (has_scale()) {
@@ -4186,42 +4199,42 @@ int DrawElementProto::ByteSize() const {
         ::google::protobuf::internal::WireFormatLite::Int32Size(
           this->scale());
     }
-    
+
     // optional .AreaRuleProto area = 3;
     if (has_area()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
           this->area());
     }
-    
+
     // optional .SymbolRuleProto symbol = 4;
     if (has_symbol()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
           this->symbol());
     }
-    
+
     // optional .CaptionRuleProto caption = 5;
     if (has_caption()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
           this->caption());
     }
-    
+
     // optional .CircleRuleProto circle = 6;
     if (has_circle()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
           this->circle());
     }
-    
+
     // optional .PathTextRuleProto path_text = 7;
     if (has_path_text()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
           this->path_text());
     }
-    
+
   }
   // repeated .LineRuleProto lines = 2;
   total_size += 1 * this->lines_size();
@@ -4230,7 +4243,7 @@ int DrawElementProto::ByteSize() const {
       ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
         this->lines(i));
   }
-  
+
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -4294,7 +4307,7 @@ void DrawElementProto::CopyFrom(const DrawElementProto& from) {
 
 bool DrawElementProto::IsInitialized() const {
   if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
-  
+
   for (int i = 0; i < lines_size(); i++) {
     if (!this->lines(i).IsInitialized()) return false;
   }
@@ -4390,7 +4403,8 @@ const ::google::protobuf::Descriptor* ClassifElementProto::descriptor() {
 }
 
 const ClassifElementProto& ClassifElementProto::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto();  return *default_instance_;
+  if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto();
+  return *default_instance_;
 }
 
 ClassifElementProto* ClassifElementProto::default_instance_ = NULL;
@@ -4433,7 +4447,7 @@ bool ClassifElementProto::MergePartialFromCodedStream(
         if (input->ExpectTag(18)) goto parse_element;
         break;
       }
-      
+
       // repeated .DrawElementProto element = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -4448,7 +4462,7 @@ bool ClassifElementProto::MergePartialFromCodedStream(
         if (input->ExpectAtEnd()) return true;
         break;
       }
-      
+
       default: {
       handle_uninterpreted:
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -4475,13 +4489,13 @@ void ClassifElementProto::SerializeWithCachedSizes(
     ::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(
       2, this->element(i), output);
   }
-  
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -4499,14 +4513,14 @@ void ClassifElementProto::SerializeWithCachedSizes(
       ::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);
@@ -4516,7 +4530,7 @@ void ClassifElementProto::SerializeWithCachedSizes(
 
 int ClassifElementProto::ByteSize() const {
   int total_size = 0;
-  
+
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     // required string name = 1;
     if (has_name()) {
@@ -4524,7 +4538,7 @@ int ClassifElementProto::ByteSize() const {
         ::google::protobuf::internal::WireFormatLite::StringSize(
           this->name());
     }
-    
+
   }
   // repeated .DrawElementProto element = 2;
   total_size += 1 * this->element_size();
@@ -4533,7 +4547,7 @@ int ClassifElementProto::ByteSize() const {
       ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
         this->element(i));
   }
-  
+
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -4582,7 +4596,7 @@ void ClassifElementProto::CopyFrom(const ClassifElementProto& from) {
 
 bool ClassifElementProto::IsInitialized() const {
   if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
-  
+
   for (int i = 0; i < element_size(); i++) {
     if (!this->element(i).IsInitialized()) return false;
   }
@@ -4653,7 +4667,8 @@ const ::google::protobuf::Descriptor* ContainerProto::descriptor() {
 }
 
 const ContainerProto& ContainerProto::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto();  return *default_instance_;
+  if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto();
+  return *default_instance_;
 }
 
 ContainerProto* ContainerProto::default_instance_ = NULL;
@@ -4688,7 +4703,7 @@ bool ContainerProto::MergePartialFromCodedStream(
         if (input->ExpectAtEnd()) return true;
         break;
       }
-      
+
       default: {
       handle_uninterpreted:
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
@@ -4712,7 +4727,7 @@ void ContainerProto::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       1, this->cont(i), output);
   }
-  
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -4727,7 +4742,7 @@ void ContainerProto::SerializeWithCachedSizes(
       WriteMessageNoVirtualToArray(
         1, this->cont(i), target);
   }
-  
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -4737,7 +4752,7 @@ void ContainerProto::SerializeWithCachedSizes(
 
 int ContainerProto::ByteSize() const {
   int total_size = 0;
-  
+
   // repeated .ClassifElementProto cont = 1;
   total_size += 1 * this->cont_size();
   for (int i = 0; i < this->cont_size(); i++) {
@@ -4745,7 +4760,7 @@ int ContainerProto::ByteSize() const {
       ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
         this->cont(i));
   }
-  
+
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -4788,7 +4803,7 @@ void ContainerProto::CopyFrom(const ContainerProto& from) {
 }
 
 bool ContainerProto::IsInitialized() const {
-  
+
   for (int i = 0; i < cont_size(); i++) {
     if (!this->cont(i).IsInitialized()) return false;
   }