diff --git a/data/06_code2000.ttf b/data/06_code2000.ttf new file mode 100755 index 0000000000..f6a95cb025 Binary files /dev/null and b/data/06_code2000.ttf differ diff --git a/data/07_abyssinica_sil_r.ttf b/data/07_abyssinica_sil_r.ttf deleted file mode 100644 index 640220c6c1..0000000000 Binary files a/data/07_abyssinica_sil_r.ttf and /dev/null differ diff --git a/data/09_droid_sans_thai.ttf b/data/09_droid_sans_thai.ttf deleted file mode 100644 index f849baeff9..0000000000 Binary files a/data/09_droid_sans_thai.ttf and /dev/null differ diff --git a/data/10_asot_biisha_n_ship.ttf b/data/10_asot_biisha_n_ship.ttf deleted file mode 100644 index 0ef6a56ba0..0000000000 Binary files a/data/10_asot_biisha_n_ship.ttf and /dev/null differ diff --git a/data/11_bnot_satyajit_sm_n_ship.ttf b/data/11_bnot_satyajit_sm_n_ship.ttf deleted file mode 100644 index c12c04af76..0000000000 Binary files a/data/11_bnot_satyajit_sm_n_ship.ttf and /dev/null differ diff --git a/data/12_boot_dhruv_n_ship.ttf b/data/12_boot_dhruv_n_ship.ttf deleted file mode 100644 index 8e9195ba06..0000000000 Binary files a/data/12_boot_dhruv_n_ship.ttf and /dev/null differ diff --git a/data/13_doot_dhruv_n_ship.ttf b/data/13_doot_dhruv_n_ship.ttf deleted file mode 100644 index 876dcafe2f..0000000000 Binary files a/data/13_doot_dhruv_n_ship.ttf and /dev/null differ diff --git a/data/14_dvot_yogesh_n_ship.ttf b/data/14_dvot_yogesh_n_ship.ttf deleted file mode 100644 index c5816bd9c5..0000000000 Binary files a/data/14_dvot_yogesh_n_ship.ttf and /dev/null differ diff --git a/data/15_gist_sat_dvot_dhruv_n_ship.ttf b/data/15_gist_sat_dvot_dhruv_n_ship.ttf deleted file mode 100644 index f6c2024aa9..0000000000 Binary files a/data/15_gist_sat_dvot_dhruv_n_ship.ttf and /dev/null differ diff --git a/data/16_gist-snd-dvot_dhruv_n_ship.ttf b/data/16_gist-snd-dvot_dhruv_n_ship.ttf deleted file mode 100644 index de501e8936..0000000000 Binary files a/data/16_gist-snd-dvot_dhruv_n_ship.ttf and /dev/null differ diff --git a/data/17_gjot_pratik_n_ship.ttf b/data/17_gjot_pratik_n_ship.ttf deleted file mode 100644 index 645f4b9297..0000000000 Binary files a/data/17_gjot_pratik_n_ship.ttf and /dev/null differ diff --git a/data/18_gjot_rohit_n_ship.ttf b/data/18_gjot_rohit_n_ship.ttf deleted file mode 100644 index dafd1eeca6..0000000000 Binary files a/data/18_gjot_rohit_n_ship.ttf and /dev/null differ diff --git a/data/19_knot_nandi_n_ship.ttf b/data/19_knot_nandi_n_ship.ttf deleted file mode 100644 index 83f551a659..0000000000 Binary files a/data/19_knot_nandi_n_ship.ttf and /dev/null differ diff --git a/data/20_koot_dhruv_n_ship.ttf b/data/20_koot_dhruv_n_ship.ttf deleted file mode 100644 index b626d1e410..0000000000 Binary files a/data/20_koot_dhruv_n_ship.ttf and /dev/null differ diff --git a/data/21_ksot_dhruv_n_ship.TTF b/data/21_ksot_dhruv_n_ship.TTF deleted file mode 100644 index be83b4bc6f..0000000000 Binary files a/data/21_ksot_dhruv_n_ship.TTF and /dev/null differ diff --git a/data/22_miot_dhruv_n_ship.ttf b/data/22_miot_dhruv_n_ship.ttf deleted file mode 100644 index 30214f6b13..0000000000 Binary files a/data/22_miot_dhruv_n_ship.ttf and /dev/null differ diff --git a/data/23_mlot_aswathi_n_ship.TTF b/data/23_mlot_aswathi_n_ship.TTF deleted file mode 100644 index 0061aaca02..0000000000 Binary files a/data/23_mlot_aswathi_n_ship.TTF and /dev/null differ diff --git a/data/24_mlot_karthika_n_ship.ttf b/data/24_mlot_karthika_n_ship.ttf deleted file mode 100644 index e50a81f493..0000000000 Binary files a/data/24_mlot_karthika_n_ship.ttf and /dev/null differ diff --git a/data/25_mrot_yogesh_n_ship.ttf b/data/25_mrot_yogesh_n_ship.ttf deleted file mode 100644 index f755c20e46..0000000000 Binary files a/data/25_mrot_yogesh_n_ship.ttf and /dev/null differ diff --git a/data/26_neot_dhruv_n_ship.ttf b/data/26_neot_dhruv_n_ship.ttf deleted file mode 100644 index e43c045177..0000000000 Binary files a/data/26_neot_dhruv_n_ship.ttf and /dev/null differ diff --git a/data/27_orot_mukt.ttf b/data/27_orot_mukt.ttf deleted file mode 100644 index 8eb2b81425..0000000000 Binary files a/data/27_orot_mukt.ttf and /dev/null differ diff --git a/data/28_sdot_dhruv_n_ship.ttf b/data/28_sdot_dhruv_n_ship.ttf deleted file mode 100644 index 7f43ad04b2..0000000000 Binary files a/data/28_sdot_dhruv_n_ship.ttf and /dev/null differ diff --git a/data/29_tlot_harshpriya_n_ship.ttf b/data/29_tlot_harshpriya_n_ship.ttf deleted file mode 100644 index fc7f52a100..0000000000 Binary files a/data/29_tlot_harshpriya_n_ship.ttf and /dev/null differ diff --git a/data/30_tmot_kapilan_n_ship.ttf b/data/30_tmot_kapilan_n_ship.ttf deleted file mode 100644 index 56c27fe9c2..0000000000 Binary files a/data/30_tmot_kapilan_n_ship.ttf and /dev/null differ diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 84445b32dd..25bd35a543 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -40,6 +40,7 @@ EE12020F11CD464100ABDD5D /* libindexer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EE12020511CD464100ABDD5D /* libindexer.a */; }; EE12021011CD464100ABDD5D /* libmap.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EE12020611CD464100ABDD5D /* libmap.a */; }; EE12021211CD464100ABDD5D /* libyg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EE12020811CD464100ABDD5D /* libyg.a */; }; + EE164811135CEE4A003B8A3E /* 06_code2000.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EE164810135CEE49003B8A3E /* 06_code2000.ttf */; }; EE583CBB12F773F00042CBE3 /* unicode_blocks.txt in Resources */ = {isa = PBXBuildFile; fileRef = EE583CBA12F773F00042CBE3 /* unicode_blocks.txt */; }; EE7F29811219ECA300EB67A9 /* RenderBuffer.mm in Sources */ = {isa = PBXBuildFile; fileRef = EE7F297D1219ECA300EB67A9 /* RenderBuffer.mm */; }; EE7F29821219ECA300EB67A9 /* RenderContext.mm in Sources */ = {isa = PBXBuildFile; fileRef = EE7F297E1219ECA300EB67A9 /* RenderContext.mm */; }; @@ -50,29 +51,6 @@ EEA61603134C496A003A9827 /* 03_jomolhari-id-a3d.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615E7134C4968003A9827 /* 03_jomolhari-id-a3d.ttf */; }; EEA61604134C496A003A9827 /* 04_padauk.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615E8134C4968003A9827 /* 04_padauk.ttf */; }; EEA61605134C496A003A9827 /* 05_khmeros.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615E9134C4968003A9827 /* 05_khmeros.ttf */; }; - EEA61606134C496A003A9827 /* 07_abyssinica_sil_r.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615EA134C4968003A9827 /* 07_abyssinica_sil_r.ttf */; }; - EEA61607134C496A003A9827 /* 09_droid_sans_thai.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615EB134C4969003A9827 /* 09_droid_sans_thai.ttf */; }; - EEA61608134C496A003A9827 /* 10_asot_biisha_n_ship.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615EC134C4969003A9827 /* 10_asot_biisha_n_ship.ttf */; }; - EEA61609134C496A003A9827 /* 11_bnot_satyajit_sm_n_ship.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615ED134C4969003A9827 /* 11_bnot_satyajit_sm_n_ship.ttf */; }; - EEA6160A134C496A003A9827 /* 12_boot_dhruv_n_ship.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615EE134C4969003A9827 /* 12_boot_dhruv_n_ship.ttf */; }; - EEA6160B134C496A003A9827 /* 13_doot_dhruv_n_ship.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615EF134C4969003A9827 /* 13_doot_dhruv_n_ship.ttf */; }; - EEA6160C134C496A003A9827 /* 14_dvot_yogesh_n_ship.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615F0134C4969003A9827 /* 14_dvot_yogesh_n_ship.ttf */; }; - EEA6160D134C496A003A9827 /* 15_gist_sat_dvot_dhruv_n_ship.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615F1134C4969003A9827 /* 15_gist_sat_dvot_dhruv_n_ship.ttf */; }; - EEA6160E134C496A003A9827 /* 16_gist-snd-dvot_dhruv_n_ship.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615F2134C4969003A9827 /* 16_gist-snd-dvot_dhruv_n_ship.ttf */; }; - EEA6160F134C496A003A9827 /* 17_gjot_pratik_n_ship.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615F3134C4969003A9827 /* 17_gjot_pratik_n_ship.ttf */; }; - EEA61610134C496A003A9827 /* 18_gjot_rohit_n_ship.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615F4134C4969003A9827 /* 18_gjot_rohit_n_ship.ttf */; }; - EEA61611134C496A003A9827 /* 19_knot_nandi_n_ship.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615F5134C4969003A9827 /* 19_knot_nandi_n_ship.ttf */; }; - EEA61612134C496A003A9827 /* 20_koot_dhruv_n_ship.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615F6134C4969003A9827 /* 20_koot_dhruv_n_ship.ttf */; }; - EEA61613134C496A003A9827 /* 21_ksot_dhruv_n_ship.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615F7134C4969003A9827 /* 21_ksot_dhruv_n_ship.ttf */; }; - EEA61614134C496A003A9827 /* 22_miot_dhruv_n_ship.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615F8134C4969003A9827 /* 22_miot_dhruv_n_ship.ttf */; }; - EEA61615134C496A003A9827 /* 23_mlot_aswathi_n_ship.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615F9134C4969003A9827 /* 23_mlot_aswathi_n_ship.ttf */; }; - EEA61616134C496A003A9827 /* 24_mlot_karthika_n_ship.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615FA134C496A003A9827 /* 24_mlot_karthika_n_ship.ttf */; }; - EEA61617134C496A003A9827 /* 25_mrot_yogesh_n_ship.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615FB134C496A003A9827 /* 25_mrot_yogesh_n_ship.ttf */; }; - EEA61618134C496A003A9827 /* 26_neot_dhruv_n_ship.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615FC134C496A003A9827 /* 26_neot_dhruv_n_ship.ttf */; }; - EEA61619134C496A003A9827 /* 27_orot_mukt.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615FD134C496A003A9827 /* 27_orot_mukt.ttf */; }; - EEA6161A134C496A003A9827 /* 28_sdot_dhruv_n_ship.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615FE134C496A003A9827 /* 28_sdot_dhruv_n_ship.ttf */; }; - EEA6161B134C496A003A9827 /* 29_tlot_harshpriya_n_ship.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615FF134C496A003A9827 /* 29_tlot_harshpriya_n_ship.ttf */; }; - EEA6161C134C496A003A9827 /* 30_tmot_kapilan_n_ship.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA61600134C496A003A9827 /* 30_tmot_kapilan_n_ship.ttf */; }; EEAF65E5134BCBD500A81C82 /* location-search.png in Resources */ = {isa = PBXBuildFile; fileRef = EEAF65E3134BCBD500A81C82 /* location-search.png */; }; EEAF65E6134BCBD500A81C82 /* location-search@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = EEAF65E4134BCBD500A81C82 /* location-search@2x.png */; }; EEB7E22211E9079400080A68 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EEB7E22111E9079400080A68 /* CoreLocation.framework */; }; @@ -160,6 +138,7 @@ EE12020611CD464100ABDD5D /* libmap.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libmap.a; sourceTree = SOURCE_ROOT; }; EE12020811CD464100ABDD5D /* libyg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libyg.a; sourceTree = SOURCE_ROOT; }; EE16192B126E374500622BD0 /* RenderContext.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; lineEnding = 0; name = RenderContext.hpp; path = Classes/RenderContext.hpp; sourceTree = SOURCE_ROOT; }; + EE164810135CEE49003B8A3E /* 06_code2000.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = 06_code2000.ttf; path = ../../data/06_code2000.ttf; sourceTree = SOURCE_ROOT; }; EE583CBA12F773F00042CBE3 /* unicode_blocks.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = unicode_blocks.txt; path = ../../data/unicode_blocks.txt; sourceTree = ""; }; EE7F297C1219ECA300EB67A9 /* RenderBuffer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; lineEnding = 0; name = RenderBuffer.hpp; path = Classes/RenderBuffer.hpp; sourceTree = SOURCE_ROOT; }; EE7F297D1219ECA300EB67A9 /* RenderBuffer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; name = RenderBuffer.mm; path = Classes/RenderBuffer.mm; sourceTree = SOURCE_ROOT; }; @@ -172,29 +151,6 @@ EEA615E7134C4968003A9827 /* 03_jomolhari-id-a3d.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "03_jomolhari-id-a3d.ttf"; path = "../../data/03_jomolhari-id-a3d.ttf"; sourceTree = SOURCE_ROOT; }; EEA615E8134C4968003A9827 /* 04_padauk.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = 04_padauk.ttf; path = ../../data/04_padauk.ttf; sourceTree = SOURCE_ROOT; }; EEA615E9134C4968003A9827 /* 05_khmeros.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = 05_khmeros.ttf; path = ../../data/05_khmeros.ttf; sourceTree = SOURCE_ROOT; }; - EEA615EA134C4968003A9827 /* 07_abyssinica_sil_r.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = 07_abyssinica_sil_r.ttf; path = ../../data/07_abyssinica_sil_r.ttf; sourceTree = SOURCE_ROOT; }; - EEA615EB134C4969003A9827 /* 09_droid_sans_thai.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = 09_droid_sans_thai.ttf; path = ../../data/09_droid_sans_thai.ttf; sourceTree = SOURCE_ROOT; }; - EEA615EC134C4969003A9827 /* 10_asot_biisha_n_ship.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = 10_asot_biisha_n_ship.ttf; path = ../../data/10_asot_biisha_n_ship.ttf; sourceTree = SOURCE_ROOT; }; - EEA615ED134C4969003A9827 /* 11_bnot_satyajit_sm_n_ship.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = 11_bnot_satyajit_sm_n_ship.ttf; path = ../../data/11_bnot_satyajit_sm_n_ship.ttf; sourceTree = SOURCE_ROOT; }; - EEA615EE134C4969003A9827 /* 12_boot_dhruv_n_ship.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = 12_boot_dhruv_n_ship.ttf; path = ../../data/12_boot_dhruv_n_ship.ttf; sourceTree = SOURCE_ROOT; }; - EEA615EF134C4969003A9827 /* 13_doot_dhruv_n_ship.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = 13_doot_dhruv_n_ship.ttf; path = ../../data/13_doot_dhruv_n_ship.ttf; sourceTree = SOURCE_ROOT; }; - EEA615F0134C4969003A9827 /* 14_dvot_yogesh_n_ship.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = 14_dvot_yogesh_n_ship.ttf; path = ../../data/14_dvot_yogesh_n_ship.ttf; sourceTree = SOURCE_ROOT; }; - EEA615F1134C4969003A9827 /* 15_gist_sat_dvot_dhruv_n_ship.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = 15_gist_sat_dvot_dhruv_n_ship.ttf; path = ../../data/15_gist_sat_dvot_dhruv_n_ship.ttf; sourceTree = SOURCE_ROOT; }; - EEA615F2134C4969003A9827 /* 16_gist-snd-dvot_dhruv_n_ship.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "16_gist-snd-dvot_dhruv_n_ship.ttf"; path = "../../data/16_gist-snd-dvot_dhruv_n_ship.ttf"; sourceTree = SOURCE_ROOT; }; - EEA615F3134C4969003A9827 /* 17_gjot_pratik_n_ship.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = 17_gjot_pratik_n_ship.ttf; path = ../../data/17_gjot_pratik_n_ship.ttf; sourceTree = SOURCE_ROOT; }; - EEA615F4134C4969003A9827 /* 18_gjot_rohit_n_ship.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = 18_gjot_rohit_n_ship.ttf; path = ../../data/18_gjot_rohit_n_ship.ttf; sourceTree = SOURCE_ROOT; }; - EEA615F5134C4969003A9827 /* 19_knot_nandi_n_ship.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = 19_knot_nandi_n_ship.ttf; path = ../../data/19_knot_nandi_n_ship.ttf; sourceTree = SOURCE_ROOT; }; - EEA615F6134C4969003A9827 /* 20_koot_dhruv_n_ship.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = 20_koot_dhruv_n_ship.ttf; path = ../../data/20_koot_dhruv_n_ship.ttf; sourceTree = SOURCE_ROOT; }; - EEA615F7134C4969003A9827 /* 21_ksot_dhruv_n_ship.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = 21_ksot_dhruv_n_ship.ttf; path = ../../data/21_ksot_dhruv_n_ship.ttf; sourceTree = SOURCE_ROOT; }; - EEA615F8134C4969003A9827 /* 22_miot_dhruv_n_ship.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = 22_miot_dhruv_n_ship.ttf; path = ../../data/22_miot_dhruv_n_ship.ttf; sourceTree = SOURCE_ROOT; }; - EEA615F9134C4969003A9827 /* 23_mlot_aswathi_n_ship.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = 23_mlot_aswathi_n_ship.ttf; path = ../../data/23_mlot_aswathi_n_ship.ttf; sourceTree = SOURCE_ROOT; }; - EEA615FA134C496A003A9827 /* 24_mlot_karthika_n_ship.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = 24_mlot_karthika_n_ship.ttf; path = ../../data/24_mlot_karthika_n_ship.ttf; sourceTree = SOURCE_ROOT; }; - EEA615FB134C496A003A9827 /* 25_mrot_yogesh_n_ship.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = 25_mrot_yogesh_n_ship.ttf; path = ../../data/25_mrot_yogesh_n_ship.ttf; sourceTree = SOURCE_ROOT; }; - EEA615FC134C496A003A9827 /* 26_neot_dhruv_n_ship.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = 26_neot_dhruv_n_ship.ttf; path = ../../data/26_neot_dhruv_n_ship.ttf; sourceTree = SOURCE_ROOT; }; - EEA615FD134C496A003A9827 /* 27_orot_mukt.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = 27_orot_mukt.ttf; path = ../../data/27_orot_mukt.ttf; sourceTree = SOURCE_ROOT; }; - EEA615FE134C496A003A9827 /* 28_sdot_dhruv_n_ship.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = 28_sdot_dhruv_n_ship.ttf; path = ../../data/28_sdot_dhruv_n_ship.ttf; sourceTree = SOURCE_ROOT; }; - EEA615FF134C496A003A9827 /* 29_tlot_harshpriya_n_ship.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = 29_tlot_harshpriya_n_ship.ttf; path = ../../data/29_tlot_harshpriya_n_ship.ttf; sourceTree = SOURCE_ROOT; }; - EEA61600134C496A003A9827 /* 30_tmot_kapilan_n_ship.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = 30_tmot_kapilan_n_ship.ttf; path = ../../data/30_tmot_kapilan_n_ship.ttf; sourceTree = SOURCE_ROOT; }; EEAF65E3134BCBD500A81C82 /* location-search.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "location-search.png"; sourceTree = ""; }; EEAF65E4134BCBD500A81C82 /* location-search@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "location-search@2x.png"; sourceTree = ""; }; EEB7E22111E9079400080A68 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; }; @@ -410,29 +366,7 @@ EEA615E7134C4968003A9827 /* 03_jomolhari-id-a3d.ttf */, EEA615E8134C4968003A9827 /* 04_padauk.ttf */, EEA615E9134C4968003A9827 /* 05_khmeros.ttf */, - EEA615EA134C4968003A9827 /* 07_abyssinica_sil_r.ttf */, - EEA615EB134C4969003A9827 /* 09_droid_sans_thai.ttf */, - EEA615EC134C4969003A9827 /* 10_asot_biisha_n_ship.ttf */, - EEA615ED134C4969003A9827 /* 11_bnot_satyajit_sm_n_ship.ttf */, - EEA615EE134C4969003A9827 /* 12_boot_dhruv_n_ship.ttf */, - EEA615EF134C4969003A9827 /* 13_doot_dhruv_n_ship.ttf */, - EEA615F0134C4969003A9827 /* 14_dvot_yogesh_n_ship.ttf */, - EEA615F1134C4969003A9827 /* 15_gist_sat_dvot_dhruv_n_ship.ttf */, - EEA615F2134C4969003A9827 /* 16_gist-snd-dvot_dhruv_n_ship.ttf */, - EEA615F3134C4969003A9827 /* 17_gjot_pratik_n_ship.ttf */, - EEA615F4134C4969003A9827 /* 18_gjot_rohit_n_ship.ttf */, - EEA615F5134C4969003A9827 /* 19_knot_nandi_n_ship.ttf */, - EEA615F6134C4969003A9827 /* 20_koot_dhruv_n_ship.ttf */, - EEA615F7134C4969003A9827 /* 21_ksot_dhruv_n_ship.ttf */, - EEA615F8134C4969003A9827 /* 22_miot_dhruv_n_ship.ttf */, - EEA615F9134C4969003A9827 /* 23_mlot_aswathi_n_ship.ttf */, - EEA615FA134C496A003A9827 /* 24_mlot_karthika_n_ship.ttf */, - EEA615FB134C496A003A9827 /* 25_mrot_yogesh_n_ship.ttf */, - EEA615FC134C496A003A9827 /* 26_neot_dhruv_n_ship.ttf */, - EEA615FD134C496A003A9827 /* 27_orot_mukt.ttf */, - EEA615FE134C496A003A9827 /* 28_sdot_dhruv_n_ship.ttf */, - EEA615FF134C496A003A9827 /* 29_tlot_harshpriya_n_ship.ttf */, - EEA61600134C496A003A9827 /* 30_tmot_kapilan_n_ship.ttf */, + EE164810135CEE49003B8A3E /* 06_code2000.ttf */, FAFF42291347F101009BBB14 /* World.mwm */, 4938BB1C1343652600E0815A /* dictionary.slf */, FAFCB63713367AD1001A5C59 /* about-travelguide-iphone.html */, @@ -613,29 +547,7 @@ EEA61603134C496A003A9827 /* 03_jomolhari-id-a3d.ttf in Resources */, EEA61604134C496A003A9827 /* 04_padauk.ttf in Resources */, EEA61605134C496A003A9827 /* 05_khmeros.ttf in Resources */, - EEA61606134C496A003A9827 /* 07_abyssinica_sil_r.ttf in Resources */, - EEA61607134C496A003A9827 /* 09_droid_sans_thai.ttf in Resources */, - EEA61608134C496A003A9827 /* 10_asot_biisha_n_ship.ttf in Resources */, - EEA61609134C496A003A9827 /* 11_bnot_satyajit_sm_n_ship.ttf in Resources */, - EEA6160A134C496A003A9827 /* 12_boot_dhruv_n_ship.ttf in Resources */, - EEA6160B134C496A003A9827 /* 13_doot_dhruv_n_ship.ttf in Resources */, - EEA6160C134C496A003A9827 /* 14_dvot_yogesh_n_ship.ttf in Resources */, - EEA6160D134C496A003A9827 /* 15_gist_sat_dvot_dhruv_n_ship.ttf in Resources */, - EEA6160E134C496A003A9827 /* 16_gist-snd-dvot_dhruv_n_ship.ttf in Resources */, - EEA6160F134C496A003A9827 /* 17_gjot_pratik_n_ship.ttf in Resources */, - EEA61610134C496A003A9827 /* 18_gjot_rohit_n_ship.ttf in Resources */, - EEA61611134C496A003A9827 /* 19_knot_nandi_n_ship.ttf in Resources */, - EEA61612134C496A003A9827 /* 20_koot_dhruv_n_ship.ttf in Resources */, - EEA61613134C496A003A9827 /* 21_ksot_dhruv_n_ship.ttf in Resources */, - EEA61614134C496A003A9827 /* 22_miot_dhruv_n_ship.ttf in Resources */, - EEA61615134C496A003A9827 /* 23_mlot_aswathi_n_ship.ttf in Resources */, - EEA61616134C496A003A9827 /* 24_mlot_karthika_n_ship.ttf in Resources */, - EEA61617134C496A003A9827 /* 25_mrot_yogesh_n_ship.ttf in Resources */, - EEA61618134C496A003A9827 /* 26_neot_dhruv_n_ship.ttf in Resources */, - EEA61619134C496A003A9827 /* 27_orot_mukt.ttf in Resources */, - EEA6161A134C496A003A9827 /* 28_sdot_dhruv_n_ship.ttf in Resources */, - EEA6161B134C496A003A9827 /* 29_tlot_harshpriya_n_ship.ttf in Resources */, - EEA6161C134C496A003A9827 /* 30_tmot_kapilan_n_ship.ttf in Resources */, + EE164811135CEE4A003B8A3E /* 06_code2000.ttf in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/qt/qt.pro b/qt/qt.pro index ddc85255f8..ebda16a133 100644 --- a/qt/qt.pro +++ b/qt/qt.pro @@ -36,31 +36,7 @@ macx { ../data/03_jomolhari-id-a3d.ttf \ ../data/04_padauk.ttf \ ../data/05_khmeros.ttf \ - ../data/07_abyssinica_sil_r.ttf \ - ../data/09_droid_sans_thai.ttf \ - ../data/10_asot_biisha_n_ship.ttf \ - ../data/11_bnot_satyajit_sm_n_ship.ttf \ - ../data/12_boot_dhruv_n_ship.ttf \ - ../data/13_doot_dhruv_n_ship.ttf \ - ../data/14_dvot_yogesh_n_ship.ttf \ - ../data/15_gist_sat_dvot_dhruv_n_ship.ttf \ - ../data/16_gist-snd-dvot_dhruv_n_ship.ttf \ - ../data/17_gjot_pratik_n_ship.ttf \ - ../data/18_gjot_rohit_n_ship.ttf \ - ../data/19_knot_nandi_n_ship.ttf \ - ../data/20_koot_dhruv_n_ship.ttf \ - ../data/21_ksot_dhruv_n_ship.ttf \ - ../data/22_miot_dhruv_n_ship.ttf \ - ../data/23_mlot_aswathi_n_ship.ttf \ - ../data/24_mlot_karthika_n_ship.ttf \ - ../data/25_mrot_yogesh_n_ship.ttf \ - ../data/26_neot_dhruv_n_ship.ttf \ - ../data/27_orot_mukt.ttf \ - ../data/28_sdot_dhruv_n_ship.ttf \ - ../data/29_tlot_harshpriya_n_ship.ttf \ - ../data/30_tmot_kapilan_n_ship.ttf - - + ../data/06_code2000.ttf FONT_RESOURCES.path = Contents/Resources QMAKE_BUNDLE_DATA += OTHER_RESOURCES CLASSIFICATOR_RESOURCES SKIN_RESOURCES FONT_RESOURCES diff --git a/yg/glyph_cache.cpp b/yg/glyph_cache.cpp index fc698e2062..985f589e96 100644 --- a/yg/glyph_cache.cpp +++ b/yg/glyph_cache.cpp @@ -83,6 +83,19 @@ namespace yg return make_pair(font, charIDX); } +#ifdef DEBUG + + for (int i = 0; i < m_impl->m_unicodeBlocks.size(); ++i) + { + if (m_impl->m_unicodeBlocks[i].hasSymbol(key.m_id)) + { + LOG(LINFO, ("symbol not found, id=", key.m_id, ", unicodeBlock=", m_impl->m_unicodeBlocks[i].m_name)); + break; + } + } + +#endif + font = fonts.front().get(); /// taking substitution character from the first font in the list