From c35e839d6f3fec009c84581286cf0be8f1c22370 Mon Sep 17 00:00:00 2001
From: ShikiSuen <shikisuen@outlook.com>
Date: Fri, 27 May 2022 20:27:23 +0800
Subject: [PATCH] KeyHandler // Add "_alt_ctrl_punctuation_".

Update KeyHandler_HandleInput.swift
---
 .../ControllerModules/KeyHandler_HandleCandidate.swift      | 6 ++++--
 .../Modules/ControllerModules/KeyHandler_HandleInput.swift  | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Source/Modules/ControllerModules/KeyHandler_HandleCandidate.swift b/Source/Modules/ControllerModules/KeyHandler_HandleCandidate.swift
index 0c73494b..7c631905 100644
--- a/Source/Modules/ControllerModules/KeyHandler_HandleCandidate.swift
+++ b/Source/Modules/ControllerModules/KeyHandler_HandleCandidate.swift
@@ -310,10 +310,12 @@ extension KeyHandler {
       if mgrPrefs.useSCPCTypingMode {
         var punctuationNamePrefix = ""
 
-        if input.isOptionHold {
+        if input.isOptionHold && !input.isControlHold {
           punctuationNamePrefix = "_alt_punctuation_"
-        } else if input.isControlHold {
+        } else if input.isControlHold && !input.isOptionHold {
           punctuationNamePrefix = "_ctrl_punctuation_"
+        } else if input.isControlHold && input.isOptionHold {
+          punctuationNamePrefix = "_alt_ctrl_punctuation_"
         } else if mgrPrefs.halfWidthPunctuationEnabled {
           punctuationNamePrefix = "_half_punctuation_"
         } else {
diff --git a/Source/Modules/ControllerModules/KeyHandler_HandleInput.swift b/Source/Modules/ControllerModules/KeyHandler_HandleInput.swift
index dbf50d43..a78b0055 100644
--- a/Source/Modules/ControllerModules/KeyHandler_HandleInput.swift
+++ b/Source/Modules/ControllerModules/KeyHandler_HandleInput.swift
@@ -382,10 +382,12 @@ extension KeyHandler {
 
     var punctuationNamePrefix = ""
 
-    if input.isOptionHold {
+    if input.isOptionHold && !input.isControlHold {
       punctuationNamePrefix = "_alt_punctuation_"
-    } else if input.isControlHold {
+    } else if input.isControlHold && !input.isOptionHold {
       punctuationNamePrefix = "_ctrl_punctuation_"
+    } else if input.isControlHold && input.isOptionHold {
+      punctuationNamePrefix = "_alt_ctrl_punctuation_"
     } else if mgrPrefs.halfWidthPunctuationEnabled {
       punctuationNamePrefix = "_half_punctuation_"
     } else {