From f540224561c7ca3860d1e3a3fc97b62c544154f2 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Thu, 5 Aug 2004 19:11:46 +0000
Subject: [PATCH] use capital S for tilde if no lowercase S

---
 panda/src/text/textAssembler.cxx | 18 ++++++++++++++++++
 panda/src/text/textAssembler.h   |  1 +
 2 files changed, 19 insertions(+)

diff --git a/panda/src/text/textAssembler.cxx b/panda/src/text/textAssembler.cxx
index 9b7e29c648..2a7ace467f 100644
--- a/panda/src/text/textAssembler.cxx
+++ b/panda/src/text/textAssembler.cxx
@@ -1067,7 +1067,10 @@ tack_on_accent(UnicodeLatinMap::AccentType accent_type,
     tack_on_accent('~', CP_above, CT_none, min_vert, max_vert, centroid,
                    properties, placement) ||
       tack_on_accent('s', CP_above, CT_squash_mirror_diag, min_vert, max_vert, centroid,
+                     properties, placement) ||
+      tack_on_accent('S', CP_above, CT_small_squash_mirror_diag, min_vert, max_vert, centroid,
                      properties, placement);
+
     break;
 
   case UnicodeLatinMap::AT_tilde_below:
@@ -1287,6 +1290,21 @@ tack_on_accent(char accent_mark, TextAssembler::CheesyPosition position,
           mirrored = true;
           break;
 
+        case CT_small_squash_mirror_diag:
+          accent_mat =
+            LMatrix4f::rotate_mat_normaxis(270.0f, LVecBase3f(0.0f, -1.0f, 0.0f)) *
+            LMatrix4f::scale_mat(-small_squash_accent_scale_x, 1.0f, small_squash_accent_scale_y);
+          
+          // rotate min, max
+          t = min_accent[0];
+          u = max_accent[0];
+          min_accent[0] = min_accent[2] * -small_squash_accent_scale_x;
+          max_accent[0] = max_accent[2] * -small_squash_accent_scale_x;
+          min_accent[2] = -u * small_squash_accent_scale_y;
+          max_accent[2] = -t * small_squash_accent_scale_y;
+          mirrored = true;
+          break;
+
         case CT_small:
           accent_mat = LMatrix4f::scale_mat(small_accent_scale);
           min_accent *= small_accent_scale;
diff --git a/panda/src/text/textAssembler.h b/panda/src/text/textAssembler.h
index b9d84b8851..25eb01306d 100644
--- a/panda/src/text/textAssembler.h
+++ b/panda/src/text/textAssembler.h
@@ -146,6 +146,7 @@ private:
     CT_squash_mirror_diag,
     CT_small_squash,
     CT_small_squash_mirror_y,
+    CT_small_squash_mirror_diag,
     CT_small,
     CT_small_rotate_270,
     CT_tiny,