From 29dee365257ccf64ab7d194c1f264a14492da5c5 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Thu, 17 Jun 2021 09:38:27 +0200
Subject: [PATCH] fixed product shvid

---
 dialogs.cpp      | 11 +++++++++++
 nonisotropic.cpp |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/dialogs.cpp b/dialogs.cpp
index 7fc56edf..2aab5325 100644
--- a/dialogs.cpp
+++ b/dialogs.cpp
@@ -1198,6 +1198,9 @@ EX namespace dialog {
 
   EX string infix;
   
+  string foreign_letters = "ÁÄÇÈÉÍÎÖÚÜßàáâãäçèéêìíîïòóôõöøùúüýąćČčĎďĘęĚěğİıŁłńňŘřŚśŞşŠšŤťůŹźŻżŽž";
+  string latin_letters   = "AACEEIIOUUsAAAAACEEEIIIIOOOOOOUUUYACCCDDEEEEGIILLNNRRSSSSSSTTUZZZZZZ";
+
   EX bool hasInfix(const string &s) {
     if(infix == "") return true;
     string t = "";
@@ -1207,6 +1210,14 @@ EX namespace dialog {
       if(c >= 'a' && c <= 'z') tt += c - 32;
       else if(c >= 'A' && c <= 'Z') tt += c;
       else if(c == '@') tt += c;
+      
+      if(tt == 0) for(int k=0; k<isize(latin_letters); k++) {
+        if(s[i] == foreign_letters[2*k] && s[i+1] == foreign_letters[2*k+1]) {
+          if(latin_letters[k] == 's') t += "SS";
+          else tt += latin_letters[k];
+          }
+        }
+
       if(tt) t += tt;
       }
     return t.find(infix) != string::npos;
diff --git a/nonisotropic.cpp b/nonisotropic.cpp
index 20873db1..d747d721 100644
--- a/nonisotropic.cpp
+++ b/nonisotropic.cpp
@@ -1278,7 +1278,7 @@ EX namespace hybrid {
 
     int shvid(cell *c) override {
       cell *c1 = hybrid::get_where(c).first; 
-      return PIU( shvid(c1) );      
+      return PIU( hr::shvid(c1) );      
       }
   
     virtual transmatrix spin_to(cell *c, int d, ld bonus) override { if(d >= c->type-2) return Id; c = get_where(c).first; return in_underlying([&] { return currentmap->spin_to(c, d, bonus); }); }