text rendering: tilde toggles overbar

Author: carrotIndustries

Diff for: src/canvas/text.cpp

@@ -42,12 +42,7 @@ std::pair<Coordf, Coordf> Canvas::draw_text0(const Coordf &p, float size, const
     }
     begin_group(layer);
     while (std::getline(ss, line, '\n')) {
-        TextData::Decoration decoration = TextData::Decoration::NONE;
-        if (line.size() && line.front() == '~') {
-            line = line.substr(1);
-            decoration = TextData::Decoration::OVERLINE;
-        }
-        const TextData td{line, font, decoration};
+        const TextData td{line, font};
 
         Placement tf;
         tf.shift.x = p.x;

Diff for: src/schematic/schematic_symbol.cpp

@@ -158,12 +158,18 @@ void SchematicSymbol::apply_expand()
     symbol.apply_expand(*pool_symbol, expand);
 }
 
+static std::string append_tilde(const std::string &s)
+{
+    if (s.size() && s.front() == '~')
+        return s + "~";
+    return s;
+}
 
 static void append_pin_name(std::string &name, const std::string &x)
 {
     if (name.size())
         name += " ";
-    name += x;
+    name += append_tilde(x);
 }
 
 void SchematicSymbol::apply_pin_names()
@@ -175,24 +181,24 @@ void SchematicSymbol::apply_pin_names()
         for (auto &it_pin : symbol.pins) {
             auto pin_uuid = it_pin.first;
             for (auto &pin_name : gate->unit->pins.at(pin_uuid).names) {
-                it_pin.second.name += pin_name + " ";
+                it_pin.second.name += append_tilde(pin_name) + " ";
             }
             UUIDPath<2> path(gate->uuid, pin_uuid);
             if (component->custom_pin_names.count(path)) {
-                it_pin.second.name += component->custom_pin_names.at(path) + " ";
+                it_pin.second.name += append_tilde(component->custom_pin_names.at(path)) + " ";
             }
-            it_pin.second.name += "(" + gate->unit->pins.at(pin_uuid).primary_name + ")";
+            it_pin.second.name += "(" + append_tilde(gate->unit->pins.at(pin_uuid).primary_name) + ")";
         }
     }
     else if (pin_display_mode == SchematicSymbol::PinDisplayMode::CUSTOM_ONLY) {
         for (auto &it_pin : symbol.pins) {
             auto pin_uuid = it_pin.first;
             UUIDPath<2> path(gate->uuid, pin_uuid);
             if (component->custom_pin_names.count(path) && component->custom_pin_names.at(path).size()) {
-                it_pin.second.name = component->custom_pin_names.at(path);
+                it_pin.second.name = append_tilde(component->custom_pin_names.at(path));
             }
             else {
-                it_pin.second.name = gate->unit->pins.at(pin_uuid).primary_name;
+                it_pin.second.name = append_tilde(gate->unit->pins.at(pin_uuid).primary_name);
             }
         }
     }
@@ -204,7 +210,7 @@ void SchematicSymbol::apply_pin_names()
             if (component->pin_names.count(path) && component->pin_names.at(path).size()) {
                 const auto &names = component->pin_names.at(path);
                 if (names.count(-1) || (pin_display_mode == SchematicSymbol::PinDisplayMode::BOTH))
-                    it_pin.second.name = gate->unit->pins.at(pin_uuid).primary_name;
+                    it_pin.second.name = append_tilde(gate->unit->pins.at(pin_uuid).primary_name);
                 for (const auto &it : names) {
                     if (it == -2) {
                         // nop, see later
@@ -222,7 +228,7 @@ void SchematicSymbol::apply_pin_names()
                 }
             }
             else {
-                it_pin.second.name = gate->unit->pins.at(pin_uuid).primary_name;
+                it_pin.second.name = append_tilde(gate->unit->pins.at(pin_uuid).primary_name);
             }
         }
     }

Diff for: src/util/text_data.cpp

@@ -178,17 +178,29 @@ static unsigned int codepoint_to_hershey(gunichar c, TextData::Font font)
 
 extern const char *hershey_glyphs[];
 
-bool operator&(TextData::Decoration a, TextData::Decoration b)
-{
-    return static_cast<int>(a) & static_cast<int>(b);
-}
-
-TextData::TextData(const std::string &str, Font font, Decoration decoration)
+TextData::TextData(const std::string &str, Font font)
 {
     Glib::ustring ustr(str);
     int x0 = 0;
     lines.reserve(ustr.size());
+    int overbar_start = -1;
+    const int bar_y = 24;
     for (const gunichar c : ustr) {
+        if (c == '~') {
+            if (overbar_start == -1) {
+                overbar_start = x0;
+                continue;
+            }
+            else {
+                if (overbar_start != x0) {
+                    lines.emplace_back(std::piecewise_construct, std::forward_as_tuple(overbar_start, bar_y),
+                                       std::forward_as_tuple(x0, bar_y));
+                    overbar_start = -1;
+                    continue;
+                }
+                overbar_start = -1;
+            }
+        }
         const char *s = hershey_glyphs[codepoint_to_hershey(c, font)];
         int left = s[0] - 'R';
         int right = s[1] - 'R';
@@ -211,7 +223,6 @@ TextData::TextData(const std::string &str, Font font, Decoration decoration)
                 xmax = std::max(xmax, x0 + x + xshift);
                 s += 2;
                 if (n > 0) {
-
                     lines.emplace_back(std::piecewise_construct, std::forward_as_tuple(x0 + x + xshift, y),
                                        std::forward_as_tuple(x0 + x2 + xshift, y2));
                 }
@@ -224,10 +235,8 @@ TextData::TextData(const std::string &str, Font font, Decoration decoration)
         x0 += right - left;
     }
     xright = x0;
-    if (decoration & Decoration::OVERLINE) {
-        int bar_y = 24;
-        lines.emplace_back(std::piecewise_construct, std::forward_as_tuple(0, bar_y),
-                           std::forward_as_tuple(xright, bar_y));
-    }
+    if (overbar_start != -1)
+        lines.emplace_back(std::piecewise_construct, std::forward_as_tuple(overbar_start, bar_y),
+                           std::forward_as_tuple(x0, bar_y));
 }
 } // namespace horizon

Diff for: src/util/text_data.hpp

@@ -20,10 +20,7 @@ class TextData {
         SCRIPT_SIMPLEX,
         SCRIPT_COMPLEX
     };
-
-    enum class Decoration { NONE = 0, OVERLINE = (1 << 1) };
-
-    TextData(const std::string &s, Font font = Font::SIMPLEX, Decoration decoration = Decoration::NONE);
+    TextData(const std::string &s, Font font = Font::SIMPLEX);
     std::vector<std::pair<Coordi, Coordi>> lines;
     int ymin = 0;
     int ymax = 0;