SheenBidi: Include in build of juce_graphics

2026-01-10 23:44:24 +00:00 · 2024-07-09 18:57:46 +01:00 · 2024-07-09 18:57:46 +01:00 · e3489703f2
commit e3489703f2
parent d77d5801d9
85 changed files with 428 additions and 61 deletions
--- a/modules/juce_graphics/unicode/sheenbidi/JUCE_CHANGES.txt
+++ b/modules/juce_graphics/unicode/sheenbidi/JUCE_CHANGES.txt
@ -0,0 +1,3 @@
+- The include of SBRun.h in SBLine.c was changed to use angle brackets.
+- Include paths to SheenBidi headers in <angle brackets> have been swapped for
+  versions that explicitly point inside the juce_graphics module.
--- a/modules/juce_graphics/unicode/sheenbidi/Source/BidiChain.c
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/BidiChain.c
@ -14,7 +14,7 @@
 * limitations under the License.
 */

-#include <SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBConfig.h>

 #include "SBBase.h"
 #include "BidiChain.h"
--- a/modules/juce_graphics/unicode/sheenbidi/Source/BidiChain.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/BidiChain.h
@ -17,7 +17,7 @@
 #ifndef _SB_INTERNAL_BIDI_CHAIN_H
 #define _SB_INTERNAL_BIDI_CHAIN_H

-#include <SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBConfig.h>
 #include "SBBase.h"

 typedef SBUInt32 BidiLink;
--- a/modules/juce_graphics/unicode/sheenbidi/Source/BidiTypeLookup.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/BidiTypeLookup.h
@ -6,8 +6,8 @@
 #ifndef _SB_INTERNAL_BIDI_TYPE_LOOKUP_H
 #define _SB_INTERNAL_BIDI_TYPE_LOOKUP_H

-#include <SBBidiType.h>
-#include <SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBBidiType.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBConfig.h>

 #include "SBBase.h"

--- a/modules/juce_graphics/unicode/sheenbidi/Source/BracketQueue.c
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/BracketQueue.c
@ -14,7 +14,7 @@
 * limitations under the License.
 */

-#include <SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBConfig.h>
 #include <stddef.h>
 #include <stdlib.h>

--- a/modules/juce_graphics/unicode/sheenbidi/Source/BracketQueue.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/BracketQueue.h
@ -17,7 +17,7 @@
 #ifndef _SB_INTERNAL_BRACKET_QUEUE_H
 #define _SB_INTERNAL_BRACKET_QUEUE_H

-#include <SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBConfig.h>

 #include "BidiChain.h"
 #include "SBBase.h"
--- a/modules/juce_graphics/unicode/sheenbidi/Source/GeneralCategoryLookup.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/GeneralCategoryLookup.h
@ -6,8 +6,8 @@
 #ifndef _SB_INTERNAL_GENERAL_CATEGORY_LOOKUP_H
 #define _SB_INTERNAL_GENERAL_CATEGORY_LOOKUP_H

-#include <SBConfig.h>
-#include <SBGeneralCategory.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBGeneralCategory.h>

 #include "SBBase.h"

--- a/modules/juce_graphics/unicode/sheenbidi/Source/IsolatingRun.c
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/IsolatingRun.c
@ -14,7 +14,7 @@
 * limitations under the License.
 */

-#include <SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBConfig.h>

 #include "BidiChain.h"
 #include "BracketQueue.h"
--- a/modules/juce_graphics/unicode/sheenbidi/Source/IsolatingRun.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/IsolatingRun.h
@ -17,7 +17,7 @@
 #ifndef _SB_INTERNAL_ISOLATING_RUN_H
 #define _SB_INTERNAL_ISOLATING_RUN_H

-#include <SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBConfig.h>

 #include "BidiChain.h"
 #include "BracketQueue.h"
--- a/modules/juce_graphics/unicode/sheenbidi/Source/LevelRun.c
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/LevelRun.c
@ -14,7 +14,7 @@
 * limitations under the License.
 */

-#include <SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBConfig.h>
 #include <stddef.h>

 #include "BidiChain.h"
--- a/modules/juce_graphics/unicode/sheenbidi/Source/LevelRun.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/LevelRun.h
@ -17,7 +17,7 @@
 #ifndef _SB_INTERNAL_LEVEL_RUN_H
 #define _SB_INTERNAL_LEVEL_RUN_H

-#include <SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBConfig.h>

 #include "BidiChain.h"
 #include "RunExtrema.h"
--- a/modules/juce_graphics/unicode/sheenbidi/Source/PairingLookup.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/PairingLookup.h
@ -6,7 +6,7 @@
 #ifndef _SB_INTERNAL_PAIRING_LOOKUP_H
 #define _SB_INTERNAL_PAIRING_LOOKUP_H

-#include <SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBConfig.h>

 #include "BracketType.h"
 #include "SBBase.h"
--- a/modules/juce_graphics/unicode/sheenbidi/Source/RunQueue.c
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/RunQueue.c
@ -14,7 +14,7 @@
 * limitations under the License.
 */

-#include <SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBConfig.h>
 #include <stddef.h>
 #include <stdlib.h>

--- a/modules/juce_graphics/unicode/sheenbidi/Source/RunQueue.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/RunQueue.h
@ -17,7 +17,7 @@
 #ifndef _SB_INTERNAL_RUN_QUEUE_H
 #define _SB_INTERNAL_RUN_QUEUE_H

-#include <SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBConfig.h>

 #include "LevelRun.h"
 #include "SBBase.h"
--- a/modules/juce_graphics/unicode/sheenbidi/Source/SBAlgorithm.c
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/SBAlgorithm.c
@ -14,7 +14,7 @@
 * limitations under the License.
 */

-#include <SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBConfig.h>
 #include <stddef.h>
 #include <stdlib.h>

--- a/modules/juce_graphics/unicode/sheenbidi/Source/SBAlgorithm.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/SBAlgorithm.h
@ -17,11 +17,11 @@
 #ifndef _SB_INTERNAL_ALGORITHM_H
 #define _SB_INTERNAL_ALGORITHM_H

-#include <SBAlgorithm.h>
-#include <SBBase.h>
-#include <SBBidiType.h>
-#include <SBCodepointSequence.h>
-#include <SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBAlgorithm.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBBase.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBBidiType.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBCodepointSequence.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBConfig.h>

 typedef struct _SBAlgorithm {
    SBCodepointSequence codepointSequence;
--- a/modules/juce_graphics/unicode/sheenbidi/Source/SBBase.c
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/SBBase.c
@ -14,7 +14,7 @@
 * limitations under the License.
 */

-#include <SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBConfig.h>

 #include "BidiTypeLookup.h"
 #include "GeneralCategoryLookup.h"
--- a/modules/juce_graphics/unicode/sheenbidi/Source/SBBase.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/SBBase.h
@ -17,12 +17,12 @@
 #ifndef _SB_INTERNAL_BASE_H
 #define _SB_INTERNAL_BASE_H

-#include <SBBase.h>
-#include <SBBidiType.h>
-#include <SBCodepoint.h>
-#include <SBConfig.h>
-#include <SBGeneralCategory.h>
-#include <SBScript.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBBase.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBBidiType.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBCodepoint.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBGeneralCategory.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBScript.h>

 /**
 * A value that indicates an invalid unsigned index.
--- a/modules/juce_graphics/unicode/sheenbidi/Source/SBCodepointSequence.c
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/SBCodepointSequence.c
@ -14,7 +14,7 @@
 * limitations under the License.
 */

-#include <SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBConfig.h>

 #include <stddef.h>
 #include <stdlib.h>
--- a/modules/juce_graphics/unicode/sheenbidi/Source/SBCodepointSequence.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/SBCodepointSequence.h
@ -17,8 +17,8 @@
 #ifndef _SB_INTERNAL_CODEPOINT_SEQUENCE_H
 #define _SB_INTERNAL_CODEPOINT_SEQUENCE_H

-#include <SBConfig.h>
-#include <SBCodepointSequence.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBCodepointSequence.h>

 SB_INTERNAL SBBoolean SBCodepointSequenceIsValid(const SBCodepointSequence *codepointSequence);

--- a/modules/juce_graphics/unicode/sheenbidi/Source/SBLine.c
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/SBLine.c
@ -14,7 +14,9 @@
 * limitations under the License.
 */

-#include <SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBRun.h>
+
 #include <stddef.h>
 #include <stdlib.h>

@ -24,7 +26,6 @@
 #include "SBBase.h"
 #include "SBCodepointSequence.h"
 #include "SBParagraph.h"
-#include "SBRun.h"
 #include "SBLine.h"

 typedef struct _LineContext {
--- a/modules/juce_graphics/unicode/sheenbidi/Source/SBLine.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/SBLine.h
@ -17,12 +17,12 @@
 #ifndef _SB_INTERNAL_LINE_H
 #define _SB_INTERNAL_LINE_H

-#include <SBBase.h>
-#include <SBCodepointSequence.h>
-#include <SBConfig.h>
-#include <SBLine.h>
-#include <SBParagraph.h>
-#include <SBRun.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBBase.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBCodepointSequence.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBLine.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBParagraph.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBRun.h>

 typedef struct _SBLine {
    SBCodepointSequence codepointSequence;
--- a/modules/juce_graphics/unicode/sheenbidi/Source/SBLog.c
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/SBLog.c
@ -14,7 +14,7 @@
 * limitations under the License.
 */

-#include <SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBConfig.h>

 #ifdef SB_CONFIG_LOG

--- a/modules/juce_graphics/unicode/sheenbidi/Source/SBLog.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/SBLog.h
@ -17,7 +17,7 @@
 #ifndef _SB_INTERNAL_LOG_H
 #define _SB_INTERNAL_LOG_H

-#include <SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBConfig.h>

 #ifdef SB_CONFIG_LOG

--- a/modules/juce_graphics/unicode/sheenbidi/Source/SBMirrorLocator.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/SBMirrorLocator.h
@ -17,9 +17,9 @@
 #ifndef _SB_INTERNAL_MIRROR_LOCATOR_H
 #define _SB_INTERNAL_MIRROR_LOCATOR_H

-#include <SBBase.h>
-#include <SBMirrorLocator.h>
-#include <SBLine.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBBase.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBMirrorLocator.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBLine.h>

 typedef struct _SBMirrorLocator {
    SBLineRef _line;
--- a/modules/juce_graphics/unicode/sheenbidi/Source/SBParagraph.c
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/SBParagraph.c
@ -14,7 +14,7 @@
 * limitations under the License.
 */

-#include <SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBConfig.h>
 #include <stddef.h>
 #include <stdlib.h>

--- a/modules/juce_graphics/unicode/sheenbidi/Source/SBParagraph.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/SBParagraph.h
@ -17,10 +17,10 @@
 #ifndef _SB_INTERNAL_PARAGRAPH_H
 #define _SB_INTERNAL_PARAGRAPH_H

-#include <SBAlgorithm.h>
-#include <SBBase.h>
-#include <SBConfig.h>
-#include <SBParagraph.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBAlgorithm.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBBase.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBParagraph.h>

 typedef struct _SBParagraph {
    SBAlgorithmRef algorithm;
--- a/modules/juce_graphics/unicode/sheenbidi/Source/SBScriptLocator.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/SBScriptLocator.h
@ -17,9 +17,9 @@
 #ifndef _SB_INTERNAL_SCRIPT_LOCATOR_H
 #define _SB_INTERNAL_SCRIPT_LOCATOR_H

-#include <SBBase.h>
-#include <SBCodepointSequence.h>
-#include <SBScriptLocator.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBBase.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBCodepointSequence.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBScriptLocator.h>

 #include "ScriptStack.h"

--- a/modules/juce_graphics/unicode/sheenbidi/Source/ScriptLookup.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/ScriptLookup.h
@ -6,8 +6,8 @@
 #ifndef _SB_INTERNAL_SCRIPT_LOOKUP_H
 #define _SB_INTERNAL_SCRIPT_LOOKUP_H

-#include <SBConfig.h>
-#include <SBScript.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBScript.h>

 #include "SBBase.h"

--- a/modules/juce_graphics/unicode/sheenbidi/Source/ScriptStack.c
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/ScriptStack.c
@ -14,7 +14,7 @@
 * limitations under the License.
 */

-#include <SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBConfig.h>

 #include "SBAssert.h"
 #include "SBBase.h"
--- a/modules/juce_graphics/unicode/sheenbidi/Source/ScriptStack.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/ScriptStack.h
@ -17,8 +17,8 @@
 #ifndef _SB_INTERNAL_SCRIPT_STACK_H
 #define _SB_INTERNAL_SCRIPT_STACK_H

-#include <SBBase.h>
-#include <SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBBase.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBConfig.h>

 #define _SBScriptStackCapacity  63

--- a/modules/juce_graphics/unicode/sheenbidi/Source/SheenBidi.c
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/SheenBidi.c
@ -14,8 +14,8 @@
 * limitations under the License.
 */

-#include <SBConfig.h>
-#include <SheenBidi.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SheenBidi.h>

 #ifdef SB_CONFIG_UNITY

--- a/modules/juce_graphics/unicode/sheenbidi/Source/StatusStack.c
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/StatusStack.c
@ -14,7 +14,7 @@
 * limitations under the License.
 */

-#include <SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBConfig.h>
 #include <stddef.h>
 #include <stdlib.h>

--- a/modules/juce_graphics/unicode/sheenbidi/Source/StatusStack.h
+++ b/modules/juce_graphics/unicode/sheenbidi/Source/StatusStack.h
@ -17,7 +17,7 @@
 #ifndef _SB_INTERNAL_STATUS_STACK_H
 #define _SB_INTERNAL_STATUS_STACK_H

-#include <SBConfig.h>
+#include <juce_graphics/unicode/sheenbidi/Headers/SBConfig.h>
 #include "SBBase.h"

 #define _StatusStackList_Length         16