keymanapp · mcdurdin · Jan 18, 2024 · Jan 16, 2024 · Jan 18, 2024
diff --git a/core/include/keyman/keyman_core_api.h b/core/include/keyman/keyman_core_api.h
diff --git a/core/include/keyman/keyman_core_api_context.h b/core/include/keyman/keyman_core_api_context.h
diff --git a/core/meson.build b/core/meson.build
@@ -29,6 +29,9 @@ python = py.find_installation()
 # For now, we use KM_CORE_LIBRARY to inject the km::core::kmx namespace
 defns += ['-DKM_CORE_LIBRARY']
 
+# See keyman_core_api_context.h
+defns += ['-D_KM_CORE_ACCESS_PRIVATE_CONTEXT_API']
+
 # #define DEBUG when we are on a debug build
 if get_option('buildtype') == 'debug'
   add_global_arguments('-DDEBUG', language : 'cpp')

diff --git a/core/src/action.cpp b/core/src/action.cpp
@@ -11,7 +11,6 @@
 #include <sstream>
 #include <memory>
 
-#include <keyman/keyman_core_api.h>
 
 #include "action.hpp"
 #include "state.hpp"

diff --git a/core/src/action.hpp b/core/src/action.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <keyman/keyman_core_api.h>
+#include "keyman_core.h"
 #include <state.hpp>
 
 namespace km {

diff --git a/core/src/context.hpp b/core/src/context.hpp
@@ -9,7 +9,7 @@
 #pragma once
 #include <list>
 #include <vector>
-#include <keyman/keyman_core_api.h>
+#include "keyman_core.h"
 
 // Forward declarations
 class json;

diff --git a/core/src/debug.hpp b/core/src/debug.hpp
@@ -9,8 +9,7 @@
 #include <cassert>
 #include <vector>
 
-#include <keyman/keyman_core_api.h>
-#include <keyman/keyman_core_api_debug.h>
+#include "keyman_core.h"
 
 namespace km {
 namespace core

diff --git a/core/src/keyboard.hpp b/core/src/keyboard.hpp
@@ -11,7 +11,7 @@
 #include <string>
 #include <vector>
 
-#include <keyman/keyman_core_api.h>
+#include "keyman_core.h"
 
 #include "option.hpp"
 #include "path.hpp"

diff --git a/core/src/keyman_core.h b/core/src/keyman_core.h
@@ -0,0 +1,5 @@
+#pragma once
+
+#include <keyman/keyman_core_api.h>
+#include <keyman/keyman_core_api_context.h>
+#include <keyman/keyman_core_api_debug.h>
diff --git a/core/src/km_core_action_api.cpp b/core/src/km_core_action_api.cpp
@@ -10,7 +10,8 @@
 #include <algorithm>
 #include <sstream>
 
-#include <keyman/keyman_core_api.h>
+#include "keyman_core.h"
+
 #include "jsonpp.hpp"
 
 #include "processor.hpp"

diff --git a/core/src/km_core_context_api.cpp b/core/src/km_core_context_api.cpp
@@ -12,7 +12,7 @@
 #include <algorithm>
 #include <vector>
 
-#include <keyman/keyman_core_api.h>
+#include "keyman_core.h"
 
 #include "context.hpp"
 #include "jsonpp.hpp"

diff --git a/core/src/km_core_debug_api.cpp b/core/src/km_core_debug_api.cpp
@@ -8,7 +8,7 @@
 #include <algorithm>
 #include <sstream>
 
-#include <keyman/keyman_core_api.h>
+#include "keyman_core.h"
 
 #include "processor.hpp"
 #include "state.hpp"

diff --git a/core/src/km_core_keyboard_api.cpp b/core/src/km_core_keyboard_api.cpp
@@ -11,7 +11,8 @@
 #include <cassert>
 #include <vector>
 
-#include <keyman/keyman_core_api.h>
+#include "keyman_core.h"
+
 #include "keyboard.hpp"
 #include "processor.hpp"
 #include "kmx/kmx_processor.hpp"

diff --git a/core/src/km_core_options_api.cpp b/core/src/km_core_options_api.cpp
@@ -11,7 +11,8 @@
 #include <cassert>
 #include <sstream>
 
-#include <keyman/keyman_core_api.h>
+#include "keyman_core.h"
+
 #include "processor.hpp"
 
 #include "jsonpp.hpp"

diff --git a/core/src/km_core_processevent_api.cpp b/core/src/km_core_processevent_api.cpp
@@ -8,7 +8,8 @@
   History:      17 Oct 2018 - TSE - Initial implementation.
 */
 
-#include <keyman/keyman_core_api.h>
+#include "keyman_core.h"
+
 #include "processor.hpp"
 #include "state.hpp"
 

diff --git a/core/src/km_core_state_api.cpp b/core/src/km_core_state_api.cpp
@@ -15,7 +15,7 @@
 #include <iomanip>
 #include <codecvt>
 
-#include <keyman/keyman_core_api.h>
+#include "keyman_core.h"
 #include "jsonpp.hpp"
 
 #include "processor.hpp"

diff --git a/core/src/km_core_state_context_set_if_needed.cpp b/core/src/km_core_state_context_set_if_needed.cpp
@@ -9,7 +9,7 @@
 */
 #include <cassert>
 
-#include <keyman/keyman_core_api.h>
+#include "keyman_core.h"
 
 #include "processor.hpp"
 #include "state.hpp"

diff --git a/core/src/kmx/kmx_base.h b/core/src/kmx/kmx_base.h
@@ -1,7 +1,6 @@
 #pragma once
 
-#include <keyman/keyman_core_api_bits.h>
-#include <keyman/keyman_core_api.h>
+#include "keyman_core.h"
 
 #if defined(_WIN32) || defined(_WIN64)
 #define snprintf _snprintf

diff --git a/core/src/kmx/kmx_options.h b/core/src/kmx/kmx_options.h
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 
-#include <keyman/keyman_core_api.h>
+#include "keyman_core.h"
 #include "option.hpp"
 
 #include "kmx_base.h"

diff --git a/core/src/kmx/kmx_processor.cpp b/core/src/kmx/kmx_processor.cpp
@@ -1,4 +1,4 @@
-#include <keyman/keyman_core_api.h>
+#include "keyman_core.h"
 #include "state.hpp"
 #include "kmx/kmx_processor.hpp"
 #include <map>

diff --git a/core/src/kmx/kmx_processor.hpp b/core/src/kmx/kmx_processor.hpp
@@ -9,7 +9,7 @@
 #pragma once
 
 #include <string>
-#include <keyman/keyman_core_api.h>
+#include "keyman_core.h"
 #include "kmx/kmx_processevent.h"
 #include "keyboard.hpp"
 #include "processor.hpp"

diff --git a/core/src/ldml/ldml_processor.hpp b/core/src/ldml/ldml_processor.hpp
@@ -13,7 +13,7 @@
 #include <utility>
 #include <vector>
 #include <memory>
-#include <keyman/keyman_core_api.h>
+#include "keyman_core.h"
 #include "processor.hpp"
 #include "option.hpp"
 #include "ldml_vkeys.hpp"

diff --git a/core/src/ldml/ldml_vkeys.hpp b/core/src/ldml/ldml_vkeys.hpp
@@ -13,7 +13,7 @@
 #include <utility>
 #include <vector>
 
-#include <keyman/keyman_core_api.h>
+#include "keyman_core.h"
 
 namespace km {
 namespace core {

diff --git a/core/src/mock/mock_processor.hpp b/core/src/mock/mock_processor.hpp
@@ -10,7 +10,7 @@
 
 #include <string>
 #include <unordered_map>
-#include <keyman/keyman_core_api.h>
+#include "keyman_core.h"
 
 #include "processor.hpp"
 #include "option.hpp"

diff --git a/core/src/option.hpp b/core/src/option.hpp
@@ -12,7 +12,8 @@
 
 #include <string>
 
-#include <keyman/keyman_core_api.h>
+#include "keyman_core.h"
+
 
 // Forward declarations
 class json;

diff --git a/core/src/path.hpp b/core/src/path.hpp
@@ -12,7 +12,8 @@
 #include <string>
 #include <type_traits>
 
-#include <keyman/keyman_core_api.h>
+#include "keyman_core.h"
+
 #include "jsonpp.hpp"
 #include "utfcodec.hpp"
 

diff --git a/core/src/processor.hpp b/core/src/processor.hpp
@@ -11,7 +11,7 @@
 #include <string>
 #include <unordered_map>
 
-#include <keyman/keyman_core_api.h>
+#include "keyman_core.h"
 
 #include "keyboard.hpp"
 

diff --git a/core/src/state.hpp b/core/src/state.hpp
@@ -11,7 +11,7 @@
 #include <cassert>
 #include <vector>
 
-#include <keyman/keyman_core_api.h>
+#include "keyman_core.h"
 
 #include "context.hpp"
 #include "option.hpp"

diff --git a/core/tests/unit/kmnkbd/action_api.cpp b/core/tests/unit/kmnkbd/action_api.cpp
@@ -6,7 +6,7 @@
   History:      23 Oct 2023 - MCD - Initial implementation.
 */
 #include <string>
-#include <keyman/keyman_core_api.h>
+#include "keyman_core.h"
 
 #include "path.hpp"
 #include "action.hpp"

diff --git a/core/tests/unit/kmnkbd/action_items.hpp b/core/tests/unit/kmnkbd/action_items.hpp
@@ -1,4 +1,4 @@
-#include <keyman/keyman_core_api.h>
+#include "keyman_core.h"
 #include <string>
 #include <iostream>
 

diff --git a/core/tests/unit/kmnkbd/action_set_api.cpp b/core/tests/unit/kmnkbd/action_set_api.cpp
@@ -6,7 +6,8 @@
   History:      23 Oct 2023 - MCD - Initial implementation.
 */
 #include <string>
-#include <keyman/keyman_core_api.h>
+
+#include "keyman_core.h"
 
 #include "path.hpp"
 #include "action.hpp"

diff --git a/core/tests/unit/kmnkbd/context_api.cpp b/core/tests/unit/kmnkbd/context_api.cpp
@@ -10,7 +10,8 @@
                                     mutation functions.
 */
 #include <string>
-#include <keyman/keyman_core_api.h>
+
+#include "keyman_core.h"
 
 #include "context.hpp"
 #include "utfcodec.hpp"

diff --git a/core/tests/unit/kmnkbd/debug_api.cpp b/core/tests/unit/kmnkbd/debug_api.cpp
@@ -10,7 +10,9 @@
 #include <algorithm>
 #include <iterator>
 #include <string>
-#include <keyman/keyman_core_api.h>
+
+#include "keyman_core.h"
+
 #include "path.hpp"
 #include "state.hpp"
 #include "kmx/kmx_base.h"

diff --git a/core/tests/unit/kmnkbd/debug_items.hpp b/core/tests/unit/kmnkbd/debug_items.hpp
@@ -1,6 +1,5 @@
 #include <iostream>
-#include <keyman/keyman_core_api.h>
-#include <keyman/keyman_core_api_debug.h>
+#include "keyman_core.h"
 #include "kmx/kmx_base.h"
 #include "kmx/kmx_xstring.h"
 

diff --git a/core/tests/unit/kmnkbd/keyboard_api.cpp b/core/tests/unit/kmnkbd/keyboard_api.cpp
@@ -6,7 +6,7 @@
 */
 #include <string>
 
-#include <keyman/keyman_core_api.h>
+#include "keyman_core.h"
 #include "path.hpp"
 
 //#include "keyboard.hpp"

diff --git a/core/tests/unit/kmnkbd/options_api.cpp b/core/tests/unit/kmnkbd/options_api.cpp
@@ -7,7 +7,7 @@
 #include <cstdlib>
 #include <string>
 
-#include <keyman/keyman_core_api.h>
+#include "keyman_core.h"
 
 #include "option.hpp"
 #include "state.hpp"

diff --git a/core/tests/unit/kmnkbd/state_api.cpp b/core/tests/unit/kmnkbd/state_api.cpp
@@ -9,7 +9,7 @@
 #include <iostream>
 #include <string>
 
-#include <keyman/keyman_core_api.h>
+#include "keyman_core.h"
 
 #include "path.hpp"
 #include "state.hpp"

diff --git a/core/tests/unit/kmx/kmx.cpp b/core/tests/unit/kmx/kmx.cpp
@@ -17,6 +17,8 @@
 #include <string>
 #include <type_traits>
 
+#include "keyman_core.h"
+
 #include <kmx/kmx_processevent.h>
 #include <kmx/kmx_xstring.h>
 

diff --git a/core/tests/unit/ldml/ldml.cpp b/core/tests/unit/ldml/ldml.cpp
@@ -24,6 +24,8 @@
 #include <test_assert.h>
 #include <test_color.h>
 
+#include "keyman_core.h"
+
 #include <kmx/kmx_xstring.h>  // for surrogate pair macros
 
 #include "ldml_test_source.hpp"

diff --git a/core/tests/unit/ldml/ldml_test_utils.hpp b/core/tests/unit/ldml/ldml_test_utils.hpp
@@ -13,7 +13,8 @@
 #include <kmx/kmx_processevent.h> // for char to vk mapping tables
 #include <kmx/kmx_xstring.h> // for surrogate pair macros
 #include <kmx/kmx_plus.h>
-#include <keyman/keyman_core_api.h>
+
+#include "keyman_core.h"
 
 namespace km {
 namespace tests {

diff --git a/core/tests/unit/ldml/test_context_normalization.cpp b/core/tests/unit/ldml/test_context_normalization.cpp
@@ -6,7 +6,7 @@
   History:      15 Jan 2024 - MCD - Initial implementation.
 */
 #include <string>
-#include <keyman/keyman_core_api.h>
+#include "keyman_core.h"
 
 #include "path.hpp"
 #include "action.hpp"

diff --git a/windows/src/engine/keyman32/keymanengine.h b/windows/src/engine/keyman32/keymanengine.h
@@ -40,6 +40,7 @@
 #include <msctf.h>
 #include "../../../../common/windows/cpp/include/legacy_kmx_file.h"
 #include <keyman/keyman_core_api.h>
+#include <keyman/keyman_core_api_context.h> // for intermediate context
 #include <keyman/keyman_core_api_consts.h>
 
 /***************************************************************************/