Add PathTextRuleProto for text-by-line.

Regenerate proto drawing rules.
Take into account correct rule color for text-by-line drawing.

1 files changed, 216 insertions, 3 deletions

diff --git a/indexer/drules_struct.pb.h b/indexer/drules_struct.pb.h
index 4a63714713..7bd03c2369 100644
--- a/indexer/drules_struct.pb.h
+++ b/indexer/drules_struct.pb.h
@@ -36,6 +36,7 @@ class AreaRuleProto;
 class SymbolRuleProto;
 class CaptionRuleProto;
 class CircleRuleProto;
+class PathTextRuleProto;
 class DrawElementProto;
 class ClassifElementProto;
 class ContainerProto;
@@ -520,7 +521,7 @@ class CaptionRuleProto : public ::google::protobuf::Message {
   inline ::google::protobuf::int32 height() const;
   inline void set_height(::google::protobuf::int32 value);
   
-  // optional uint32 color = 2;
+  // required uint32 color = 2;
   inline bool has_color() const;
   inline void clear_color();
   static const int kColorFieldNumber = 2;
@@ -684,6 +685,108 @@ class CircleRuleProto : public ::google::protobuf::Message {
 };
 // -------------------------------------------------------------------
 
+class PathTextRuleProto : public ::google::protobuf::Message {
+ public:
+  PathTextRuleProto();
+  virtual ~PathTextRuleProto();
+
+  PathTextRuleProto(const PathTextRuleProto& from);
+
+  inline PathTextRuleProto& operator=(const PathTextRuleProto& from) {
+    CopyFrom(from);
+    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);
+
+  // implements Message ----------------------------------------------
+
+  PathTextRuleProto* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const PathTextRuleProto& from);
+  void MergeFrom(const PathTextRuleProto& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::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();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // required int32 height = 1;
+  inline bool has_height() const;
+  inline void clear_height();
+  static const int kHeightFieldNumber = 1;
+  inline ::google::protobuf::int32 height() const;
+  inline void set_height(::google::protobuf::int32 value);
+
+  // required uint32 color = 2;
+  inline bool has_color() const;
+  inline void clear_color();
+  static const int kColorFieldNumber = 2;
+  inline ::google::protobuf::uint32 color() const;
+  inline void set_color(::google::protobuf::uint32 value);
+
+  // required int32 priority = 3;
+  inline bool has_priority() const;
+  inline void clear_priority();
+  static const int kPriorityFieldNumber = 3;
+  inline ::google::protobuf::int32 priority() const;
+  inline void set_priority(::google::protobuf::int32 value);
+
+  // @@protoc_insertion_point(class_scope:PathTextRuleProto)
+ private:
+  inline void set_has_height();
+  inline void clear_has_height();
+  inline void set_has_color();
+  inline void clear_has_color();
+  inline void set_has_priority();
+  inline void clear_has_priority();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::google::protobuf::int32 height_;
+  ::google::protobuf::uint32 color_;
+  ::google::protobuf::int32 priority_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
+
+  friend void  protobuf_AddDesc_drules_5fstruct_2eproto();
+  friend void protobuf_AssignDesc_drules_5fstruct_2eproto();
+  friend void protobuf_ShutdownFile_drules_5fstruct_2eproto();
+
+  void InitAsDefaultInstance();
+  static PathTextRuleProto* default_instance_;
+};
+// -------------------------------------------------------------------
+
 class DrawElementProto : public ::google::protobuf::Message {
  public:
   DrawElementProto();
@@ -789,6 +892,14 @@ class DrawElementProto : public ::google::protobuf::Message {
   inline ::CircleRuleProto* mutable_circle();
   inline ::CircleRuleProto* release_circle();
   
+  // optional .PathTextRuleProto path_text = 7;
+  inline bool has_path_text() const;
+  inline void clear_path_text();
+  static const int kPathTextFieldNumber = 7;
+  inline const ::PathTextRuleProto& path_text() const;
+  inline ::PathTextRuleProto* mutable_path_text();
+  inline ::PathTextRuleProto* release_path_text();
+
   // @@protoc_insertion_point(class_scope:DrawElementProto)
  private:
   inline void set_has_scale();
@@ -801,6 +912,8 @@ class DrawElementProto : public ::google::protobuf::Message {
   inline void clear_has_caption();
   inline void set_has_circle();
   inline void clear_has_circle();
+  inline void set_has_path_text();
+  inline void clear_has_path_text();
   
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
   
@@ -809,10 +922,11 @@ class DrawElementProto : public ::google::protobuf::Message {
   ::SymbolRuleProto* symbol_;
   ::CaptionRuleProto* caption_;
   ::CircleRuleProto* circle_;
+  ::PathTextRuleProto* path_text_;
   ::google::protobuf::int32 scale_;
   
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(6 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(7 + 31) / 32];
   
   friend void  protobuf_AddDesc_drules_5fstruct_2eproto();
   friend void protobuf_AssignDesc_drules_5fstruct_2eproto();
@@ -1367,7 +1481,7 @@ inline void CaptionRuleProto::set_height(::google::protobuf::int32 value) {
   height_ = value;
 }
 
-// optional uint32 color = 2;
+// required uint32 color = 2;
 inline bool CaptionRuleProto::has_color() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
@@ -1534,6 +1648,76 @@ inline void CircleRuleProto::set_priority(::google::protobuf::int32 value) {
 
 // -------------------------------------------------------------------
 
+// PathTextRuleProto
+
+// required int32 height = 1;
+inline bool PathTextRuleProto::has_height() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void PathTextRuleProto::set_has_height() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void PathTextRuleProto::clear_has_height() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void PathTextRuleProto::clear_height() {
+  height_ = 0;
+  clear_has_height();
+}
+inline ::google::protobuf::int32 PathTextRuleProto::height() const {
+  return height_;
+}
+inline void PathTextRuleProto::set_height(::google::protobuf::int32 value) {
+  set_has_height();
+  height_ = value;
+}
+
+// required uint32 color = 2;
+inline bool PathTextRuleProto::has_color() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void PathTextRuleProto::set_has_color() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void PathTextRuleProto::clear_has_color() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void PathTextRuleProto::clear_color() {
+  color_ = 0u;
+  clear_has_color();
+}
+inline ::google::protobuf::uint32 PathTextRuleProto::color() const {
+  return color_;
+}
+inline void PathTextRuleProto::set_color(::google::protobuf::uint32 value) {
+  set_has_color();
+  color_ = value;
+}
+
+// required int32 priority = 3;
+inline bool PathTextRuleProto::has_priority() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void PathTextRuleProto::set_has_priority() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void PathTextRuleProto::clear_has_priority() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void PathTextRuleProto::clear_priority() {
+  priority_ = 0;
+  clear_has_priority();
+}
+inline ::google::protobuf::int32 PathTextRuleProto::priority() const {
+  return priority_;
+}
+inline void PathTextRuleProto::set_priority(::google::protobuf::int32 value) {
+  set_has_priority();
+  priority_ = value;
+}
+
+// -------------------------------------------------------------------
+
 // DrawElementProto
 
 // required int32 scale = 1;
@@ -1699,6 +1883,35 @@ inline ::CircleRuleProto* DrawElementProto::release_circle() {
   return temp;
 }
 
+// optional .PathTextRuleProto path_text = 7;
+inline bool DrawElementProto::has_path_text() const {
+  return (_has_bits_[0] & 0x00000040u) != 0;
+}
+inline void DrawElementProto::set_has_path_text() {
+  _has_bits_[0] |= 0x00000040u;
+}
+inline void DrawElementProto::clear_has_path_text() {
+  _has_bits_[0] &= ~0x00000040u;
+}
+inline void DrawElementProto::clear_path_text() {
+  if (path_text_ != NULL) path_text_->::PathTextRuleProto::Clear();
+  clear_has_path_text();
+}
+inline const ::PathTextRuleProto& DrawElementProto::path_text() const {
+  return path_text_ != NULL ? *path_text_ : *default_instance_->path_text_;
+}
+inline ::PathTextRuleProto* DrawElementProto::mutable_path_text() {
+  set_has_path_text();
+  if (path_text_ == NULL) path_text_ = new ::PathTextRuleProto;
+  return path_text_;
+}
+inline ::PathTextRuleProto* DrawElementProto::release_path_text() {
+  clear_has_path_text();
+  ::PathTextRuleProto* temp = path_text_;
+  path_text_ = NULL;
+  return temp;
+}
+
 // -------------------------------------------------------------------
 
 // ClassifElementProto