gosu 1.4.6 → 1.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/COPYING +2 -1
- data/dependencies/SDL/include/SDL3/SDL.h +91 -0
- data/dependencies/SDL/include/SDL3/SDL_assert.h +710 -0
- data/dependencies/SDL/include/SDL3/SDL_asyncio.h +550 -0
- data/dependencies/SDL/include/SDL3/SDL_atomic.h +692 -0
- data/dependencies/SDL/include/SDL3/SDL_audio.h +2382 -0
- data/dependencies/SDL/include/SDL3/SDL_begin_code.h +553 -0
- data/dependencies/SDL/include/{SDL_bits.h → SDL3/SDL_bits.h} +47 -27
- data/dependencies/SDL/include/{SDL_blendmode.h → SDL3/SDL_blendmode.h} +59 -55
- data/dependencies/SDL/include/SDL3/SDL_camera.h +535 -0
- data/dependencies/SDL/include/SDL3/SDL_clipboard.h +331 -0
- data/dependencies/SDL/include/{close_code.h → SDL3/SDL_close_code.h} +9 -8
- data/dependencies/SDL/include/{SDL_types.h → SDL3/SDL_copying.h} +2 -9
- data/dependencies/SDL/include/SDL3/SDL_cpuinfo.h +374 -0
- data/dependencies/SDL/include/SDL3/SDL_dialog.h +343 -0
- data/dependencies/SDL/include/SDL3/SDL_dlopennote.h +234 -0
- data/dependencies/SDL/include/{SDL_egl.h → SDL3/SDL_egl.h} +11 -8
- data/dependencies/SDL/include/SDL3/SDL_endian.h +645 -0
- data/dependencies/SDL/include/SDL3/SDL_error.h +226 -0
- data/dependencies/SDL/include/SDL3/SDL_events.h +1651 -0
- data/dependencies/SDL/include/SDL3/SDL_filesystem.h +537 -0
- data/dependencies/SDL/include/SDL3/SDL_gamepad.h +1657 -0
- data/dependencies/SDL/include/SDL3/SDL_gpu.h +4637 -0
- data/dependencies/SDL/include/SDL3/SDL_guid.h +106 -0
- data/dependencies/SDL/include/SDL3/SDL_haptic.h +1461 -0
- data/dependencies/SDL/include/SDL3/SDL_hidapi.h +571 -0
- data/dependencies/SDL/include/SDL3/SDL_hints.h +5041 -0
- data/dependencies/SDL/include/SDL3/SDL_init.h +508 -0
- data/dependencies/SDL/include/SDL3/SDL_intrin.h +410 -0
- data/dependencies/SDL/include/SDL3/SDL_iostream.h +1379 -0
- data/dependencies/SDL/include/SDL3/SDL_joystick.h +1385 -0
- data/dependencies/SDL/include/SDL3/SDL_keyboard.h +615 -0
- data/dependencies/SDL/include/SDL3/SDL_keycode.h +348 -0
- data/dependencies/SDL/include/SDL3/SDL_loadso.h +145 -0
- data/dependencies/SDL/include/{SDL_locale.h → SDL3/SDL_locale.h} +40 -24
- data/dependencies/SDL/include/SDL3/SDL_log.h +541 -0
- data/dependencies/SDL/include/SDL3/SDL_main.h +704 -0
- data/dependencies/SDL/include/SDL3/SDL_main_impl.h +149 -0
- data/dependencies/SDL/include/{SDL_messagebox.h → SDL3/SDL_messagebox.h} +85 -48
- data/dependencies/SDL/include/{SDL_metal.h → SDL3/SDL_metal.h} +29 -29
- data/dependencies/SDL/include/{SDL_misc.h → SDL3/SDL_misc.h} +13 -12
- data/dependencies/SDL/include/SDL3/SDL_mouse.h +813 -0
- data/dependencies/SDL/include/SDL3/SDL_mutex.h +1117 -0
- data/dependencies/SDL/include/SDL3/SDL_oldnames.h +1339 -0
- data/dependencies/SDL/include/{SDL_opengl.h → SDL3/SDL_opengl.h} +1247 -278
- data/dependencies/SDL/include/{SDL_opengl_glext.h → SDL3/SDL_opengl_glext.h} +5 -1
- data/dependencies/SDL/include/{SDL_opengles.h → SDL3/SDL_opengles.h} +6 -7
- data/dependencies/SDL/include/{SDL_opengles2.h → SDL3/SDL_opengles2.h} +10 -11
- data/dependencies/SDL/include/SDL3/SDL_pen.h +198 -0
- data/dependencies/SDL/include/SDL3/SDL_pixels.h +1441 -0
- data/dependencies/SDL/include/{SDL_test_log.h → SDL3/SDL_platform.h} +25 -26
- data/dependencies/SDL/include/SDL3/SDL_platform_defines.h +497 -0
- data/dependencies/SDL/include/{SDL_power.h → SDL3/SDL_power.h} +40 -20
- data/dependencies/SDL/include/SDL3/SDL_process.h +441 -0
- data/dependencies/SDL/include/SDL3/SDL_properties.h +572 -0
- data/dependencies/SDL/include/SDL3/SDL_rect.h +528 -0
- data/dependencies/SDL/include/SDL3/SDL_render.h +3034 -0
- data/dependencies/SDL/include/SDL3/SDL_revision.h +56 -0
- data/dependencies/SDL/include/{SDL_scancode.h → SDL3/SDL_scancode.h} +60 -68
- data/dependencies/SDL/include/SDL3/SDL_sensor.h +321 -0
- data/dependencies/SDL/include/SDL3/SDL_stdinc.h +6186 -0
- data/dependencies/SDL/include/SDL3/SDL_storage.h +686 -0
- data/dependencies/SDL/include/SDL3/SDL_surface.h +1769 -0
- data/dependencies/SDL/include/SDL3/SDL_system.h +840 -0
- data/dependencies/SDL/include/{SDL_test.h → SDL3/SDL_test.h} +16 -22
- data/dependencies/SDL/include/{SDL_test_assert.h → SDL3/SDL_test_assert.h} +27 -34
- data/dependencies/SDL/include/{SDL_test_common.h → SDL3/SDL_test_common.h} +109 -52
- data/dependencies/SDL/include/{SDL_test_compare.h → SDL3/SDL_test_compare.h} +22 -14
- data/dependencies/SDL/include/{SDL_test_crc32.h → SDL3/SDL_test_crc32.h} +27 -30
- data/dependencies/SDL/include/{SDL_test_font.h → SDL3/SDL_test_font.h} +50 -49
- data/dependencies/SDL/include/{SDL_test_fuzzer.h → SDL3/SDL_test_fuzzer.h} +64 -79
- data/dependencies/SDL/include/{SDL_test_harness.h → SDL3/SDL_test_harness.h} +47 -30
- data/dependencies/SDL/include/SDL3/SDL_test_log.h +83 -0
- data/dependencies/SDL/include/{SDL_test_md5.h → SDL3/SDL_test_md5.h} +21 -28
- data/dependencies/SDL/include/{SDL_test_memory.h → SDL3/SDL_test_memory.h} +19 -16
- data/dependencies/SDL/include/SDL3/SDL_thread.h +602 -0
- data/dependencies/SDL/include/SDL3/SDL_time.h +249 -0
- data/dependencies/SDL/include/SDL3/SDL_timer.h +454 -0
- data/dependencies/SDL/include/SDL3/SDL_touch.h +184 -0
- data/dependencies/SDL/include/SDL3/SDL_tray.h +544 -0
- data/dependencies/SDL/include/SDL3/SDL_version.h +198 -0
- data/dependencies/SDL/include/SDL3/SDL_video.h +3497 -0
- data/dependencies/SDL/include/SDL3/SDL_vulkan.h +287 -0
- data/dependencies/SDL/lib/x64/libSDL3.dll.a +0 -0
- data/dependencies/SDL/lib/x86/libSDL3.dll.a +0 -0
- data/dependencies/SDL_sound/SDL3_sound/SDL_sound.h +755 -0
- data/dependencies/SDL_sound/SDL_sound.c +136 -215
- data/dependencies/SDL_sound/SDL_sound_aiff.c +55 -54
- data/dependencies/SDL_sound/SDL_sound_au.c +32 -32
- data/dependencies/SDL_sound/SDL_sound_coreaudio.c +24 -41
- data/dependencies/SDL_sound/SDL_sound_flac.c +32 -12
- data/dependencies/SDL_sound/SDL_sound_internal.h +33 -48
- data/dependencies/SDL_sound/SDL_sound_modplug.c +21 -29
- data/dependencies/SDL_sound/SDL_sound_mp3.c +35 -13
- data/dependencies/SDL_sound/SDL_sound_raw.c +14 -15
- data/dependencies/SDL_sound/SDL_sound_shn.c +82 -82
- data/dependencies/SDL_sound/SDL_sound_voc.c +30 -30
- data/dependencies/SDL_sound/SDL_sound_vorbis.c +34 -25
- data/dependencies/SDL_sound/SDL_sound_wav.c +86 -82
- data/dependencies/SDL_sound/dr_flac.h +1890 -1301
- data/dependencies/SDL_sound/dr_mp3.h +1098 -660
- data/dependencies/SDL_sound/libmodplug/fastmix.c +1 -1
- data/dependencies/SDL_sound/libmodplug/libmodplug.h +5 -4
- data/dependencies/SDL_sound/libmodplug/load_ams.c +6 -3
- data/dependencies/SDL_sound/libmodplug/load_dsm.c +2 -1
- data/dependencies/SDL_sound/libmodplug/load_mt2.c +2 -2
- data/dependencies/SDL_sound/libmodplug/modplug.h +2 -1
- data/dependencies/SDL_sound/libmodplug/snd_fx.c +3 -3
- data/dependencies/SDL_sound/libmodplug/sndfile.c +3 -0
- data/dependencies/SDL_sound/libmodplug/sndmix.c +7 -3
- data/dependencies/SDL_sound/stb_vorbis.h +397 -342
- data/dependencies/mojoAL/AL/alc.h +2 -2
- data/dependencies/mojoAL/mojoal.c +2120 -1885
- data/dependencies/stb/stb_image.h +1190 -1379
- data/dependencies/stb/stb_image_write.h +329 -129
- data/dependencies/stb/stb_truetype.h +304 -60
- data/dependencies/utf8proc/utf8proc.c +133 -75
- data/dependencies/utf8proc/utf8proc.h +131 -50
- data/dependencies/utf8proc/utf8proc_data.h +16213 -15658
- data/ext/gosu-ffi/extconf.rb +103 -0
- data/ext/gosu-ffi/gosu-ffi.def +467 -0
- data/ffi/Gosu.cpp +330 -0
- data/ffi/Gosu.h +84 -0
- data/ffi/Gosu_Channel.cpp +62 -0
- data/ffi/Gosu_Channel.h +17 -0
- data/ffi/Gosu_Color.cpp +176 -0
- data/ffi/Gosu_Color.h +31 -0
- data/ffi/Gosu_Constants.cpp +334 -0
- data/ffi/Gosu_FFI.h +34 -0
- data/ffi/Gosu_FFI_internal.h +160 -0
- data/ffi/Gosu_Font.cpp +97 -0
- data/ffi/Gosu_Font.h +32 -0
- data/ffi/Gosu_Image.cpp +239 -0
- data/ffi/Gosu_Image.h +71 -0
- data/ffi/Gosu_Sample.cpp +29 -0
- data/ffi/Gosu_Sample.h +14 -0
- data/ffi/Gosu_Song.cpp +69 -0
- data/ffi/Gosu_Song.h +18 -0
- data/ffi/Gosu_TextInput.cpp +94 -0
- data/ffi/Gosu_TextInput.h +25 -0
- data/ffi/Gosu_Window.cpp +314 -0
- data/ffi/Gosu_Window.h +78 -0
- data/include/Gosu/Audio.hpp +6 -11
- data/include/Gosu/Bitmap.hpp +38 -53
- data/include/Gosu/Buffer.hpp +54 -0
- data/include/Gosu/Color.hpp +29 -36
- data/include/Gosu/Directories.hpp +25 -28
- data/include/Gosu/Drawable.hpp +58 -0
- data/include/Gosu/Font.hpp +6 -5
- data/include/Gosu/Fwd.hpp +4 -6
- data/include/Gosu/Gosu.hpp +5 -5
- data/include/Gosu/Graphics.hpp +53 -61
- data/include/Gosu/GraphicsBase.hpp +1 -11
- data/include/Gosu/Image.hpp +12 -15
- data/include/Gosu/Math.hpp +50 -72
- data/include/Gosu/Transform.hpp +32 -0
- data/include/Gosu/Utility.hpp +77 -1
- data/include/Gosu/Version.hpp +2 -2
- data/include/Gosu/Window.hpp +15 -9
- data/lib/SDL3.dll +0 -0
- data/lib/gosu/channel.rb +50 -0
- data/lib/gosu/color.rb +173 -0
- data/lib/gosu/compat.rb +130 -17
- data/lib/gosu/constants.rb +386 -0
- data/lib/gosu/ffi.rb +269 -0
- data/lib/gosu/font.rb +62 -0
- data/lib/gosu/gl_tex_info.rb +33 -0
- data/lib/gosu/gosu.rb +250 -0
- data/lib/gosu/image.rb +179 -0
- data/lib/gosu/numeric.rb +17 -0
- data/lib/gosu/preview.rb +6 -6
- data/lib/gosu/sample.rb +25 -0
- data/lib/gosu/song.rb +57 -0
- data/lib/gosu/text_input.rb +83 -0
- data/lib/gosu/window.rb +249 -0
- data/lib/gosu.rb +29 -8
- data/lib64/SDL3.dll +0 -0
- data/rdoc/gosu.rb +2 -2
- data/src/Audio.cpp +30 -24
- data/src/AudioFile.hpp +5 -4
- data/src/AudioFileAudioToolbox.cpp +8 -8
- data/src/AudioFileSDLSound.cpp +12 -15
- data/src/BinPacker.cpp +188 -0
- data/src/BinPacker.hpp +55 -0
- data/src/Bitmap.cpp +172 -143
- data/src/BitmapIO.cpp +60 -86
- data/src/Buffer.cpp +150 -0
- data/src/ClipRectStack.cpp +38 -0
- data/src/ClipRectStack.hpp +17 -83
- data/src/Color.cpp +75 -80
- data/src/Directories.cpp +47 -0
- data/src/DirectoriesUIKit.cpp +50 -0
- data/src/DrawOp.hpp +20 -18
- data/src/DrawOpQueue.hpp +27 -33
- data/src/Drawable.cpp +95 -0
- data/src/EmptyDrawable.hpp +38 -0
- data/src/FPS.cpp +31 -0
- data/src/Font.cpp +104 -74
- data/src/GosuGLView.cpp +13 -11
- data/src/GosuViewController.cpp +2 -10
- data/src/Graphics.cpp +86 -145
- data/src/GraphicsImpl.hpp +14 -68
- data/src/Image.cpp +41 -35
- data/src/Input.cpp +73 -78
- data/src/Macro.cpp +46 -29
- data/src/Macro.hpp +23 -17
- data/src/MarkupParser.cpp +5 -5
- data/src/Math.cpp +48 -22
- data/src/OffScreenTarget.cpp +47 -50
- data/src/OffScreenTarget.hpp +13 -11
- data/src/OpenGLContext.cpp +116 -0
- data/src/OpenGLContext.hpp +41 -0
- data/src/RenderState.hpp +49 -71
- data/src/Resolution.cpp +65 -53
- data/src/TexChunk.cpp +35 -80
- data/src/TexChunk.hpp +44 -35
- data/src/Text.cpp +1 -1
- data/src/TextBuilder.cpp +35 -21
- data/src/TextBuilder.hpp +6 -9
- data/src/TextInput.cpp +9 -9
- data/src/Texture.cpp +62 -80
- data/src/Texture.hpp +25 -23
- data/src/TiledDrawable.cpp +149 -0
- data/src/TiledDrawable.hpp +47 -0
- data/src/TimingApple.cpp +1 -1
- data/src/Transform.cpp +45 -50
- data/src/TransformStack.hpp +16 -16
- data/src/TrueTypeFont.cpp +59 -51
- data/src/TrueTypeFont.hpp +6 -7
- data/src/TrueTypeFontApple.cpp +28 -19
- data/src/TrueTypeFontUnix.cpp +39 -32
- data/src/TrueTypeFontWin.cpp +30 -30
- data/src/Utility.cpp +113 -37
- data/src/UtilityWin.cpp +49 -0
- data/src/Window.cpp +121 -151
- data/src/WindowUIKit.cpp +14 -14
- metadata +165 -118
- data/dependencies/SDL/include/SDL.h +0 -233
- data/dependencies/SDL/include/SDL_assert.h +0 -320
- data/dependencies/SDL/include/SDL_atomic.h +0 -415
- data/dependencies/SDL/include/SDL_audio.h +0 -1500
- data/dependencies/SDL/include/SDL_clipboard.h +0 -141
- data/dependencies/SDL/include/SDL_config.h +0 -331
- data/dependencies/SDL/include/SDL_cpuinfo.h +0 -594
- data/dependencies/SDL/include/SDL_endian.h +0 -348
- data/dependencies/SDL/include/SDL_error.h +0 -163
- data/dependencies/SDL/include/SDL_events.h +0 -1166
- data/dependencies/SDL/include/SDL_filesystem.h +0 -149
- data/dependencies/SDL/include/SDL_gamecontroller.h +0 -1074
- data/dependencies/SDL/include/SDL_gesture.h +0 -117
- data/dependencies/SDL/include/SDL_guid.h +0 -100
- data/dependencies/SDL/include/SDL_haptic.h +0 -1341
- data/dependencies/SDL/include/SDL_hidapi.h +0 -451
- data/dependencies/SDL/include/SDL_hints.h +0 -2569
- data/dependencies/SDL/include/SDL_joystick.h +0 -1066
- data/dependencies/SDL/include/SDL_keyboard.h +0 -353
- data/dependencies/SDL/include/SDL_keycode.h +0 -358
- data/dependencies/SDL/include/SDL_loadso.h +0 -115
- data/dependencies/SDL/include/SDL_log.h +0 -404
- data/dependencies/SDL/include/SDL_main.h +0 -275
- data/dependencies/SDL/include/SDL_mouse.h +0 -465
- data/dependencies/SDL/include/SDL_mutex.h +0 -471
- data/dependencies/SDL/include/SDL_name.h +0 -33
- data/dependencies/SDL/include/SDL_pixels.h +0 -644
- data/dependencies/SDL/include/SDL_platform.h +0 -261
- data/dependencies/SDL/include/SDL_quit.h +0 -58
- data/dependencies/SDL/include/SDL_rect.h +0 -376
- data/dependencies/SDL/include/SDL_render.h +0 -1919
- data/dependencies/SDL/include/SDL_revision.h +0 -7
- data/dependencies/SDL/include/SDL_rwops.h +0 -841
- data/dependencies/SDL/include/SDL_sensor.h +0 -322
- data/dependencies/SDL/include/SDL_shape.h +0 -155
- data/dependencies/SDL/include/SDL_stdinc.h +0 -830
- data/dependencies/SDL/include/SDL_surface.h +0 -997
- data/dependencies/SDL/include/SDL_system.h +0 -623
- data/dependencies/SDL/include/SDL_syswm.h +0 -386
- data/dependencies/SDL/include/SDL_test_images.h +0 -78
- data/dependencies/SDL/include/SDL_test_random.h +0 -115
- data/dependencies/SDL/include/SDL_thread.h +0 -464
- data/dependencies/SDL/include/SDL_timer.h +0 -222
- data/dependencies/SDL/include/SDL_touch.h +0 -150
- data/dependencies/SDL/include/SDL_version.h +0 -204
- data/dependencies/SDL/include/SDL_video.h +0 -2150
- data/dependencies/SDL/include/SDL_vulkan.h +0 -215
- data/dependencies/SDL/include/begin_code.h +0 -187
- data/dependencies/SDL/lib/x64/libSDL2.dll.a +0 -0
- data/dependencies/SDL/lib/x86/libSDL2.dll.a +0 -0
- data/dependencies/SDL_sound/SDL_sound.h +0 -725
- data/ext/gosu/extconf.rb +0 -119
- data/include/Gosu/IO.hpp +0 -254
- data/include/Gosu/ImageData.hpp +0 -53
- data/include/Gosu/Inspection.hpp +0 -7
- data/lib/SDL2.dll +0 -0
- data/lib/gosu/patches.rb +0 -66
- data/lib/gosu/run.rb +0 -20
- data/lib/gosu/swig_patches.rb +0 -110
- data/lib64/SDL2.dll +0 -0
- data/src/BlockAllocator.cpp +0 -131
- data/src/BlockAllocator.hpp +0 -32
- data/src/DirectoriesApple.cpp +0 -69
- data/src/DirectoriesUnix.cpp +0 -46
- data/src/DirectoriesWin.cpp +0 -65
- data/src/EmptyImageData.hpp +0 -52
- data/src/FileUnix.cpp +0 -99
- data/src/FileWin.cpp +0 -88
- data/src/IO.cpp +0 -60
- data/src/Iconv.hpp +0 -51
- data/src/Inspection.cpp +0 -27
- data/src/LargeImageData.cpp +0 -215
- data/src/LargeImageData.hpp +0 -39
- data/src/Log.hpp +0 -19
- data/src/RubyGosu.cxx +0 -13100
- data/src/RubyGosu.h +0 -49
- data/src/WinUtility.cpp +0 -61
- data/src/WinUtility.hpp +0 -27
- /data/dependencies/SDL/include/{SDL_opengles2_gl2.h → SDL3/SDL_opengles2_gl2.h} +0 -0
- /data/dependencies/SDL/include/{SDL_opengles2_gl2ext.h → SDL3/SDL_opengles2_gl2ext.h} +0 -0
- /data/dependencies/SDL/include/{SDL_opengles2_gl2platform.h → SDL3/SDL_opengles2_gl2platform.h} +0 -0
- /data/dependencies/SDL/include/{SDL_opengles2_khrplatform.h → SDL3/SDL_opengles2_khrplatform.h} +0 -0
|
@@ -101,7 +101,7 @@ UTF8PROC_DLLEXPORT const char *utf8proc_version(void) {
|
|
|
101
101
|
}
|
|
102
102
|
|
|
103
103
|
UTF8PROC_DLLEXPORT const char *utf8proc_unicode_version(void) {
|
|
104
|
-
return "
|
|
104
|
+
return "18.0.0";
|
|
105
105
|
}
|
|
106
106
|
|
|
107
107
|
UTF8PROC_DLLEXPORT const char *utf8proc_errmsg(utf8proc_ssize_t errcode) {
|
|
@@ -288,35 +288,47 @@ static utf8proc_bool grapheme_break_simple(int lbc, int tbc) {
|
|
|
288
288
|
true; // GB999
|
|
289
289
|
}
|
|
290
290
|
|
|
291
|
-
static utf8proc_bool grapheme_break_extended(int lbc, int tbc, utf8proc_int32_t *state)
|
|
291
|
+
static utf8proc_bool grapheme_break_extended(int lbc, int tbc, int licb, int ticb, utf8proc_int32_t *state)
|
|
292
292
|
{
|
|
293
293
|
if (state) {
|
|
294
|
-
int
|
|
295
|
-
if (*state ==
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
294
|
+
int state_bc, state_icb; /* boundclass and indic_conjunct_break state */
|
|
295
|
+
if (*state == 0) { /* state initialization */
|
|
296
|
+
state_bc = lbc;
|
|
297
|
+
state_icb = licb;
|
|
298
|
+
}
|
|
299
|
+
else { /* lbc and licb are already encoded in *state */
|
|
300
|
+
state_bc = *state & 0xff; // 1st byte of state is bound class
|
|
301
|
+
state_icb = *state >> 8; // 2nd byte of state is indic conjunct break
|
|
302
|
+
}
|
|
303
|
+
|
|
304
|
+
utf8proc_bool break_permitted = grapheme_break_simple(state_bc, tbc) &&
|
|
305
|
+
!(state_icb == UTF8PROC_INDIC_CONJUNCT_BREAK_LINKER
|
|
306
|
+
&& ticb == UTF8PROC_INDIC_CONJUNCT_BREAK_CONSONANT); // GB9c
|
|
307
|
+
|
|
308
|
+
// Special support for GB9c. Don't break between linker + 0+ extend chars and consonant.
|
|
309
|
+
// We enter LINKER state after a linker and stay in it for extend chars.
|
|
310
|
+
state_icb = (state_icb == UTF8PROC_INDIC_CONJUNCT_BREAK_LINKER && ticb == UTF8PROC_INDIC_CONJUNCT_BREAK_EXTEND) ? state_icb : ticb;
|
|
300
311
|
|
|
301
312
|
// Special support for GB 12/13 made possible by GB999. After two RI
|
|
302
313
|
// class codepoints we want to force a break. Do this by resetting the
|
|
303
314
|
// second RI's bound class to UTF8PROC_BOUNDCLASS_OTHER, to force a break
|
|
304
315
|
// after that character according to GB999 (unless of course such a break is
|
|
305
316
|
// forbidden by a different rule such as GB9).
|
|
306
|
-
if (
|
|
307
|
-
|
|
317
|
+
if (state_bc == tbc && tbc == UTF8PROC_BOUNDCLASS_REGIONAL_INDICATOR)
|
|
318
|
+
state_bc = UTF8PROC_BOUNDCLASS_OTHER;
|
|
308
319
|
// Special support for GB11 (emoji extend* zwj / emoji)
|
|
309
|
-
else if (
|
|
320
|
+
else if (state_bc == UTF8PROC_BOUNDCLASS_EXTENDED_PICTOGRAPHIC) {
|
|
310
321
|
if (tbc == UTF8PROC_BOUNDCLASS_EXTEND) // fold EXTEND codepoints into emoji
|
|
311
|
-
|
|
322
|
+
state_bc = UTF8PROC_BOUNDCLASS_EXTENDED_PICTOGRAPHIC;
|
|
312
323
|
else if (tbc == UTF8PROC_BOUNDCLASS_ZWJ)
|
|
313
|
-
|
|
324
|
+
state_bc = UTF8PROC_BOUNDCLASS_E_ZWG; // state to record emoji+zwg combo
|
|
314
325
|
else
|
|
315
|
-
|
|
326
|
+
state_bc = tbc;
|
|
316
327
|
}
|
|
317
328
|
else
|
|
318
|
-
|
|
329
|
+
state_bc = tbc;
|
|
319
330
|
|
|
331
|
+
*state = state_bc + (state_icb << 8);
|
|
320
332
|
return break_permitted;
|
|
321
333
|
}
|
|
322
334
|
else
|
|
@@ -326,8 +338,12 @@ static utf8proc_bool grapheme_break_extended(int lbc, int tbc, utf8proc_int32_t
|
|
|
326
338
|
UTF8PROC_DLLEXPORT utf8proc_bool utf8proc_grapheme_break_stateful(
|
|
327
339
|
utf8proc_int32_t c1, utf8proc_int32_t c2, utf8proc_int32_t *state) {
|
|
328
340
|
|
|
329
|
-
|
|
330
|
-
|
|
341
|
+
const utf8proc_property_t *p1 = utf8proc_get_property(c1);
|
|
342
|
+
const utf8proc_property_t *p2 = utf8proc_get_property(c2);
|
|
343
|
+
return grapheme_break_extended(p1->boundclass,
|
|
344
|
+
p2->boundclass,
|
|
345
|
+
p1->indic_conjunct_break,
|
|
346
|
+
p2->indic_conjunct_break,
|
|
331
347
|
state);
|
|
332
348
|
}
|
|
333
349
|
|
|
@@ -354,7 +370,7 @@ static utf8proc_int32_t seqindex_decode_index(const utf8proc_uint32_t seqindex)
|
|
|
354
370
|
return seqindex_decode_entry(&entry);
|
|
355
371
|
}
|
|
356
372
|
|
|
357
|
-
static utf8proc_ssize_t seqindex_write_char_decomposed(utf8proc_uint16_t seqindex, utf8proc_int32_t *dst, utf8proc_ssize_t bufsize,
|
|
373
|
+
static utf8proc_ssize_t seqindex_write_char_decomposed(utf8proc_uint16_t seqindex, utf8proc_int32_t *dst, utf8proc_ssize_t bufsize, unsigned int options, utf8proc_int32_t *last_boundclass) {
|
|
358
374
|
utf8proc_ssize_t written = 0;
|
|
359
375
|
const utf8proc_uint16_t *entry = &utf8proc_sequences[seqindex & 0x3FFF];
|
|
360
376
|
int len = seqindex >> 14;
|
|
@@ -365,10 +381,10 @@ static utf8proc_ssize_t seqindex_write_char_decomposed(utf8proc_uint16_t seqinde
|
|
|
365
381
|
for (; len >= 0; entry++, len--) {
|
|
366
382
|
utf8proc_int32_t entry_cp = seqindex_decode_entry(&entry);
|
|
367
383
|
|
|
368
|
-
|
|
369
|
-
(bufsize > written) ? (bufsize - written) : 0, options,
|
|
370
|
-
|
|
371
|
-
|
|
384
|
+
utf8proc_ssize_t decomp_result = utf8proc_decompose_char(entry_cp, dst ? dst+written : dst,
|
|
385
|
+
(bufsize > written) ? (bufsize - written) : 0, options, last_boundclass);
|
|
386
|
+
if (decomp_result < 0) return decomp_result;
|
|
387
|
+
written += decomp_result;
|
|
372
388
|
}
|
|
373
389
|
return written;
|
|
374
390
|
}
|
|
@@ -409,6 +425,10 @@ UTF8PROC_DLLEXPORT int utf8proc_charwidth(utf8proc_int32_t c) {
|
|
|
409
425
|
return utf8proc_get_property(c)->charwidth;
|
|
410
426
|
}
|
|
411
427
|
|
|
428
|
+
UTF8PROC_DLLEXPORT utf8proc_bool utf8proc_charwidth_ambiguous(utf8proc_int32_t c) {
|
|
429
|
+
return (utf8proc_bool) utf8proc_get_property(c)->ambiguous_width;
|
|
430
|
+
}
|
|
431
|
+
|
|
412
432
|
UTF8PROC_DLLEXPORT utf8proc_category_t utf8proc_category(utf8proc_int32_t c) {
|
|
413
433
|
return (utf8proc_category_t) utf8proc_get_property(c)->category;
|
|
414
434
|
}
|
|
@@ -420,9 +440,9 @@ UTF8PROC_DLLEXPORT const char *utf8proc_category_string(utf8proc_int32_t c) {
|
|
|
420
440
|
|
|
421
441
|
#define utf8proc_decompose_lump(replacement_uc) \
|
|
422
442
|
return utf8proc_decompose_char((replacement_uc), dst, bufsize, \
|
|
423
|
-
|
|
443
|
+
options & ~(unsigned int)UTF8PROC_LUMP, last_boundclass)
|
|
424
444
|
|
|
425
|
-
UTF8PROC_DLLEXPORT utf8proc_ssize_t utf8proc_decompose_char(utf8proc_int32_t uc, utf8proc_int32_t *dst, utf8proc_ssize_t bufsize,
|
|
445
|
+
UTF8PROC_DLLEXPORT utf8proc_ssize_t utf8proc_decompose_char(utf8proc_int32_t uc, utf8proc_int32_t *dst, utf8proc_ssize_t bufsize, unsigned int options, utf8proc_int32_t *last_boundclass) {
|
|
426
446
|
const utf8proc_property_t *property;
|
|
427
447
|
utf8proc_propval_t category;
|
|
428
448
|
utf8proc_int32_t hangul_sindex;
|
|
@@ -498,8 +518,8 @@ UTF8PROC_DLLEXPORT utf8proc_ssize_t utf8proc_decompose_char(utf8proc_int32_t uc,
|
|
|
498
518
|
}
|
|
499
519
|
if (options & UTF8PROC_CHARBOUND) {
|
|
500
520
|
utf8proc_bool boundary;
|
|
501
|
-
|
|
502
|
-
|
|
521
|
+
boundary = grapheme_break_extended(0, property->boundclass, 0, property->indic_conjunct_break,
|
|
522
|
+
last_boundclass);
|
|
503
523
|
if (boundary) {
|
|
504
524
|
if (bufsize >= 1) dst[0] = -1; /* sentinel value for grapheme break */
|
|
505
525
|
if (bufsize >= 2) dst[1] = uc;
|
|
@@ -512,14 +532,14 @@ UTF8PROC_DLLEXPORT utf8proc_ssize_t utf8proc_decompose_char(utf8proc_int32_t uc,
|
|
|
512
532
|
|
|
513
533
|
UTF8PROC_DLLEXPORT utf8proc_ssize_t utf8proc_decompose(
|
|
514
534
|
const utf8proc_uint8_t *str, utf8proc_ssize_t strlen,
|
|
515
|
-
utf8proc_int32_t *buffer, utf8proc_ssize_t bufsize,
|
|
535
|
+
utf8proc_int32_t *buffer, utf8proc_ssize_t bufsize, unsigned int options
|
|
516
536
|
) {
|
|
517
537
|
return utf8proc_decompose_custom(str, strlen, buffer, bufsize, options, NULL, NULL);
|
|
518
538
|
}
|
|
519
539
|
|
|
520
540
|
UTF8PROC_DLLEXPORT utf8proc_ssize_t utf8proc_decompose_custom(
|
|
521
541
|
const utf8proc_uint8_t *str, utf8proc_ssize_t strlen,
|
|
522
|
-
utf8proc_int32_t *buffer, utf8proc_ssize_t bufsize,
|
|
542
|
+
utf8proc_int32_t *buffer, utf8proc_ssize_t bufsize, unsigned int options,
|
|
523
543
|
utf8proc_custom_func custom_func, void *custom_data
|
|
524
544
|
) {
|
|
525
545
|
/* strlen will be ignored, if UTF8PROC_NULLTERM is set in options */
|
|
@@ -533,14 +553,15 @@ UTF8PROC_DLLEXPORT utf8proc_ssize_t utf8proc_decompose_custom(
|
|
|
533
553
|
utf8proc_int32_t uc;
|
|
534
554
|
utf8proc_ssize_t rpos = 0;
|
|
535
555
|
utf8proc_ssize_t decomp_result;
|
|
536
|
-
|
|
556
|
+
utf8proc_int32_t boundclass = UTF8PROC_BOUNDCLASS_START;
|
|
537
557
|
while (1) {
|
|
538
558
|
if (options & UTF8PROC_NULLTERM) {
|
|
539
|
-
|
|
559
|
+
utf8proc_ssize_t nread = utf8proc_iterate(str + rpos, -1, &uc);
|
|
540
560
|
/* checking of return value is not necessary,
|
|
541
561
|
as 'uc' is < 0 in case of error */
|
|
542
562
|
if (uc < 0) return UTF8PROC_ERROR_INVALIDUTF8;
|
|
543
|
-
if (
|
|
563
|
+
if (nread > (utf8proc_ssize_t)SSIZE_MAX - rpos) return UTF8PROC_ERROR_OVERFLOW;
|
|
564
|
+
rpos += nread;
|
|
544
565
|
if (uc == 0) break;
|
|
545
566
|
} else {
|
|
546
567
|
if (rpos >= strlen) break;
|
|
@@ -551,15 +572,14 @@ UTF8PROC_DLLEXPORT utf8proc_ssize_t utf8proc_decompose_custom(
|
|
|
551
572
|
uc = custom_func(uc, custom_data); /* user-specified custom mapping */
|
|
552
573
|
}
|
|
553
574
|
decomp_result = utf8proc_decompose_char(
|
|
554
|
-
uc, buffer +
|
|
575
|
+
uc, buffer ? buffer+wpos : buffer, (bufsize > wpos) ? (bufsize - wpos) : 0, options,
|
|
555
576
|
&boundclass
|
|
556
577
|
);
|
|
557
578
|
if (decomp_result < 0) return decomp_result;
|
|
558
|
-
wpos += decomp_result;
|
|
559
579
|
/* prohibiting integer overflows due to too long strings: */
|
|
560
|
-
if (
|
|
561
|
-
wpos > (utf8proc_ssize_t)(SSIZE_MAX/sizeof(utf8proc_int32_t)/2))
|
|
580
|
+
if (decomp_result > (utf8proc_ssize_t)(SSIZE_MAX/sizeof(utf8proc_int32_t)/2) - wpos)
|
|
562
581
|
return UTF8PROC_ERROR_OVERFLOW;
|
|
582
|
+
wpos += decomp_result;
|
|
563
583
|
}
|
|
564
584
|
}
|
|
565
585
|
if ((options & (UTF8PROC_COMPOSE|UTF8PROC_DECOMPOSE)) && bufsize >= wpos) {
|
|
@@ -568,7 +588,17 @@ UTF8PROC_DLLEXPORT utf8proc_ssize_t utf8proc_decompose_custom(
|
|
|
568
588
|
utf8proc_int32_t uc1, uc2;
|
|
569
589
|
const utf8proc_property_t *property1, *property2;
|
|
570
590
|
uc1 = buffer[pos];
|
|
591
|
+
if (uc1 < 0) {
|
|
592
|
+
/* skip grapheme break */
|
|
593
|
+
pos++;
|
|
594
|
+
continue;
|
|
595
|
+
}
|
|
571
596
|
uc2 = buffer[pos+1];
|
|
597
|
+
if (uc2 < 0) {
|
|
598
|
+
/* cannot recombine; skip grapheme break */
|
|
599
|
+
pos+=2;
|
|
600
|
+
continue;
|
|
601
|
+
}
|
|
572
602
|
property1 = unsafe_get_property(uc1);
|
|
573
603
|
property2 = unsafe_get_property(uc2);
|
|
574
604
|
if (property1->combining_class > property2->combining_class &&
|
|
@@ -584,7 +614,7 @@ UTF8PROC_DLLEXPORT utf8proc_ssize_t utf8proc_decompose_custom(
|
|
|
584
614
|
return wpos;
|
|
585
615
|
}
|
|
586
616
|
|
|
587
|
-
UTF8PROC_DLLEXPORT utf8proc_ssize_t utf8proc_normalize_utf32(utf8proc_int32_t *buffer, utf8proc_ssize_t length,
|
|
617
|
+
UTF8PROC_DLLEXPORT utf8proc_ssize_t utf8proc_normalize_utf32(utf8proc_int32_t *buffer, utf8proc_ssize_t length, unsigned int options) {
|
|
588
618
|
/* UTF8PROC_NULLTERM option will be ignored, 'length' is never ignored */
|
|
589
619
|
if (options & (UTF8PROC_NLF2LS | UTF8PROC_NLF2PS | UTF8PROC_STRIPCC)) {
|
|
590
620
|
utf8proc_ssize_t rpos;
|
|
@@ -619,15 +649,25 @@ UTF8PROC_DLLEXPORT utf8proc_ssize_t utf8proc_normalize_utf32(utf8proc_int32_t *b
|
|
|
619
649
|
}
|
|
620
650
|
if (options & UTF8PROC_COMPOSE) {
|
|
621
651
|
utf8proc_int32_t *starter = NULL;
|
|
622
|
-
|
|
623
|
-
const utf8proc_property_t *starter_property = NULL, *current_property;
|
|
652
|
+
const utf8proc_property_t *starter_property = NULL;
|
|
624
653
|
utf8proc_propval_t max_combining_class = -1;
|
|
625
654
|
utf8proc_ssize_t rpos;
|
|
626
655
|
utf8proc_ssize_t wpos = 0;
|
|
627
|
-
utf8proc_int32_t composition;
|
|
628
656
|
for (rpos = 0; rpos < length; rpos++) {
|
|
629
|
-
current_char = buffer[rpos];
|
|
630
|
-
|
|
657
|
+
utf8proc_int32_t current_char = buffer[rpos];
|
|
658
|
+
if (current_char < 0 || current_char >= 0x110000) {
|
|
659
|
+
/* grapheme-break sentinel or out-of-range codepoint: pass it through
|
|
660
|
+
unchanged, but never compose across it, since we cannot inspect it
|
|
661
|
+
(unsafe_get_property would OOB on utf8proc_stage1table, idx = uc >> 8).
|
|
662
|
+
utf8proc_reencode drops what cannot be encoded, so this is invisible
|
|
663
|
+
to utf8proc_map. */
|
|
664
|
+
buffer[wpos++] = current_char;
|
|
665
|
+
starter = NULL;
|
|
666
|
+
starter_property = NULL;
|
|
667
|
+
max_combining_class = -1;
|
|
668
|
+
continue;
|
|
669
|
+
}
|
|
670
|
+
const utf8proc_property_t *current_property = unsafe_get_property(current_char);
|
|
631
671
|
if (starter && current_property->combining_class > max_combining_class) {
|
|
632
672
|
/* combination perhaps possible */
|
|
633
673
|
utf8proc_int32_t hangul_lindex;
|
|
@@ -649,31 +689,41 @@ UTF8PROC_DLLEXPORT utf8proc_ssize_t utf8proc_normalize_utf32(utf8proc_int32_t *b
|
|
|
649
689
|
(hangul_sindex % UTF8PROC_HANGUL_TCOUNT) == 0) {
|
|
650
690
|
utf8proc_int32_t hangul_tindex;
|
|
651
691
|
hangul_tindex = current_char - UTF8PROC_HANGUL_TBASE;
|
|
652
|
-
if (hangul_tindex
|
|
692
|
+
if (hangul_tindex > 0 && hangul_tindex < UTF8PROC_HANGUL_TCOUNT) {
|
|
653
693
|
*starter += hangul_tindex;
|
|
654
694
|
starter_property = NULL;
|
|
655
695
|
continue;
|
|
656
696
|
}
|
|
657
697
|
}
|
|
658
698
|
if (!starter_property) {
|
|
699
|
+
/* `*starter` is either a Hangul character, or points into
|
|
700
|
+
the table `utf8proc_combinations_combined`. It is always
|
|
701
|
+
valid. */
|
|
659
702
|
starter_property = unsafe_get_property(*starter);
|
|
660
703
|
}
|
|
661
|
-
|
|
662
|
-
|
|
663
|
-
|
|
664
|
-
|
|
665
|
-
|
|
666
|
-
|
|
667
|
-
|
|
668
|
-
|
|
669
|
-
|
|
670
|
-
|
|
671
|
-
|
|
672
|
-
|
|
673
|
-
|
|
674
|
-
|
|
675
|
-
|
|
676
|
-
|
|
704
|
+
int idx = starter_property->comb_index;
|
|
705
|
+
if (idx < 0x3FF && current_property->comb_issecond) {
|
|
706
|
+
int len = starter_property->comb_length;
|
|
707
|
+
utf8proc_int32_t max_second = utf8proc_combinations_second[idx + len - 1];
|
|
708
|
+
if (current_char <= max_second) {
|
|
709
|
+
int off;
|
|
710
|
+
// TODO: binary search? arithmetic search?
|
|
711
|
+
for (off = 0; off < len; ++off) {
|
|
712
|
+
utf8proc_int32_t second = utf8proc_combinations_second[idx + off];
|
|
713
|
+
if (current_char < second) {
|
|
714
|
+
/* not found */
|
|
715
|
+
break;
|
|
716
|
+
}
|
|
717
|
+
if (current_char == second) {
|
|
718
|
+
/* found */
|
|
719
|
+
utf8proc_int32_t composition = utf8proc_combinations_combined[idx + off];
|
|
720
|
+
*starter = composition;
|
|
721
|
+
starter_property = NULL;
|
|
722
|
+
break;
|
|
723
|
+
}
|
|
724
|
+
}
|
|
725
|
+
if (starter_property == NULL) {
|
|
726
|
+
/* found */
|
|
677
727
|
continue;
|
|
678
728
|
}
|
|
679
729
|
}
|
|
@@ -696,7 +746,7 @@ UTF8PROC_DLLEXPORT utf8proc_ssize_t utf8proc_normalize_utf32(utf8proc_int32_t *b
|
|
|
696
746
|
return length;
|
|
697
747
|
}
|
|
698
748
|
|
|
699
|
-
UTF8PROC_DLLEXPORT utf8proc_ssize_t utf8proc_reencode(utf8proc_int32_t *buffer, utf8proc_ssize_t length,
|
|
749
|
+
UTF8PROC_DLLEXPORT utf8proc_ssize_t utf8proc_reencode(utf8proc_int32_t *buffer, utf8proc_ssize_t length, unsigned int options) {
|
|
700
750
|
/* UTF8PROC_NULLTERM option will be ignored, 'length' is never ignored
|
|
701
751
|
ASSERT: 'buffer' has one spare byte of free space at the end! */
|
|
702
752
|
length = utf8proc_normalize_utf32(buffer, length, options);
|
|
@@ -721,27 +771,36 @@ UTF8PROC_DLLEXPORT utf8proc_ssize_t utf8proc_reencode(utf8proc_int32_t *buffer,
|
|
|
721
771
|
}
|
|
722
772
|
|
|
723
773
|
UTF8PROC_DLLEXPORT utf8proc_ssize_t utf8proc_map(
|
|
724
|
-
const utf8proc_uint8_t *str, utf8proc_ssize_t strlen, utf8proc_uint8_t **dstptr,
|
|
774
|
+
const utf8proc_uint8_t *str, utf8proc_ssize_t strlen, utf8proc_uint8_t **dstptr, unsigned int options
|
|
725
775
|
) {
|
|
726
776
|
return utf8proc_map_custom(str, strlen, dstptr, options, NULL, NULL);
|
|
727
777
|
}
|
|
728
778
|
|
|
729
779
|
UTF8PROC_DLLEXPORT utf8proc_ssize_t utf8proc_map_custom(
|
|
730
|
-
const utf8proc_uint8_t *str, utf8proc_ssize_t strlen, utf8proc_uint8_t **dstptr,
|
|
780
|
+
const utf8proc_uint8_t *str, utf8proc_ssize_t strlen, utf8proc_uint8_t **dstptr, unsigned int options,
|
|
731
781
|
utf8proc_custom_func custom_func, void *custom_data
|
|
732
782
|
) {
|
|
733
783
|
utf8proc_int32_t *buffer;
|
|
734
784
|
utf8proc_ssize_t result;
|
|
785
|
+
utf8proc_ssize_t bufsize;
|
|
735
786
|
*dstptr = NULL;
|
|
736
|
-
|
|
737
|
-
if (
|
|
738
|
-
buffer = (utf8proc_int32_t *) malloc(((utf8proc_size_t)
|
|
787
|
+
bufsize = utf8proc_decompose_custom(str, strlen, NULL, 0, options, custom_func, custom_data);
|
|
788
|
+
if (bufsize < 0) return bufsize;
|
|
789
|
+
buffer = (utf8proc_int32_t *) malloc(((utf8proc_size_t)bufsize) * sizeof(utf8proc_int32_t) + 1);
|
|
739
790
|
if (!buffer) return UTF8PROC_ERROR_NOMEM;
|
|
740
|
-
result = utf8proc_decompose_custom(str, strlen, buffer,
|
|
791
|
+
result = utf8proc_decompose_custom(str, strlen, buffer, bufsize, options, custom_func, custom_data);
|
|
741
792
|
if (result < 0) {
|
|
742
793
|
free(buffer);
|
|
743
794
|
return result;
|
|
744
795
|
}
|
|
796
|
+
/* a custom_func that returns different results across the two decompose
|
|
797
|
+
passes can make the second pass longer than the buffer we sized from the
|
|
798
|
+
first; reencode would then read and write past the allocation, so bail
|
|
799
|
+
out instead of corrupting the heap */
|
|
800
|
+
if (result > bufsize) {
|
|
801
|
+
free(buffer);
|
|
802
|
+
return UTF8PROC_ERROR_OVERFLOW;
|
|
803
|
+
}
|
|
745
804
|
result = utf8proc_reencode(buffer, result, options);
|
|
746
805
|
if (result < 0) {
|
|
747
806
|
free(buffer);
|
|
@@ -758,35 +817,34 @@ UTF8PROC_DLLEXPORT utf8proc_ssize_t utf8proc_map_custom(
|
|
|
758
817
|
|
|
759
818
|
UTF8PROC_DLLEXPORT utf8proc_uint8_t *utf8proc_NFD(const utf8proc_uint8_t *str) {
|
|
760
819
|
utf8proc_uint8_t *retval;
|
|
761
|
-
utf8proc_map(str, 0, &retval, UTF8PROC_NULLTERM | UTF8PROC_STABLE |
|
|
762
|
-
UTF8PROC_DECOMPOSE);
|
|
820
|
+
utf8proc_map(str, 0, &retval, UTF8PROC_NULLTERM | UTF8PROC_STABLE | UTF8PROC_DECOMPOSE);
|
|
763
821
|
return retval;
|
|
764
822
|
}
|
|
765
823
|
|
|
766
824
|
UTF8PROC_DLLEXPORT utf8proc_uint8_t *utf8proc_NFC(const utf8proc_uint8_t *str) {
|
|
767
825
|
utf8proc_uint8_t *retval;
|
|
768
|
-
utf8proc_map(str, 0, &retval, UTF8PROC_NULLTERM | UTF8PROC_STABLE |
|
|
769
|
-
UTF8PROC_COMPOSE);
|
|
826
|
+
utf8proc_map(str, 0, &retval, UTF8PROC_NULLTERM | UTF8PROC_STABLE | UTF8PROC_COMPOSE);
|
|
770
827
|
return retval;
|
|
771
828
|
}
|
|
772
829
|
|
|
773
830
|
UTF8PROC_DLLEXPORT utf8proc_uint8_t *utf8proc_NFKD(const utf8proc_uint8_t *str) {
|
|
774
831
|
utf8proc_uint8_t *retval;
|
|
775
|
-
utf8proc_map(str, 0, &retval, UTF8PROC_NULLTERM | UTF8PROC_STABLE |
|
|
776
|
-
UTF8PROC_DECOMPOSE | UTF8PROC_COMPAT);
|
|
832
|
+
utf8proc_map(str, 0, &retval, UTF8PROC_NULLTERM | UTF8PROC_STABLE | UTF8PROC_DECOMPOSE | UTF8PROC_COMPAT);
|
|
777
833
|
return retval;
|
|
778
834
|
}
|
|
779
835
|
|
|
780
836
|
UTF8PROC_DLLEXPORT utf8proc_uint8_t *utf8proc_NFKC(const utf8proc_uint8_t *str) {
|
|
781
837
|
utf8proc_uint8_t *retval;
|
|
782
|
-
utf8proc_map(str, 0, &retval, UTF8PROC_NULLTERM | UTF8PROC_STABLE |
|
|
783
|
-
UTF8PROC_COMPOSE | UTF8PROC_COMPAT);
|
|
838
|
+
utf8proc_map(str, 0, &retval, UTF8PROC_NULLTERM | UTF8PROC_STABLE | UTF8PROC_COMPOSE | UTF8PROC_COMPAT);
|
|
784
839
|
return retval;
|
|
785
840
|
}
|
|
786
841
|
|
|
787
842
|
UTF8PROC_DLLEXPORT utf8proc_uint8_t *utf8proc_NFKC_Casefold(const utf8proc_uint8_t *str) {
|
|
788
843
|
utf8proc_uint8_t *retval;
|
|
789
|
-
utf8proc_map(str, 0, &retval, UTF8PROC_NULLTERM | UTF8PROC_STABLE |
|
|
790
|
-
UTF8PROC_COMPOSE | UTF8PROC_COMPAT | UTF8PROC_CASEFOLD | UTF8PROC_IGNORE);
|
|
844
|
+
utf8proc_map(str, 0, &retval, UTF8PROC_NULLTERM | UTF8PROC_STABLE | UTF8PROC_COMPOSE | UTF8PROC_COMPAT | UTF8PROC_CASEFOLD | UTF8PROC_IGNORE);
|
|
791
845
|
return retval;
|
|
792
846
|
}
|
|
847
|
+
|
|
848
|
+
UTF8PROC_DLLEXPORT void utf8proc_free(utf8proc_uint8_t *ptr) {
|
|
849
|
+
free(ptr);
|
|
850
|
+
}
|