From de6314e3b5ce58f932bcbba7bd85d8f94485e0f8 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Mon, 10 Aug 2020 18:16:22 +0100
Subject: [PATCH] Convert smart quotes and dashes to ASCII in DRC rules.

Fixes https://gitlab.com/kicad/code/kicad/issues/5135
---
 common/scintilla_tricks.cpp          | 30 ++++++++++++++++++++++++++--
 pcbnew/dialogs/panel_setup_rules.cpp | 15 ++++++++++++--
 2 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/common/scintilla_tricks.cpp b/common/scintilla_tricks.cpp
index adae90bcf4..8e1694f710 100644
--- a/common/scintilla_tricks.cpp
+++ b/common/scintilla_tricks.cpp
@@ -23,10 +23,12 @@
 
 
 #include <fctsys.h>
+#include <kicad_string.h>
 #include <scintilla_tricks.h>
 #include <wx/stc/stc.h>
 #include <gal/color4d.h>
 #include <dialog_shim.h>
+#include <wx/clipbrd.h>
 
 SCINTILLA_TRICKS::SCINTILLA_TRICKS( wxStyledTextCtrl* aScintilla, const wxString& aBraces ) :
         m_te( aScintilla ),
@@ -66,7 +68,13 @@ SCINTILLA_TRICKS::SCINTILLA_TRICKS( wxStyledTextCtrl* aScintilla, const wxString
 
 void SCINTILLA_TRICKS::onCharHook( wxKeyEvent& aEvent )
 {
-    if( aEvent.GetKeyCode() == WXK_TAB )
+    wxString c = aEvent.GetUnicodeKey();
+
+    if( ConvertSmartQuotesAndDashes( &c ) )
+    {
+        m_te->AddText( c );
+    }
+    else if( aEvent.GetKeyCode() == WXK_TAB )
     {
         if( aEvent.ControlDown() )
         {
@@ -107,7 +115,25 @@ void SCINTILLA_TRICKS::onCharHook( wxKeyEvent& aEvent )
     }
     else if( aEvent.GetModifiers() == wxMOD_CONTROL && aEvent.GetKeyCode() == 'V' )
     {
-        m_te->Paste();
+        if( m_te->GetSelectionEnd() > m_te->GetSelectionStart() )
+            m_te->DeleteBack();
+
+        if( wxTheClipboard->Open() )
+        {
+            if( wxTheClipboard->IsSupported( wxDF_TEXT ) )
+            {
+                wxTextDataObject data;
+                wxString         str;
+
+                wxTheClipboard->GetData( data );
+                str = data.GetText();
+
+                ConvertSmartQuotesAndDashes( &str );
+                m_te->AddText( str );
+            }
+
+            wxTheClipboard->Close();
+        }
     }
     else if( aEvent.GetKeyCode() == WXK_BACK )
     {
diff --git a/pcbnew/dialogs/panel_setup_rules.cpp b/pcbnew/dialogs/panel_setup_rules.cpp
index 36e08048eb..109a8b5f96 100644
--- a/pcbnew/dialogs/panel_setup_rules.cpp
+++ b/pcbnew/dialogs/panel_setup_rules.cpp
@@ -294,7 +294,18 @@ bool PANEL_SETUP_RULES::TransferDataToWindow()
     wxFileName rulesFile( rulesFilepath );
 
     if( rulesFile.FileExists() )
-        m_textEditor->LoadFile( rulesFile.GetFullPath() );
+    {
+        wxTextFile file( rulesFile.GetFullPath() );
+
+        if( file.Open() )
+        {
+            for ( wxString str = file.GetFirstLine(); !file.Eof(); str = file.GetNextLine() )
+            {
+                ConvertSmartQuotesAndDashes( &str );
+                m_textEditor->AddText( str << '\n' );
+            }
+        }
+    }
 
     m_originalText = m_textEditor->GetText();
 
@@ -309,7 +320,7 @@ bool PANEL_SETUP_RULES::TransferDataFromWindow()
 
     try
     {
-        std::vector<DRC_RULE*>     dummyRules;
+        std::vector<DRC_RULE*> dummyRules;
 
         DRC_RULES_PARSER parser( m_frame->GetBoard(), m_textEditor->GetText(), _( "DRC rules" ) );